Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pageA/product/business_buy.vue

@@ -114,16 +114,11 @@
 		<view  v-if="purchaseOrder.procurementPlanType=='期货'"  class=" align-start ">
 			<view class="titles">结算价格</view>
 			<text class="textA">结算价格=点价+基差+发票费用+包装费</text>
-			<text style="font-size: 18px;color: #FD714F;margin-left: 120rpx;">￥{{purchaseOrder.settlementPrice}}</text>
+			<text style="font-size: 18px;color: #FD714F;margin-left: 25px;">￥{{purchaseOrder.settlementPrice}}</text>
 			<!-- <input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput' v-model="purchaseOrder.settlementPrice"></input> -->
 		</view>
-		<!-- <view style='background:#fff;'>
-			结算价格=点价+基差+发票费用+包装费
-		</view> -->
 		</view>
-	
 			<button class="btn" @click="commit()">提交</button>
-	
 	</view>
 </template>
 
@@ -397,6 +392,9 @@
 							this.purchaseOrder.invoiceFee=0
 						}
 					}
+					else{
+						this.purchaseOrder.invoiceFee=0
+					}
 				},
 				changeZhihang(){
 					uni.navigateTo({

pageA/product/business_sale.vue

@@ -114,9 +114,7 @@
 		<view  v-if="purchaseOrder.salePlanType=='期货'" class=" align-start ">
 			<view class="titles">结算价格</view>
 			<text class="textA">结算价格=点价+基差+发票费用+包装费</text>
-			<view class="con-list">
-			<text >{{purchaseOrder.settlementPrice}}</text>
-			</view>
+			<text style="font-size: 18px;color: #FD714F;margin-left: 25px;">￥{{purchaseOrder.settlementPrice}}</text>
 			<!-- <input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput' v-model="purchaseOrder.settlementPrice"></input> -->
 		</view>
 		<!-- <view style='background:#fff;'>
@@ -229,7 +227,7 @@
 				this.purchaseOrder.settlementPrice = options.basisPrice
 				this.purchaseOrder.salePlanType = options.salePlanType
 				this.purchaseOrder.salePlan=options.salePlan
-				this.purchaseOrder.baggingNotes=options.baggingNotes
+				// this.purchaseOrder.baggingNotes=options.baggingNotes
 				this.purchaseOrder.sendWarehouse = options.sendWarehouse
 				this.purchaseOrder.compId=options.compId
 			},
@@ -241,10 +239,10 @@
 					if(res.data.code==200){
 						this.goods=res.data.data
 						if(this.goods.customerTypeFlag==1){
-							this.purchaseOrder.invoiceFee=-20
+							// this.purchaseOrder.invoiceFee=-20
 							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.invoiceFee)
 						}else{
-							this.purchaseOrder.invoiceFee=0
+							// this.purchaseOrder.invoiceFee=0
 							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.invoiceFee)
 						}
 					}
@@ -380,11 +378,11 @@
 					this.invoiceIndex = e.detail.value
 					this.purchaseOrder.typeKey=e.detail.value+1
 					this.purchaseOrder.type = this.invoiceType[this.invoiceIndex];
-					if(this.invoiceIndex == 0){
-						if(this.goods.customerTypeFlag==1){
-							this.purchaseOrder.invoiceFee=-20
-						}else{
-							this.purchaseOrder.invoiceFee=0
+					if(this.invoiceIndex == 1){
+						if(this.purchaseOrder.goodsName=='玉米'){
+							this.purchaseOrder.invoiceFee=10
+						}else if(this.purchaseOrder.goodsName=='大豆'){
+							this.purchaseOrder.invoiceFee=20
 						}
 					}
 				},

pageA/product/detail.vue

@@ -10,7 +10,7 @@
 				<view class='flex justify-between'>
 					<view style='flex:1.5;color:#878C9C;'>{{goods.receivePrivate}}{{goods.receiveCity}}{{goods.receiveArea}}{{goods.receiveWarehouse}}</view>
 					<view  v-if='goods.procurementPlanType=="现货"' class="title-tip">
-						<text class="price">{{goods.procurementPrice}}</text>
+						{{goods.procurementPrice}}
 					</view>
 					<view style='text-align:right;'  v-else class="title-tip">
 						{{goods.basisPrice}}

pageA/product/lookup.vue

@@ -368,7 +368,6 @@
 				} else {
 					param1 = '/salePlanInfo/selectSalePlanInfo'
 				}
-				console.log(this.userInfo)
 				this.$api.doRequest('get', param1,{pageSize:this.pageSize,
 				currentPage:this.currentPage,searchKeyWord:this.searchKeyWord}).then(res => {
 					uni.hideLoading()

pageA/product/sales_detail.vue

@@ -10,10 +10,10 @@
 				<view class='flex justify-between'>
 					<view style='flex:1.5;color:#878C9C;'>{{goods.sendPrivate}}{{goods.sendCity}}{{goods.sendArea}}{{goods.sendWarehouse}}</view>
 					<view  v-if='goods.salePlanType=="现货"' class="title-tip">
-						<text class="price">{{goods.salePrice}}</text>
+						{{goods.salePrice}}
 					</view>
 					<view style='text-align:right;'  v-else class="title-tip">
-						{{goods.basisPrice}}
+						+{{goods.basisPrice}}
 					</view>
 				</view>
 				<view style='text-align:right;' v-if='goods.salePlanType=="现货"'>销售价格</view>

pageB/contract/collectLook.vue

@@ -36,29 +36,33 @@
 						<text>{{item.settlementPrice}}</text>
 					</view>
 				</view>
-				<view class="c-row b-b">
+				<view class="c-row" v-bind:class="item.confirmFlag == 1 ? 'b-b' : ''">
 					<text class="tit">净重(吨)</text>
+					<view style="font-size: 18px;margin-left: 80px;">{{item.loadNetWeight}}<text class="hair">发</text></view>
 					<view class="con-list">
-						<text style="font-size: 18px;">{{item.loadNetWeight}}<text
-								class="hair">发</text>{{item.unloadNetWeight}}<text class="collect">收</text></text>
+						
+						<view v-if="item.confirmFlag == 1" style="color: #FE6430;">未收货</view>
+						<view v-if="item.confirmFlag == 3" style="color: #22C572;">已收货</view>
 					</view>
 				</view>
-				<view class="c-row ">
-					<button v-if='item.loadPoundImg' class="cu-btn commit margin-tb-sm lg"
-						style="background-color:  #4CD964; width: 210rpx;height: 30px; "
-						@click="shipments(item)">发货磅单</button>
-					<button v-if='item.unloadPoundImg' class="cu-btn commit margin-tb-sm lg"
-						style="background-color:  #1CBBB4; margin-left: 15px; width: 210rpx;height: 30px;"
-						@click="unload(item)">收货磅单</button>
+				<view v-if="item.confirmFlag == 1" >
+					<view class="titles">磅单照片</view>
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+						:size-type="['compressed']" @on-success="getImgUrl" @on-remove="onRemove"
+						@on-uploaded="isAdd = true" :before-upload="filterFileType"
+						v-if="item.loadPoundImg == null || item.loadPoundImg == '' "></upload>
+					<image :src="item.loadPoundImg" mode="" v-if="item.loadPoundImg != null || item.loadPoundImg != ''"
+						class="picture "></image>
+				</view>
+				<view class="c-row" v-if="item.confirmFlag == 1">
+					<view class="flex" style="justify-content: flex-end;width: 100%;">
+						<view class="commit" @click="confirmunload(item)">
+							确认收货
+						</view>
+					</view>
 				</view>
-
 			</view>
 		</view>
-		<view class="c-list">
-			<button class=" btn btns" style="background-color: #22C572; color: #FFFFFF ; "
-				@click="confirmunload(item)">确认收货</button>
-
-		</view>
 		<view v-if='imgstatus' class='shade'>
 			<view class='shade-content'>
 				<image v-if='img' style='width:100px;height:100px;' :src='img'></image>
@@ -88,16 +92,7 @@
 				swiperLength: 0,
 				id: '',
 				goods: {
-					// id:"",
-					// contractNo:'',
-					// contractNo:'',
-					// unloadPoundImg:'',
-					// loadPoundImg:'',
-					// carNo:'',
-					// sendDateStart:'',
-					// settlementPrice:'',
-					// deductionAmount:'',
-					// deductionItems:'',
+
 				},
 				gooods1: {
 					contractNo: '',
@@ -123,7 +118,7 @@
 		},
 		onLoad(option) {
 			this.goods.goodsName = option.goodsName
-			this.goods.customer = option.customer
+			this.goods.customer = option.contracter
 			this.id = option.id
 			this.planId = option.planId
 			this.goods.contractNo = option.contractNo
@@ -141,7 +136,10 @@
 			collect() {
 				var num = 0
 				for (var i = 0; i < this.carlist.length; i++) {
-					num += this.carlist[i].unloadNetWeight
+					if( this.carlist[i].confirmFlag == 3){
+						num += this.carlist[i].loadNetWeight
+					}
+					
 				}
 				return num
 			}
@@ -180,6 +178,7 @@
 					}).then(res => {
 						if (res.data.code == 200) {
 							item.confirmFlag = 3
+							this.$api.msg('确认成功！')
 						}
 					})
 					.catch(res => {
@@ -220,12 +219,6 @@
 			reasonInput(e) {
 				this.reason = e.detail.value
 			},
-			// navToDetailPage() {
-			// 	const that = this
-			// 	uni.navigateTo({
-			// 		url: `/pageA/product/detail_upload?id=${that.goods.id}`
-			// 	})
-			// },
 
 			endSale() {
 				const that = this
@@ -410,58 +403,6 @@
 			color: $uni-color-primary;
 		}
 	}
-
-	/* .c-list {
-		font-size: $font-sm + 2upx;
-		color: $font-color-base;
-		background: #fff;
-
-		.c-row {
-			display: flex;
-			align-items: center;
-			padding: 20upx 30upx;
-			position: relative;
-		}
-
-		.tit {
-			width: 220upx;
-		}
-
-		.con {
-			flex: 1;
-			color: $font-color-dark;
-
-			.selected-text {
-				margin-right: 10upx;
-			}
-		}
-
-		.bz-list {
-			height: 40upx;
-			font-size: $font-sm+2upx;
-			color: $font-color-dark;
-
-			text {
-				display: inline-block;
-				margin-right: 30upx;
-			}
-		}
-
-		.con-list {
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			color: $font-color-dark;
-			line-height: 40upx;
-			text-align: right;
-			padding-right: 20upx;
-		}
-
-		.red {
-			color: $uni-color-primary;
-		}
-	} */
-
 	/* 评价 */
 	.eva-section {
 		display: flex;
@@ -1001,4 +942,25 @@
 	.btns {
 		background-color: #22C572;
 	}
+
+	.picture {
+		width: 75px;
+		height: 75px;
+		border-radius: 10px;
+		margin-left: 16px;
+	}
+
+	.commit {	
+		width: 85px;
+		height: 35px;
+		border-radius: 16px;
+		border: 1px solid #22C572;
+		text-align: center;
+		line-height: 33px;
+		color: #22C572;
+	}
+	.titles{
+		margin: 10px 0 10px 16px;
+		font-size: 15px;
+	}
 </style>

pageB/contract/contract.vue

@@ -228,7 +228,7 @@
 			},
 			commit2(item) {
 				uni.navigateTo({
-					url: `/pageB/contract/collectLook?id=${item.id}&contractNo=${item.contractNo}&customer=${item.customer}&goodsName=${item.goodsName}`
+					url: `/pageB/contract/collectLook?id=${item.id}&contractNo=${item.contractNo}&customer=${item.customer}&goodsName=${item.goodsName}&contracter=${item.contracter}`
 				})
 			},
 			getList() {

pageB/contract/look.vue

@@ -2,8 +2,6 @@
 	<view class="center">	
 		<view class="c-list">
 			<view class="xinxiup">
-
-
 				<view class="c-row b-b">
 					<text class="tit">合同编号:</text>
 					<view class="con-list">
@@ -51,7 +49,7 @@
 						<text>{{item.deductionAmount}}</text>
 					</view>
 				</view>
-				<view class="c-row b-b">
+				<view class="c-row b-b" v-if=" item.deductionItems == null && item.confirmFlag == 1">
 					<text class="tit">扣款原因</text>
 					<view class="con-list">
 						<text>{{item.deductionItems}}</text>
@@ -73,12 +71,10 @@
 			</view>
 		</view>
 		<view class="c-list">
-			
 				<button class=" btn btns" style="background-color: #FFFFFF; "
 					@click="commit1(goods)">
 					<image src="../../static/img/jiaoyi/ic_fabu@2x.png" style="width: 24px; height: 24px;top: 7px;"></image>
 					添加发车信息</button>
-
 				<button class=" btn btns" style="background-color: #22C572; color: #FFFFFF ; "
 					@click="confirmunload(item)" >确认卸货</button>
 			

pageD/identity/companyIdentity.vue

@@ -106,10 +106,18 @@
 						this.$api.msg('公司名称不能为空')
 						return
 					}
+					if (this.identityAuthenticationInfo.compName.length < 2 || this.identityAuthenticationInfo.compName.length > 25) {
+						this.$api.msg('公司名称输入错误')
+						return
+					}
 					if (!this.identityAuthenticationInfo.payTaxesCard) {
 						this.$api.msg('纳税人识别号不能为空')
 						return
 					}
+					if (this.identityAuthenticationInfo.payTaxesCard.length < 15 || this.identityAuthenticationInfo.payTaxesCard.length > 20) {
+						this.$api.msg('纳税人识别号输入错误')
+						return
+					}
 					if (this.identityAuthenticationInfo.businessLicenseAddressUrl == "" || this.identityAuthenticationInfo
 						.businessLicenseAddressUrl == null) {
 						this.$api.msg('请上传营业执照')
@@ -135,10 +143,18 @@
 						this.$api.msg('姓名不能为空')
 						return
 					}
+					if (this.identityAuthenticationInfo.customerName.length < 2 || this.identityAuthenticationInfo.customerName.length > 10) {
+						this.$api.msg('姓名输入错误')
+						return
+					}
 					if (!this.identityAuthenticationInfo.customerNumberCard) {
 						this.$api.msg('身份证号不能为空')
 						return
 					}
+					if (this.identityAuthenticationInfo.customerNumberCard.length != 18) {
+						this.$api.msg('身份证号输入错误')
+						return
+					}
 					this.identityAuthenticationInfo.customerTypeFlag = "1"
 					this.identityAuthenticationInfo.customerType = "个人"
 					var model = JSON.stringify(this.identityAuthenticationInfo);
@@ -197,8 +213,16 @@
 								that.id1 = strToObj.url
 								that.identityImgs1.personImg = strToObj.url
 								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.identityImgs1).then(res => {
-									that.$set(that.identityAuthenticationInfo,'customerName',res.data.data.recPerson)
-									that.$set(that.identityAuthenticationInfo,'customerNumberCard',res.data.data.recPersonNo)
+									if(res.data.data.recPerson != null){
+										if(res.data.data.recPerson != ""){
+										that.$set(that.identityAuthenticationInfo,'customerName',res.data.data.recPerson)
+										}
+									}
+									if(res.data.data.recPersonNo != null){
+										if(res.data.data.recPersonNo != ""){
+										that.$set(that.identityAuthenticationInfo,'customerNumberCard',res.data.data.recPersonNo)
+										}
+									}			
 								}).catch(res => {
 									uni.showToast({
 										title: res.data.message,
@@ -225,6 +249,27 @@
 								var strToObj = JSON.parse(data)			
 								that.id[1] = strToObj.url
 								that.id2 = strToObj.url
+								that.identityImgs1.personImg = strToObj.url
+								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.identityImgs1).then(res => {
+									if(res.data.data.recPerson != null){
+										if(res.data.data.recPerson != ""){
+										that.$set(that.identityAuthenticationInfo,'customerName',res.data.data.recPerson)
+										}
+									}
+									if(res.data.data.recPersonNo != null){
+										if(res.data.data.recPersonNo != ""){
+										that.$set(that.identityAuthenticationInfo,'customerNumberCard',res.data.data.recPersonNo)
+										}
+									}
+									
+									
+								}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								})
 							}
 						})
 					}

