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

pages/mine/company/addcompany.vue

@@ -54,7 +54,7 @@
 			<view class="flex border-bottom mt20 align-center">
 				<view class="left">企业名称</view>
 				<view class="flex right" >
-					<u--input placeholder="输入企业名称" inputAlign='left' border="none" v-model="dataDetails.companyName"
+					<u--input placeholder="输入企业名称" @input='companyNamechange' inputAlign='left' border="none" v-model="dataDetails.companyName"
 						@blur='companyNameBlur'>
 					</u--input>
 				</view>
@@ -121,6 +121,49 @@
 				</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>
+			
+		</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 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>
+				<view @click="manualInput" class="type">手动输入</view>
+			</view>
+		
+		</view>
 		<!-- 	<view class="flex row noborder">
 					<view class="left-text">身份证截止日期</view>
 					<view class="" @click="selectData(1)">
@@ -222,6 +265,9 @@
 		<u-picker :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod" @confirm="confirmValidityPeriod"
 			@change="changeHandler" @cancel="isShowcardValidity=false">
 		</u-picker>
+		<u-picker :show="isShowBank" :columns="columns" :closeOnClickOverlay='true' @close='zhBankClose'
+			@cancel='zhBankClose' @confirm='confirmBank'></u-picker>
+		</u-picker>
 		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
 			@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true" @close="isShowimgType=false">
 		</u-action-sheet>
@@ -247,7 +293,10 @@
 				},
 				consentStatus: false,
 				ValidityPeriodType: '',
+				isShowManualInput: false,
 				value: false,
+				isShowBank:false,
+				columns:[],
 				radioCustomStyle: {
 					margin: '0 0 0 20rpx'
 				},
@@ -275,8 +324,8 @@
 					advanceFreightService: 0,
 					landOwnership: '自有',
 					videoAddressUrl: null,
-					legalPersonName: ''
-
+					legalPersonName: '',
+					corporateAccount:''
 				},
 				dataType:""
 			}
@@ -331,6 +380,31 @@
 				this.dataType = num
 				this.isShowcardValidity = true
 			},
+			zhBankClose() {
+				this.isShowBank = false
+			},
+			// 选择支行
+			selectZhbank() {
+				if (uni.$u.test.isEmpty(this.columns)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请先上传银行卡！",
+					})
+					return true
+				}
+			
+				this.isShowBank = true
+			},
+			confirmBank(e) {
+				console.log(e)
+				this.dataDetails.bankDepositBranch = e.value[0]
+				this.isShowBank = false
+			},
+			uploadImg() {
+				this.uploadType = 5
+				this.imgTypeSelect()
+				// this.isShowimgType = true
+			},
 			confirmValidityPeriod(e) {
 				switch (this.dataType) {
 					case 0:
@@ -387,7 +461,13 @@
 			// 		})
 			// 	});
 			// },
+			companyNamechange(e){
+				console.log(e)
+				this.dataDetails.corporateAccount=e
+			},
 			companyNameBlur() {
+				
+				
 				this.$request.baseRequest('get', '/companyInfo/repeatCompanyInfo', {
 						commonId: this.userInfo.id,
 						companyName: this.dataDetails.companyName
@@ -484,7 +564,7 @@
 				// 	})
 				// 	return true
 				// }
-				if (this.dataDetails.cardNumber.length==18) {
+				if (this.dataDetails.cardNumber.length!=18) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "身份证号输入错误！",
@@ -625,7 +705,7 @@
 						count: 1,
 						// sourceType: ,
 						success: function(res) {
-							console.log(JSON.stringify(res.tempFilePaths));
+							console.log(_this.uploadType);
 						
 							uploadImage('image', res.tempFilePaths[0], 'appData/',
 								result => {
@@ -651,6 +731,7 @@
 																.licensePerson
 															_this.dataDetails.companyName = res.data
 																.licenseName
+															_this.dataDetails.corporateAccount=_this.dataDetails.companyName
 															console.log(res)
 															_this.$forceUpdate()
 														}
@@ -702,6 +783,32 @@
 											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)
+											  
+											  		}
+											  		_this.$forceUpdate()
+											  	})
+											  	.catch(res => {
+											  		uni.$u.toast(res.message);
+											  	});
+											break;
 									}
 								}
 							)
@@ -873,7 +980,18 @@
 		background: url(../../../static/images/mine/gh.png);
 		background-size: 100% 100%;
 	}
-	
+	.type {
+		background: #2772FB;
+		border-radius: 10rpx;
+		color: white;
+		box-sizing: border-box;
+		padding: 4rpx 10rpx;
+		font-size: 26rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 68rpx;
+	}
 
 	.content1 {
 		background: #fff;
@@ -1001,4 +1119,7 @@
 	}
 
 	.myVideo {}
+	// /deep/.u-input:disabled{
+	// 	background:transparent !important;
+	// }
 </style>

pages/mine/company/editcompany.vue

@@ -45,7 +45,7 @@
 			<view class="flex border-bottom mt20 align-center">
 				<view class="left">企业名称</view>
 				<view class="flex right">
-					<u--input placeholder="输入企业名称" inputAlign='left' border="none" v-model="dataDetails.companyName"
+					<u--input placeholder="输入企业名称" @input='companyNamechange' inputAlign='left' border="none" v-model="dataDetails.companyName"
 						@blur='companyNameBlur'>
 					</u--input>
 				</view>
@@ -93,7 +93,7 @@
 					</view>
 				</view>
 			<view class="flex row">
