zhongtianhaoyuan há 2 anos atrás
pai
commit
33d04a0f4a

+ 1 - 1
App.vue

@@ -519,7 +519,7 @@
 			// #ifdef APP-PLUS
 			getCurrentNo(res => {
 				// 进页面获取当前APP版本号(用于页面显示)
-				this.version = res.version;
+				this.version = res.versionName;
 			});
 			// #endif
 		},

+ 8 - 15
pages/mine/driverCertification.vue

@@ -4,11 +4,11 @@
 		<view class="container">
 			<view class="content2 content-other">
 				<view class="title">上传身份证人像面</view>
-				<view @click.stop="uploadImg(1,index)" class="picture picture1" v-if="!dataDetails.cardAddressUrl">
+				<view @click.stop="uploadImg(1)" class="picture picture1" v-if="!dataDetails.cardAddressUrl">
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 					<view class="text">上传身份证人像面</view>
 				</view>
-				<view v-if="dataDetails.cardAddressUrl" @click.stop="uploadImg(1,index)"
+				<view v-if="dataDetails.cardAddressUrl" @click.stop="uploadImg(1)"
 					class="preview-card-img picture">
 					<!-- <image class="card-img" :src="dataDetails.cardAddressUrl"></image> -->
 					<view @click.stop="delCard(1)">
@@ -20,12 +20,12 @@
 				</view>
 
 				<view class="title">上传身份证国徽面</view>
-				<view @click="uploadImg(2,index)" class="picture picture2" v-if="!dataDetails.cardBackAddressUrl">
+				<view @click="uploadImg(2)" class="picture picture2" v-if="!dataDetails.cardBackAddressUrl">
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 					<view class="text">上传身份证国徽面</view>
 				</view>
 
-				<view v-if="dataDetails.cardBackAddressUrl" @click.stop="uploadImg(2,index)"
+				<view v-if="dataDetails.cardBackAddressUrl" @click.stop="uploadImg(2)"
 					class="preview-card-img picture">
 					<!-- <image class="card-img" :src="dataDetails.cardAddressUrl"></image> -->
 					<view @click.stop="delCard(2)">
@@ -446,7 +446,6 @@
 					// 身份正面
 					case 1:
 						_this.dataDetails.cardAddressUrl = ''
-
 						break
 						// 身份反面
 					case 2:
@@ -713,12 +712,13 @@
 				)
 			},
 			uploadImg(type, index) {
-				console.log(index,"sdfjkahfi")
 				this.uploadType = type
 				// this.isShowimgType = true
 				// this.imgTypeSelect()
-				this.index = index
-				this.dataDetails.hyDriverPayeeInfoList[index].bankDepositBranch=''
+				if(index >=0){
+					this.index = index
+					this.dataDetails.hyDriverPayeeInfoList[index].bankDepositBranch=''
+				}
 				this.imgTypeSelect()
 			},
 			// 上传图片
@@ -966,14 +966,7 @@
 								}
 							})
 					}
-
 				}
