修改登录注册接口，修改商户营业开启问题

components/yzhua006-update/app-update.vue

@@ -119,26 +119,13 @@
 					apptype:'2',
 					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() {

manifest.json

@@ -2,8 +2,8 @@
     "name" : "掌柜生活商户版",
     "appid" : "__UNI__D5F9FE3",
     "description" : "",
-    "versionName" : "0.0.0.1",
-    "versionCode" : "0001",
+    "versionName" : "0.0.0.2",
+    "versionCode" : "0002",
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

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

@@ -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,