-				<view class="left-text" style="width:50%;">身份证有效期</view>
+				<view class="left" >身份证有效期</view>
 				<view style='font-size:14px;width:50%;' class='flex flex-space-between'
 					@click="selectData(1)">
 					<view :style="{'color':dataDetails.cardValidityDate ? '#000':'#C6CBD5'}">
@@ -113,6 +113,46 @@
 					</u--input>
 				</view>
 			</view>
+			<view class="flex row border-bottom mt20">
+				<view class="left">对公账户</view>
+				<view class="flex">
+					<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">卡号</view>
+				<view class="flex">
+					<u--input placeholder="输入银行卡号码" inputAlign='left' border="none" v-model="dataDetails.bankCard">
+					</u--input>
+				</view>
+				<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 class="flex row border-bottom mt20">
+				<view class="left">开户行</view>
+				<u--input placeholder="输入开户行" inputAlign='left' border="none" v-model="dataDetails.bankDeposit">
+				</u--input>
+			</view>
+			<view class="flex row border-bottom mt20">
+				<view class="left khzh-styel">开户支行</view>
+				<view class="flex align-center" 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" 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>
+					<view @click="manualInput" class="type">手动输入</view>
+				</view>
+			
+			</view>
 			<!-- 	<view class="flex mt20 align-center">
 				<view class="left">注册实缴金额</view>
 				<view class="flex right align-center">
@@ -216,6 +256,9 @@
 			<!-- <view @click="goDetailPage('/pages/mine/company/addcompanythree')" class='newlyIncreased'>下一步</view> -->
 			<view @click="submit" class='newlyIncreased'>提交</view>
 		</view>
+		<u-picker :show="isShowBank" :columns="columns" :closeOnClickOverlay='true' @close='zhBankClose'
+			@cancel='zhBankClose' @confirm='confirmBank'></u-picker>
+		</u-picker>
 		<u-picker :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod" @confirm="confirmValidityPeriod"
 			@change="changeHandler" @cancel="isShowcardValidity=false">
 		</u-picker>
@@ -245,9 +288,11 @@
 				consentStatus: false,
 				ValidityPeriodType: '',
 				value: false,
+				columns:[],
 				radioCustomStyle: {
 					margin: '0 0 0 20rpx'
 				},
+				isShowBank:false,
 				radiolist1: [{
 						name: '自有',
 						disabled: false
@@ -323,6 +368,26 @@
 				this.dataType = num
 				this.isShowcardValidity = true
 			},
+			zhBankClose() {
+				this.isShowBank = false
+			},
+			// 选择支行
+			selectZhbank() {
+				if (uni.$u.test.isEmpty(this.columns)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请先上传银行卡！",
+					})
+					return true
+				}
+			
+				this.isShowBank = true
+			},
+			confirmBank(e) {
+				console.log(e)
+				this.dataDetails.bankDepositBranch = e.value[0]
+				this.isShowBank = false
+			},
 			confirmValidityPeriod(e) {
 				switch (this.dataType) {
 					case 0:
@@ -507,6 +572,10 @@
 				// 	return true
 				// }
 			},
+			companyNamechange(e){
+				console.log(e)
+				this.dataDetails.corporateAccount=e
+			},
 			submit() {
 				if (this.validate()) return
 				if (!this.consentStatus) {
@@ -615,6 +684,7 @@
 																.licensePerson
 															_this.dataDetails.companyName = res.data
 																.licenseName
+															_this.dataDetails.corporateAccount=_this.dataDetails.companyName
 															console.log(res)
 															_this.$forceUpdate()
 														}else{
@@ -664,6 +734,32 @@
 											});
 											_this.$forceUpdate()
 											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)
+											  
+											  		}
+											  		_this.$forceUpdate()
+											  	})
+											  	.catch(res => {
+											  		uni.$u.toast(res.message);
+											  	});
+											break;
 									}
 								}
 							)
@@ -767,7 +863,7 @@
 	}
 
 	/deep/.uni-input-input:disabled {
-		background: #fff;
+		background: transparent;
 	}
 
 	page {
@@ -784,7 +880,14 @@
 		padding: 20rpx 30rpx;
 		border-radius: 5px;
 		margin: 20rpx;
-
+		.left-text {
+			// background: red;
+			width: 50%;
+			color: #333333;
+			display: flex;
+			align-items: center;
+			font-size: 14px;
+		}
 		.left {
 			width: 240rpx;
 			font-size: 28rpx;
@@ -802,7 +905,18 @@
 		//     transform: scale(1.5) rotate(-90deg);
 		// }
 	}
-
+.type {
+		background: #2772FB;
+		border-radius: 10rpx;
+		color: white;
+		box-sizing: border-box;
+		padding: 4rpx 10rpx;
+		font-size: 26rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 68rpx;
+	}
 	.picture {
 		margin-top: 20rpx;
 		background: #F5F6FA;

pages/order/addEvaluation.vue

@@ -84,32 +84,32 @@
 				rate: [{
 						name: "司机信用",
 						count: "5",
-						value1: '0',
-						level: ''
+						value1: '5',
+						level: '非常好'
 					},
 					{
 						name: "运输效率",
 						count: "5",
-						value1: '0',
-						level: ''
+						value1: '5',
+						level: '非常好'
 					},
 					{
 						name: "运输安全",
 						count: "5",
-						value1: '0',
-						level: ''
+						value1: '5',
+						level: '非常好'
 					},
 					{
 						name: "服务质量",
 						count: "5",
-						value1: '0',
-						level: ''
+						value1: '5',
+						level: '非常好'
 					},
 					{
 						name: "满意度",
 						count: "5",
-						value1: '0',
-						level: ''
+						value1: '5',
+						level: '非常满意'
 					}
 				],
 				button: [{