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

pages/mine/company/addcompany.vue

@@ -32,8 +32,7 @@
 			</view>
 			<view class="flex row">
 				<view class="left-text">营业期限截止日期</view>
-				<view style='font-size:14px;width:50%;' class='flex flex-space-between'
-					@click="selectData(0)">
+				<view style='font-size:14px;width:50%;' class='flex flex-space-between' @click="selectData(0)">
 					<view :style="{'color':dataDetails.businessTermDate ? '#000':'#C6CBD5'}">
 						{{dataDetails.businessTermDate?dataDetails.businessTermDate:'选择期限截止日期'}}
 					</view>
@@ -45,7 +44,7 @@
 			<view class="flex row noborder">
 				<view class="left-text">统一社会信用代码</view>
 				<u--input placeholder="请输入统一社会信用代码" inputAlign='left' border="none"
-					v-model="dataDetails.unifiedSocialCreditCode">
+					v-model="dataDetails.unifiedSocialCreditCode" maxlength='18'>
 				</u--input>
 			</view>
 
@@ -53,9 +52,9 @@
 		<view class='wrap'>
 			<view class="flex border-bottom mt20 align-center">
 				<view class="left">企业名称</view>
-				<view class="flex right" >
-					<u--input placeholder="输入企业名称" @input='companyNamechange' inputAlign='left' border="none" v-model="dataDetails.companyName"
-						@blur='companyNameBlur'>
+				<view class="flex right">
+					<u--input placeholder="输入企业名称" @input='companyNamechange' inputAlign='left' border="none"
+						v-model="dataDetails.companyName" @blur='companyNameBlur'>
 					</u--input>
 				</view>
 			</view>
@@ -88,8 +87,7 @@
 				<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(2)"
-				class="preview-card-img picture">
+			<view v-if="dataDetails.cardAddressUrl" @click.stop="uploadImg(2)" class="preview-card-img picture">
 				<image class="" :src="dataDetails.cardAddressUrl" mode="aspectFit" style=""></image>
 			</view>
 			<view class="title">上传身份证国徽面</view>
@@ -97,8 +95,7 @@
 				<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(3)"
-				class="preview-card-img picture">
+			<view v-if="dataDetails.cardBackAddressUrl" @click.stop="uploadImg(3)" class="preview-card-img picture">
 				<image class="" :src="dataDetails.cardBackAddressUrl" mode="aspectFit" style=""></image>
 			</view>
 			<view class="flex border-bottom mt20 align-center">
@@ -109,62 +106,63 @@
 					</u--input>
 				</view>
 			</view>
