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

common/helper.js

@@ -108,7 +108,7 @@ const contactCustomerService = (phone) => {
 	console.log(phone)
 	//客服
 	if (!phone) {
-		phone = '13304979986'
+		phone = '4006688647'
 	}
 	const res = uni.getSystemInfoSync();
 	// ios系统默认有个模态框

pages/goodSource/cargoOwnerSee.vue

@@ -44,7 +44,7 @@
 				<view class="enterprise_title" v-if="companyList.length>0">所属企业:</view>
 				<view class="enterprise_title" v-else>个人货主，暂未代理企业</view>
 				<view v-for='item in companyList'>
-					{{item.company?item.company:item.companyName}}
+					<view style="color: #999999;margin: 20rpx;">{{item.company?item.company:item.companyName}}</view>
 				</view>
 			<!-- 	<view class="enterprise_name" v-if="companyList.length>0">{{objectInfo.cargoOwner}}</view> -->
 			</view>

pages/mine/driverCertificationNext.vue

@@ -704,6 +704,14 @@
 					})
 					return true
 				}
+				// if (!uni.$u.test.rangeLength(this.dataDetails.qualificationCertificateNumber,[12,19])) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "从业资格证号输入错误！",
+				// 	})
+				// 	return true
+				// }
+
 				if (this.dataDetails.qualificationCertificateNumber.length!=19) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -784,6 +792,8 @@
 					})
 					return
 				}
+				//账号传
+				this.dataDetails.accountNumber = uni.getStorageSync("userInfo").phone
 				uni.showLoading({
 					mask: true,
 					title: '加载中'

pages/mine/editDriverCertificationNext.vue

@@ -659,6 +659,15 @@
 					})
 					return true
 				}
+
+				// if (uni.$u.test.rangeLength(this.dataDetails.qualificationCertificateNumber,[12,19])) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "从业资格证号输入错误！",
+				// 	})
+				// 	return true
+				// }
+
 				if (this.dataDetails.qualificationCertificateNumber.length!=19) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -771,6 +780,7 @@
 				// 校验
 				if (this.validate()) return
 				this.delSubmitObj()
+				this.dataDetails.accountNumber = uni.getStorageSync("userInfo").phone
 				uni.showLoading({
 					mask: true,
 					title: '加载中'

pages/order/orderDetails.vue

@@ -522,8 +522,6 @@
 						this.isShowTerminationReason = true
 					}
 				if(item.orderStatus=='未装车'){
-					
-					
 					this.show = true
 				}else{
 					this.isShowAlert=true