perf: 优化页面

circlePages/addShare.vue

@@ -10,7 +10,8 @@
 					<text :style="{fontSize:(wxFontSize)+'px'}">发布供应</text>
 				</view>
 				<view>
-					<button plain="true" style="margin-right: 4px;border-radius: 24px;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#1d60b1;border-color:#1d60b1;" @click="saveForm(1)"  :style="{fontSize:(wxFontSize-3)+'px'}">暂存</button>
+					<button v-if="canSave" plain="true" style="margin-right: 4px;border-radius: 24px;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#1d60b1;border-color:#1d60b1;" @click="saveForm(1)"  :style="{fontSize:(wxFontSize-3)+'px'}">暂存</button>
+					<button v-if="!canSave" :disabled="!canSave"  plain="true" style="margin-right: 4px;border-radius: 24px;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#0003;border-color:#0003;" @click="saveForm(1)"  :style="{fontSize:(wxFontSize-3)+'px'}">暂存</button>
 				</view>
 			</view>
 		</tn-nav-bar>
@@ -18,7 +19,7 @@
 		<view class="tn-safe-area-inset-bottom" :style="{paddingTop: vuex_custom_bar_height + 'px'}">
 
 			<tn-steps style="pointer-events:none;" :list="selectValue=='个人'?stepList:stepList2" :current="stepIndex" mode="dotIcon" :fontSize="(wxFontSize-3)+'px'"></tn-steps>
-			<view v-if="stepIndex==1">
+			<view v-show="stepIndex==1">
 
 				<view style="padding: 16px">
 					<view style="line-height: 30px;" :style="{fontSize:(wxFontSize-1)+'px'}">
@@ -96,7 +97,7 @@
 					</view>
 				</view>
 			</view>
-			<view v-if="stepIndex!=1">
+			<view v-show="stepIndex!=1">
 
 				<view style="padding: 16px;padding-bottom: 0;" v-if="(selectValue=='公司'&&stepIndex==2)||(selectValue=='个人'&&stepIndex==2)">
 					
@@ -222,7 +223,7 @@
 
 
 
-					<view class="tn-margin-left tn-padding-top-xs"  v-if="stepIndex==3">
+					<view class="tn-margin-left tn-padding-top-xs"  v-show="stepIndex==3">
 						<uni-file-picker v-model="imgList" :limit="6" :auto-upload="false" @select="select"
 							@success="success" @delete="deleteFile">
 
@@ -249,7 +250,7 @@
 					 				</view> -->
 					</view>
 
-					<view class="tn-margin-left tn-padding-top-xs"  v-if="stepIndex==3">
+					<view class="tn-margin-left tn-padding-top-xs"  v-show="stepIndex==3">
 						<uni-file-picker v-model="fileList" :limit="3" mode="grid" file-mediatype="all"
 							file-extname="pdf,docx,doc,xls,xlsx" :auto-upload="false" @select="select" @success="success" @delete="deleteFile">
 							<view style="text-align: left;">
@@ -302,18 +303,25 @@
 				<view class="tn-flex tn-footerfixed"  v-if="(stepIndex==3)">
 					<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
 						<button type="default" plain="true" style="border-radius: 24px;"
-							@click="preStep()" :style="{fontSize:(wxFontSize-2)+'px'}">
+							@click="preStep()" :style="{fontSize:(wxFontSize-2)+'px'}" :disabled="!canSave||!canNext">
 							 上一步 
 						</button>
 						 
 					</view>
-					<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
+					<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center" v-if="canSave&&canNext">
 						<button type="primary" style="background-color:#1d60b1;border-radius: 23px" @click="saveForm()" :style="{fontSize:(wxFontSize-2)+'px'}">提交审核</button>
 						<!-- <tn-button backgroundColor="#3668FC" padding="40rpx 0" width="60%" shadow fontBold
 							@click="saveForm()">
 							<text class="tn-color-white">提交审核</text>
 						</tn-button> -->
 					</view>
+					<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center" v-if="!canSave||!canNext">
+						<button type="primary" :disabled="!canSave||!canNext" style="background-color:#0003;border-radius: 23px" @click="saveForm()" :style="{fontSize:(wxFontSize-2)+'px'}">提交审核</button>
+						<!-- <tn-button backgroundColor="#3668FC" padding="40rpx 0" width="60%" shadow fontBold
+							@click="saveForm()">
+							<text class="tn-color-white">提交审核</text>
+						</tn-button> -->
+					</view>
 				</view>
 			</view>
 		</view>
@@ -471,7 +479,8 @@
 				items: [],
 				org: {},
 				isEdit:false,
-				editItem:{}
+				editItem:{},
+				canNext:true
 			}
 		},
 		watch: {
@@ -572,7 +581,7 @@
 					 	return false;
 					 }
 					 
-					 if(this.formInfo.jobTitle.length<1){
+					 if(!this.formInfo.jobTitle||this.formInfo.jobTitle.length<1){
 					 	uni.showToast({
 					 		title: '请输入您的职称',
 					 		duration: 2000,
@@ -580,7 +589,7 @@
 					 	});
 					 	return false;
 					 }
-					 if(this.formInfo.contactPerson.length<1){
+					 if(!this.formInfo.contactPerson||this.formInfo.contactPerson.length<1){
 					 	uni.showToast({
 					 		title: '请输入联系人姓名',
 					 		duration: 2000,
@@ -588,7 +597,7 @@
 					 	});
 					 	return false;
 					 }
-					 if(this.formInfo.contactMethod.length<1){
+					 if(!this.formInfo.contactMethod||this.formInfo.contactMethod.length<1){
 					 	uni.showToast({
 					 		title: '请输入联系手机/微信/邮箱',
 					 		duration: 2000,
@@ -674,9 +683,30 @@
 							}
 							that.items = list;
 							console.warn(that.items);
-						}  
+						}else{
+							if(res._redirect){
+								uni.showToast({
+									title: '操作过期，请重试',
+									duration: 2000,
+									icon:'none'
+								});
+								that.goBack();
+							}
+						}
 					})
 			},