-		<view class="flex border-bottom mt20 align-center">
-			<view class="left-text" >身份证有效期</view>
-			<view  class='flex right'
-				@click="selectData(1)">
-				<span :style="{'color':dataDetails.cardValidityDate ? '#000':'#C6CBD5'}">
-					{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择身份证有效期'}}
-				</span>
-				<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
-				<view>
+			<view class="flex border-bottom mt20 align-center">
+				<view class="left-text">身份证有效期</view>
+				<view class='flex right' @click="selectData(1)">
+					<span :style="{'color':dataDetails.cardValidityDate ? '#000':'#C6CBD5'}">
+						{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择身份证有效期'}}
+					</span>
+					<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+					<view>
+					</view>
 				</view>
 			</view>
-		</view>
-		<view class="flex row border-bottom mt20">
-			<view class="left-text">对公账户</view>
-			<view class="flex  right">
-				<u--input disabled placeholder="户名与企业名称一致" inputAlign='left' border="none" v-model="dataDetails.corporateAccount">
-				</u--input>
-			</view>
-		</view>
-		<view class="flex row border-bottom mt20">
-			<view class="left-text">卡号</view>
-			<view class="flex right">
-				<u--input placeholder="输入银行卡号码" inputAlign='left' border="none" v-model="dataDetails.bankCard">
-				</u--input>
-				<view class="" @click="uploadImg(5)">
-				<image src="../../../static/images/xiangji-2.png" mode="" style="width: 40rpx ;height: 40rpx;margin-top: 10rpx;"></image>
-			</view>
+			<view class="flex row border-bottom mt20">
+				<view class="left-text">对公账户</view>
+				<view class="flex  right">
+					<u--input disabled placeholder="户名与企业名称一致" inputAlign='left' border="none"
+						v-model="dataDetails.corporateAccount">
+					</u--input>
+				</view>
 			</view>
-			
-		</view>
-		<view class="flex row border-bottom mt20">
-			<view class="left-text">开户行</view>
-			<view class="flex right">
-			<u--input placeholder="输入开户行" inputAlign='left' border="none" v-model="dataDetails.bankDeposit">
-			</u--input>
+			<view class="flex row border-bottom mt20">
+				<view class="left-text">卡号</view>
+				<view class="flex right">
+					<u--input placeholder="输入银行卡号码" inputAlign='left' border="none" v-model="dataDetails.bankCard">
+					</u--input>
+					<view class="" @click="uploadImg(5)">
+						<image src="../../../static/images/xiangji-2.png" mode=""
+							style="width: 40rpx ;height: 40rpx;margin-top: 10rpx;"></image>
+					</view>
+				</view>
+
 			</view>
-		</view>
-		<view class="flex row border-bottom mt20">
-			<view class="left-text khzh-styel">开户支行</view>
-			<view class="flex align-center flex-space-between right" v-if="isShowManualInput">
-				<u--input class="select-bankzh point" placeholder="输入开户支行" inputAlign='left' border="none"
-					v-model="dataDetails.bankDepositBranch">
-				</u--input>
-				<view @click="manualInput" class="type">选择支行</view>
+			<view class="flex row border-bottom mt20">
+				<view class="left-text">开户行</view>
+				<view class="flex right">
+					<u--input placeholder="输入开户行" inputAlign='left' border="none" v-model="dataDetails.bankDeposit">
+					</u--input>
+				</view>
 			</view>
-			<view class="flex align-center flex-space-between right" v-if="!isShowManualInput">
-				<!-- 	<u--input  @click="selectZhbank" placeholder="选择开户支行" inputAlign='left' border="none" disabled>
+			<view class="flex row border-bottom mt20">
+				<view class="left-text khzh-styel">开户支行</view>
+				<view class="flex align-center flex-space-between right" v-if="isShowManualInput">
+					<u--input class="select-bankzh point" placeholder="输入开户支行" inputAlign='left' border="none"
+						v-model="dataDetails.bankDepositBranch">
+					</u--input>
+					<view @click="manualInput" class="type">选择支行</view>
+				</view>
+				<view class="flex align-center flex-space-between right" v-if="!isShowManualInput">
+					<!-- 	<u--input  @click="selectZhbank" placeholder="选择开户支行" inputAlign='left' border="none" disabled>
 				</u--input> -->
-				<view class="select-bankzh" @click="selectZhbank">
-					{{dataDetails.bankDepositBranch?dataDetails.bankDepositBranch:'选择开户支行'}}
+					<view class="select-bankzh" @click="selectZhbank">
+						{{dataDetails.bankDepositBranch?dataDetails.bankDepositBranch:'选择开户支行'}}
+					</view>
+					<view @click="manualInput" class="type">手动输入</view>
 				</view>
-				<view @click="manualInput" class="type">手动输入</view>
+
 			</view>
-		
-		</view>
-		<!-- 	<view class="flex row noborder">
+			<!-- 	<view class="flex row noborder">
 					<view class="left-text">身份证截止日期</view>
 					<view class="" @click="selectData(1)">
 						{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择身份证截止日期>'}}
@@ -182,7 +180,8 @@
 			<view class="flex row noborder mt20 flex-space-between">
 				<view class="left-text">视频验证（点击按钮播放视频）</view>
 				<view>
-					<u-button color='#2772FB' type="primary" @click="goDetailPage('/pages/mine/company/companyvideo')" size="mini">重新上传
+					<u-button color='#2772FB' type="primary" @click="goDetailPage('/pages/mine/company/companyvideo')"
+						size="mini">重新上传
 					</u-button>
 				</view>
 			</view>
@@ -295,8 +294,8 @@
 				ValidityPeriodType: '',
 				isShowManualInput: false,
 				value: false,
-				isShowBank:false,
-				columns:[],
+				isShowBank: false,
+				columns: [],
 				radioCustomStyle: {
 					margin: '0 0 0 20rpx'
 				},
@@ -325,9 +324,9 @@
 					landOwnership: '自有',
 					videoAddressUrl: null,
 					legalPersonName: '',
-					corporateAccount:''
+					corporateAccount: ''
 				},
-				dataType:""
+				dataType: ""
 			}
 		},
 		onShow() {
@@ -360,20 +359,20 @@
 		},
 		methods: {
 			async get_camera_permission() {
-				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
-				if(photol == false){
+				var photol = await permision.requestAndroidPermission("android.permission.CAMERA")
+				if (photol == false) {
 					uni.showModal({
 						title: '提示',
 						content: '您已经关闭相机权限,去设置',
-						success: function (res) {
+						success: function(res) {
 							if (res.confirm) {
 								permision.gotoAppPermissionSetting()
-									            // plus.runtime.openURL("app-settings:");
+								// plus.runtime.openURL("app-settings:");
 							} else if (res.cancel) {
 								console.log('用户点击取消');
 							}
 						}
-					});	
+					});
 				}
 			},
 			selectData(num) {
@@ -392,7 +391,7 @@
 					})
 					return true
 				}
