Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-huozhuapp

# Conflicts:
#	config/index.js

pages/mine/helpDescription.vue

@@ -15,27 +15,27 @@
 
 			</view>
 		</u-navbar>
-		<image src="@/static/images/mine/tsb/jjb.png" mode="widthFix" class="banner" v-if="isShowType"></image>
+		<image src="@/static/images/tsb/jjb.png" mode="widthFix" class="banner" v-if="isShowType"></image>
 		<view class="content1" v-if="!isShowType">
-			<image src="@/static/images/mine/tsb/1.png" mode="widthFix" class="content-img">
+			<image src="@/static/images/tsb/1.png" mode="widthFix" class="content-img">
 			</image>
-			<image src="@/static/images/mine/tsb/2.png" mode="widthFix" class="content-img">
+			<image src="@/static/images/tsb/2.png" mode="widthFix" class="content-img">
 			</image>
-			<image src="@/static/images/mine/tsb/3.png" mode="widthFix" class="content-img">
+			<image src="@/static/images/tsb/3.png" mode="widthFix" class="content-img">
 			</image>
-			<image src="@/static/images/mine/tsb/4.png" mode="widthFix" class="content-img">
+			<image src="@/static/images/tsb/4.png" mode="widthFix" class="content-img">
 			</image>
-			<image src="@/static/images/mine/tsb/5.png" mode="widthFix" class="content-img">
+			<image src="@/static/images/tsb/5.png" mode="widthFix" class="content-img">
 			</image>
-			<image src="@/static/images/mine/tsb/6.png" mode="widthFix" class="content-img">
+			<image src="@/static/images/tsb/6.png" mode="widthFix" class="content-img">
 			</image>
-			<image src="@/static/images/mine/tsb/7.png" mode="widthFix" class="content-img">
+			<image src="@/static/images/tsb/7.png" mode="widthFix" class="content-img">
 			</image>
-			<image src="@/static/images/mine/tsb/8.png" mode="widthFix" class="content-img">
+			<image src="@/static/images/tsb/8.png" mode="widthFix" class="content-img">
 			</image>
-			<image src="@/static/images/mine/tsb/9.png" mode="widthFix" class="content-img">
+			<image src="@/static/images/tsb/9.png" mode="widthFix" class="content-img">
 			</image>
-			<image src="@/static/images/mine/tsb/10.png" mode="widthFix" class="content-img">
+			<image src="@/static/images/tsb/10.png" mode="widthFix" class="content-img">
 			</image>
 		</view>
 	</view>

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>

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)

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) {

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,此处删去*/
 }
 

util/request.js

@@ -20,75 +20,77 @@ const baseRequest = (method, url, data, header) => {
 		}
 	}
 	let promise = new Promise(function(resolve, reject) {
-		uni.getNetworkType({}).then((res) => {
-			console.log(res)
-			if (res[1].networkType === "none") {
-				uni.showToast({
-					icon: 'none',
-					title: '网络异常，请检查网络状况',
-					duration: 2000
-				});
-			} else {
-				uni.request(baseDefaultOpts).then(
-					(res) => {
-						// console.log(JSON.stringify(res[1].data))
-						// if(res[1].data.code == '200' || res[1].data.code == 200){
-						// 	// 后端返回的状态码100为成功状态,成功则返回请求结果,在app调试时可以通过console.log(JSON.stringify(res[1].data))来查看返回值（以项目实际情况为准）
-						// 	resolve(res[1].data)
-						// }else{
-						// 	uni.showToast({
-						// 		icon:'none',
-						// 	    title: res[1].data.message,
-						// 	    duration: 2000 
-						// 	}); 
-						// }
-						if (res[1]) {
-							if (res[1].data.code == '200' || res[1].data.code == 200) {
-								resolve(res[1].data)
-							}else{
+		uni.getNetworkType({
+			success:function(res){
+				console.log(res)
+				if (res.networkType === "none") {
+					uni.showToast({
+						icon: 'none',
+						title: '网络异常，请检查网络状况',
+						duration: 2000
+					});
+				} else {
+					uni.request(baseDefaultOpts).then(
+						(res) => {
+							// console.log(JSON.stringify(res[1].data))
+							// if(res[1].data.code == '200' || res[1].data.code == 200){
+							// 	// 后端返回的状态码100为成功状态,成功则返回请求结果,在app调试时可以通过console.log(JSON.stringify(res[1].data))来查看返回值（以项目实际情况为准）
+							// 	resolve(res[1].data)
+							// }else{
+							// 	uni.showToast({
+							// 		icon:'none',
+							// 	    title: res[1].data.message,
+							// 	    duration: 2000 
+							// 	}); 
+							// }
+							if (res[1]) {
+								if (res[1].data.code == '200' || res[1].data.code == 200) {
+									resolve(res[1].data)
+								}else{
+									uni.showToast({
+										icon:'none',
+										title: res[1].data.message,
+										duration: 2000 
+									}); 
+									// resolve(res[1].data)
+								}
+							} else {
 								uni.showToast({
-									icon:'none',
-									title: res[1].data.message,
-									duration: 2000 
-								}); 
-								// resolve(res[1].data)
+									icon: 'none',
+									title: '网络异常，请检查网络状况',
+									duration: 2000
+								});
+								reject(res)
+								
 							}
-						} else {
+							// // 登录失败
+							// if(res[1].data.code == '11006' || res[1].data.code == 11006){
+							// 	reject(res[1].data)
+							// }
+							// if(res[1].data.code == '105' || res[1].data.code == 105){
+							// 	// 后端返回状态码为105则为未登录状态（以项目实际情况为准）
+							// 	uni.showToast({
+							// 		icon:'none',
+							// 	    title: '尚未登录',
+							// 	    duration: 2000 
+							// 	}); 
+							// 	// 尚未登录的逻辑处理
+							// 	return false
+							// }
+						}
+					).catch(
+						(response) => {
 							uni.showToast({
 								icon: 'none',
-								title: '网络异常，请检查网络状况',
+								title: '系统未知异常，请联系管理员',
 								duration: 2000
 							});
-							reject(res)
-							
+							reject(response)
 						}
-						// // 登录失败
-						// if(res[1].data.code == '11006' || res[1].data.code == 11006){
-						// 	reject(res[1].data)
-						// }
-						// if(res[1].data.code == '105' || res[1].data.code == 105){
-						// 	// 后端返回状态码为105则为未登录状态（以项目实际情况为准）
-						// 	uni.showToast({
-						// 		icon:'none',
-						// 	    title: '尚未登录',
-						// 	    duration: 2000 
-						// 	}); 
-						// 	// 尚未登录的逻辑处理
-						// 	return false
-						// }
-					}
-				).catch(
-					(response) => {
-						uni.showToast({
-							icon: 'none',
-							title: '系统未知异常，请联系管理员',
-							duration: 2000
-						});
-						reject(response)
-					}
-				)
+					)
+				}
+				
 			}
-
 		})
 	})
 	return promise