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

config/index.js

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

pages/mine/index.vue

@@ -18,6 +18,11 @@
 					</view>
 					<view @click="toLogin" class="phone" v-if="hasLogin">{{starUserphone}}</view>
 				</view>
+				<view style="margin: auto;margin-right: 10px">
+					<u-image @click="goDetailPage('/pages/mine/set')" style='margin-top: -6px;' class='image'
+						:showLoading="true" src="@/static/images/mine/set.png" width="25px" height="25px"></u-image>
+				</view>
+				
 			</view>
 		</view>
 		<view class="content1">
@@ -126,7 +131,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="flex flex-space-between" @click="goDetailPage('/pages/mine/set')">
+			<!-- <view class="flex flex-space-between" @click="goDetailPage('/pages/mine/set')">
 				<view class="flex align-center">
 					<image class="img" src="@/static/images/mine/set.png" mode='widthFix'>
 					</image>
@@ -135,7 +140,7 @@
 				<view>
 					<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
 				</view>
-			</view>
+			</view> -->
 			<!-- <view class="flex flex-space-between" @click="goDetailPage('/pages/mine/index1')">
 				<view class="flex align-center">
 					<image class="img" src="@/static/images/mine/set.png" mode='widthFix'>

pages/public/code.vue

@@ -52,10 +52,15 @@
 				inputList: [],
 				//计时器
 				count_down: 60,
-				status: false
+				status: false,
+				clientId:""
 			}
 		},
 		onLoad(options) {
+			// #ifdef APP-PLUS
+			   this.clientId = uni.getStorageSync("clientId")
+			// #endif
+		
 			console.log("options", options.phone)
 			this.phone = options.phone
 			console.log("phone:", this.phone);
@@ -139,7 +144,8 @@
 							phone: this.phone,
 							verifyCode: this.inputList,
 							loginFlag: 2,
-							identification:1
+							identification:1,
+							cid:this.clientId
 						}).then(res => {
 							if (res.code == 200) {
 								uni.setStorageSync('userInfo', res.data)

pages/public/login.vue

@@ -126,6 +126,7 @@
 				appSecurity: "", //网络货运企业在省平台申请的接入安全码
 				enterpriseSenderCode: "", //网络货运企业在省平台申请的企业发送代码
 				environment: "", //环境:“debug”接入测试环境,“release”接入正式环境。
+				clientid:"",
 			}
 		},
 		computed: {
@@ -137,8 +138,15 @@
 			this.$api.logout()
 		},
 		onLoad(options) {
-
 			// #ifdef APP-PLUS
+			plus.push.getClientInfoAsync((info) => {//获取设备唯一cid
+				var name = 'clientId'
+				var value = info.clientid
+				// this.$store.commit('$uStore', {name,value});
+				uni.setStorageSync("clientId", info.clientid)
+				this.clientid = info.clientid
+			}, err => {});
+			
 			var isContains = true; //隐私权政策是否包含高德开平隐私权政策  true是包含
 			var isShow = true; //隐私权政策是否弹窗展示告知用户 true是展示 
 			sdkwx.updatePrivacyShow(isContains, isShow);
@@ -314,7 +322,8 @@
 								phone: that.phone,
 								password: that.password,
 								loginFlag: 2,
-								identification: 1
+								identification: 1,
+								cid:that.clientid
 							}, 'application/x-www-form-urlencoded').then(res => {
 								if (res.code == 200) {
 									// 							uni.setStorageSync("shiro",encodeURIComponent(`ws_login_companyShortName=