-			
+
 				this.isShowBank = true
 			},
 			manualInput() {
@@ -404,16 +403,16 @@
 						})
 						return true
 					}
-					if (this.columns.length==0) {
+					if (this.columns.length == 0) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "请选择手动输入！",
 						})
 						return true
 					}
-					
+
 					this.isShowBank = true
-			
+
 				} else {
 					this.isShowBank = false
 				}
@@ -485,13 +484,13 @@
 			// 		})
 			// 	});
 			// },
-			companyNamechange(e){
+			companyNamechange(e) {
 				console.log(e)
-				this.dataDetails.corporateAccount=e
+				this.dataDetails.corporateAccount = e
 			},
 			companyNameBlur() {
-				
-				
+
+
 				this.$request.baseRequest('get', '/companyInfo/repeatCompanyInfo', {
 						commonId: this.userInfo.id,
 						companyName: this.dataDetails.companyName
@@ -588,7 +587,7 @@
 				// 	})
 				// 	return true
 				// }
-				if (this.dataDetails.cardNumber.length!=18) {
+				if (this.dataDetails.cardNumber.length != 18) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "身份证号输入错误！",
@@ -616,6 +615,13 @@
 					})
 					return true
 				}
+				if (uni.$u.test.rangeLength(this.dataDetails.unifiedSocialCreditCode, [17, 17])) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "统一社会信用代码输出错误！",
+					})
+					return true
+				}
 				//先注释掉
 				// if (this.dataDetails.advanceFreightService == 1 && uni.$u.test.isEmpty(this.dataDetails
 				// 		.propertyAddressUrl)) {