+			goBack() {
+				const pages = getCurrentPages()
+				// 有可返回的页面则直接返回，uni.navigateBack 默认返回失败之后会自动刷新页面 ，无法继续返回
+				if (pages.length > 1) {
+					uni.navigateBack()
+					return;
+				}else{
+					uni.navigateTo({
+						url: '/pages/index/index'
+					})
+				}
+			},
 			changeSelect(e) {
 				this.selectValue = e;
 			},
@@ -740,6 +770,15 @@
 					return false;
 				}
 				
+				if(!that.canNext){
+					uni.showToast({
+						title: '照片/文件正在上传中，请耐心等待',
+						duration: 2000,
+						icon:'none'
+					});
+					return false;
+				}
+
 				let params = {
 
 				};
@@ -755,6 +794,7 @@
 						content: that.content,
 						userNo: uni.getStorageSync('userNo'),
 						status: status==1?status:3,
+						showFlag: '是',
 						brand: that.brand,
 						id: that.isEdit?that.editItem.id:undefined,
 						bisNo: that.isEdit?that.editItem.bisNo:undefined,
@@ -807,24 +847,28 @@
 				});
 				that.canSave = false;
 				request.post(that.isEdit?'/slbResourceShare/update':'/slbResourceShare/add', params).then(res => {
-					that.canSave = true;
+					
 					if (res.success) {
 						uni.showToast({
 							title: status==1?'信息已暂存，请在我的供应中查看暂存信息':'发布已提交，请在我的供应中查看进度',
 							icon: 'none',
 							success: () => {
 								setTimeout(() => {
+									
 									uni.redirectTo({
 										url: "/pages/mine/share?tab="+(status==1?2:1)
 									});
+									 
 								}, 2500)
 							}
 						})
+						
 					} else {
 						uni.showToast({
 							title: res.msg,
 							icon: 'none'
 						})
+						that.canSave = true;
 					}
 					console.warn(res);
 				})
@@ -843,10 +887,6 @@
 			clear() {
 				this.$refs.imageUpload.clear()
 			},
-			// 图片拖拽重新排序
-			onSortList(list) {
-				console.log(list);
-			},
 			select(e) {
 				console.log('选择文件：', e)
 				let tempFiles = e.tempFiles;
@@ -857,19 +897,40 @@
 			upfile(file) {
 				let that = this;
 				console.warn(file);
+				this.canNext = false;
+				uni.showToast({
+					title: '照片/文件正在上传中，请耐心等待',
+					icon:'none'
+				});
+				
 				uni.uploadFile({
 					url: 'https://slb-m.lx-device.com/oss/upload/userFeedback', //仅为示例，非真实的接口地址
 					filePath: file.url,
 					name: 'file',
 					success: (uploadFileRes) => {
+						that.canNext = true;
+						uni.hideToast();
 						console.warn(JSON.parse(uploadFileRes.data));
-						let resultMap = JSON.parse(uploadFileRes.data).resultMap;
-						that.fileDetailList.push({
-							name: file.name,
-							fileName: file.name, // 原始文件名
-							ftpUrl: resultMap.uploadUrl, // 文件访问url
-							path: file.path
-						})
+						if(JSON.parse(uploadFileRes.data).success){
+							let resultMap = JSON.parse(uploadFileRes.data).resultMap;
+							that.fileDetailList.push({
+								name: file.name,
+								fileName: file.name, // 原始文件名
+								ftpUrl: resultMap.uploadUrl, // 文件访问url
+								path: file.path
+							})
+						}else{
+							uni.showToast({
+								title: JSON.parse(uploadFileRes.data).msg+'，请删除后重试',
+								icon:'none'
+							});
+						}
+					},
+					fail:(err)=>{
+						 uni.showToast({
+						 	title: '上传失败，请删除后重试',
+						 	icon:'none'
+						 });
 					}
 				});
 			},
@@ -878,6 +939,13 @@
 				console.log('上传成功')
 			},
 			deleteFile(e, index) {
+				if(!this.canNext){
+					uni.showToast({
+						title: '照片/文件正在上传中，请耐心等待',
+						icon:'none'
+					});
+					return false;
+				}
 				for(let i=0;i<this.fileDetailList.length;i++){
 					if(e.tempFile.path===this.fileDetailList[i].path){
 						this.fileDetailList.splice(i, 1);
@@ -924,11 +992,15 @@
 						if (res.success) {
 							let list = res.resultMap.data || [];
 							that.items = list;
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: 'none'
-							})
+						}else{
+							if(res._redirect){
+								uni.showToast({
+									title: '操作过期，请重试',
+									duration: 2000,
+									icon:'none'
+								});
+								that.goBack();
+							}
 						}
 					})
 

circlePages/circle.vue

@@ -11,7 +11,8 @@
 					<text :style="{fontSize:(wxFontSize)+'px'}">发布需求</text>
 				</view>
 				<view>