pageD/identity/companyIdentityThree.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="center">
 		<view>
-		
+
 			<view style="margin: 0 auto;height: 240px;" v-if="bank1 != ''" @click="bankUp()">
 				<image v-bind:src="bank1" class="picture"></image>
 				<view class="floats" v-if="certificates == true">
@@ -12,7 +12,7 @@
 					</view>
 				</view>
 			</view>
-		
+
 			<view style="margin: 0 auto;height: 240px;" v-if="bank2 != ''" @click="bankLow()">
 				<image v-bind:src="bank2" class="picture"></image>
 				<view class="floats" v-if="certificatesTwo == true">
@@ -37,12 +37,6 @@
 			</view>
 		</view>
 		<view class="c-row b-b">
-			<!-- <text class="tit">开户支行</text>
-			<picker @change="bankChange" :value="bankIndex" :range="bankType" class="con-list">
-				<view class="con-list">
-					{{bankIndex>-1?bankType[bankIndex]:'请选择开户支行'}}
-				</view>
-			</picker> -->
 			<text class="tit">开户支行</text>
 			<view v-if="zhihangStatus" class="con-list">
 				<picker @change="bankChange" :value="bankIndex" :range="bankType" class="con-list">
@@ -77,8 +71,7 @@
 			</view>
 		</view>
 		<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
-			<button :class='codestatus&&!sendDisabled?"active":""' @click='obtain'
-				class='getcode'>{{sendText}}</button>
+			<button :class='codestatus&&!sendDisabled?"active":""' @click='obtain' class='getcode'>{{sendText}}</button>
 			<view style='width:70%;position:relative;margin-left: 200px;'>
 				<input v-model='verifyCode' placeholder="请输入验证码" type="number">
 			</view>
@@ -122,10 +115,10 @@
 				bankImgs1: {},
 				bankIndex: -1,
 				bankType: [],