@@ -725,121 +731,123 @@
 			imgTypeSelect(val) {
 				var _this = this
 				// if (val.name == '相册') {
-					uni.chooseImage({
-						count: 1,
-						// sourceType: ,
-						success: function(res) {
-							console.log(_this.uploadType);
-						
-							uploadImage('image', res.tempFilePaths[0], 'appData/',
-								result => {
-									// 上传成功回调函数
-									switch (_this.uploadType) {
-										
-										// 身份正面
-										case 1:
-											_this.dataDetails.businessLicenseAddressUrl = result
-											// 识别
-											_this.$request.baseRequest('get',
-													'/cargoOwnerInfo/api/licenseShibie', {
-														licenseImg: result,
-													}).then(res => {
-													if (res.code == '200') {
-														if(res.data){
-															if (res.data.validPeriod == '29991231') {
-																_this.dataDetails.businessTermDate = '长期'
-															}
-															_this.dataDetails.unifiedSocialCreditCode = res
-																.data.regNum
-															_this.dataDetails.legalPersonName = res.data
-																.licensePerson
-															_this.dataDetails.companyName = res.data
-																.licenseName
-															_this.dataDetails.corporateAccount=_this.dataDetails.companyName
-															console.log(res)
-															_this.$forceUpdate()
+				uni.chooseImage({
+					count: 1,
+					// sourceType: ,
+					success: function(res) {
+						console.log(_this.uploadType);
+
+						uploadImage('image', res.tempFilePaths[0], 'appData/',
+							result => {
+								// 上传成功回调函数
+								switch (_this.uploadType) {
+
+									// 身份正面
+									case 1:
+										_this.dataDetails.businessLicenseAddressUrl = result
+										// 识别
+										_this.$request.baseRequest('get',
+												'/cargoOwnerInfo/api/licenseShibie', {
+													licenseImg: result,
+												}).then(res => {
+												if (res.code == '200') {
+													if (res.data) {
+														if (res.data.validPeriod == '29991231') {
+															_this.dataDetails.businessTermDate = '长期'
 														}
+														_this.dataDetails.unifiedSocialCreditCode = res
+															.data.regNum
+														_this.dataDetails.legalPersonName = res.data
+															.licensePerson
+														_this.dataDetails.companyName = res.data
+															.licenseName
+														_this.dataDetails.corporateAccount = _this
+															.dataDetails.companyName
+														console.log(res)
+														_this.$forceUpdate()
 													}
+												}
+
+											})
+											.catch(res => {
+												console.log(res)
+												uni.$u.toast(res.message);
+											});
+										console.log(_this.dataDetails.businessLicenseAddressUrl)
+										break
+										// 身份反面
+									case 2:
+										_this.dataDetails.cardAddressUrl = result
+										// 识别
+										_this.$request.baseRequest('get',
+												'/driverInfo/personShibie', {
+													personImg: result,
+													flag: 1
+												}).then(res => {
+												_this.dataDetails.cardNumber = res.data.recPersonNo
+												_this.$forceUpdate()
+											})
+											.catch(res => {
+												uni.$u.toast(res.message);
+											});
 
-												})
-												.catch(res => {
-													console.log(res)
-													uni.$u.toast(res.message);
-												});
-											console.log(_this.dataDetails.businessLicenseAddressUrl)
-											break
-											// 身份反面
-										case 2:
-											_this.dataDetails.cardAddressUrl = result
-											// 识别
-											_this.$request.baseRequest('get',
-													'/driverInfo/personShibie', {
-														personImg: result,
-														flag:1
-													}).then(res => {
-													_this.dataDetails.cardNumber = res.data.recPersonNo
-													_this.$forceUpdate()
-												})
-												.catch(res => {
-													uni.$u.toast(res.message);
-												});
-											
-											break
-										case 3:
+										break
+									case 3:
 										_this.dataDetails.cardBackAddressUrl = result
-											// 识别
-											_this.$request.baseRequest('get',
-													'/driverInfo/personShibie', {
-														personImg: result,
-														flag:2
-													}).then(res => {
-														if(res.data.idCardValidity){
-															let date = res.data.idCardValidity.split("-")[1]
-														    _this.dataDetails.cardValidityDate = date.replace('.', '-').replace('.', '-')
-														}
-													_this.$forceUpdate()
-												})
-												.catch(res => {
-													uni.$u.toast(res.message);
-												});
+										// 识别
+										_this.$request.baseRequest('get',
+												'/driverInfo/personShibie', {
+													personImg: result,
+													flag: 2
+												}).then(res => {
+												if (res.data.idCardValidity) {
+													let date = res.data.idCardValidity.split("-")[1]
+													_this.dataDetails.cardValidityDate = date.replace(
+														'.', '-').replace('.', '-')
+												}
 												_this.$forceUpdate()
-											break;
-											case 4:
-											   _this.dataDetails.propertyAddressUrl = result
-											break;
-											case 5:
-											  _this.$request.baseRequest('get',
-											  		'/driverInfo/bankShibie', {
-											  			bankImg: result,
-											  		}).then(res => {
-											  		console.log(res)
-											  		_this.dataDetails.payeeAddressUrl = result
-											  		if (res.data.bankNo) {
-											  			_this.dataDetails.bankCard = res.data.bankNo
-											  		}
-											  		if (res.data.bankName) {
-											  			_this.dataDetails.bankDeposit = res.data.bankName
-											  		}
-											  
-											  		// 开户支行LIst
-											  		if (res.data.bankNameZhihang) {
-											  			_this.columns.push(res.data
-											  				.bankNameZhihang)
-											  
-											  		}else{
-														_this.columns=[]
-													}
-											  		_this.$forceUpdate()
-											  	})
-											  	.catch(res => {
-											  		uni.$u.toast(res.message);
-											  	});
-											break;
-									}
+											})
+											.catch(res => {
+												uni.$u.toast(res.message);
+											});
+										_this.$forceUpdate()
+										break;
+									case 4:
+										_this.dataDetails.propertyAddressUrl = result
+										break;
+									case 5:
+										_this.$request.baseRequest('get',
+												'/driverInfo/bankShibie', {
+													bankImg: result,
+												}).then(res => {
+												console.log(res)
+												_this.dataDetails.payeeAddressUrl = result
+												if (res.data.bankNo) {
+													_this.dataDetails.bankCard = res.data.bankNo
+												}
+												if (res.data.bankName) {
+													_this.dataDetails.bankDeposit = res.data.bankName
+												}
+
+												// 开户支行LIst
+												if (res.data.bankNameZhihang) {
+													_this.columns.push(res.data
+														.bankNameZhihang)
+
+												} else {
+													_this.columns = []
+												}
+												_this.$forceUpdate()
+											})
+											.catch(res => {
+												uni.$u.toast(res.message);
+											});
+										break;
 								}
-							)
-						}
-					});
+							}
+						)
+					}
+				});
 				// } else {
 				// 	uni.chooseImage({
 				// 		count: 1,
@@ -907,7 +915,7 @@
 				this.ValidityPeriodType = type
 				this.imgTypeSelect()
 			},
-			
+
 			changeHandler(e) {
 				const {
 					columnIndex,
@@ -945,6 +953,7 @@
 	/deep/uni-image.uploadimage-small {
 		width: 100% !important;
 	}
+
 	.title {
 		color: #333333;
 		margin: 20rpx 0;
@@ -965,6 +974,7 @@
 			width: 50%;
 			font-size: 28rpx;
 		}
+
 		.left-text {
 			// background: red;
 			width: 50%;
@@ -998,14 +1008,17 @@
 		align-items: center;
 		color: #6A7282;
 	}
+
 	.picture1 {
 		background: url(../../../static/images/mine/zm.png);
 		background-size: 100% 100%;
 	}
+
 	.picture2 {
 		background: url(../../../static/images/mine/gh.png);
 		background-size: 100% 100%;
 	}
+
 	.type {
 		background: #2772FB;
 		border-radius: 10rpx;
@@ -1055,7 +1068,7 @@
 				margin-top: 20rpx;
 			}
 		}
-		
+
 		.picture7 {
 			background: url(../../../static/mine/cy.png);
 			background-size: 100% 100%;
@@ -1066,7 +1079,7 @@
 			height: 100rpx;
 		}
 
-		
+
 	}
 
 	.content2,
@@ -1146,6 +1159,7 @@
 	}
 
 	.myVideo {}
+
 	// /deep/.u-input:disabled{
 	// 	background:transparent !important;
 	// }

pages/mine/company/editcompany.vue

@@ -35,7 +35,7 @@
 			<view class="flex row noborder">
 				<view class="left-text">统一社会信用代码</view>
 				<u--input placeholder="请输入统一社会信用代码" inputAlign='left' border="none"
-					v-model="dataDetails.unifiedSocialCreditCode">
+					v-model="dataDetails.unifiedSocialCreditCode" maxlength='18'>
 				</u--input>
 			</view>
 
@@ -174,7 +174,8 @@
 			<view class="flex row noborder mt20 flex-space-between">
 				<view class="left-text">视频验证（点击按钮播放视频）</view>
 				<view>
-					<u-button color='#2772FB' type="primary" @click="goDetailPage('/pages/mine/company/companyvideo')" size="mini">重新上传
+					<u-button color='#2772FB' type="primary" @click="goDetailPage('/pages/mine/company/companyvideo')"
+						size="mini">重新上传
 					</u-button>
 				</view>
 			</view>
@@ -301,7 +302,7 @@
 					},
 
 				],
