Merge branch 'master' into master-pro

# Conflicts:
#	manifest.json

components/yzhua006-update/app-update.vue

@@ -111,34 +111,21 @@
 				//向后台发起请求，获取最新版本号
 				let apkquote = await this.$http.post('/sysVersionRecord/sysVersionRecord/queryByAppId', {
 					apptype:'2',
-					appId:"__UNI__E0EA6E1"
+					appId:"__UNI__D5F9FE31"
 				});
 				vm.apkInfo = apkquote.data.result
 				vm.apkLatestVersion = apkquote.data.result.versionno;
 				let wgtquote = await this.$http.post('/sysVersionRecord/sysVersionRecord/queryByAppId', {
 					apptype:'2',
-					appId:"__UNI__E0EA6E1"
+					appId:"__UNI__D5F9FE31"
 				});
-				console.log(apkquote,wgtquote)
+				console.log(wgtquote)
 				// wgtquote
-				vm.wgtInfo = wgtquote.data.result
-				vm.wgtLatestVersion = wgtquote.data.result.versionno;
-				vm.checkUpdate(); //检查是否更新
-				// var data = {
-				// 	appid: "__UNI__D4FE29A"
-				// }
-				// let res = await this.$http.get('/sysVersion/queryMaxNum', data);
-				// vm.update_info = res.data;
-				// if (vm.update_info.updateflag == '1') {
-				// 	vm.force = true;
-				// } else {
-				// 	vm.force = false;
-				// }
-				// if (!vm.update_info.platform) {
-				// 	// 后台未配置当前系统的升级数据
-				// } else {
-				// 	
-				// }
+				if(wgtquote.data.code==200 && wgtquote.data.result!=null){
+					vm.wgtInfo = wgtquote.data.result
+				    vm.wgtLatestVersion = wgtquote.data.result.versionno;
+				}
+				vm.checkUpdate(); //检查是否更
 			},
 			// 检查是否更新
 			checkUpdate() {

pages/index/shop.vue

@@ -160,7 +160,12 @@
 							this.isPopup = false
 							this.getShopData()
 							this.isSuccess = true
-						}
+						}else {
+              uni.showToast({
+                icon: 'none',
+                title: res.data.message
+              })
+            }
 					})
 				} else if (this.currentIndex == 1) {
 					let data = {
@@ -172,7 +177,12 @@
 							this.isPopup = false
 							this.getShopData()
 							this.isSuccess = true
-						}
+						}else {
+              uni.showToast({
+                icon: 'none',
+                title: res.data.message
+              })
+            }
 					})
 				} else if (this.currentIndex == 2) {
 					let data = {

pages/login/login.vue

@@ -36,7 +36,7 @@
 				<view style="margin-top: 216upx;">
 					<button class="cu-btn round lg  bg-blue " style="display: flex;" :loading="loading"
 						:class="[shape == 'round' ? 'round' : '']" @tap="onLogin"><text
-							space="emsp">{{ loading ? "登录中..." : " 登录/注册"}}</text>
+							space="emsp">{{ loading ? "登录中..." : " 登录/注册(测试)"}}</text>
 					</button>
 				</view>
        <!--  去掉注册和忘记密码  add by hxl  2025-07-16       -->
@@ -196,19 +196,23 @@
 			},
 			//  登录
 			onLogin: function() {
-
-				if (!this.checked || this.checked.length == 0) {
-					this.$tip.toast('请阅读后勾选并同意《平台协议》及《隐私协议》政策');
-					return;
-				}
+				let checkPhone = new RegExp(/^[1]([3-9])[0-9]{9}$/);
 				if (!this.phoneNo || this.phoneNo.length == 0) {
-					this.$tip.toast('请填写手机号');
-					return;
+					this.$tip.toast('请输入手机号');
+					return false
+				}
+				if (!checkPhone.test(this.phoneNo)) {
+					this.$tip.toast('请输入正确的手机号');
+					return false
 				}
 				if (!this.smsCode || this.smsCode.length == 0) {
 					this.$tip.toast('请填写验证码');
 					return;
 				}
+				if (!this.checked || this.checked.length == 0) {
+					this.$tip.toast('请阅读后勾选并同意《平台协议》及《隐私政策》');
+					return;
+				}
 				let loginParams = {
           phone: this.phoneNo,
 					code: this.smsCode,

pages/login/settled.vue

@@ -383,7 +383,6 @@
       if (data.loginType){
         // data.loginType =2  需要根据merchantId查询商户临时数据
         // data.loginType =3  不需要回显
-        console.log(data.loginType)
         this.loginType = data.loginType;
         if(data.loginType === '2') {
           this.$http.post('/merchant/examine/new/info/temporary', {
@@ -393,7 +392,7 @@
               this.form = {
                 id: data.merchantId,
                 ordinaryUserId: data.ordinaryUserId,
-                name: data.name,
+                name: (data.name==null || data.name =='null') ?"":data.name,
                 type: res.data.result.type == null ? null : res.data.result.type + '',
                 corporateName: !res.data.result.corporateName ? null : res.data.result.corporateName,
                 creditCode: !res.data.result.creditCode ? null : res.data.result.creditCode,
@@ -424,7 +423,7 @@
           });
         }else if(data.loginType === '3') {
           this.form.ordinaryUserId =data.ordinaryUserId;
-          this.form.name = data.name;
+            name: (data.name==null || data.name =='null') ?"":data.name,
           this.form.passWord =data.passWord;
           this.form.phone  =data.phone;
         }
@@ -451,11 +450,9 @@
 		},
 		methods: {
 			getCurrentLocation() {
-				console.log('1111111')
 				uni.getStorage({
 					key: 'currentAddress',
 					success: (res) => {
-						console.log(res, '2222222');
 						if (res.data && res.data.location) {
 							let temp = res.data.location.split(',');
 							this.latitude = temp[1];
@@ -484,20 +481,16 @@ this.$forceUpdate();
 
 					},
 					fail: () => {
-						console.log('3333333')
 						// 如果没有存储的位置，可以设置默认位置
 						this.setDefaultLocation();
 					}
 				});
 			},
 			setDefaultLocation() {
-				console.log('444444444')
 				let that = this
 				uni.getLocation({
 					type: 'gcj02',
 					success: function(res) {
-						console.log('555555555')
-						console.log(res)
 						that.latitude = res.latitude;
 						that.longitude = res.longitude;
 						that.marker = [{
@@ -512,7 +505,7 @@ this.$forceUpdate();
 						
 					},
 					fail() {
-						console.log('666666666')
+				
 					}
 				});
 
@@ -800,23 +793,11 @@ this.$forceUpdate();
                   //放入session
                   const result = res.data.result
                   const userInfo = result.userInfo
-                  uni.showToast({
-                    title: '111111！',
-                    icon: 'none'
-                  })
                   uni.setStorageSync(ACCESS_TOKEN,result.token);
                   uni.setStorageSync(USER_INFO,userInfo);
-                  uni.showToast({
-                    title: '222222222！',
-                    icon: 'none'
-                  })
                   this.$store.commit('SET_TOKEN', result.token)
                   this.$store.commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname})
                   this.$store.commit('SET_AVATAR', userInfo.avatar)
-                  uni.showToast({
-                    title: '44444444444444！',
-                    icon: 'none'
-                  })
                   // #ifdef APP-PLUS
                   uni.switchTab({
                     url: '/pages/index/index'
@@ -828,10 +809,6 @@ this.$forceUpdate();
                     name: 'index'
                   })
                   // #endif
-                  uni.showToast({
-                    title: '888888888888888888！',
-                    icon: 'none'
-                  })
                 } else {
                   this.$tip.error(res.data.message);
                 }