-					<button plain="true" style="margin-right: 4px;border-radius: 24px;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#1d60b1;border-color:#1d60b1;" @click="saveForm(1)" :style="{fontSize:(wxFontSize-3)+'px'}">暂存</button>
+					<button v-if="!canSave" :disabled="!canSave"  plain="true" style="margin-right: 4px;border-radius: 24px;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#0003;border-color:#0003;" @click="saveForm(1)"  :style="{fontSize:(wxFontSize-3)+'px'}">暂存</button>
+					<button v-if="canSave" plain="true" :disabled="!canSave" style="margin-right: 4px;border-radius: 24px;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#1d60b1;border-color:#1d60b1;" @click="saveForm(1)" :style="{fontSize:(wxFontSize-3)+'px'}">暂存</button>
 				</view>
 			</view>
 		</tn-nav-bar>
@@ -20,7 +21,7 @@
 
 			<tn-steps style="pointer-events:none;" :list="stepList" :current="stepIndex" mode="dotIcon" :fontSize="(wxFontSize-3)+'px'"></tn-steps>
 			
-			<view v-if="stepIndex==1">
+			<view v-show="stepIndex==1">
 			<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top tn-margin">
 				<view class="tn-flex justify-content-item">
 					<view class="tn-text-lg tn-padding-right-xs tn-text-bold" style="font-size: 16px;" :style="{fontSize:(wxFontSize-1)+'px'}">以下三种方式可任选其一，若有可都输入</view>
@@ -108,14 +109,14 @@
 			<!-- 悬浮按钮-->
 			<view class="tn-flex tn-footerfixed">
 				<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
-					<button type="default" plain="true" style="border-radius: 24px;"
+					<button type="default" plain="true" style="border-radius: 24px;" :disabled="!canNext"
 						@click="nextStep()" :style="{fontSize:(wxFontSize-2)+'px'}">
 						 下一步 
 					</button>
 				</view>
 			</view>
 </view>
-<view v-if="stepIndex==2">
+<view v-show="stepIndex==2">
 	
 	<view style="padding:16px">
 		<uni-forms :modelValue="formData" label-width="0">
@@ -160,12 +161,13 @@
 	<view class="tn-flex tn-footerfixed">
 		<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
 			<button type="default" plain="true" style="border-radius: 24px;"
-				@click="preStep()" :style="{fontSize:(wxFontSize-2)+'px'}">
+				@click="preStep()" :disabled="!canSave" :style="{fontSize:(wxFontSize-2)+'px'}">
 				 上一步 
 			</button>
 		</view>
 		<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
-			<button type="primary" style="background-color:#1d60b1;border-radius: 23px" @click="saveForm()" :style="{fontSize:(wxFontSize-2)+'px'}">提交审核</button>
+			<button v-if="canSave&&canNext" type="primary" style="background-color:#1d60b1;border-radius: 23px" @click="saveForm()" :style="{fontSize:(wxFontSize-2)+'px'}">提交审核</button>
+			<button v-if="!canSave||!canNext" type="primary" :disabled="!canSave||!canNext" style="background-color:#0003;border-radius: 23px" @click="saveForm()" :style="{fontSize:(wxFontSize-2)+'px'}">提交审核</button>
 		</view>
 	</view>
 </view>
@@ -245,7 +247,8 @@
 					regNumber:''
 				},
 				editItem:{},
-				styleString:'font-size:'+14+'px'
+				styleString:'font-size:'+14+'px',
+				canNext:true
 			}
 		},
 		watch: {
@@ -340,14 +343,23 @@
 			 					 
 			 				}
 			 				that.items = list;