-				isShowManualInput:false,
+				isShowManualInput: false,
 				isShowcardValidity: false,
 				uploadType: '',
 				index: '',
@@ -373,7 +374,7 @@
 						return true
 					}
 					this.isShowBank = true
-			
+
 				} else {
 					this.isShowBank = false
 				}
@@ -560,6 +561,13 @@
 					})
 					return true
 				}
+				if (uni.$u.test.rangeLength(this.dataDetails.unifiedSocialCreditCode, [17, 17])) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "统一社会信用代码输出错误！",
+					})
+					return true
+				}
 				//先注释掉
 				// if (this.dataDetails.advanceFreightService == 1 && uni.$u.test.isEmpty(this.dataDetails
 				// 		.propertyAddressUrl)) {

pages/mine/index.vue

@@ -35,12 +35,12 @@
 
 			<view class='flex operate flex-space-around'>
 				<view style='font-size:14px;' class='flex items-center' @click="toMyRelease">
-					<u--image style='margin-right:8px;position:relative;top:3px;' :showLoading="true" src="../../static/mine/wodefabu.png"
-						width="42px" height="42px"></u--image>我的发布
+					<u--image style='margin-right:8px;position:relative;top:3px;' :showLoading="true"
+						src="../../static/mine/wodefabu.png" width="42px" height="42px"></u--image>我的发布
 				</view>
 				<view style='font-size:14px;' class='flex items-center' @click="goDetailPage('/pages/mine/evaluate')">