-				certificates:true,
-				certificatesTwo:true,
-				zhihangStatus:true,
-				verification:true,
+				certificates: true,
+				certificatesTwo: true,
+				zhihangStatus: true,
+				verification: true,
 			}
 		},
 		computed: {
@@ -133,11 +126,15 @@
 		},
 		onLoad(options) {
 			this.identityAuthenticationInfo = JSON.parse(options.identityAuthenticationInfo)
+			if (this.identityAuthenticationInfo.customerTypeFlag == 1) {
+				this.identityAuthenticationInfo.payeeName = this.identityAuthenticationInfo.customerName
+				this.identityAuthenticationInfo.payeeNumberCard = this.identityAuthenticationInfo.customerNumberCard
+			}
 		},
 		methods: {
-			obtain(){
-				if(this.sendText == "获取验证码")
-				this.getcode()
+			obtain() {
+				if (this.sendText == "获取验证码")
+					this.getcode()
 			},
 			bankUp() {
 				var that = this
@@ -156,11 +153,21 @@
 								that.bankImgs1.bankImg = strToObj.url
 								that.$api.doRequest('get', '/driverViewInfo/bankShibie', that
 									.bankImgs1).then(res => {
-									that.$set(that.identityAuthenticationInfo, 'bankCard', res
-										.data.data.bankNo)
-									that.$set(that.identityAuthenticationInfo, 'bankDeposit',
-										res.data.data.bankName)
-									that.bankType = res.data.data.bankNameZhihang
+									if (res.data.data.bankNo != null) {
+										if (res.data.data.bankNo != "") {
+											that.$set(that.identityAuthenticationInfo,
+												'bankCard', res.data.data.bankNo)
+										}
+									}
+									if (res.data.data.bankName != null) {
+										if (res.data.data.bankName != "") {
+											that.$set(that.identityAuthenticationInfo,
+												'bankDeposit', res.data.data.bankName)
+										}
+									}
+									if (res.data.data.bankNameZhihang.length != 0) {
+										that.bankType = res.data.data.bankNameZhihang
+									}
 								}).catch(res => {
 									uni.showToast({
 										title: res.data.message,
@@ -187,7 +194,32 @@
 								that.bankid[1] = strToObj.url
 								that.bank2 = strToObj.url
 								that.certificatesTwo = false
-								
+								that.bankImgs1.bankImg = strToObj.url
+								that.$api.doRequest('get', '/driverViewInfo/bankShibie', that
+									.bankImgs1).then(res => {
+									if (res.data.data.bankNo != null) {
+										if (res.data.data.bankNo != "") {
+											that.$set(that.identityAuthenticationInfo,
+												'bankCard', res.data.data.bankNo)
+										}
+									}
+									if (res.data.data.bankName != null) {
+										if (res.data.data.bankName != "") {
+											that.$set(that.identityAuthenticationInfo,
+												'bankDeposit', res.data.data.bankName)
+										}
+									}
+									if (res.data.data.bankNameZhihang != null) {
+										that.bankType = res.data.data.bankNameZhihang
+									}
+								}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								})
+
 							}
 						})
 					}
@@ -198,11 +230,11 @@
 				this.Model = this.bankType[this.bankIndex];
 				this.identityAuthenticationInfo.bankDepositBranch = this.bankType[this.bankIndex];
 			},
-			changeZhihang(){
+			changeZhihang() {
 				this.zhihangStatus = !this.zhihangStatus
 			},
 			commit() {
-				var that=this
+				var that = this
 				if (this.bankid[0] == '' || this.bankid[0] == null) {
 					this.$api.msg('请上传银行卡正面')
 					return
@@ -215,14 +247,29 @@
 					this.$api.msg('银行卡号不能为空')
 					return
 				}
+				if (this.identityAuthenticationInfo.bankCard.length < 16 || this.identityAuthenticationInfo.bankCard
+					.length > 19) {
+					this.$api.msg('银行卡号输入错误')
+					return
+				}
 				if (!this.identityAuthenticationInfo.bankDeposit) {
 					this.$api.msg('开户行不能为空')
 					return
 				}
+				if (this.identityAuthenticationInfo.bankDeposit.length < 4 || this.identityAuthenticationInfo.bankDeposit
+					.length > 15) {
+					this.$api.msg('开户行输入错误')
+					return
+				}
 				if (!this.identityAuthenticationInfo.bankDepositBranch) {
 					this.$api.msg('开户支行不能为空')
 					return
 				}
+				if (this.identityAuthenticationInfo.bankDepositBranch.length < 4 || this.identityAuthenticationInfo
+					.bankDepositBranch.length > 30) {
+					this.$api.msg('开户支行输入错误')
+					return
+				}
 				if (!this.identityAuthenticationInfo.customerPhone) {
 					this.$api.msg('手机号不能为空')
 					return
@@ -231,127 +278,142 @@
 					this.$api.msg('手机号填写不正确')
 					return
 				}
-				if(this.identityAuthenticationInfo.customerTypeFlag == 1){
+				if(!this.verifyCode){
+					this.$api.msg('请填写验证码')
+					return
+				}
+				if (this.identityAuthenticationInfo.customerTypeFlag == 1) {
 					if (!this.identityAuthenticationInfo.payeeName) {
 						this.$api.msg('收款人姓名不能为空')
 						return
 					}
+					if (this.identityAuthenticationInfo.payeeName < 2 || this.identityAuthenticationInfo.payeeName > 10) {
+						this.$api.msg('收款人姓名输入错误')
+						return
+					}
 					if (!this.identityAuthenticationInfo.payeeNumberCard) {
 						this.$api.msg('收款人身份证号不能为空')
 						return
 					}
+					if (this.identityAuthenticationInfo.payeeNumberCard.length != 18) {
+						this.$api.msg('收款人身份证号输入错误')
+						return
+					}
 					if (!this.identityAuthenticationInfo.compAddress) {
 						this.$api.msg('联系地址不能为空')
 						return
 					}
-				}else if(this.identityAuthenticationInfo.customerTypeFlag == 2){
+					if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
+						.compAddress.length > 20) {
+						this.$api.msg('联系地址输入错误')
+						return
+					}
+				} else if (this.identityAuthenticationInfo.customerTypeFlag == 2) {
 					if (!this.identityAuthenticationInfo.compAddress) {
 						this.$api.msg('公司地址不能为空')
 						return
-					}  
-				}
-			
-				this.identityAuthenticationInfo.commonId = this.userInfo.id
-				this.identityAuthenticationInfo.payeeAddressUrl = this.bankid.toString()
-				this.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
-				if(this.amendprice() == false){
-					this.$api.msg('验证码输入有误！')
-					return
+					}
+					if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
+						.compAddress.length > 20) {
+						this.$api.msg('公司地址输入错误')
+						return
+					}
 				}
-				this.$api.doRequest('post', '/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', this
-						.identityAuthenticationInfo)
-					.then(res => {
-						// console.log(res.data.message)
-						// if(res.data.message == "Success"){
-						// 	uni.navigateTo({
-						// 		url: `/pages/attestation/indexTwo` ,
-						// 	})
-						// }else{				
-						// 		this.$api.msg(res.data.message)
-						// 		return
-						// }
-						if(res.data.code=='11018'){
-							uni.showModal({
-								title: '提示',
-								content: '该手机号已认证过个人粮商，再次认证将覆盖之前的认证信息，是否确定认证？',
-								success: function (res) {
-									if (res.confirm) {
-										that.identityAuthenticationInfo.cover=1
-											that.$api.doRequest('post', '/identityAuthenticationInfo/api/editIdentityAuthenticationInfo', that.identityAuthenticationInfo).then(res => {
-												uni.showToast({
-													title: '提交成功',
-													icon: 'none',
-													duration: 2000
-												})
-												uni.navigateTo({
-														url: `/pages/attestation/indexTwo` ,
-													})
-											}).catch(res => {
-												uni.showToast({
-													title: res.data.message,
-													icon: 'none',
-													duration: 2000
-												})
-											})
-								        } else if (res.cancel) {
-								          uni.showToast({
-								          	title: '提交失败',
-								          	icon: 'none',
-								          	duration: 2000
-								          })
-								        }
-								    }
-								});
-						}else if(res.data.code==200){
-							uni.showToast({
-								title: '提交成功',
-								icon: 'none',
-								duration: 2000
-							})
-							uni.navigateTo({
-									url: `/pages/attestation/indexTwo` ,
-								})
-						}else{
-							uni.showToast({
-								title: res.data.message,
-								icon: 'none',
-								duration: 2000
-							})
-						}
-						
-					}).catch(res => {
-						uni.showToast({
-							title: res.data.message,
-							icon: 'none',
-							duration: 2000
-						})
-					})
+				this.amendprice()
+
+
 			},
