修改bug

common/service/config.service.js

@@ -2,9 +2,9 @@ let BASE_URL = ''
 
 
 if (process.env.NODE_ENV == 'development') {
-	// BASE_URL = 'https://test.baoxianzhanggui.com/locallive-java' // 测试环境
+	BASE_URL = 'https://test.baoxianzhanggui.com/locallive-java' // 测试环境
 	// BASE_URL = 'http://192.168.0.36:8080/jeecg-boot' // 开发环境
-    BASE_URL = 'http://192.168.0.52:8080/jeecg-boot' // 开发环境
+    // BASE_URL = 'http://192.168.0.52:8080/jeecg-boot' // 开发环境
 
 } else {
 	BASE_URL = 'https://test.baoxianzhanggui.com/locallive-java' // 测试环境

manifest.json

@@ -6,12 +6,11 @@
     "versionCode" : 1,
     "transformPx" : false,
     "app-plus" : {
-        "nvueStyleCompiler" : "uni-app",
         /* 5+App特有相关 */
         "modules" : {
             "Maps" : {},
-            "Barcode" : {},
-            "Geolocation" : {}
+            "Geolocation" : {},
+            "Barcode" : {}
         },
         /* 模块配置 */
         "distribute" : {
@@ -71,9 +70,6 @@
                         "appkey_android" : "220880dab49e4a565afbf0bd989af006"
                     }
                 },
-                "push" : {
-                    "unipush" : {}
-                },
                 "geolocation" : {
                     "amap" : {
                         "name" : "amap_15513573860CluPH7RHj",
@@ -84,6 +80,9 @@
                     "system" : {
                         "__platform__" : [ "ios", "android" ]
                     }
+                },
+                "push" : {
+                    "unipush" : {}
                 }
             }
         }

pages/index/index.vue

@@ -10,7 +10,7 @@
 
 		</view>
 		<view class="data_box">
-			<view class="title">
+			<view class="title" @click="scanRecordaa">
 				今日概况
 				<image src="/static/index/today.png" mode=""></image>
 			</view>
@@ -114,6 +114,11 @@
 					url: '/pages/scan/record'
 				})
 			},
+			scanRecordaa() {
+				uni.navigateTo({
+					url: '/pages/login/login'
+				})
+			},
 			gettodayData() {
 				this.$http.get("/merchant/app/home/todayData?merchantId=" + '111', {}).then(res => {
 					if (res.data.code == 200) {

pages/login/login.vue

@@ -153,7 +153,7 @@ export default {
 				return;
 			}
 			let loginParams = {
-				phone: this.userName,
+				username: this.userName,
 				passWord: this.password,
 			}
 			this.loading = true;
@@ -167,6 +167,9 @@ export default {
 					// #ifndef APP-PLUS
 					this.$tip.success('登录成功!')
 					this.$Router.replaceAll({ name: 'index' })
+					// uni.navigateTo({
+					// 	url: '/pages/index/index'
+					// })
 					// #endif
 				} else {
 					this.$tip.alert(res.data.message);
@@ -180,9 +183,10 @@ export default {
 			})
 		},
 		saveClientId() {
-			var info = plus.push.getClientInfo();
-			var cid = info.clientid;
-			this.$http.get("/sys/user/saveClientId", { params: { clientId: cid } }).then(res => {
+		// 	var info = plus.push.getClientInfo();
+		// 	var cid = info.clientid;
+			var randomNum = new Date().getTime();
+			this.$http.get("/sys/user/saveClientId", { params: { clientId: randomNum } }).then(res => {
 				console.log("res::saveClientId>", res)
 				this.$tip.success('登录成功!')
 				this.$Router.replaceAll({ name: 'index' })

pages/login/register.vue

@@ -155,7 +155,7 @@
 			          return;
 			        }
 			        let loginParams = {
-						phone:this.userName,
+						username:this.userName,
 						passWord:this.password,
 			        }
 					this.loading=true;
@@ -164,11 +164,14 @@
 					  this.loading=false;
 			          if(res.data.success){
 						 // #ifdef APP-PLUS
-						  this.saveClientId()
+						//   this.saveClientId()
 						 // #endif
 						 // #ifndef APP-PLUS
 						  this.$tip.success('登录成功!')
-						  this.$Router.replaceAll({name:'index'})
+						  uni.navigateTo({
+								url: '/pages/index/index'
+							})
+						//   this.$Router.replaceAll({name:'index'})
 						 // #endif
 						}else{
 			              this.$tip.alert(res.data.message);
@@ -181,15 +184,15 @@
 					  this.loading=false;
 					})
 			},
-			saveClientId(){
-				var info = plus.push.getClientInfo();
-				var cid = info.clientid;
-				this.$http.get("/sys/user/saveClientId",{params:{clientId:cid}}).then(res=>{
-					console.log("res::saveClientId>",res)
-					this.$tip.success('登录成功!')
-					this.$Router.replaceAll({name:'index'})
-				})
-			},
+			// saveClientId(){
+			// 	var info = plus.push.getClientInfo();
+			// 	var cid = info.clientid;
+			// 	this.$http.get("/sys/user/saveClientId",{params:{clientId:cid}}).then(res=>{
+			// 		console.log("res::saveClientId>",res)
+			// 		this.$tip.success('登录成功!')
+			// 		this.$Router.replaceAll({name:'index'})
+			// 	})
+			// },
 			changePassword() {
 				this.showPassword = !this.showPassword;
 			},
@@ -228,6 +231,7 @@
 				}, 1000);
 			},
 			onSMSLogin() {
+			
 				let checkPhone = new RegExp(/^[1]([3-9])[0-9]{9}$/);
 			
 				if(!this.phoneNo || this.phoneNo.length==0){
@@ -242,6 +246,14 @@
 				  this.$tip.toast('请填短信验证码');
 				  return;
 				}
+				if(!this.password ){
+				  this.$tip.toast('请输入密码');
+				  return;
+				}
+				if(!this.password1 ){
+				  this.$tip.toast('请输入新密码');
+				  return;
+				}
 				if(this.password !== this.password1){
 				  this.$tip.toast('请确定密码是否一致');
 				  return;

pages/login/settled.vue

@@ -487,6 +487,8 @@ export default {
                         let data = JSON.parse(files.data);
                         if (data.success) {
                             this.form[type] = data.message
+                            console.log(type,777);
+                            
                             if (type == 'businessLicense' || type == 'identityOne') {
                                 uni.uploadFile({
                                     url: configService.apiUrl + `${type == 'businessLicense' ? '/order/identify/businessLicense' : '/order/identify/idCard'}`,
@@ -530,7 +532,10 @@ export default {
                                     }
                                 });
                             }
+                            else{
+                                this.lodingshow = false;
 
+                            }
                         }
                     }
                 });

store/index.js

@@ -32,7 +32,7 @@ export default new Vuex.Store({
     // 登录
     mLogin({ commit }, param) {
       return new Promise((resolve, reject) => {
-       api.login(param.passWord,param.phone).then(response => {
+       api.login(param.passWord,param.username).then(response => {
           if(response.data.code ==200){ 
             const result = response.data.result
             const userInfo = result.userInfo