-			 			}  
+			 			}else{
+							if(res._redirect){
+								uni.showToast({
+									title: '操作过期，请重试',
+									duration: 2000,
+									icon:'none'
+								});
+								that.goBack();
+							}
+						}
 			 		})
 			},
 			preStep(){
 				this.stepIndex = 1;
 			},
 			nextStep(){
-				
+				console.warn(this.searchValue);
 				if(this.content==''&&this.fileDetailList.length===0){
 					 uni.showToast({
 						title:'请输入您的需求或上传图片/文件',
@@ -417,6 +429,16 @@
 					});
 					return false;
 				}
+				
+				if(!that.canNext){
+					uni.showToast({
+						title: '照片/文件正在上传中，请耐心等待',
+						duration: 2000,
+						icon:'none'
+					});
+					return false;
+				}
+				
 				uni.showToast({
 					title: '提交中...',
 					icon:'none'
@@ -434,6 +456,7 @@
 					userNo:uni.getStorageSync('userNo'),
 					validDate:this.selectValue,
 					status: status==1?status:3,
+					showFlag:'是',
 					id: that.isEdit?that.editItem.id:undefined,
 					bisNo: that.isEdit?that.editItem.bisNo:undefined,
 					version: that.isEdit?that.editItem.version:undefined
@@ -468,26 +491,28 @@
 				
 				params.fileDetailList = JSON.stringify(this.fileDetailList);
 				request.post(that.isEdit?'/slbResourceDemand/update':'/slbResourceDemand/add', params).then(res => {
-				    that.canSave = true;
+				    
 					if(res.success){
 						uni.showToast({
 							title:status==1?'信息已暂存，请在我的需求中查看暂存信息':'发布已提交，请在我的需求中查看进度',
 							icon:'none',
 							success:()=>{
 								setTimeout(()=>{
+									
 									uni.redirectTo({
 									 url: "/pages/mine/need?tab="+(status==1?2:1)
 									});
+									 
 								},1500)
 								
 							}
 						})
-						
 					}else{
 						uni.showToast({
 							title:res.msg,
 							icon:'none'
 						})
+						that.canSave = true;
 					}
 					console.warn(res);
 				})
@@ -518,6 +543,13 @@
 				}
 			},
 			deleteFile(e, index) {
+				if(!this.canNext){
+					uni.showToast({
+						title: '照片/文件正在上传中，请耐心等待',
+						icon:'none'
+					});
+					return false;
+				}
 				for(let i=0;i<this.fileDetailList.length;i++){
 					if(e.tempFile.path===this.fileDetailList[i].path){
 						this.fileDetailList.splice(i, 1);
@@ -527,19 +559,39 @@
 			upfile(file) {
 				let that = this;
 				console.warn(file);
+				this.canNext = false;
+				uni.showToast({
+					title: '照片/文件正在上传中，请耐心等待',
+					icon:'none'
+				});
 				uni.uploadFile({
 					url: 'https://slb-m.lx-device.com/oss/upload/userFeedback', //仅为示例，非真实的接口地址
 					filePath: file.url,
 					name: 'file',
 					success: (uploadFileRes) => {
+						that.canNext = true;
+						uni.hideToast();
 						console.warn(JSON.parse(uploadFileRes.data));
-						let resultMap = JSON.parse(uploadFileRes.data).resultMap;
-						that.fileDetailList.push({
-							name: file.name,
-							fileName: file.name, // 原始文件名
-							ftpUrl: resultMap.uploadUrl, // 文件访问url
-							path:file.path
-						})
+						if(JSON.parse(uploadFileRes.data).success){
+							let resultMap = JSON.parse(uploadFileRes.data).resultMap;
+							that.fileDetailList.push({
+								name: file.name,
+								fileName: file.name, // 原始文件名
+								ftpUrl: resultMap.uploadUrl, // 文件访问url
+								path: file.path
+							})
+						}else{
+							uni.showToast({
+								title: JSON.parse(uploadFileRes.data).msg+'，请删除后重试',
+								icon:'none'
+							});
+						}
+					},
+					fail:(err)=>{
+						 uni.showToast({
+						 	title: '上传失败，请删除后重试',
+						 	icon:'none'
+						 });
 					}
 				});
 			},
@@ -547,6 +599,7 @@
 			success(e) {
 				console.log('上传成功')
 			},
+			 
 			selectChange(e){
 				console.error(e);
 				this.searchValue = e.name
@@ -585,6 +638,15 @@
 						if(res&&res.success){
 							let list = res.resultMap.data || [];
 							that.items = list;
+						}else{
+							if(res._redirect){
+								uni.showToast({
+									title: '操作过期，请重试',
+									duration: 2000,
+									icon:'none'
+								});
+								that.goBack();
+							}
 						} 
 					})
 				}else{
@@ -592,6 +654,18 @@
 					that.org = {}; 
 				}
 			},
+			goBack() {
+				const pages = getCurrentPages()
+				// 有可返回的页面则直接返回，uni.navigateBack 默认返回失败之后会自动刷新页面 ，无法继续返回
+				if (pages.length > 1) {
+					uni.navigateBack()
+					return;
+				}else{
+					uni.navigateTo({
+						url: '/pages/index/index'
+					})
+				}
+			},
 		}
 	}
 </script>

pages/comm/comm.vue

@@ -63,7 +63,7 @@
 											size="lg">
 										  </tn-avatar>
 										</view> -->
-										<view class="tn-padding-right tn-text-ellipsis">
+										<view class="tn-padding-right">
 											<view class="tn-padding-right tn-color-grey tn-text-lg"  :style="{fontSize:(wxFontSize)+'px'}">
 												{{ item.company||(item.contactNickName||item.contactPerson) }}
 											</view>
@@ -80,9 +80,9 @@
 						 
 							<!-- 不用限制长度了，因为发布的时候限制长度了-->
 							<tn-tag margin="-4px 4px 0 0" backgroundColor="#3a96d733" v-if="item.brand"
-								fontColor="#3a96d7" shape="circle" :fontSize="wxFontSize+11" @click="showBrand(item.brand)">{{ item.brand }}</tn-tag>
+								fontColor="#3a96d7" shape="circle" :fontSize="wxFontSize+11" @click="showBrand('品牌：'+item.brand)">{{ item.brand }}</tn-tag>
 							<tn-tag margin="-4px 4px 0 0" backgroundColor="#3a96d733" v-if="!item.company"
-								fontColor="#3a96d7" shape="circle" :fontSize="wxFontSize+11">个人</tn-tag>
+								fontColor="#3a96d7" shape="circle" :fontSize="wxFontSize+11" @click="showBrand('个人发布')">个人</tn-tag>
 
 							<text v-if="item.content"
 								class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" :style="{fontSize:(wxFontSize-2)+'px'}">{{ item.content }}</text>
@@ -616,7 +616,7 @@
 			},
 			showBrand(text){
 				uni.showToast({
-					title: '品牌：'+text,
+					title: text,
 					icon: 'none'
 				})
 			},

pages/home/home.vue

@@ -22,7 +22,7 @@
 										<tn-avatar class="" shape="circle" :src="item.userAvatar" size="lg">
 										</tn-avatar>
 									</view> -->
-									<view class="tn-padding-right tn-text-ellipsis">
+									<view class="tn-padding-right">
 										<view class="tn-padding-right  tn-color-grey tn-text-lg" :style="{fontSize:(wxFontSize)+'px'}">
 											{{ item.company }}
 										</view>