-			phoneinput(e){
-				if(e.detail.value.length==11){
-					this.codestatus=true
+			phoneinput(e) {
+				if (e.detail.value.length == 11) {
+					this.codestatus = true
 				}
 			},
-			amendprice(item) {
+			amendprice() {
 				var that = this
 				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
 						phone: this.identityAuthenticationInfo.customerPhone,
 						verifyCode: this.verifyCode
 					}).then(res => {
 						if (res.data.code == 200) {
-						
+							this.identityAuthenticationInfo.commonId = this.userInfo.id
+							this.identityAuthenticationInfo.payeeAddressUrl = this.bankid.toString()
+							this.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+							this.$api.doRequest('post',
+									'/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', this
+									.identityAuthenticationInfo)
+								.then(res => {
+									if (res.data.code == '11018') {
+										uni.showModal({
+											title: '提示',
+											content: '该手机号已认证过个人粮商，再次认证将覆盖之前的认证信息，是否确定认证？',
+											success: function(res) {
+												if (res.confirm) {
+													that.identityAuthenticationInfo.cover = 1
+													that.$api.doRequest('post',
+														'/identityAuthenticationInfo/api/editIdentityAuthenticationInfo',
+														that.identityAuthenticationInfo).then(
+														res => {
+															uni.showToast({
+																title: '提交成功',
+																icon: 'none',
+																duration: 2000
+															})
+															uni.navigateTo({
+																url: `/pages/attestation/indexTwo`,
+															})
+														}).catch(res => {
+														uni.showToast({
+															title: res.data.message,
+															icon: 'none',
+															duration: 2000
+														})
+													})
+												} else if (res.cancel) {
+													uni.showToast({
+														title: '提交失败',
+														icon: 'none',
+														duration: 2000
+													})
+												}
+											}
+										});
+									} else if (res.data.code == 200) {
+										uni.showToast({
+											title: '提交成功',
+											icon: 'none',
+											duration: 2000
+										})
+										uni.navigateTo({
+											url: `/pages/attestation/indexTwo`,
+										})
+									} else {
+										uni.showToast({
+											title: res.data.message,
+											icon: 'none',
+											duration: 2000
+										})
+									}
+
+								}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								})
+
 						} else {
 							that.verification = false
 							uni.showToast({
 								title: res.data.message,
 								icon: 'none',
 								duration: 2000
-							})	
+							})
 							return false
 						}
 					})
 					.catch(res => {
-							that.verification = false
+						that.verification = false
 						uni.showToast({
 							title: res.data.message,
 							icon: 'none',
@@ -459,6 +521,7 @@
 		text-align: center;
 		margin-top: 10px;
 	}
+
 	.getcode {
 		font-size: 14px;
 		position: absolute;
@@ -469,18 +532,20 @@
 		height: 30px;
 		line-height: 30px;
 	}
+
 	.getcode.active {
 		border: none;
 	}
-	.words{
+
+	.words {
 		font-size: 18px;
 		font-weight: 600;
 		color: #617E8B;
-		}
-		.floats{
-			position: relative;
-			top: -150px;
-			text-align: center;
-		}
-	
+	}
+
+	.floats {
+		position: relative;
+		top: -150px;
+		text-align: center;
+	}
 </style>

pageD/identity/companyIdentityTwo.vue

@@ -76,10 +76,18 @@
 					this.$api.msg('姓名不能为空')
 					return
 				}
+				if (this.identityAuthenticationInfo.customerName.length < 2 || this.identityAuthenticationInfo.customerName.length > 10) {
+					this.$api.msg('姓名输入错误')
+					return
+				}
 				if (!this.identityAuthenticationInfo.customerNumberCard) {
 					this.$api.msg('身份证号不能为空')
 					return
 				}	
+				if (this.identityAuthenticationInfo.customerNumberCard.length != 18) {
+					this.$api.msg('身份证号输入错误')
+					return
+				}
 				var model = JSON.stringify(this.identityAuthenticationInfo);
 				uni.navigateTo({
 					url: `/pageD/identity/companyIdentityThree?identityAuthenticationInfo=` + model,
@@ -101,8 +109,16 @@
 								that.certificates = false
 								that.identityImgs1.personImg = strToObj.url
 								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.identityImgs1).then(res => {
-									that.$set(that.identityAuthenticationInfo,'customerName',res.data.data.recPerson)
-									that.$set(that.identityAuthenticationInfo,'customerNumberCard',res.data.data.recPersonNo)
+									if(res.data.data.recPerson != null){
+										if(res.data.data.recPerson != ""){
+										that.$set(that.identityAuthenticationInfo,'customerName',res.data.data.recPerson)
+										}
+									}
+									if(res.data.data.recPersonNo != null){
+										if(res.data.data.recPersonNo != ""){
+										that.$set(that.identityAuthenticationInfo,'customerNumberCard',res.data.data.recPersonNo)
+										}
+									}
 								}).catch(res => {
 									uni.showToast({
 										title: res.data.message,
@@ -129,6 +145,27 @@
 								that.id[1] = strToObj.url
 								that.id2 = strToObj.url
 								that.certificatesTwo = false
+								that.identityImgs1.personImg = strToObj.url
+								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.identityImgs1).then(res => {
+									if(res.data.data.recPerson != null){
+										if(res.data.data.recPerson != ""){
+											that.$set(that.identityAuthenticationInfo,'customerName',res.data.data.recPerson)
+										}
+										
+									}
+									if(res.data.data.recPersonNo != null){
+										if(res.data.data.recPersonNo != ""){
+											that.$set(that.identityAuthenticationInfo,'customerNumberCard',res.data.data.recPersonNo)
+										}
+										
+									}
+								}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								})
 							}
 						})
 					}

pageD/identity/driverIdentity.vue

@@ -55,7 +55,9 @@
 			<view class="c-row ">
 				<text class="tit">常驻城市</text>
 				<view class="con-list">
-					<input placeholder="请填写常驻城市" name="input" v-model="DriverViewInfo.residentCityProvincial"></input>
+					<!-- <input placeholder="请填写常驻城市" name="input" v-model="DriverViewInfo.residentCityProvincial"></input> -->
+					<view @click='regionchange'>{{region}}</view>
+					<u-picker :params='params' @confirm='regionpicker' mode="region" v-model="show"></u-picker>
 				</view>
 			</view>
 		</view>
@@ -103,7 +105,12 @@
 				certificatesTwo:true,
 				certificates:true,
 				verification:true,
-
+				region:"请选择常驻城市",
+				show:false,
+				params: {
+					province: true,
+					city: true,
+				},
 			}
 		},
 		computed: {
@@ -115,6 +122,15 @@
 			// 		this.codestatus = true
 			// 	}
 			// },
+			regionchange() {
+				this.show = true
+			},
+			regionpicker(e) {
+				// this.deptList.outputPrivate = e.province.label
+				// this.deptList.outputCity = e.city.label
+				this.region = e.province.label + '-' + e.city.label
+				this.DriverViewInfo.residentCityProvincial = e.province.label + e.city.label
+			},
 			jumpUrl() {
 				if (this.id[0] == "" || this.id[0] == null) {
 					this.$api.msg('请上传身份证正面！')
@@ -128,28 +144,40 @@
 					this.$api.msg('姓名不能为空')
 					return
 				}
+				if (this.DriverViewInfo.driverName.length < 2 || this.DriverViewInfo.driverName.length > 10) {
+					this.$api.msg('姓名输入错误')
+					return
+				}
+			
 				if (!this.DriverViewInfo.numberCard) {
 					this.$api.msg('身份证号不能为空')
 					return
 				}
+				if (this.DriverViewInfo.numberCard.length != 18) {
+					this.$api.msg('身份证号输入错误')
+					return
+				}
 				if (!this.DriverViewInfo.driverPhone) {
 					this.$api.msg('手机号不能为空')
 					return
 				}
-				if (!this.DriverViewInfo.residentCityProvincial) {
-					this.$api.msg('常住城市不能为空')
+				if (this.DriverViewInfo.driverPhone.length != 11) {
+					this.$api.msg('手机号输入错误')
 					return
 				}
-				
-				if(this.amendprice() == false){
-					this.$api.msg('验证码输入有误！')
+				if(!this.verifyCode){
+					this.$api.msg('验证码不能为空')
 					return
 				}
-				this.DriverViewInfo.cardAddressUrl = this.id.toString()
-				var model = JSON.stringify(this.DriverViewInfo);
-				uni.navigateTo({
-					url: `/pageD/identity/driverIdentityTwo?DriverViewInfo=` + model,
-				})
+				if(this.verifyCode.length != 6){
+					this.$api.msg('验证码输入错误')
+					return
+				}
+				if (!this.DriverViewInfo.residentCityProvincial) {
+					this.$api.msg('常住城市不能为空')
+					return
+				}
+				this.amendprice()
 			},
 			async amendprice() {
 				var that = this
@@ -158,27 +186,25 @@
 						verifyCode: this.verifyCode
 					}).then(res => {
 						if (res.data.code == 200) {
-							
+							that.DriverViewInfo.cardAddressUrl = that.id.toString()
+							var model = JSON.stringify(that.DriverViewInfo);
+							uni.navigateTo({
+								url: `/pageD/identity/driverIdentityTwo?DriverViewInfo=` + model,
+							})
 						} else {
-							that.verification = false
-							console.log(that.verification,"1")
-							uni.showToast({
+							uni.showToast({		
 								title: res.data.message,
 								icon: 'none',
 								duration: 2000
 							})
-							return false
 						}
 					})
 					.catch(res => {
-						that.verification = false
-						console.log(that.verification,"2")
 						uni.showToast({
 							title: res.data.message,
 							icon: 'none',
 							duration: 2000
 						})
-						return false
 					});
 			},
 			getcode() {
@@ -249,8 +275,16 @@
 								that.certificates = false
 								that.personImgs.personImg = that.id[0]
 								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.personImgs).then(res => {
-									that.$set(that.DriverViewInfo,'driverName',res.data.data.recPerson)
-									that.$set(that.DriverViewInfo,'numberCard',res.data.data.recPersonNo)
+									if(res.data.data.recPerson != null){
+										if(res.data.data.recPerson != ""){
+											that.$set(that.DriverViewInfo,'driverName',res.data.data.recPerson)
+										}
+									}
+									if(res.data.data.recPersonNo != null){
+										if(res.data.data.recPersonNo != ""){
+											that.$set(that.DriverViewInfo,'numberCard',res.data.data.recPersonNo)
+										}
+									}
 								}).catch(res => {
 									uni.showToast({
 										title: res.data.message,
@@ -277,6 +311,25 @@
 								that.id[1] = strToObj.url
 								that.id2 = strToObj.url
 								that.certificatesTwo = false
+								that.personImgs.personImg = that.id[1]
+								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.personImgs).then(res => {
+									if(res.data.data.recPerson != null){
+										if(res.data.data.recPerson != ""){
+											that.$set(that.DriverViewInfo,'driverName',res.data.data.recPerson)
+										}
+									}
+									if(res.data.data.recPersonNo != null){
+										if(res.data.data.recPersonNo != ""){
+											that.$set(that.DriverViewInfo,'numberCard',res.data.data.recPersonNo)
+										}
+									}
+								}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								})
 							}
 						})
 					}

pageD/identity/driverIdentityThree.vue

@@ -97,7 +97,6 @@
 				this.DriverViewInfo.commonId = this.userInfo.id
 				this.DriverViewInfo.pcFlag = 0
 				this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
-				console.log(this.DriverViewInfo,"司机对象")
 				this.$api.doRequest('post', '/driverViewInfo/api/addInfo', this.DriverViewInfo).then(res => {
 					if(res.data.code=='ERROR001'){
 						uni.showModal({
@@ -113,6 +112,9 @@
 												icon: 'none',
 												duration: 2000
 											})
+											uni.navigateTo({
+												url: `/pages/attestation/indexThree` 
+											})
 										})
 							        } else if (res.cancel) {
 							          uni.showToast({
@@ -129,6 +131,9 @@
 							icon: 'none',
 							duration: 2000
 						})
+						uni.navigateTo({
+							url: `/pages/attestation/indexThree` 
+						})
 					}
 					
 				}).catch(res => {

pageD/identity/driverIdentityTwo.vue

@@ -5,7 +5,7 @@
 			<view class="c-row">
 				<text class="tit">货车信息</text>
 				<view class="con-list">
-					<image v-bind:src="opencar" class="open" opencarboolean @click="opencarclick" ></image>
+					<image v-bind:src="opencar" class="open" opencarboolean @click="opencarclick"></image>
 				</view>
 			</view>
 		</view>
@@ -14,7 +14,8 @@
 			<view class="c-row ">
 				<text class="tit">车辆 -{{index+1}}</text>
 				<view class="con-list">
-					<image src="../../static/img/jiaoyi/shanchu@2x.png" class="eliminate" @click="carDel(index)" ></image>
+					<image src="../../static/img/jiaoyi/shanchu@2x.png" class="eliminate" @click="carDel(index)">
+					</image>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -25,20 +26,25 @@
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">车型</text>
-				<picker @change="ModelChange" :value="ModelIndex" :range="ModelType" class="con-list">
+				<picker @change="ModelChange($event,index)" :value="ModelIndex" :range="ModelType" class="con-list">
 					<view class="picker " v-model="item.carModel">
-						{{ModelIndex>-1?ModelType[ModelIndex]:'请选择车型'}}
+						{{carModelType[index] != null?carModelType[index]:'请选择车型'}}
 					</view>
 				</picker>
-				<!-- </view> -->
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">不含车头车长（米）</text>
-				<picker @change="carLongChange" :value="carLongIndex" :range="carLongType" class="con-list">
+				<picker v-if="carchength" @change="carLongChange($event,index)" :value="carLongIndex"
+					:range="carLongType" class="con-list">
 					<view class="picker" v-model="item.carLength">
-						{{carLongIndex>-1?carLongType[carLongIndex]:'请选择车长'}}
+						{{carLengtharr[index] != null?carLengtharr[index]:'请选择车长'}}
 					</view>
 				</picker>
+				<view v-else class="con-list">
+					<input placeholder="请填写车长(米)" name="input" v-model="item.carLength"></input>
+				</view>
+				<button v-if="carchength" class='cu-btn bg-green shadow' @click="changeCarChength">填写</button>
+				<button v-else class='cu-btn bg-green shadow' @click="changeCarChength">选择</button>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">载重（吨）</text>
@@ -49,14 +55,16 @@
 			<view class="c-row ">
 				<text class="tit">出厂年份</text>
 				<view class="con-list">
-					<input placeholder="请填写出厂年份" name="input" v-model="item.yearManufacture"></input>
+					<view @click='yearchange'>{{year[index] == null?"请选择出厂年份":year[index]}}</view>
+					<u-picker :params='params' @confirm='yearpicker($event,index)' v-model="show" mode="time">
+					</u-picker>
 				</view>
 			</view>
 		</view>
 		<button class="btn" v-if="opencarboolean == true" @click="carAdd">
-				 <image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add" style="top: 8px;"></image> 
-				 <texe>添加车辆</texe>
-				 </button>
+			<image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add" style="top: 8px;"></image>
+			<texe>添加车辆</texe>
+		</button>
 		<!-- 账户信息 -->
 		<view class="information">
 			<view class="c-row">
@@ -69,28 +77,29 @@
 
 		<view class="informations" v-if="openuserboolean == true" v-for="(items , index) in driverPayeeInfoList"
 			:Key="index">
-			<!-- <view class="labels"> 账户 -？</view> -->
 			<view class="c-row ">
 				<text class="tit">账户 -{{index+1}}</text>
 				<view class="con-list">
-					<image src="../../static/img/jiaoyi/shanchu@2x.png" class="eliminate" @click="userDel(index)"></image>
+					<image src="../../static/img/jiaoyi/shanchu@2x.png" class="eliminate" @click="userDel(index)">
+					</image>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">账户类型</text>
-				<view class="con-list">
-					<input placeholder="请填写账户类型" name="input" v-model="items.accountType"></input>
-				</view>
+				<picker @change="accountChange($event,index)" :value="accountarr[index]" :range="accountType"
+					class="con-list">
+					<view class="picker" v-model="items.accountType">
+						{{accountarr[index] != null ? accountarr[index]:'个人账户'}}
+					</view>
+				</picker>
 			</view>
-			<view class="c-row b-b"> 
+			<view class="c-row b-b">
 				<text class="tit">银行卡照片（可选）</text>
 				<view class="con-list">
-					<!-- <input placeholder="请上传照片" name="input" v-model="items.payeeAddressUrl" @clisk="bankimg(items)"></input> -->
-					<view  v-if="bankimg == ''"  @click="bankimgs(index)">请上传照片</view>
-					<view  v-if="bankimg != ''" @click="bankimgs(index)">
-						<image v-bind:src="bankimg" style="width: 40px; height: 40px;"></image>
+					<view v-if="bankimg[index] == null" @click="bankimgs(index)">请上传照片</view>
+					<view v-if="bankimg[index] != null" @click="bankimgs(index)">
+						<image v-bind:src="bankimg[index]" style="width: 40px; height: 40px;"></image>
 					</view>
-					
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -101,40 +110,49 @@
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">开户行</text>
-				
 				<view class="con-list">
 					<input placeholder="请输入开户行" name="input" v-model="items.bankDeposit"></input>
 				</view>
-			
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">开户支行</text>
-				<picker @change="bankChange" :value="bankIndex" :range="bankType" class="con-list">
-				<view class="con-list">
-					{{bankIndex>-1?bankType[bankIndex]:'请选择开户支行'}}
+				<picker v-if="subBranch" @change="bankChange($event,index)" :value="bankarr[index]" :range="bankType[index]"
+					class="con-list">
+					<view class="con-list">
+						{{bankarr[index] != null?bankarr[index]:'请选择开户支行'}}
+					</view>
+				</picker>
+				<view v-else class="con-list">
+					<input placeholder="请填写开户支行" name="input" v-model="items.bankDepositBranch"></input>
 				</view>
-					</picker>
+				<button v-if="subBranch" class='cu-btn bg-green shadow' @click="subBranchChength">填写</button>
+				<button v-else class='cu-btn bg-green shadow' @click="subBranchChength">识别</button>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row b-b" v-if="items.accountType == '个人账户'"> 
 				<text class="tit">收款人姓名</text>
 				<view class="con-list">
 					<input placeholder="请输入收款人姓名" name="input" v-model="items.payeeName"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row " v-if="items.accountType == '个人账户'">
 				<text class="tit">收款人身份证号</text>
 				<view class="con-list">
 					<input placeholder="请输入收款人身份证号" name="input" v-model="items.payeeNumberCard"></input>
 				</view>
+			</view>	
+			<view class="c-row " v-if="items.accountType == '企业账户'">
+				<text class="tit">企业名称</text>
+				<view class="con-list">
+					<input placeholder="请输入企业名称" name="input" v-model="items.compName"></input>
+				</view>
 			</view>
 		</view>
-		<button class="btn" v-if="openuserboolean == true" @click="userAdd()">
-			 <image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add" style="top: 8px;"></image> 
+		<button class="btn" v-if="openuserboolean == true && this.driverPayeeInfoList.length < 10" @click="userAdd()" >
+			<image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add" style="top: 8px;"></image>
 			<text style="margin-top: -2px;">添加账户</text>
-			</button>
-		 <button class="btns btn"  @click="jumpUrl">下一步</button>
+		</button>
+		<button class="btns btn" @click="jumpUrl">下一步</button>
 	</view>
-	   
 	</view>
 </template>
 
@@ -156,36 +174,70 @@
 					carLoad: "",
 					yearManufacture: "",
 				}],