-					<u--image style='margin-right:8px;position:relative;top:3px;' :showLoading="true" src="../../static/mine/pingjia.png"
-						width="42px" height="42px"></u--image>
+					<u--image style='margin-right:8px;position:relative;top:3px;' :showLoading="true"
+						src="../../static/mine/pingjia.png" width="42px" height="42px"></u--image>
 					司机评价
 				</view>
 			</view>
@@ -142,7 +142,7 @@
 		data() {
 			return {
 				confirmText: '',
-				CargoOwner:{},
+				CargoOwner: {},
 				showCancelButton: true,
 				isShowAlert: false,
 				alertTitle: '',
@@ -164,8 +164,9 @@
 					}).then(res => {
 						uni.hideLoading()
 						if (res.data) {
-							this.CargoOwner=res.data
-							if (res.data.authenticationStatus == '审核中' || res.data.authenticationStatus == '已驳回'||res.data.authenticationStatus == '未认证') {
+							this.CargoOwner = res.data
+							if (res.data.authenticationStatus == '审核中' || res.data.authenticationStatus == '已驳回' || res
+								.data.authenticationStatus == '未认证') {
 								this.status = false
 							} else {
 								this.status = true
@@ -302,7 +303,7 @@
 		background: url('~@/static/mine/bg@3x.png');
 		background-size: 100% 100%;
 		margin: 0 auto;
-		height: calc(100vh - 0px);
+		height: calc(100vh - 85px);
 
 		.container_content {
 			padding: 18px;