-				// if (this.payCheck) {
-				// 	uni.$u.route('/pages/mine/driverCertificationNext', {
-				// 		data: JSON.stringify(this.dataDetails),
-				// 	});
-				// }
-
 			},
 			validate() {
 				// true 为校验不通过

+ 20 - 17
pages/mine/index.vue

@@ -4,7 +4,7 @@
 		<view class="top-height"></view>
 		<view class="head">
 			<view class="row1">
-			<!-- 	<u--image class="flex-end" :showLoading="true" src="../../static/images/mine/saoma.png" width="30px"
+				<!-- 	<u--image class="flex-end" :showLoading="true" src="../../static/images/mine/saoma.png" width="30px"
 					height="30px"></u--image> -->
 			</view>
 			<view class="row2 flex align-center">
@@ -14,7 +14,8 @@
 					<!-- <view @click="toLogin" class="name">{{hasLogin? userName : '立即登录' }} -->
 					<!-- {{hasLogin?driverSex:""}} -->
 					<!-- <view class="name" v-if='userName'></view> -->
-					<view @click="toLogin" class="name">{{hasLogin? userName : '立即登录' }} {{hasLogin?driverSex:""}}</view>
+					<view @click="toLogin" class="name">{{hasLogin? userName : '立即登录' }} {{hasLogin?driverSex:""}}
+					</view>
 					<view @click="toLogin" class="phone" v-if="hasLogin">{{starUserphone}}</view>
 				</view>
 			</view>
@@ -26,7 +27,7 @@
 					<image class="sfrz-icon" src="@/static/images/mine/sfrz.png" mode='widthFix'>
 					</image>
 				</view>
-				<view class="right-text" >
+				<view class="right-text">
 					<view class="top">司机认证</view>
 					<view class="bottom">{{hasLogin? statusVal : '你还没有完成身份认证' }}</view>
 				</view>
@@ -36,7 +37,7 @@
 					<image class="sfrz-icon" src="@/static/images/mine/pingjia@2x.png" mode='widthFix'>
 					</image>
 				</view>
-				<view class="right-text" >
+				<view class="right-text">
 					<view class="top">货主评价</view>
 					<view class="bottom">看看货主对你的评价吧</view>
 				</view>
@@ -153,14 +154,14 @@
 				driverCall: '',
 				isFirstSH: false,
 				driverSex: "",
-				version:"1.1.0"//版本号
+				version: "1.1.0" //版本号
 
 			};
 		},
 		onShow() {
-				// #ifdef APP-PLUS
+			// #ifdef APP-PLUS
 			this.version = plus.runtime.version
-			     // #endif
+			// #endif
 			uni.setTabBarItem({
 				index: 0,
 				text: '货源',
@@ -184,7 +185,7 @@
 			that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 				reCommonId: this.userInfo.id,
 			}).then(res3 => {
-				if (res3.data||res3.data==0) {
+				if (res3.data || res3.data == 0) {
 					let name = 'myTip';
 					let value = res3.data
 					if (value == 0) {
@@ -239,7 +240,7 @@
 				await this.$request.baseRequest('', '/driverInfo/firstAuthentication', {
 						driverPhone: this.userInfo.phone,
 					}).then(res => {
-						if(res.data){
+						if (res.data) {
 							uni.setStorageSync("firstAuthentication", res.data) //更新缓存数据(解决pc端审核后未及时更新缓存  用于车友判断)
 						}
 						this.firstAuthentication = res.data
@@ -261,13 +262,13 @@
 								this.statusVal = '身份认证审核中'
 							} else if (this.firstAuthentication.authenticationStatus == '未通过') {
 								this.statusVal = '身份认证未通过'
-							}  else if (this.firstAuthentication.authenticationStatus == '已驳回') {
+							} else if (this.firstAuthentication.authenticationStatus == '已驳回') {
 								this.statusVal = '已驳回'
 							} else if (this.firstAuthentication.authenticationStatus == '已过期') {
 								this.statusVal = '证件已过期'
-							}  else if (this.firstAuthentication.authenticationStatus == '未认证') {
+							} else if (this.firstAuthentication.authenticationStatus == '未认证') {
 								this.statusVal = '未认证'
-							}else {
+							} else {
 								this.statusVal = '已认证'
 							}
 						} else {
@@ -314,7 +315,8 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 				} else {
-					if (type == 1 && this.statusVal == '已认证' || type == 1 &&this.statusVal == '证件已过期' || type == 1 &&this.statusVal == '身份认证未通过'|| type == 1 &&this.statusVal == '已驳回') {
+					if (type == 1 && this.statusVal == '已认证' || type == 1 && this.statusVal == '证件已过期' || type == 1 && this
+						.statusVal == '身份认证未通过' || type == 1 && this.statusVal == '已驳回') {
 						src = '/pages/mine/editDriverCertification'
 					}
 					if ((type == 2 || type == 3) && this.isFirstSH) {
@@ -451,9 +453,8 @@
 			margin: 10rpx 0 50rpx 0;
 		}
 	}
-	.version_css{
-		
-		// margin-top: 100rpx;
+
+	.version_css {
 		margin: 0 auto;
 		bottom: 120rpx;
 		color: #9D9D9D;
@@ -461,6 +462,8 @@
 		// position:fixed;
 		position: absolute;
 		text-align: center;
-		left:0;right:0;margin:0 auto;
+		left: 0;
+		right: 0;
+		margin: 0 auto;
 	}
 </style>

+ 1 - 3
pages/mine/set.vue

@@ -52,11 +52,10 @@
 				<view>
 					<text>检查更新</text>
 				</view>
-				<view @click="onAPPUpdate" style="text-align: right;">
+				<view @click="onAPPUpdate">
 					{{version}}
 					<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
 				</view>
-
 			</view>
 			<!-- <u-line color="#EEEEEE" class="line"></u-line>
 			<view class='flex flex-space-between' @click='clearStorage'>
@@ -117,7 +116,6 @@
 		},
 		onLoad() {
 			_this = this
-
 		},
 		methods: {
 			// 检查APP是否有新版本

+ 0 - 1
uni_modules/zhouWei-APPUpdate/js_sdk/appUpdate.js

@@ -10,7 +10,6 @@ const $iconUrl = componentConfig.appUpdateIcon ? componentConfig.appUpdateIcon :
 export const getCurrentNo = function(callback) {
 	// 获取本地应用资源版本号
 	plus.runtime.getProperty(plus.runtime.appid, function(inf) {
-		console.log("inf-----------",inf)
 		callback && callback({
 			versionCode: inf.versionCode,
 			versionName: inf.version