-				driverPayeeInfoList: [
-					{
-						accountType:"",
-						cardAddressUrl:"",
-						bankCard:"",
-						bankDeposit:"",
-						bankDepositBranch:"",
-						payeeName:"",
-						payeeNumberCard:"",
-					}
-				],
+				driverPayeeInfoList: [{
+					accountType: "个人账户",
+					accountIndex: '0',
+					binkindex: 0,
+					cardAddressUrl: "",
+					bankCard: "",
+					bankDeposit: "",
+					bankDepositBranch: "",
+					payeeName: "",
+					payeeNumberCard:"",
+				}],
 				ModelIndex: 0,
 				Model: '',
 				ModelType: ["高栏", "集装箱", "自卸车"],
 				carLong: '',
 				carLongIndex: 0,
 				carLongType: ['13', '9.6', '8.2', '8.7', '11.7', '12.5', '13.7', '15', '16', '17.5'],
-				DriverViewInfo:{},
-				bankimg:"",
-				bankImgs1:{},
-				bankIndex:-1,
-				bankType:[],
+				DriverViewInfo: {},
+				bankimg: [],
+				bankImgs1: {},
+				bankIndex: -1,
+				bankType: [],
+				accountType: ["个人账户", "企业账户"],
+				accountarr: [],
+				bankarr: [],
+				show: false,
+				carchength: true,
+				subBranch:true,
+				params: {
+					year: true,
+					month: false,
+					day: false,
+				},
+				year: [],
+				carModelType: [],
+				carLengtharr: [],
 			}
 		},
