zhongtianhaoyuan hace 1 año
padre
commit
76d389752e

+ 2 - 2
config/index.js

@@ -1,7 +1,7 @@
 const dev = {
-	baseUrlNew: 'https://api.changyuntong56.com',
+	// baseUrlNew: 'https://api.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.changyuntong56.com',
-	// baseUrlNew: 'http://192.168.110.9:8099',
+	baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'https://apitest.eliangeyun.com',
 	// baseUrlNew: 'http://192.168.110.67:8999/',
 	h5Appid: 'wxb66b599f7f61b46f',

+ 5 - 10
pages/public/code.vue

@@ -52,13 +52,13 @@
 				inputList: [],
 				//计时器
 				count_down: 60,
-				status: false
+				status: false,
+				clientId:""
 			}
 		},
 		onLoad(options) {
-			console.log("options", options.phone)
+			this.clientId = uni.getStorageSync("clientId")
 			this.phone = options.phone
-			console.log("phone:", this.phone);
 			if (this.phone) {
 				this.regain()
 			} else {
@@ -125,18 +125,14 @@
 						title: '登录中',
 						mask: true
 					})
-					console.log("----------------------------")
-					console.log(this.phone)
-					console.log(this.inputList)
 					this.$request.baseRequest('get', '/commonUser/loginVerifyCode', {
 							phone: this.phone,
 							verifyCode: this.inputList,
 							loginFlag: 1,
-							identification: 2
+							identification: 2,
+							cid:this.clientId 
 						}).then(res => {
-							console.log("res",res)
 							if (res.code == 200) {
-								console.log("res",res)
 								uni.setStorageSync('userInfo', res.data)
 								helper.getListByUserId()
 								that.$store.commit('login', res.data)
@@ -164,7 +160,6 @@
 						});
 				}
 			}
-
 		}
 	}
 </script>

+ 13 - 3
pages/public/login.vue

@@ -89,7 +89,8 @@
 				system: '',
 				platform: '',
 				userData: undefined,
-				canIUseProfile: false
+				canIUseProfile: false,
+				clientid:""
 			}
 		},
 		computed: {
@@ -101,7 +102,15 @@
 			console.log("login onShow")
 		},
 		onLoad(options) {
-
+			// #ifdef APP-PLUS
+				plus.push.getClientInfoAsync((info) => {
+					var name = 'clientId'
+					var value = info.clientid
+					// this.$store.commit('$uStore', {name,value});
+					uni.setStorageSync("clientId", info.clientid)
+					this.clientid = info.clientid
+				}, err => {});
+			// #endif
 			if (wx.getUserProfile) {
 				console.log('--check getUserProfile--OK');
 				this.canIUseProfile = true;
@@ -181,7 +190,8 @@
 								phone: that.phone,
 								password: that.password,
 								loginFlag: 1,
-								identification: 2
+								identification: 2,
+								cid:that.clientid
 							}).then(res => {
 								if (res.code == 200) {
 									uni.setStorageSync('userInfo', res.data)

+ 3 - 3
pages/public/loginOther.vue

@@ -78,7 +78,8 @@
 				tabbar: true,
 				windowHeight: '',
 				canIUseProfile: false,
-				codestatus: false
+				codestatus: false,
+				clientid:""
 			}
 		},
 		computed: {
@@ -88,8 +89,7 @@
 			// this.loginType = "wechat"
 			this.$api.logout()
 		},
-		onLoad(options) {
-		},
+		onLoad(options) {},
 		methods: {
 			changephone(e) {
 				if (e.detail.value.length > 11) {

+ 1 - 0
uni_modules/mescroll-uni/components/mescroll-uni/components/mescroll-up.css

@@ -13,6 +13,7 @@
 	display: inline-block;
 	font-size: 28rpx;
 	vertical-align: middle;
+	color: #AFB3BF;
 	/* color: gray; 已在style设置color,此处删去*/
 }