@@ -33,7 +33,7 @@
 						</view>
 						<view v-if="item.validDate"
 							class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-							<text class="" style="background: #3F51B542;font-size: 12px;
+							<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
     padding: 8px;
     color: #0000FF;
     border-radius: 24px;

pages/index/index.vue

@@ -156,6 +156,38 @@
 			}else{
 				uni.removeStorageSync('nextPage')
 			}
+			if (wx.canIUse('getUpdateManager')) {
+			  const updateManager = wx.getUpdateManager();
+			  updateManager && updateManager.onCheckForUpdate((res) => {
+				if (res.hasUpdate) {
+				  updateManager.onUpdateReady(() => {
+					uni.showModal({
+					  title: '更新提示',
+					  content: '新版本已经准备好，是否重启应用？',
+					  success: (res) => {
+						if (res.confirm) {
+						  uni.clearStorageSync() // 更新完成后刷新storage的数据
+						  updateManager.applyUpdate()
+						}
+					  }
+					})
+				  })
+			
+				  updateManager.onUpdateFailed(() => {
+				//     uni.showModal({
+				//       title: '已有新版本上线',
+				//       content: '小程序自动更新失败，请删除该小程序后重新搜索打开哟~~~',
+				// showCancel: false
+				//     })
+					uni.reLaunch({
+						url:'/pages/index/index'
+					})
+				  })
+				} else {
+				  //没有更新
+				}
+			  })
+			}
 		},
 		methods: {
 			// 切换导航

pages/login/login.vue

@@ -63,14 +63,13 @@
 				unionid: '',
 				canSave:true,
 				phoneNum:'',
-				tryTime:0,
-				wxFontSize: 17
+				wxFontSize: 17,
+				phoneData: null
 			}
 		},
 		onLoad() {
 			const appBaseInfo = wx.getAppBaseInfo();
 			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
-			// this.getLxSessionKey()
 		},
 		onShow(){
 			if(uni.getStorageSync('agreeInfo')){
@@ -127,12 +126,15 @@
 				console.warn(this.value);
 				console.log('e:', e);
 			},
-			getLxSessionKey() {
+			
+			getLxSessionKey(e) {
 				const that = this;
 				uni.login({
 					success(res) {
 						console.error(res);
-						that.getOpenId(res.code);
+						//如果已经注册，自动登录一次
+						 
+						that.getOpenId(res.code,e);
 					},
 					fail(res) {
 						console.error(res);
@@ -140,7 +142,7 @@
 					}
 				});
 			},
-			getOpenId(code) {
+			getOpenId(code,data) {
 				const that = this;
 				request.post('/wxma/code2Session', {
 					code: code,
@@ -152,6 +154,7 @@
 						that.lxSessionKey = res.resultMap.lxSessionKey;
 						that.openId = res.resultMap.openId;
 						that.unionid = res.resultMap.unionid;
+						that._getPhoneNumber(data);
 					}
 
 				})
@@ -167,10 +170,10 @@
 					console.error(e)
 					return;
 				}
-				this.getLxSessionKey();
-				setTimeout(() => {
-					this._getPhoneNumber(e)
-				}, 500)
+				//
+				this.phoneData = e;
+				//获取手机号之前，先登录一次，判断是否注册过。
+				this.loginFirst();
 
 			},
 
@@ -186,8 +189,8 @@
 					wx.getUserInfo({
 						success: function(res) {
 							console.error(res);
-							res.encryptedData = (encodeURIComponent(e.detail.encryptedData));
-							res.iv = (encodeURIComponent(e.detail.iv));
+							res.encryptedData = encodeURIComponent(encodeURIComponent(e.detail.encryptedData));
+							res.iv = encodeURIComponent(encodeURIComponent(e.detail.iv));
 							res.lxSessionKey = that.lxSessionKey;
 							that.getPhone(res)
 						}
@@ -216,10 +219,9 @@
 				).then(res => {
 					console.error(res);
 					if (res&&res.success) {
-						//
+						 
 						that.phoneNum = res.resultMap.waUserPhoneInfo.phoneNumber;
-						that.loginFirst();
-						// this.ZhuceByPhone(res.resultMap.waUserPhoneInfo.phoneNumber);
+						that.ZhuceByPhone(res.resultMap.waUserPhoneInfo.phoneNumber);
 					} else {
 						uni.showToast({
 							title: res.msg,
@@ -320,10 +322,11 @@
 								uni.setStorageSync('userNo', res2.resultMap.accountName);
 								uni.removeStorageSync('loginOut');
 								that.getUserInfo();
+								
 							} else {
 								//
-								
-								that.ZhuceByPhone(that.phoneNum)
+								that.getLxSessionKey(that.phoneData);
+								// that.ZhuceByPhone(that.phoneNum)
 								// that.canSave = true;
 								
 								//登录失败,
@@ -387,22 +390,15 @@
 				}).then(res => {
 					that.canSave = true;
 					if (res&&res.success) {
-						that.tryTime = 0;
+						
 						that.personInfo = res.resultMap.userInfo || {};
 						uni.setStorageSync('userInfo', JSON.stringify(res.resultMap.userInfo));
 						that.goBack();
 					}else{
-						that.tryTime++;
-						if(that.tryTime<5){
-							setTimeout(()=>{
-								that.loginAgain()
-							},500)
-						}else{
-							uni.showToast({
-								title: '登录超时,请再试一次',
-								icon: 'none'
-							})
-						}
+						uni.showToast({
+							title: '登录超时,请再试一次',
+							icon: 'none'
+						})
 					}
 					// uni.navigateBack();
 					console.warn(res);

pages/mine/coll.vue

@@ -28,7 +28,7 @@
 													<tn-avatar class="" shape="circle" :src="item.userAvatar" size="lg">
 													</tn-avatar>
 												</view> -->
-										<view class="tn-padding-right tn-text-ellipsis">
+										<view class="tn-padding-right">
 											<view class="tn-padding-right tn-text-bold tn-text-lg"  :style="{fontSize:(wxFontSize)+'px'}">
 												{{ item.company||(item.contactNickName||item.contactPerson) }}
 											</view>
@@ -39,7 +39,7 @@
 							</view>
 							<view v-if="item.validDate&&current==0"
 								class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-								<text class="" style="background: #3F51B542;font-size: 12px;
+								<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
 				padding: 8px;
 				color: #0000FF;
 				border-radius: 24px;

pages/mine/need.vue

@@ -27,7 +27,7 @@
 											<tn-avatar class="" shape="circle" :src="item.userAvatar" size="lg">
 											</tn-avatar>
 										</view> -->
-									<view class="tn-padding-right tn-text-ellipsis">
+									<view class="tn-padding-right">
 										<view class="tn-padding-right tn-text-bold tn-text-lg" :style="{fontSize:(wxFontSize)+'px'}">
 											{{ item.company }}
 										</view>
@@ -38,7 +38,7 @@
 						</view>
 						<view v-if="item.status=='4'&&item.showFlag=='否'"
 							class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-							<text class="" style="background: #3F51B542;font-size: 12px;
+							<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
 		padding: 8px;
 		color: #333333;
 		border-radius: 24px;
@@ -47,7 +47,7 @@
 						<!-- 状态(1:暂存,2:待处理,3:审核中,4:已通过,9:已拒绝,10:已取消) -->
 						<view v-if="item.status=='1'"
 							class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-							<text class="" style="background: #3F51B542;font-size: 12px;
+							<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
 					padding: 8px;
 					color: #333333;
 					border-radius: 24px;
@@ -55,7 +55,7 @@
 						</view>
 						<view v-if="item.status=='3'"
 								class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-								<text class="" style="background: #3f51b56b;font-size: 12px;
+								<text class="" style="background: #3f51b56b;font-size: 12px;word-break: keep-all;
 						padding: 8px;
 						color: #ff0;
 						border-radius: 24px;
@@ -63,7 +63,7 @@
 							</view>
 						<view v-if="item.status=='4'&&item.showFlag!='否'"
 								class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-								<text class="" style="background: #3F51B542;font-size: 12px;
+								<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
 						padding: 8px;
 						color: #007000;
 						border-radius: 24px;
@@ -71,7 +71,7 @@
 							</view>
 						<view v-if="item.status=='9'"
 								class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-								<text class="" style="background: #3F51B542;font-size: 12px;
+								<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
 						padding: 8px;
 						color: #d23920;
 						border-radius: 24px;
@@ -79,7 +79,7 @@
 							</view>
 							<view v-if="item.status=='10'"
 									class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-									<text class="" style="background: #3F51B542;font-size: 12px;
+									<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
 							padding: 8px;
 							color: #333333;
 							border-radius: 24px;
@@ -89,14 +89,14 @@
 
 					<view
 						class="blogger__desc tn-margin-top-sm tn-margin-bottom-sm tn-text-justify tn-flex-col-center tn-flex-row-left"
-						@click="tn('')">
+						 >
 						<text
 							class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" :style="{fontSize:(wxFontSize-2)+'px'}">{{ item.content }}</text>
 					</view>
 
 					<block v-if="item.imgList">
 						<view v-if="[1,2,4].indexOf(item.imgList.length) != -1" class="tn-padding-top-xs"
-							@click="tn('')">
+							 >
 							<image v-for="(image_item,image_index) in item.imgList" :key="image_index"
 								class="blogger__main-image" :class="{
 		            'blogger__main-image--1 tn-margin-bottom-sm': item.imgList.length === 1,
@@ -139,7 +139,7 @@
 					<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin-top-xs">
 						<view class="justify-content-item tn-color-gray">
 							<view class="tn-padding-right   tn-padding-top-xs tn-color-gray" style="display: flex;">
-								<view style="white-space: nowrap;">{{ item.createTime|formatDate }}</view>
+								<view style="white-space: nowrap;" :style="{fontSize:(wxFontSize-3)+'px'}">{{ item.createTime|formatDate }}</view>
 								<view style="color: red;margin-left:8px;" v-if="item.status==9&&item.feedback"  :style="{fontSize:(wxFontSize-3)+'px'}">
 									反馈意见:{{item.feedback||'--'}}
 								</view>
@@ -148,14 +148,16 @@
 
 						</view>
 						<view class="justify-content-item tn-flex tn-flex-col-center" v-if="item.status==4&&item.showFlag!='否'">
-							<button type="warn" plain="true" size="mini" @click="finishItem(item)">结束需求</button>
+							<button type="warn" plain="true" size="mini" @click="finishItem(item)" :style="{fontSize:(wxFontSize-4)+'px'}">结束需求</button>
 							<!-- <tn-button shadow shape="round" fontColor="tn-color-white" backgroundColor="tn-bg-blue"
 								:fontSize="24" height="auto" padding="10rpx 18rpx"
 								@click="finishItem(item)">结束需求</tn-button> -->
 
 						</view>
-						<view class="justify-content-item tn-flex tn-flex-col-center" style="flex: none;" v-if="item.status==1||item.status==9">
-							<button type="warn" plain="true" size="mini" @click="editItem(item)">编辑</button>
+						<view class="justify-content-item tn-flex tn-flex-col-center" style="flex: none;" v-if="item.status==1||item.status==9||(item.status==4&&item.showFlag=='否')">
+							<button type="warn" plain="true" size="mini" @click="editItem(item)" :style="{fontSize:(wxFontSize-4)+'px'}">编辑</button>
+							
+							<button v-if="item.status==4&&item.showFlag=='否'" style="border-color: #007000;color:#007000;margin-left:12px" type="warn" plain="true" size="mini" @click="reOpen(item)" :style="{fontSize:(wxFontSize-4)+'px'}">恢复</button>
 							<!-- <tn-button shadow shape="round" fontColor="tn-color-white" backgroundColor="tn-bg-blue"
 								:fontSize="24" height="auto" padding="10rpx 18rpx"
 								@click="finishItem(item)">结束需求</tn-button> -->
@@ -302,7 +304,7 @@
 					}else{
 						if(res._redirect){
 							uni.showToast({
-								title: '操作过期，请重试',
+								title: '操作过期，请登录后重试',
 								duration: 2000,
 								icon:'none'
 							});
@@ -333,6 +335,60 @@
 					}
 				})
 			},
+			reOpen(item){
+				this.curItem = item;
+				let that = this;
+				uniShowModal('确定恢复需求吗?', '', {
+					showCancel: true,
+					confirmText:'确定',
+					success: (res) => {
+						if(res.confirm){
+							 //update 
+							 let params = {};
+							 params.slbResourceDemand = JSON.parse(JSON.stringify(item));
+							 params.slbResourceDemand.status = 4;
+							 params.slbResourceDemand.showFlag = '是';
+							 params.slbResourceDemand.fileDetailList = undefined;
+							 
+							 params.slbResourceDemand.companyEntity = {};
+							 params.slbResourceDemand.companyEntity.company = params.slbResourceDemand.company;
+							 params.slbResourceDemand.companyEntity.jobTitle = params.slbResourceDemand.jobTitle;
+							 params.slbResourceDemand.companyEntity.creditCode = params.slbResourceDemand.creditCode;
+							 params.slbResourceDemand.companyEntity.address = params.slbResourceDemand.base;
+							 params.slbResourceDemand.companyEntity.regStatus = params.slbResourceDemand.regStatus;
+							 
+							 params.slbResourceDemand.companyEntity.contactPerson = params.slbResourceDemand.contactPerson;
+							 params.slbResourceDemand.companyEntity.contactMethod = params.slbResourceDemand.contactMethod;
+							 
+							 params.slbResourceDemand.slbUserExt = {
+							 		contactPerson:params.slbResourceDemand.contactPerson,
+							 		contactMethod:params.slbResourceDemand.contactMethod,
+							 		userNo:params.slbResourceDemand.userNo,
+							 };
+							 
+							 params.slbResourceDemand = JSON.stringify(params.slbResourceDemand);
+							 
+							 params.fileDetailList = JSON.stringify(item.fileDetailList);
+							 
+							 request.post('/slbResourceDemand/update', params).then(res => {
+							     
+							 	if(res.success){
+							 		uni.showToast({
+							 			title: '恢复成功'
+							 		})
+							 		that.loadData(); 
+							 	}else{
+							 		uni.showToast({
+							 			title:res.msg,
+							 			icon:'none'
+							 		})
+							 		that.canSave = true;
+							 	}
+							 })
+						}
+					}
+				})
+			},
 			finishItem(item) {
 				this.curItem = item;
 				let that = this;

pages/mine/share.vue

@@ -24,7 +24,7 @@
 							<view class="tn-flex tn-flex-row-center">
 								<view class="tn-flex tn-flex-row-center tn-flex-col-center">
 									 
-									<view class="tn-padding-right tn-text-ellipsis">
+									<view class="tn-padding-right">
 										<view class="tn-padding-right  tn-text-bold tn-text-lg"  :style="{fontSize:(wxFontSize)+'px'}">
 											{{ item.company||(item.contactNickName||item.contactPerson)}} </view>
 									</view>
@@ -35,7 +35,7 @@
 										<!-- 状态(1:暂存,2:待处理,3:审核中,4:已通过,9:已拒绝,10:已取消) -->
 										<view v-if="item.status=='1'"
 											class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-											<text class="" style="background: #3F51B542;font-size: 12px;
+											<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
 									padding: 8px;
 									color: #333333;
 									border-radius: 24px;
@@ -43,7 +43,7 @@
 										</view>
 										<view v-if="item.status=='3'"
 												class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-												<text class="" style="background: #3f51b56b;font-size: 12px;
+												<text class="" style="background: #3f51b56b;font-size: 12px;word-break: keep-all;
 										padding: 8px;
 										color: #ff0;
 										border-radius: 24px;
@@ -51,7 +51,7 @@
 											</view>
 										<view v-if="item.status=='4'&&item.showFlag!='否'"
 												class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-												<text class="" style="background: #3F51B542;font-size: 12px;
+												<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
 										padding: 8px;
 										color: #007000;
 										border-radius: 24px;
@@ -59,7 +59,7 @@
 											</view>
 										<view v-if="item.status=='9'"
 												class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-												<text class="" style="background: #3F51B542;font-size: 12px;
+												<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
 										padding: 8px;
 										color: #d23920;
 										border-radius: 24px;
@@ -67,7 +67,7 @@
 											</view>
 											<view v-if="item.status=='10'"
 													class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-													<text class="" style="background: #3F51B542;font-size: 12px;
+													<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
 											padding: 8px;
 											color: #333333;
 											border-radius: 24px;
@@ -76,7 +76,7 @@
 									 
 						<view v-if="item.status=='4'&&item.showFlag=='否'"
 										class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-										<text class="" style="background: #3F51B542;font-size: 12px;
+										<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
 						padding: 8px;
 						color: #333333;
 						border-radius: 24px;
@@ -151,7 +151,7 @@
 					<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin-top-xs">
 						<view class="justify-content-item tn-color-gray tn-text-center">
 							<view class="tn-padding-right   tn-padding-top-xs tn-color-gray"  style="display: flex;">
-								<view style="white-space: nowrap;">{{ item.createTime|formatDate }}</view>
+								<view style="white-space: nowrap;" :style="{fontSize:(wxFontSize-3)+'px'}">{{ item.createTime|formatDate }}</view>
 								<view v-if="item.status==9&&item.feedback" style="color: red;margin-left:8px;" :style="{fontSize:(wxFontSize-3)+'px'}">
 									反馈意见:{{item.feedback||'--'}}
 								</view>
@@ -161,10 +161,11 @@
 						<view class="justify-content-item tn-flex tn-flex-col-center">
 							<view class="justify-content-item tn-flex tn-flex-col-center" v-if="item.status==4&&item.showFlag!='否'">
 								<!-- <tn-button shadow shape="round" fontColor="tn-color-white" backgroundColor="tn-bg-blue" :fontSize="24" height="auto" padding="10rpx 18rpx" @click="finishItem(item)">下架</tn-button> -->
-								<button type="warn" plain="true" size="mini" @click="finishItem(item)">下架供应</button>
+								<button type="warn" plain="true" size="mini" @click="finishItem(item)" :style="{fontSize:(wxFontSize-4)+'px'}">下架供应</button>
 							</view>
-							<view class="justify-content-item tn-flex tn-flex-col-center" style="flex:none" v-if="item.status==1||item.status==9">
-								<button type="warn" plain="true" size="mini" @click="editItem(item)">编辑</button>
+							<view class="justify-content-item tn-flex tn-flex-col-center" style="flex:none" v-if="item.status==1||item.status==9||(item.status==4&&item.showFlag=='否')">
+								<button type="warn" plain="true" size="mini" @click="editItem(item)" :style="{fontSize:(wxFontSize-4)+'px'}">编辑</button>
+								<button v-if="item.status==4&&item.showFlag=='否'" style="border-color: #007000;color:#007000;margin-left:12px" type="warn" plain="true" size="mini" @click="reOpen(item)" :style="{fontSize:(wxFontSize-4)+'px'}">恢复</button>
 								<!-- <tn-button shadow shape="round" fontColor="tn-color-white" backgroundColor="tn-bg-blue"
 									:fontSize="24" height="auto" padding="10rpx 18rpx"
 									@click="finishItem(item)">结束需求</tn-button> -->
@@ -340,7 +341,7 @@
 					}else{
 						if(res._redirect){
 							uni.showToast({
-								title: '操作过期，请重试',
+								title: '操作过期，请登录后重试',
 								duration: 2000,
 								icon:'none'
 							});
@@ -435,7 +436,63 @@
 				uni.navigateTo({
 					url: '/circlePages/addShare?sid=' + item.bisNo,
 				})
-			}
+			},
+			reOpen(item){
+				this.curItem = item;
+				let that = this;
+				uniShowModal('确定恢复供应吗?', '', {
+					showCancel: true,
+					confirmText:'确定',
+					success: (res) => {
+						if(res.confirm){
+							 //update 
+							 let params = {};
+							 let postData = JSON.parse(JSON.stringify(item));
+							 postData.status = 4;
+							 postData.showFlag = '是';
+							 postData.fileDetailList = undefined;
+							 postData.companyEntity = {};
+							 postData.companyEntity.company = postData.company;
+							 postData.companyEntity.jobTitle = postData.jobTitle;
+							 postData.companyEntity.creditCode = postData.creditCode;
+							 postData.companyEntity.address = postData.base;
+							 postData.companyEntity.regStatus = postData.regStatus;
+							 
+							 postData.companyEntity.contactPerson = postData.contactPerson;
+							 postData.companyEntity.contactMethod = postData.contactMethod;
+							 postData.companyEntity.contactNickName = postData.contactNickName;
+							 
+							  
+							 postData.slbUserExt = {};
+							 postData.slbUserExt.userContactMethod = postData.contactMethod;
+							 postData.slbUserExt.contactPerson = postData.contactPerson;
+							 postData.slbUserExt.contactMethod = postData.contactMethod;
+							 postData.slbUserExt.contactNickName = postData.contactNickName;
+							 postData.slbUserExt.userRealName = postData.userRealName;
+							 
+							 params.slbResourceShare = JSON.stringify(postData);
+							
+							 params.fileDetailList = JSON.stringify(item.fileDetailList);
+							 
+							 request.post('/slbResourceShare/update', params).then(res => {
+							     
+							 	if(res.success){
+							 		uni.showToast({
+							 			title: '恢复成功'
+							 		})
+							 		that.loadData(); 
+							 	}else{
+							 		uni.showToast({
+							 			title:res.msg,
+							 			icon:'none'
+							 		})
+							 		that.canSave = true;
+							 	}
+							 })
+						}
+					}
+				})
+			},
 		}
 	}
 </script>