-		onLoad(options){
+		onLoad(options) {
 			this.DriverViewInfo = JSON.parse(options.DriverViewInfo)
+			this.driverPayeeInfoList[0].payeeName = this.DriverViewInfo.driverName
+				this.driverPayeeInfoList[0].payeeNumberCard = this.DriverViewInfo.numberCard
 		},
 		methods: {
-			bankimgs(items){
-				console.log(items)
+			subBranchChength(){
+				this.subBranch = !this.subBranch
+			},
+			changeCarChength() {
+				this.carchength = !this.carchength
+			},
+			yearchange() {
+				this.show = true
+			},
+			yearpicker(e, index) {
+				this.year[index] = e.year
+				this.driverCarInfoList[index].yearManufacture = e.year
+			},
+			accountChange(e, index) {
+				this.driverPayeeInfoList[index].accountIndex = e.detail.value
+				this.driverPayeeInfoList[index].accountType = this.accountType[this.driverPayeeInfoList[index]
+					.accountIndex];
+				this.accountarr[index] = this.accountType[e.detail.value];
+			},
+			bankimgs(items) {
 				var that = this
 				wx.chooseImage({
 					success: function(res) {
@@ -197,15 +249,16 @@
 								var data = res.data
 								var strToObj = JSON.parse(data)
 								// that.id[0] = strToObj.url
-								that.bankimg = strToObj.url
-								 that.bankImgs1.bankImg = strToObj.url
-								that.$api.doRequest('get', '/driverViewInfo/bankShibie', that.bankImgs1).then(res => {
-									console.log(res)
-									that.$set(that.driverPayeeInfoList[items],'bankCard',res.data.data.bankNo)
-									that.$set(that.driverPayeeInfoList[items],'bankDeposit',res.data.data.bankName)
-		
-									that.bankType = res.data.data.bankNameZhihang
-									console.log(that.ban)
+								that.bankimg[items] = strToObj.url
+								that.bankImgs1.bankImg = strToObj.url
+								that.driverPayeeInfoList[items].cardAddressUrl = strToObj.url
+								that.$api.doRequest('get', '/driverViewInfo/bankShibie', that
+									.bankImgs1).then(res => {
+									that.$set(that.driverPayeeInfoList[items], 'bankCard', res
+										.data.data.bankNo)
+									that.$set(that.driverPayeeInfoList[items], 'bankDeposit',
+										res.data.data.bankName)
+									that.bankType[items] = res.data.data.bankNameZhihang
 								}).catch(res => {
 									uni.showToast({
 										title: res.data.message,
@@ -216,14 +269,18 @@
 							}
 						})
 					}
-				})	
+				})
 			},
-			jumpUrl(){
-				for(var i = 0 ; i < this.driverCarInfoList.length ; i++){
+			jumpUrl() {
+				for (var i = 0; i < this.driverCarInfoList.length; i++) {
 					if (!this.driverCarInfoList[i].carNumber) {
 						this.$api.msg('车牌号不能为空')
 						return
 					}
+					if (this.driverCarInfoList[i].carNumber.toString().length != 7) {
+						this.$api.msg('车牌号输入错误')
+						return
+					}
 					if (!this.driverCarInfoList[i].carModel) {
 						this.$api.msg('车型不能为空')
 						return
@@ -232,49 +289,92 @@
 						this.$api.msg('车长不能为空')
 						return
 					}
+					if (this.driverCarInfoList[i].carLength > 50) {
+						this.$api.msg('车长输入错误')
+						return
+					}
+					if (this.driverCarInfoList[i].carLength.indexOf('.') != -1) {
+						if (this.driverCarInfoList[i].carLength.split('.')[1].length > 1) {
+							this.$api.msg('车长输入错误')
+							return
+						}
+					}
 					if (!this.driverCarInfoList[i].carLoad) {
 						this.$api.msg('载重不能为空')
 						return
 					}
+					if (this.driverCarInfoList[i].carLoad > 50) {
+						this.$api.msg('载重输入错误')
+						return
+					}
+					if (this.driverCarInfoList[i].carLoad.indexOf('.') != -1) {
+						if (this.driverCarInfoList[i].carLoad.split('.')[1].length > 1) {
+							this.$api.msg('载重输入错误')
+							return
+						}
+					}
 					if (!this.driverCarInfoList[i].yearManufacture) {
 						this.$api.msg('出厂年份不能为空')
 						return
 					}
 				}
-				for(var i = 0 ; i < this.driverPayeeInfoList.length ; i++){
+				for (var i = 0; i < this.driverPayeeInfoList.length; i++) {
 					if (!this.driverPayeeInfoList[i].accountType) {
 						this.$api.msg('账户类型不能为空')
 						return
 					}
 					// if (!this.driverCarInfoList[i].cardAddressUrl) {
 					// 	this.$api.msg('银行卡照片不能为空')
-					
 					// }
 					if (!this.driverPayeeInfoList[i].bankCard) {
 						this.$api.msg('银行卡号不能为空')
 						return
 					}
+					if (this.driverPayeeInfoList[i].bankCard.length < 16 || this.driverPayeeInfoList[i].bankCard.length >
+						19) {
+						this.$api.msg('银行卡号输入错误')
+						return
+					}
 					if (!this.driverPayeeInfoList[i].bankDeposit) {
 						this.$api.msg('开户行不能为空')
 						return
 					}
+					if (this.driverPayeeInfoList[i].bankDeposit.length < 4 || this.driverPayeeInfoList[i].bankDeposit
+						.length > 15) {
+						this.$api.msg('开户行输入错误')
+						return
+					}
 					if (!this.driverPayeeInfoList[i].bankDepositBranch) {
 						this.$api.msg('开户支行不能为空')
 						return
 					}
+					if (this.driverPayeeInfoList[i].bankDepositBranch.length < 4 || this.driverPayeeInfoList[i]
+						.bankDepositBranch.length > 30) {
+						this.$api.msg('开户支行输入错误')
+						return
+					}
 					if (!this.driverPayeeInfoList[i].payeeName) {
 						this.$api.msg('收款人姓名不能为空')
 						return
 					}
+					if (this.driverPayeeInfoList[i].payeeName.length < 2 || this.driverPayeeInfoList[i].payeeName.length >
+						10) {
+						this.$api.msg('收款人姓名输入错误')
+						return
+					}
 					if (!this.driverPayeeInfoList[i].payeeNumberCard) {
 						this.$api.msg('收款人身份证号不能为空')
 						return
 					}
+					if (this.driverPayeeInfoList[i].payeeNumberCard.length != 18) {
+						this.$api.msg('收款人身份证号输入错误')
+						return
+					}
 				}
-					this.DriverViewInfo.driverCarInfoList = this.driverCarInfoList
-					this.DriverViewInfo.driverPayeeInfoList = this.driverPayeeInfoList
-					this.DriverViewInfo.driverPayeeInfoList.payeeAddressUrl = this.bankimg
-					var model = JSON.stringify(this.DriverViewInfo);
+				this.DriverViewInfo.driverCarInfoList = this.driverCarInfoList
+				this.DriverViewInfo.driverPayeeInfoList = this.driverPayeeInfoList
+				this.DriverViewInfo.driverPayeeInfoList.payeeAddressUrl = this.bankimg
+				var model = JSON.stringify(this.DriverViewInfo);
 				uni.navigateTo({
 					url: `/pageD/identity/driverIdentityThree?DriverViewInfo=` + model
 				})
@@ -290,13 +390,15 @@
 			},
 			userAdd() {
 				this.driverPayeeInfoList.push({
-					accountType:"",
-					cardAddressUrl:"",
-					bankCard:"",
-					bankDeposit:"",
-					bankDepositBranch:"",
-					payeeName:"",
-					payeeNumberCard:"",
+					accountType: "个人账户",
+					accountIndex: '0',
+					binkindex: 0,
+					cardAddressUrl: "",
+					bankCard: "",
+					bankDeposit: "",
+					bankDepositBranch: "",
+					payeeName: this.DriverViewInfo.driverName,
+					payeeNumberCard: this.DriverViewInfo.numberCard,
 				})
 			},
 			carDel(index) {
@@ -309,21 +411,21 @@
 					this.driverPayeeInfoList.splice(index, 1)
 				}
 			},
-			ModelChange(e) {
+			ModelChange(e, index) {
 				this.ModelIndex = e.detail.value
-				this.Model = this.ModelType[this.ModelIndex];
-				
-				this.driverCarInfoList[this.driverCarInfoList.length - 1].carModel = this.ModelType[this.ModelIndex];
+				this.driverCarInfoList[index].carModel = this.ModelType[this.ModelIndex];
+				this.carModelType[index] = this.ModelType[this.ModelIndex];
 			},
-			bankChange(e) {
-				this.bankIndex = e.detail.value
-				this.Model = this.bankType[this.bankIndex];	
-				this.driverPayeeInfoList[this.driverPayeeInfoList.length - 1].bankDepositBranch = this.bankType[this.bankIndex];
+			bankChange(e, index) {
+				this.driverPayeeInfoList[index].binkindex = e.detail.value
+				this.$set(this.bankarr, index, this.bankType[index][this.driverPayeeInfoList[index].binkindex])
+				this.driverPayeeInfoList[index].bankDepositBranch = this.bankType[index][e.detail.value];
 			},
-			carLongChange(e) {
+			carLongChange(e, index) {
 				this.carLongIndex = e.detail.value
 				this.carLong = this.carLongType[this.carLongIndex];
-				this.driverCarInfoList[this.driverCarInfoList.length - 1].carLength = this.carLongType[this.carLongIndex];
+				this.driverCarInfoList[index].carLength = this.carLongType[this.carLongIndex];
+				this.carLengtharr[index] = this.carLongType[this.carLongIndex];
 			},
 			opencarclick() {
 				if (this.opencarboolean == false) {
@@ -411,10 +513,12 @@
 		border-radius: 25px;
 		border: none;
 	}
-	.btns{
+
+	.btns {
 		background-color: #22C572;
 	}
-	.add{
+
+	.add {
 		width: 26px;
 		height: 26px;
 
@@ -427,9 +531,9 @@
 		height: 20px;
 		float: right;
 	}
-	.bankImg{
+
+	.bankImg {
 		width: 20px;
 		height: 20px;
 	}
-
 </style>

pageD/myRelease/buyGrain.vue

@@ -278,36 +278,33 @@
 			})
 		},
 		methods: {
-			async amendprice() {
-				var that = this
-				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
-						phone: this.deptList.buyerPhone,
-						verifyCode: this.verifyCode
-					}).then(res => {
-						if (res.data.code == 200) {
-							
-						} else {
-							that.verification = false
-							console.log(that.verification,"1")
-							uni.showToast({
-								title: res.data.message,
-								icon: 'none',
-								duration: 2000
-							})
-							return false
-						}
-					})
-					.catch(res => {
-						that.verification = false
-						console.log(that.verification,"2")
-						uni.showToast({
-							title: res.data.message,
-							icon: 'none',
-							duration: 2000
-						})
-						return false
-					});
-			},
+			// async amendprice() {
+			// 	var that = this
+			// 	this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
+			// 			phone: this.deptList.buyerPhone,
+			// 			verifyCode: this.verifyCode
+			// 		}).then(res => {
+			// 			if (res.data.code == 200) {	
+			// 			} else {
+			// 				that.verification = false
+			// 				uni.showToast({
+			// 					title: res.data.message,
+			// 					icon: 'none',
+			// 					duration: 2000
+			// 				})
+			// 				return false
+			// 			}
+			// 		})
+			// 		.catch(res => {
+			// 			that.verification = false
+			// 			uni.showToast({
+			// 				title: res.data.message,
+			// 				icon: 'none',
+			// 				duration: 2000
+			// 			})
+			// 			return false
+			// 		});
+			// },
 			getcode() {
 				var that = this
 				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(that.deptList.buyerPhone)) {
@@ -557,10 +554,10 @@
 						}
 					}
 				}
-				if(this.amendprice() == false){
-					this.$api.msg('验证码输入有误！')
-					return
-				}
+				// if(this.amendprice() == false){
+				// 	this.$api.msg('验证码输入有误！')
+				// 	return
+				// }
 				this.insertProcurementPlanInfo = this.deptList
 				this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
 				this.insertProcurementPlanInfo.commonId = this.userInfo.id
@@ -602,7 +599,14 @@
 										duration: 2000
 									})
 								});
-						} else {
+						} 
+						else if(res.data.code=='11003'){
+							uni.showModal({
+								title: '提示',
+								content: '验证码不正确',
+								});
+						}
+						else {
 							uni.showToast({
 								title: res.data.message,
 								icon: 'none',

pageD/myRelease/sellEdit.vue

@@ -41,7 +41,7 @@
 			<view class="c-row b-b">
 				<text class="tit">价格类型</text>
 				<view class="con-list">
-					<input placeholder="请填写价格类型" name="input" v-model="deptList.priceType"></input>
+					{{deptList.priceType}}
 				</view>
 			</view>
 			<view class="c-row b-b" v-if="this.typesIndex != 1">
@@ -104,8 +104,7 @@
 			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">杂质（%）<= </text>
 						<view class="con-list">
-							<!-- <input placeholder="请填写杂质占比" name="input" v-model="deptList.impurity"></input> -->
-							{{deptList.impurity}}
+							<input placeholder="请填写杂质占比" name="input" v-model="deptList.impurity"></input>
 						</view>
 			</view>
 			<view v-if='!checked' class="c-row b-b">

pageD/myRelease/sellGrain.vue

@@ -283,6 +283,33 @@
 			})
 		},
 		methods: {
+			// async amendprice() {
+			// 	var that = this
+			// 	this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
+			// 			phone: this.deptList.buyerPhone,
+			// 			verifyCode: this.verifyCode
+			// 		}).then(res => {
+			// 			if (res.data.code == 200) {	
+			// 			} else {
+			// 				that.verification = false
+			// 				uni.showToast({
+			// 					title: res.data.message,
+			// 					icon: 'none',
+			// 					duration: 2000
+			// 				})
+			// 				return false
+			// 			}
+			// 		})
+			// 		.catch(res => {
+			// 			that.verification = false
+			// 			uni.showToast({
+			// 				title: res.data.message,
+			// 				icon: 'none',
+			// 				duration: 2000
+			// 			})
+			// 			return false
+			// 		});
+			// },
 			getcode() {
 				var that = this
 				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(that.deptList.sellerPhone)) {
@@ -535,9 +562,13 @@
 						}
 					}
 				}
+				// if(this.amendprice() == false){
+				// 	this.$api.msg('验证码输入有误！')
+				// 	return
+				// }
 				var that=this
 				this.insertSalePlanInfo = this.deptList
-				this.insertSalePlanInfo.basisPrice = -this.insertSalePlanInfo.basisPrice
+				this.insertSalePlanInfo.basisPrice = this.insertSalePlanInfo.basisPrice
 				this.insertSalePlanInfo.commonId = this.userInfo.id
 				this.insertSalePlanInfo.salePlanNo='XSJH'+this.getdate()+this.verifyinit()
 				this.insertSalePlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
@@ -575,7 +606,14 @@
 										duration: 2000
 									})
 								});
-						} else {
+						}
+						else if(res.data.code=='11003'){
+						 	uni.showModal({
+						 		title: '提示',
+						 		content: '验证码不正确',
+						 		});
+						 }
+						else {
 							uni.showToast({
 								title: res.data.message,
 								icon: 'none',

pageD/warehousings/ex_warehouse.vue

@@ -97,7 +97,7 @@
 					<text class="tit">出库日期</text>
 
 					<view class="con-list" @click="show = true">
-						{{WarehouseInOutInfo.inOutDate!='' || WarehouseInOutInfo.inOutDate != null ? WarehouseInOutInfo.inOutDate : time1}}
+						{{ WarehouseInOutInfo.inOutDate != null ? WarehouseInOutInfo.inOutDate : time1}}
 					</view>
 					<u-picker :params='params' :default-time='time1' @confirm="DateChange" v-model="show" mode="time">
 					</u-picker>
@@ -219,6 +219,7 @@
 					pcFlag: 0,
 					contractNo: {},
 					carNo: {},
+					warehouseName:{},
 				},
 				WarehouseInOutInfo1: {
 					contractNo: {},
@@ -247,6 +248,7 @@
 				},
 				show: false,
 				license1: "",
+				ids:"",
 
 			}
 		},
@@ -288,7 +290,19 @@
 				return new Date()
 			}
 		},
