Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-app

manifest.json

@@ -2,8 +2,8 @@
     "name" : "智运",
     "appid" : "__UNI__9C76CB6",
     "description" : "",
-    "versionName" : "1.0.7",
-    "versionCode" : 107,
+    "versionName" : "1.0.8",
+    "versionCode" : 108,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/goodSource/index.vue

@@ -237,14 +237,14 @@
 			}).then(res => {
 				return res.data.authenticationStatus
 			})
-			if (_status == '已禁用') {
-				this.isShowAlert = true
-				this.alertTitle = '账号审核中'
-				this.confirmText = '退出APP'
-				this.showCancelButton = false
-			} else {
-				console.log(1231233212332312312213)
-			}
+			// if (_status == '已禁用') {
+			// 	this.isShowAlert = true
+			// 	this.alertTitle = '账号审核中'
+			// 	this.confirmText = '退出APP'
+			// 	this.showCancelButton = false
+			// } else {
+			// 	console.log(1231233212332312312213)
+			// }
 			// #endif
 
 		},
@@ -278,16 +278,7 @@
 				this.mescroll = mescroll;
 			},
 			confirmClick() {
-				// #ifdef APP-PLUS
-				if (this.alertTitle = '账号审核中') {
-					if (uni.getSystemInfoSync().platform == 'ios') {
-						plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
-					} else if (uni.getSystemInfoSync().platform == 'android') {
-						plus.runtime.quit();
-					}
-					return
-				}
-				// #endif
+		
 				let item = this.ObjSelect
 				let _obj = {
 					driverCommonId: this.firstAuthentication.commonId,

pages/mine/editDriverCertification.vue

@@ -42,21 +42,21 @@
 			</view>
 			<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,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,1)"
 					class="preview-card-img picture">
 					<image class="" :src="dataDetails.cardAddressUrl" mode="aspectFit" style=""></image>
 				</view>
 
 				<view class="title">上传身份证国徽面</view>
-				<view @click="uploadImg(2,index)" class="picture picture2" v-if="!dataDetails.cardBackAddressUrl">
+				<view @click="uploadImg(2,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(1,index)"
+				<view v-if="dataDetails.cardBackAddressUrl" @click.stop="uploadImg(2,2)"
 					class="preview-card-img picture">
 					<image class="" :src="dataDetails.cardBackAddressUrl" mode="aspectFit" style=""></image>
 				</view>
@@ -74,7 +74,7 @@
 				</view>
 			</view>
 			<u-picker :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod"
-				@confirm="confirmValidityPeriod" @change="changeHandler">
+				@confirm="confirmValidityPeriod" @change="changeHandler" @cancel='isShowcardValidity= false'>
 			</u-picker>
 			<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
 				@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true"

pages/mine/editDriverCertificationNext.vue

@@ -10,7 +10,7 @@
 			<view class="level1-title">证件信息</view>
 			<view class="content1">
 				<view class="title">上传驾驶证主页</view>
-				<view @click="uploadImg(1)" class="picture picture1" v-if="!dataDetails.driverLicenseHomePage">
+				<view @click.stop="uploadImg(1)" class="picture picture1" v-if="!dataDetails.driverLicenseHomePage">
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 					<view class="text">上传驾驶证主页</view>
 				</view>
@@ -23,13 +23,13 @@
 					<image class="" :src="dataDetails.driverLicenseHomePage" mode="aspectFit"></image>
 				</view>
 				<view class="title">上传驾驶证副页</view>
-				<view @click="uploadImg(2)" class="picture picture2" v-if="!dataDetails.driverLicenseBackPage">
+				<view @click.stop="uploadImg(2)" class="picture picture2" v-if="!dataDetails.driverLicenseBackPage">
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 					<view class="text">上传驾驶证副页</view>
 				</view>
-				<view v-if="dataDetails.driverLicenseBackPage" @click.stop="uploadImg(1)"
+				<view v-if="dataDetails.driverLicenseBackPage" @click.stop="uploadImg(2)"
 					class="preview-card-img picture">
-					<view @click.stop="delCard(1)">
+					<view @click.stop="delCard(2)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
@@ -47,9 +47,9 @@
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 					<view class="text">上传行驶证主页</view>
 				</view>
-				<view v-if="dataDetails.drivingLicenseHomePage" @click.stop="uploadImg(1)"
+				<view v-if="dataDetails.drivingLicenseHomePage" @click.stop="uploadImg(3)"
 					class="preview-card-img picture">
-					<view @click.stop="delCard(1)">
+					<view @click.stop="delCard(3)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
@@ -60,9 +60,9 @@
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 					<view class="text">上传行驶证副页</view>
 				</view>
-				<view v-if="dataDetails.drivingLicenseBackPage" @click.stop="uploadImg(1)"
+				<view v-if="dataDetails.drivingLicenseBackPage" @click.stop="uploadImg(4)"
 					class="preview-card-img picture">
-					<view @click.stop="delCard(1)">
+					<view @click.stop="delCard(4)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
@@ -88,9 +88,9 @@
 						<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 						<view class="text">上传挂车行驶证主页</view>
 					</view>
-					<view v-if="dataDetails.trailerLicenseHomePage" @click.stop="uploadImg(1)"
+					<view v-if="dataDetails.trailerLicenseHomePage" @click.stop="uploadImg(5)"
 						class="preview-card-img picture">
-						<view @click.stop="delCard(1)">
+						<view @click.stop="delCard(5)">
 							<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 							</image>
 						</view>
@@ -103,9 +103,9 @@
 						<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 						<view class="text">上传挂车行驶证副页</view>
 					</view>
-					<view v-if="dataDetails.trailerLicenseBackPage" @click.stop="uploadImg(1)"
+					<view v-if="dataDetails.trailerLicenseBackPage" @click.stop="uploadImg(6)"
 						class="preview-card-img picture">
-						<view @click.stop="delCard(1)">
+						<view @click.stop="delCard(6)">
 							<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 							</image>
 						</view>
@@ -130,9 +130,9 @@
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 					<view class="text">上传从业资格证</view>
 				</view>
-				<view v-if="dataDetails.qualificationCertificate" @click.stop="uploadImg(1)"
+				<view v-if="dataDetails.qualificationCertificate" @click.stop="uploadImg(7)"
 					class="preview-card-img picture">
-					<view @click.stop="delCard(1)">
+					<view @click.stop="delCard(7)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
@@ -151,9 +151,9 @@
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 					<view class="text">上传道路运输证</view>
 				</view>
-				<view v-if="dataDetails.operationCertificate" @click.stop="uploadImg(1)"
+				<view v-if="dataDetails.operationCertificate" @click.stop="uploadImg(8)"
 					class="preview-card-img picture">
-					<view @click.stop="delCard(1)">
+					<view @click.stop="delCard(8)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
@@ -179,9 +179,9 @@
 						<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 						<view class="text">上传挂车道路运输证</view>
 					</view>
-					<view v-if="dataDetails.trailerOperationCertificate" @click.stop="uploadImg(1)"
+					<view v-if="dataDetails.trailerOperationCertificate" @click.stop="uploadImg(9)"
 						class="preview-card-img picture">
-						<view @click.stop="delCard(1)">
+						<view @click.stop="delCard(9)">
 							<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 							</image>
 						</view>
@@ -350,8 +350,9 @@
 						sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage(res.tempFilePaths[0], 'appData/',
+							uploadImage('image',res.tempFilePaths[0], 'appData/',
 								result => {
+									debugger
 									// 上传成功回调函数
 									console.log('图片地址-----', result)
 									switch (_this.uploadType) {
@@ -393,7 +394,7 @@
 				}
 
 			},
-			uploadImg(type) {
+			uploadImg(type) {debugger
 				this.uploadType = type
 				this.isShowimgType = true
 

pages/mine/index.vue

@@ -180,7 +180,6 @@
 			})
 		},
 		async onLoad() {
-			debugger
 			that = this
 		
 			// let _status = await that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
@@ -260,7 +259,7 @@
 			},
 			confirmClick() {
 				// #ifdef APP-PLUS
-				if (this.alertTitle = '账号审核中') {
+				if (this.alertTitle == '账号审核中') {
 					if (uni.getSystemInfoSync().platform == 'ios') {
 						plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
 					} else if (uni.getSystemInfoSync().platform == 'android') {

pages/news/index.vue

@@ -80,14 +80,14 @@
 			}).then(res => {
 				return res.data.authenticationStatus
 			})
-			if (_status == '已禁用') {
-				this.isShowAlert = true
-				this.alertTitle == '账号审核中'
-				this.confirmText = '退出APP'
-				this.showCancelButton = false
-			} else {
-				console.log(1231233212332312312213)
-			}
+			// if (_status == '已禁用') {
+			// 	this.isShowAlert = true
+			// 	this.alertTitle == '账号审核中'
+			// 	this.confirmText = '退出APP'
+			// 	this.showCancelButton = false
+			// } else {
+			// 	console.log(1231233212332312312213)
+			// }
 			// #endif
 
 		},

pages/order/confirmUnloading.vue

@@ -294,14 +294,14 @@
 				}
 				this.detailData.carrierInfo.statusFlag = this.detailData.statusFlag
 				this.detailData.carrierInfo.unloadingImg = this.imgList.toString()
-				if (!this.detailData.carrierInfo.totalFreight) {
-					uni.showToast({
-						title: '运费不能为空！',
-						duration: 2000,
-						icon: "none",
-					});
-					return
-				}
+				// if (!this.detailData.carrierInfo.totalFreight) {
+				// 	uni.showToast({
+				// 		title: '运费不能为空！',
+				// 		duration: 2000,
+				// 		icon: "none",
+				// 	});
+				// 	return
+				// }
 				if (
 					this.detailData.carrierInfo.totalFreight < 0 || this.detailData.carrierInfo.totalFreight > 100000 || (
 						String(this.detailData.carrierInfo.totalFreight).indexOf('.') != -1 && String(this.detailData

pages/order/index.vue

@@ -95,8 +95,8 @@
 							<!-- 货主装车确认前运费 -->
 							<view class="car"
 								v-if="good.orderStatus=='待货主确认'||good.orderStatus=='未装车'||good.orderStatus=='待货主确认装车'||good.orderStatus=='货主驳回装车信息'||good.orderStatus=='已终止'">
-								{{good.billingMethod==0?(good.freightInfo.freight?good.freightInfo.freight:good.freight):good.freightCar}}{{good.billingMethod==0?'元/吨':'元/车'}}
-								<!-- {{good.illingMethod==0?good.freight:good.freightCar}}{{good.illingMethod==0?'元/吨':'元/车'}} -->
+								<!-- {{good.billingMethod==0?good.freightInfo.freight?good.freightInfo.freight:good.freight:good.freightCar}}{{good.billingMethod==0?'元/吨':'元/车'}} -->
+								{{good.freightInfo.freight?good.freightInfo.freight:good.freight}}{{good.illingMethod==0?'元/吨':'元/车'}}
 							</view>
 							<!-- 货主装车确认后卸车确认前运费 -->
 							<view class="car"
@@ -292,14 +292,14 @@
 			}).then(res => {
 				return res.data.authenticationStatus
 			})
-			if (_status == '已禁用') {
-				this.isShowAlert = true
-				this.alertTitle = '账号审核中'
-				this.confirmText = '退出APP'
-				this.showCancelButton = false
-			} else {
-				console.log(1231233212332312312213)
-			}
+			// if (_status == '已禁用') {
+			// 	this.isShowAlert = true
+			// 	this.alertTitle = '账号审核中'
+			// 	this.confirmText = '退出APP'
+			// 	this.showCancelButton = false
+			// } else {
+			// 	console.log(1231233212332312312213)
+			// }
 			// #endif
 
 		},
@@ -426,7 +426,7 @@
 			},
 			confirmClick() {
 				// #ifdef APP-PLUS
-				if (this.alertTitle = '账号审核中') {
+				if (this.alertTitle == '账号审核中') {
 					if (uni.getSystemInfoSync().platform == 'ios') {
 						plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
 					} else if (uni.getSystemInfoSync().platform == 'android') {