fixed: 36版本

1.小程序登录的时候如果手机号或者账号错误的时候，没提示
2.小程序在个人中心编辑的时候，不能保存

@@ -10,7 +10,15 @@ export function active(data) {
 		method: 'post',
 		method: 'post',
 		params: data
 		params: data
 	})
 	})
+}
+export function commitPaymentVoucherYJ(data) {
+	return request({
+		url: '/person/paymentDocYj/commitPaymentVoucher',
+		method: 'post',
+		params: data
+	})
 }
 }
+
 export function editMyMemberCertifiedInfo(data) {
 export function editMyMemberCertifiedInfo(data) {
 	return request({
 	return request({
 		url: '/system/dept/editMyMemberCertifiedInfo',
 		url: '/system/dept/editMyMemberCertifiedInfo',

@@ -70,7 +70,11 @@ function loginByPhone(phonenumber, code) {
     url: '/userLoginByPhone',
     url: '/userLoginByPhone',
     method: 'post',
     method: 'post',
     params: data
     params: data
-  }).then((res) => {
+  }).then((res) => {
+	  uni.showToast({
+	  	title: res.msg,
+	  	icon: 'none'
+	  })
     uni.setStorageSync('token', 'Bearer ' + res.data.token)
     uni.setStorageSync('token', 'Bearer ' + res.data.token)
   }).then(getInfo)
   }).then(getInfo)
 }
 }

@@ -163,14 +163,12 @@
 				return
 				return
 			}
 			}
 
 
-			pcLogin(form.value)
-				.then((res) => {
+			pcLogin(form.value).then((res) => {
 					app.globalData.isLogin = true
 					app.globalData.isLogin = true
 					uni.redirectTo({
 					uni.redirectTo({
 						url: '/pages/index/index'
 						url: '/pages/index/index'
 					})
 					})
 				})
 				})
-			.catch(getCode)
 		} else if (isActive.value == 1) {
 		} else if (isActive.value == 1) {
 			if (!form2.value.telNo) {
 			if (!form2.value.telNo) {
 				uni.showToast({
 				uni.showToast({
@@ -178,7 +176,16 @@
 					icon: 'none'
 					icon: 'none'
 				})
 				})
 				return
 				return
-			}
+			}
+			var pattern = /^1[3456789]\d{9}$/;
+			if (!pattern.test(form2.value.telNo)) {  
+				uni.showToast({
+					title: '请输入正确的手机号',
+					duration: 2000,
+					icon: 'none'
+				})
+			    return   
+			}  
 			if (!form2.value.code) {
 			if (!form2.value.code) {
 				uni.showToast({
 				uni.showToast({
 					title: '短信验证码不能为空',
 					title: '短信验证码不能为空',
@@ -221,7 +228,16 @@
 				icon: 'none'
 				icon: 'none'
 			})
 			})
 			return
 			return
-		}
+		}
+		var pattern = /^1[3456789]\d{9}$/;
+		if (!pattern.test(form2.value.telNo)) {  
+			uni.showToast({
+				title: '请输入正确的手机号',
+				duration: 2000,
+				icon: 'none'
+			})
+		    return   
+		}  
 		if (!form2.value.captcha) {
 		if (!form2.value.captcha) {
 			uni.showToast({
 			uni.showToast({
 				title: '图形验证码不能为空',
 				title: '图形验证码不能为空',
@@ -236,14 +252,17 @@
 			code: form2.value.captcha
 			code: form2.value.captcha
 		}).then(res => {
 		}).then(res => {
 			uni.showToast({
 			uni.showToast({
-				title: '短信验证码下发成功',
+				title: res.data.msg,
 				icon: 'none'
 				icon: 'none'
 			})
 			})
 			countDown.value.start = true
 			countDown.value.start = true
-		}).catch(res=>{
-			console.log(res.data.msg)
-			getCode()
-		})
+		})
+	// 	.catch(res=>{
+	// 		uni.showModal({
+	// 			content:res.data.msg
+	// 		})
+	// 		getCode()
+	// 	})
 	}
 	}
 
 
 	function timeup() {
 	function timeup() {

@@ -101,7 +101,7 @@ function submit(){
 		})
 		})
 		return
 		return
 	}
 	}
-	if(!user.value.phoneNumber){
+	if(!user.value.phonenumber){
 		uni.showToast({
 		uni.showToast({
 			icon:'none',title:`请输入手机号码`
 			icon:'none',title:`请输入手机号码`
 		})
 		})
@@ -117,6 +117,7 @@ function submit(){
 		uni.showToast({
 		uni.showToast({
 			icon:'none',title:`修改成功`
 			icon:'none',title:`修改成功`
 		})
 		})
+		edit.value = false
 	})
 	})
 }
 }
 function changeSex(e){
 function changeSex(e){

@@ -41,7 +41,7 @@
 		</view>
 		</view>
         <view class="func">
         <view class="func">
           <button
           <button
-            @click="handleUpdate(item)" v-if="item.settleFlag != 0">上传凭证
+            @click="handleUpdate(item)" v-if="item.settleFlag != 0">确认并上传
 			</button>
 			</button>
 			<button @click="handleDownload(item)" >下载缴费通知单</button>
 			<button @click="handleDownload(item)" >下载缴费通知单</button>
         </view>
         </view>
@@ -62,7 +62,7 @@
           <uni-forms-item label="缴费凭证" required>
           <uni-forms-item label="缴费凭证" required>
 						
 						
             <uni-file-picker limit="1" file-mediatype="all" file-extname="png,jpg,jpeg,pdf,zip"
             <uni-file-picker limit="1" file-mediatype="all" file-extname="png,jpg,jpeg,pdf,zip"
-                @select="selectFile"
+                @select="selectFile" v-model="form.payEvidenceObj"
                 @progress="fileProgress" @delete="delSupplementFile(index)"></uni-file-picker>
                 @progress="fileProgress" @delete="delSupplementFile(index)"></uni-file-picker>
           </uni-forms-item>
           </uni-forms-item>
           <uni-forms-item label="备注">
           <uni-forms-item label="备注">
@@ -118,6 +118,16 @@ function getList() {
 
 
 function handleUpdate(item) {
 function handleUpdate(item) {
   form.value.yjId = item.yjId
   form.value.yjId = item.yjId
+  form.value.payTime = item.payTime
+  if(item.payEvidence){
+	  let file = JSON.parse(item.payEvidence)
+	  console.log(file)
+	  form.value.payEvidenceObj = {      
+		    url: file[0].url,
+			name: file[0].name,
+			extname: 'png'
+		}
+  }
   UpPop.value.open()
   UpPop.value.open()
 }
 }
 let selectFileValue = {}
 let selectFileValue = {}
@@ -144,7 +154,11 @@ function delSupplementFile(index) {
 }
 }
 function uploadSure(){
 function uploadSure(){
   console.log(form.value)
   console.log(form.value)
-  api.commitPaymentVoucher(form.value).then(res=>{
+  api.commitPaymentVoucherYJ({
+	  payTime:form.value.payTime,
+	  url:form.value.url,
+	  yjId:form.value.yjId
+	}).then(res=>{
     UpPop.value.close()
     UpPop.value.close()
     form.value = {}
     form.value = {}
     uni.showToast({
     uni.showToast({
@@ -224,6 +238,7 @@ function circulation(id) {
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
+	:deep(.file-picker__progress){opacity: 0;}
 	.popBody {
 	.popBody {
 		font-size: 28rpx;
 		font-size: 28rpx;
 		line-height: 1.5;
 		line-height: 1.5;