-		onShow() {
+		onLoad(option) {
+			this.WarehouseInOutInfo.contractNo = option.contractNo
+			this.WarehouseInOutInfo.goodsName = option.goodsName
+			this.WarehouseInOutInfo.consignee = option.consignee
+			this.WarehouseInOutInfo.boxNo = option.boxNo
+			this.WarehouseInOutInfo.tranCarNo = option.tranCarNo
+			this.WarehouseInOutInfo.titleNo = option.titleNo
+			this.WarehouseInOutInfo.id = option.id
+			this.WarehouseInOutInfo.carNo = option.carNo
+			this.WarehouseInOutInfo.warehouseName = option.warehouseName
+			this.getList(this.WarehouseInOutInfo.id)
+		},
+		onShow() {	
 			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {
 				compId: '2710b21efc1e4393930c5dc800010dc4',
 				warehouseType: 1,
@@ -298,68 +312,66 @@
 					for (var i = 0; i < res.data.data.length; i++) {
 						if (res.data.data[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
 							this.warehouseIndex = i
+							this.ids = res.data.data[i].id
 						}
 						arr.push(res.data.data[i].warehouseName)
 					}
 					this.warehouselist = res.data.data
 					this.warehouse = arr
 				}
-
 			})
-			this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
-				compId: '2710b21efc1e4393930c5dc800010dc4',
-				warehouseType: 1,
-			}).then(res => {})
-		},
-		onLoad(option) {
-			this.WarehouseInOutInfo.contractNo = option.contractNo
-			this.WarehouseInOutInfo.goodsName = option.goodsName
-			this.WarehouseInOutInfo.consignee = option.consignee
-			this.WarehouseInOutInfo.boxNo = option.boxNo
-			this.WarehouseInOutInfo.tranCarNo = option.tranCarNo
-			this.WarehouseInOutInfo.titleNo = option.titleNo
-			this.WarehouseInOutInfo.id = option.id
-			this.WarehouseInOutInfo.carNo = option.carNo
-			// var date = new Date()
-			// var year = date.getFullYear()
-			// var month = date.getMonth()
-			// var date1 = date.getDate()
-			// if (month + 1 < 10) {
-			// 	month = "0" + (month + 1)
-			// }
-			// this.time = year + '-' + month + "-" + date1
-			this.getList(this.WarehouseInOutInfo.id)
+			// this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
+			// 	id: this.ids,
+			// }).then(res => {
+			// 	var arr = []
+			// 	for (var i = 0; i < res.data.data.warehousePositionInfoList.length; i++) {
+			// 		console.log(res.data.data.warehousePositionInfoList[i])
+			// 		arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
+			// 	}
+			// 	this.warehouse1 = arr
+			// 	this.warehouselist11 = res.data.data
+			// })
 		},
+		
 		methods: {
 			getList(id1) {
 				var that = this
 				this.$api.doRequest('get', '/warehouseInOutInfo/getInfo', {
 						id: id1
 					}).then(res => {
-						this.WarehouseInOutInfo = res.data.data
-						if (this.WarehouseInOutInfo.warehouseInOutDetail != null || this.WarehouseInOutInfo
-							.warehouseInOutDetail != "") {
-							this.list = this.WarehouseInOutInfo.warehouseInOutDetail
+						
+
+						if(res.data.code == 200){
+							this.WarehouseInOutInfo = res.data.data
+							if (this.WarehouseInOutInfo.warehouseInOutDetail != null ) {
+									this.list = this.WarehouseInOutInfo.warehouseInOutDetail
+								}
+								if(this.WarehouseInOutInfo.inOutTypeKey != null){
+										this.ruIndex = this.WarehouseInOutInfo.inOutTypeKey
+								}
+							    if(this.WarehouseInOutInfo.warehouseNameKey != null){
+									this.warehouseIndex = this.WarehouseInOutInfo.warehouseNameKey
+								}
+								this.warehouseIndex1 = this.WarehouseInOutInfo.binNumberKey
+								
+								if(this.WarehouseInOutInfo.gradeKey != null){
+									this.pinIndex = this.WarehouseInOutInfo.gradeKey
+								}
+								
+								var positionid
+								for (var i = 0; i < this.warehouselist.length; i++) {
+									if (this.warehouselist[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
+										this.warehouseIndex = i
+										positionid = this.warehouselist[i].id
+									}
+								}
+							this.warehouseChange3(positionid)
+								for (var i = 0; i < this.warehouse1.length; i++) {
+									if (this.warehouse1[i] == this.WarehouseInOutInfo.binNumber) {
+										this.warehouseIndex1 = i
+									}
+								}
 						}
-						this.ruIndex = this.WarehouseInOutInfo.inOutTypeKey
-						this.warehouseIndex1 = this.WarehouseInOutInfo.binNumberKey
-						this.warehouseIndex = this.WarehouseInOutInfo.warehouseNameKey
-						this.pinIndex = this.WarehouseInOutInfo.gradeKey
-						var positionid
-						for (var i = 0; i < this.warehouselist.length; i++) {
-							if (this.warehouselist[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
-								this.warehouseIndex = i
-								positionid = this.warehouselist[i].id
-							}
-						}
-					// this.warehouse1 = this.warehouseChange3(positionid)
-					// console.log(this.warehouse1,"仓库号")
-						for (var i = 0; i < this.warehouse1.length; i++) {
-							if (this.warehouse1[i] == this.WarehouseInOutInfo.binNumber) {
-								this.warehouseIndex1 = i
-							}
-						}
-
 					})
 					.catch(res => {
 						uni.showToast({
@@ -374,18 +386,22 @@
 			this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
 				id: id,
 			}).then(res => {
-				var arr = []
-				for (var i = 0; i < res.data.data.warehousePositionInfoList.length; i++) {
-				
-					arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
-				}
-				that.warehouse1 = arr
-				this.warehouselist11 = res.data.data
+				if(res.data.code == 200 ){
+					var arr = []
+					for (var i = 0; i < res.data.data.warehousePositionInfoList.length; i++) {
+						arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
+					}
+					that.warehouse1 = arr
+					for(var i = 0 ; i < that.warehouse1.length ; i++){
+						if(that.warehouse1[i] == that.WarehouseInOutInfo.binNumber){
+							that.warehouseIndex1 = i
+						}
+					}
+				}			
 			})
 			return 	that.warehouse1
 		},
 			warehouseChange(e) {
-				console.log(e)
 				var id = ''
 				this.warehouseIndex = e.detail.value
 				this.WarehouseInOutInfo.warehouseName = this.warehouse[this.warehouseIndex]
@@ -399,11 +415,10 @@
 				}).then(res => {
 					var arr = []
 					for (var i = 0; i < res.data.data.warehousePositionInfoList.length; i++) {
-						console.log(res.data.data.warehousePositionInfoList[i])
+						// console.log(res.data.data.warehousePositionInfoList[i])
 						arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
 					}
 					this.warehouse1 = arr
-					this.warehouselist11 = res.data.data
 				})
 			},
 			warehouseChange1(e) {
@@ -429,7 +444,6 @@
 				}
 			},
 			getImgUrl(res) {
-				console.log(res)
 				this.imgUrls.push(res);
 			},
 			onRemove(index) {
@@ -544,7 +558,6 @@
 				if (this.imgUrls.length > 0) {
 					this.WarehouseInOutInfo.addressUrl = this.imgUrls[0]
 				}
-				console.log(this.WarehouseInOutInfo, "出库暂存对象")
 				this.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse', this.WarehouseInOutInfo).then(res => {
 					if (res.data.code == 200) {
 						uni.showToast({
@@ -552,6 +565,9 @@
 							icon: 'none',
 							duration: 2000
 						})
+						uni.navigateTo({
+							url: `/pages/task/my_task`,
+						})
 
 						// setTimeout(() => {
 						// 	uni.navigateBack({})
@@ -595,8 +611,8 @@
 					this.$api.msg('毛重输入错误')
 					return
 				}
-				if (this.WarehouseInOutInfo.grossWeight.indexOf('.') != -1) {
-					if (this.WarehouseInOutInfo.grossWeight.split('.')[1].length > 2) {
+				if (this.WarehouseInOutInfo.grossWeight.toString().indexOf('.') != -1) {
+					if (this.WarehouseInOutInfo.grossWeight.toString().split('.')[1].length > 2) {
 						this.$api.msg('毛重输入错误')
 						return
 					}
@@ -708,9 +724,12 @@
 							title: '提交成功',
 							icon: 'none'
 						})
-						setTimeout(() => {
-							uni.navigateBack({})
-						}, 200)
+						uni.navigateTo({
+							url: `/pages/task/my_task`,
+						})
+						// setTimeout(() => {
+						// 	uni.navigateBack({})
+						// }, 200)
 					} else {
 						uni.showToast({
 							title: res.data.message,
@@ -925,13 +944,11 @@
 		margin-left: -60px;
 	}
 
-	.picture {
+	/* .picture {
 		width: 90px;
 		height: 90px;
 		border-radius: 10px;
-		/* 
-		position: relative; */
-	}
+	} */
 
 	.picture1 {
 		width: 90px;

pages/attestation/indexThree.vue

@@ -6,7 +6,10 @@
 					{{item.logo}}
 				</view>
 				<view class="company">{{item.driverName}}</view>
-				
+				<view class="status" v-if="item.cover == '1'">
+					已覆盖
+				</view>
+				<view v-else>
 				<view class="status" v-if="item.authenticationStatus == '已认证'">
 					<image src="../../static/img/authentication/cert-personal@3x.png"
 						style="width: 16px;height: 16px;top:3px;"></image>
@@ -21,6 +24,7 @@
 				<view class="status3" v-if="item.authenticationStatus == '已覆盖'">
 					{{item.authenticationStatus}}
 				</view>
+				</view>
 			</view>
 			<view class="geren">{{item.driverPhone}}</view>
 			<hr style="margin: 10px 0;">
@@ -29,8 +33,8 @@
 					<image src="../../static/img/authentication/selected(2).png"
 						style="width: 16px;height: 16px;top: 3px;">设为默认</image>
 				</view> -->
-				<view class='but' @click="open(item)">更换手机号</view>
-				<view class='but' @click="companyEdit(item)">修改</view>
+				<view class='but' v-if="item.authenticationStatus == '已覆盖'||item.authenticationStatus == '已认证'" @click="open(item)">更换手机号</view>
+				<view class='but' v-if="item.authenticationStatus != '审核中'" @click="companyEdit(item)">修改</view>
 				<view class='but' @click="deleteSJ(item)">删除</view>
 			</view>
 			<view v-if='pricestatus' class='shade'>
@@ -40,7 +44,7 @@
 					</view>
 					<view class="cancel" @click='pricestatus=false'>×</view>
 					<view class='shade-content-item'>
-						<input v-model='price' placeholder="请输入手机号" type="number" class="tainput">
+						<input v-model='price' placeholder="请输入手机号" maxlength="11" type="number" class="tainput" >
 					</view>
 					<view>
 						<!--<view style='width:50%;display:inline-block;' @click='pricestatus=false'>取消</view>
@@ -60,7 +64,7 @@
 					<text style="color:#AFB3BF;font-size: 14px;">验证码已发送至+86 {{price}}</text>
 					<view class="cancel" @click='pricestatusTwo=false,pricestatus=false'>×</view>
 					<view class='shade-content-item flex'>
-						<input v-model='verifyCode' placeholder="填写验证码" type="number" class="tainput1">
+						<input v-model='verifyCode' placeholder="填写验证码" type="number" class="tainput1" maxlength="6">
 						<text style="color:#AFB3BF;font-size: 14px;" @click="resend()">{{sendText}}</text>
 					</view>
 					<view>
@@ -109,6 +113,9 @@
 		},
 		methods: {
 			resend() {
+				
+				price
+				
 				if (this.sendText == "获取验证码") {
 					this.getcode()
 				}
@@ -145,6 +152,7 @@
 					});
 			},
 			amendprice(item) {
+				var that = this
 				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
 						phone: this.price,
 						verifyCode: this.verifyCode
@@ -156,10 +164,10 @@
 									commonId: this.userInfo.id
 								}, 'application/json;charset=UTF-8').then(res => {
 									if (res.data.code == 200) {
-										uni.navigateTo({
-											url: '/pages/attestation/indexThree'
-										});
-										this.$api.msg('修改成功！')
+										that.$api.msg('修改成功！')
+										that.pricestatusTwo = false
+										that.pricestatus = false
+										that.getList()
 									}
 								})
 								.catch(res => {
@@ -189,7 +197,6 @@
 					});
 			},
 			getcode() {
-		
 					if (!this.price) {
 						uni.showToast({
 							title: '请填写手机号！',
@@ -198,7 +205,6 @@
 						})
 						return
 					}
-			
 				if (this.price.length != 11 ) {
 					uni.showToast({
 						title: '请正确填写手机号！',
@@ -264,13 +270,11 @@
 					success: (e) => {
 						this.$api.doRequest('post', '/driverViewInfo/api/deleteDriver', this.deletes,
 								'application/json;charset=UTF-8').then(res => {
-								this.procurementPlanInfos = res.data.data.records
-								if (res.errmsg == "Success") {
+								if (res.data.code == 200) {
 									this.$api.msg('删除成功！')
 									this.getList()
 									return
 								}
-
 							})
 							.catch(res => {
 								uni.showToast({

pages/attestation/indexTwo.vue

@@ -7,19 +7,24 @@
 				</view>
 				<view class="company">{{item.compName}}</view>
 				<view class="company" v-if="item.customerTypeFlag == 1">{{item.customerName}}</view>
-				<view class="status" v-if="item.authenticationStatus == '已认证'">
-					<image src="../../static/img/authentication/cert-personal@3x.png"
-						style="width: 16px;height: 16px;top:3px;"></image>
-					{{item.authenticationStatus}}
+				<view class="status" v-if="item.cover == '1'">
+					已覆盖
 				</view>
-				<view class="status1" v-if="item.authenticationStatus == '审核中'">
-					{{item.authenticationStatus}}
-				</view>
-				<view class="status2" v-if="item.authenticationStatus == '未通过'">
-					{{item.authenticationStatus}}
-				</view>
-				<view class="status3" v-if="item.authenticationStatus == '已覆盖'">
-					{{item.authenticationStatus}}
+				<view v-else>
+					<view class="status" v-if="item.authenticationStatus == '已认证'">
+						<image src="../../static/img/authentication/cert-personal@3x.png"
+							style="width: 16px;height: 16px;top:3px;"></image>
+						{{item.authenticationStatus}}
+					</view>
+					<view class="status1" v-if="item.authenticationStatus == '审核中'">
+						{{item.authenticationStatus}}
+					</view>
+					<view class="status2" v-if="item.authenticationStatus == '未通过'">
+						{{item.authenticationStatus}}
+					</view>
+					<view class="status3" v-if="item.authenticationStatus == '已覆盖'">
+						{{item.authenticationStatus}}
+					</view>
 				</view>
 			</view>
 			<view class="geren" v-if="item.customerTypeFlag == 1"> {{item.customerPhone}}</view>
@@ -33,8 +38,9 @@
 					<text style="font-size: 12px;" @click.stop="select(item)">设为默认</text>
 				</view>
 				<view class="options flex">
-					<view class='but' @click="open(item)">更换手机号</view>
-					<view class='but' @click="companyEdit(item)">修改</view>
+					<view class='but' v-if="item.authenticationStatus == '已覆盖'||item.authenticationStatus == '已认证'"
+						@click="open(item)">更换手机号</view>
+					<view class='but' v-if="item.authenticationStatus == '未通过'" @click="companyEdit(item)">修改</view>
 					<view class='but' @click="deleteLS(item)">删除</view>
 				</view>
 			</view>
@@ -45,11 +51,9 @@
 					</view>
 					<view class="cancel" @click='pricestatus=false'>×</view>
 					<view class='shade-content-item'>
-						<input v-model='price' placeholder="请输入手机号" type="number" class="tainput">
+						<input v-model='price' placeholder="请输入手机号" type="number" class="tainput" maxlength="11">
 					</view>
 					<view>
-						<!-- 	<view style='width:50%;display:inline-block;' @click='pricestatus=false'>取消</view>
-						<view style='width:50%;display:inline-block;' @click='amendprice'>确定</view> -->
 						<view class="determine" @click="getcode">
 							获取验证码
 						</view>
@@ -65,7 +69,7 @@
 					<text style="color:#AFB3BF;font-size: 14px;">验证码已发送至+86 {{price}}</text>
 					<view class="cancel" @click='pricestatusTwo=false,pricestatus=false'>×</view>
 					<view class='shade-content-item flex'>
-						<input v-model='verifyCode' placeholder="填写验证码" type="number" class="tainput1">
+						<input v-model='verifyCode' placeholder="填写验证码" type="number" class="tainput1" maxlength="6">
 						<text style="color:#AFB3BF;font-size: 14px;" @click="resend">{{sendText}}</text>
 					</view>
 					<view>
@@ -73,9 +77,6 @@
 							<text class="btns1 btn1" @click='pricestatusTwo=false'>取消</text>
 							<view class="btns1 btn2" @click='amendprice(item)'>确定</view>
 						</view>
-						<!-- <view class="determine">
-							获取验证码
-						</view> -->
 					</view>
 				</view>
 			</view>
@@ -123,7 +124,7 @@
 				}
 			},
 			select(item) {
-				if(item.authenticationStatus == '已认证'){
+				if (item.authenticationStatus == '已认证') {
 					if (item.basis == "false") {
 						for (var i = 0; i < this.businessman.length; i++) {
 							if (this.businessman[i] == item) {
@@ -132,7 +133,7 @@
 								this.businessman[i].basis = "false"
 							}
 						}
-					
+
 						// this.defaults1 = "default2"
 					} else if (item.basis == "true") {
 						item.basis = "false"
@@ -141,7 +142,8 @@
 					this.identityAuthenticationInfo.commonId = this.userInfo.id
 					this.identityAuthenticationInfo.defaultFlag = 1
 					this.identityAuthenticationInfo.id = item.id
-					this.$api.doRequest('post', '/identityAuthenticationInfo/api/setDefault', this.identityAuthenticationInfo,
+					this.$api.doRequest('post', '/identityAuthenticationInfo/api/setDefault', this
+							.identityAuthenticationInfo,
 							'application/json;charset=UTF-8').then(res => {
 							for (var i = 0; i < this.businessman.length; i++) {
 								if (this.businessman.defaultFlag == 1) {
@@ -159,11 +161,9 @@
 								duration: 2000
 							})
 						});
-				}else{
+				} else {
 					this.$api.msg('已认证的身份才能设为默认！')
 				}
-				
-
 			},
 			open(item) {
 				this.id = item.id
@@ -180,7 +180,8 @@
 				this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {
 						pageSize: 10,
 						currentPage: 1,
-						commonId: this.userInfo.id
+						commonId: this.userInfo.id,
+						flag: 0
 					}, 'application/json;charset=UTF-8').then(res => {
 						for (var i = 0; i < res.data.data.records.length; i++) {
 							res.data.data.records[i].basis = "false"
@@ -200,6 +201,7 @@
 					});
 			},
 			amendprice(item) {
+				var that = this
 				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
 						phone: this.price,
 						verifyCode: this.verifyCode
@@ -211,10 +213,14 @@
 									commonId: this.userInfo.id
 								}, 'application/json;charset=UTF-8').then(res => {
 									if (res.data.code == 200) {
-										uni.navigateTo({
-											url: '/pages/attestation/indexTwo'
-										});
-										this.$api.msg('修改成功！')
+										that.$api.msg('修改成功！')
+										that.pricestatusTwo = false
+										that.pricestatus = false
+										that.getList()
+										// uni.navigateTo({
+										// 	url: '/pages/attestation/indexTwo'
+										// });
+
 									} else {
 										uni.showToast({
 											title: res.errmsg,
@@ -333,13 +339,12 @@
 								'/identityAuthenticationInfo/api/deleteIdentityAuthenticationInfo', {
 									id: item.id
 								}, 'application/json;charset=UTF-8').then(res => {
-								this.procurementPlanInfos = res.data.data.records
-								if (res.errmsg == "Success") {
+								// this.procurementPlanInfos = res.data.data.records
+								if (res.data.code == 200) {
 									this.$api.msg('删除成功！')
 									this.getList()
 									return
 								}
-
 							})
 							.catch(res => {
 								uni.showToast({

pages/business/business.vue

@@ -45,7 +45,7 @@
 							style='font-size:13px;color:#333333;'>元/吨</text></view>
 					<view class='price' v-if='item.procurementPlanType=="现货"'>{{item.procurementPrice}}<text
 							style='font-size:13px;color:#333;'>元/吨</text></view>
-					<view class='price' v-if='item.salePlanType=="期货"'>{{item.basisPrice}}<text
+					<view class='price' v-if='item.salePlanType=="期货"'>+{{item.basisPrice}}<text
 						style='font-size:13px;color:#333333;'>元/吨</text></view>
 					<view class='price' v-if='item.salePlanType=="现货"'>{{item.salePrice}}<text
 						style='font-size:13px;color:#333;'>元/吨</text></view>

pages/public/code.vue

@@ -135,6 +135,9 @@
 				var interval = setInterval(() =>{
 					--this.count_down
 				},1000) 
+				if(this.count_down == 0){
+					this.status=false
+				}
 				// 设定一个定时器 60000就是六十秒
 				setTimeout(() =>{
 					this.status=false

pages/release/release.vue

@@ -28,8 +28,8 @@
 				<hr style="margin: 16px 0; color: #EEEEEE;">
 				<view class="flex" style="right: 10px;">
 					<view @click='edit(item)' v-if='item.status!="待审核"' class='anniu'>编辑</view>
-					<view class='anniu' @click="switch1(item)" v-if="item.showFlag == 0">显示</view>
-					<view class='anniu' @click="switch1(item)" v-if="item.showFlag == 1">隐藏</view>
+					<view class='anniu' @click="switch1(item)" v-if='item.showFlag == 0&&item.status!="待审核"'>显示</view>
+					<view class='anniu' @click="switch1(item)" v-if='item.showFlag == 1&&item.status!="待审核"'>隐藏</view>
 					<view class='anniu' @click="deleteRelease(item)">删除</view>
 				</view>
 			</view>
@@ -152,7 +152,6 @@
 										})
 									});
 							} else if (res.cancel) {
-								// console.log('用户点击取消');
 							}
 						},
 					})
@@ -170,6 +169,7 @@
 				}
 			},
 			deleteRelease(item) {
+				var that = this
 				if (item.type == "买粮") {
 					var that = this
 					uni.showModal({
@@ -233,7 +233,6 @@
 						fail: () => {},
 						complete: () => {}
 					})
-
 				}
 			},
 			releaseChange(e) {