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

pageA/product/business_buy.vue

@@ -55,7 +55,7 @@
 			<view   class="title">采购单价（元/吨）</view>
 			<view class="con-list">
 				<view class="picker">
-					<text>{{purchaseOrder.unitPrice}}</text>
+					<text>{{purchaseOrder.procurementPrice}}</text>
 				</view>
 				</view>
 		</view>
@@ -135,7 +135,7 @@
 						memo:'',
 						buyer:'',
 						buyerPhone:'',
-						unitPrice:0,
+						procurementPrice:0,
 						address:'',
 						count:0,
 						province:'',
@@ -175,7 +175,7 @@
 					memo:'',
 					buyer:'',
 					buyerPhone:'',
-					unitPrice:0,
+					procurementPrice:0,
 					address:'',
 					count:0,
 					id:0,
@@ -217,7 +217,7 @@
 				this.purchaseOrder.buyer = options.buyer
 				this.purchaseOrder.customer = options.customerName
 				this.purchaseOrder.basis = options.basisPrice
-				this.purchaseOrder.unitPrice = options.unitPrice
+				this.purchaseOrder.procurementPrice = options.procurementPrice
 				this.purchaseOrder.receiveWarehouse = options.receiveWarehouse
 				this.purchaseOrder.settlementPrice = options.basisPrice
 				this.purchaseOrder.procurementPlanType = options.procurementPlanType
@@ -248,14 +248,14 @@
 						url: `/pageA/product/Identity_switching?goodsName=${this.purchaseOrder.goodsName}
 						&receivePrivate=${this.purchaseOrder.receivePrivate}&receiveCity=${this.purchaseOrder.receiveCity}
 						&receiveArea=${this.purchaseOrder.receiveArea}&minimumVolume=${this.purchaseOrder.minimumVolume}
-						&buyer=${this.purchaseOrder.buyer}&basisPrice=${this.purchaseOrder.basis}&unitPrice=${this.purchaseOrder.unitPrice}
+						&buyer=${this.purchaseOrder.buyer}&basisPrice=${this.purchaseOrder.basis}&procurementPrice=${this.purchaseOrder.procurementPrice}
 						&receiveWarehouse=${this.purchaseOrder.receiveWarehouse}&procurementPlanType=${this.purchaseOrder.procurementPlanType}
 						&procurementPlanNo=${this.purchaseOrder.procurementPlan}`
 					})
 				},
 				commit(){
 					if(!this.purchaseOrder.transactionsNumber){
-						this.$api.msg('出售价格不能为空')
+						this.$api.msg('出售数量不能为空')
 						return
 					}
 					if(this.purchaseOrder.transactionsNumber>10000||this.purchaseOrder.transactionsNumber<1){
@@ -309,27 +309,27 @@
 							if (res.confirm) {
 								that.$api.doRequest('post','/purchaseOrder/api/insertPurchaseOrder', that.purchaseOrder).then(res => {
 									if(res.data.code==200){
-										// that.$api.doRequest('post','/purchaseOrder/api/submitPurchaseOrder', {id:res.data.data}).then(res1 => {
-										// 	if(res1.data.code==200){
+										that.$api.doRequest('post','/purchaseOrder/api/submitPurchaseOrder', {id:res.data.data}).then(res1 => {
+											if(res1.data.code==200){
 												uni.showToast({
 													title: '提交成功，等待买方回复',
 													icon: 'none',
 													duration: 2000
 												})
-										// 	}else{
-										// 		uni.showToast({
-										// 			title: res.data.message,
-										// 			icon: 'none',
-										// 			duration: 2000
-										// 		})
-										// 	}
-										// }).catch(res => {
-										// 	uni.showToast({
-										// 		title: res.data.message,
-										// 		icon: 'none',
-										// 		duration: 2000
-										// 	})
-										// })
+											}else{
+												uni.showToast({
+													title: res.data.message,
+													icon: 'none',
+													duration: 2000
+												})
+											}
+										}).catch(res => {
+											uni.showToast({
+												title: res.data.message,
+												icon: 'none',
+												duration: 2000
+											})
+										})
 										// uni.navigateBack();
 									}else{
 										uni.showToast({
@@ -339,8 +339,9 @@
 										})
 									}
 								}).catch(res => {
+									console.log(res)
 									uni.showToast({
-										title: res.data.message,
+										title: res.errMsg,
 										icon: 'none',
 										duration: 2000
 									})

pageA/product/detail.vue

@@ -77,7 +77,7 @@
 				<view v-if='goods.procurementPlanType=="现货"' class="c-row">
 					<text class="tit">采购价格(元/吨)</text>
 					<view class="con-list">
-						<text>{{goods.unitPrice}}</text>
+						<text>{{goods.procurementPrice}}</text>
 					</view>
 				</view>
 				<view v-else class="c-row">
@@ -392,7 +392,7 @@
 							uni.navigateTo({
 								url: `/pageA/product/business_buy?id=${this.goods.id}&receiveArea=${this.goods.receiveArea}&minimumVolume=${this.goods.minimumVolume}
 										&goodsName=${this.goods.goodsName}&receiveCity=${this.goods.receiveCity}&receivePrivate=${this.goods.receivePrivate}&buyer=${this.goods.buyer}
-										&basisPrice=${this.goods.basisPrice}&unitPrice=${this.goods.unitPrice}&receiveWarehouse=${this.goods.receiveWarehouse}
+										&basisPrice=${this.goods.basisPrice}&procurementPrice=${this.goods.procurementPrice}&receiveWarehouse=${this.goods.receiveWarehouse}
 										&procurementPlanType=${this.goods.procurementPlanType}&procurementPlan=${this.goods.procurementPlanNo}&compId=${this.goods.compId}`
 							// 	url: `/pageA/product/business_buy?id=${this.goods.id}&packing=${this.goods.packing}}&province=${this.goods.province}
 							// 	&city=${this.goods.city}&area=${this.goods.area}&storeName=${this.goods.storeName}&seller=${this.goods.seller}

pageA/product/lookup.vue

@@ -4,10 +4,10 @@
 			<view style='background:#fff;display:flex;' class="cu-bar search">
 			<view style='flex:6;' class="search-form round" >
 				<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
-				<input type="text" v-model="searchKeyWord" @input="doSearch" placeholder="请输入货名或标题" confirm-type="search"></input>
+				<input type="text" v-model="searchKeyWord" @input='search' placeholder="请输入货名或标题" confirm-type="search"></input>
 				
 			</view>
-			<view @click='emptysearch1' style="width:4%;flex:1;">{{content}}</view>
+			<view @click='doSearch()' style="width:4%;flex:1;">搜索</view>
 			<text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text>
 			</view>
 			<!-- mSearch组件 如果使用原样式，删除组件元素-->
@@ -177,18 +177,63 @@
 				this.loadHotKeyword();
 
 			},
+			search(e){
+				if(e.detail.value.length==0){
+					this.isShowKeywordList=false
+					this.loadOldKeyword()
+					this.loadHotKeyword()
+				}
+			},
 			blur(){
 				uni.hideKeyboard()
 			},
-			emptysearch1(){
-				if(this.content=='取消'){
-					this.searchKeyWord=''
-					this.content='搜索'
+			doSearch(keyword){
+				console.log(keyword)
+				if(keyword){
+					this.searchKeyWord=keyword.searchContent
+
+				}
+				if(this.searchKeyWord.length>0){
+						this.isShowKeywordList=true
+						this.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{commonId:this.userInfo.id,searchContent:this.searchKeyWord}).then(res => {
+						})
+						.catch(res => {
+							
+						});
+					}else{
+						this.isShowKeywordList=false
+						this.loadOldKeyword()
+						this.loadHotKeyword()
+					}
+				uni.showLoading({
+					title: '正在加载',
+					mask:true
+				})
+				var param1=''
+				if (this.TabCur == 0) {
+					param1 = '/procurementPlanInfo/selectProcurementPlanInfo'
+				} else {
+					param1 = '/salePlanInfo/selectSalePlanInfo'
 				}
+				this.$api.doRequest('get', param1,{pageSize:this.pageSize,
+				currentPage:this.currentPage,searchKeyWord:this.searchKeyWord}).then(res => {
+					uni.hideLoading()
+					this.keywordList=res.data.data.records
+				})
+				.catch(res => {
+					uni.hideLoading()
+					uni.showToast({
+						title: res.errmsg,
+						icon:'none',
+						duration: 2000
+					})
+				});
 			},
 			emptysearch(){
 				this.searchKeyWord=''
-				this.content='搜索'
+				this.isShowKeywordList=false
+				this.loadOldKeyword()
+				this.loadHotKeyword()
 			},
 			loadHotKeyword(){
 				this.$api.doRequest('get', '/searchRecordsInfo/selectRecommendedSearchRecordsInfo',{pageSize:this.pageSize,
@@ -323,74 +368,74 @@
 			hotToggle() {
 				this.forbid = this.forbid ? '' : '_forbid';
 			},
-			//执行搜索
-			doSearch(e) {
-				if(e.detail){
-					if(e.detail.value.length>0){
-						this.content='取消'
-						this.isShowKeywordList=true
-						this.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{commonId:this.userInfo.id,searchContent:e.detail.value}).then(res => {
-						})
-						.catch(res => {
+			// //执行搜索
+			// doSearch(e) {
+			// 	if(e.detail){
+			// 		if(e.detail.value.length>0){
+			// 			this.content='取消'
+			// 			this.isShowKeywordList=true
+			// 			this.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{commonId:this.userInfo.id,searchContent:e.detail.value}).then(res => {
+			// 			})
+			// 			.catch(res => {
 							
-						});
-					}else{
-						this.content='搜索'
-						this.isShowKeywordList=false
-						this.loadOldKeyword()
-						this.loadHotKeyword()
-					}
-				}
-				else if(e){
-					if(e.length>0){
-						this.isShowKeywordList=true
-						this.content='取消'
-						this.searchKeyWord = e
-						this.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{commonId:this.userInfo.id,searchContent:e}).then(res => {
-						})
-						.catch(res => {
+			// 			});
+			// 		}else{
+			// 			this.content='搜索'
+			// 			this.isShowKeywordList=false
+			// 			this.loadOldKeyword()
+			// 			this.loadHotKeyword()
+			// 		}
+			// 	}
+			// 	else if(e){
+			// 		if(e.length>0){
+			// 			this.isShowKeywordList=true
+			// 			this.content='取消'
+			// 			this.searchKeyWord = e
+			// 			this.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{commonId:this.userInfo.id,searchContent:e}).then(res => {
+			// 			})
+			// 			.catch(res => {
 							
-						})
-					}else{
-						this.content='搜索'
-						this.isShowKeywordList=false
-						this.loadOldKeyword()
-						this.loadHotKeyword()
-					}
-				}
-				uni.showLoading({
-					title: '正在加载',
-					mask:true
-				})
-				var param1=''
-				if (this.TabCur == 0) {
-					param1 = '/procurementPlanInfo/selectProcurementPlanInfo'
-				} else {
-					param1 = '/salePlanInfo/selectSalePlanInfo'
-				}
-				this.$api.doRequest('get', param1,{pageSize:this.pageSize,
-				currentPage:this.currentPage,searchKeyWord:this.searchKeyWord}).then(res => {
-					uni.hideLoading()
-					this.keywordList=res.data.data.records
-				})
-				.catch(res => {
-					uni.hideLoading()
-					uni.showToast({
-						title: res.errmsg,
-						icon:'none',
-						duration: 2000
-					})
-				});
-				// console.log(key)
-				// console.log(this.keyword)
-				// key = key ? key : this.keyword ? this.keyword : this.defaultKeyword;
-				// this.keyword = key;
-				// this.saveKeyword(key); //保存为历史 
-				// var TabCur = this.TabCur
-				// uni.navigateTo({
-				// 	url: `/pageA/product/querylist?keywords=${key}&TabCur=${TabCur}`
-				// })
-			},
+			// 			})
+			// 		}else{
+			// 			this.content='搜索'
+			// 			this.isShowKeywordList=false
+			// 			this.loadOldKeyword()
+			// 			this.loadHotKeyword()
+			// 		}
+			// 	}
+			// 	uni.showLoading({
+			// 		title: '正在加载',
+			// 		mask:true
+			// 	})
+			// 	var param1=''
+			// 	if (this.TabCur == 0) {
+			// 		param1 = '/procurementPlanInfo/selectProcurementPlanInfo'
+			// 	} else {
+			// 		param1 = '/salePlanInfo/selectSalePlanInfo'
+			// 	}
+			// 	this.$api.doRequest('get', param1,{pageSize:this.pageSize,
+			// 	currentPage:this.currentPage,searchKeyWord:this.searchKeyWord}).then(res => {
+			// 		uni.hideLoading()
+			// 		this.keywordList=res.data.data.records
+			// 	})
+			// 	.catch(res => {
+			// 		uni.hideLoading()
+			// 		uni.showToast({
+			// 			title: res.errmsg,
+			// 			icon:'none',
+			// 			duration: 2000
+			// 		})
+			// 	});
+			// 	// console.log(key)
+			// 	// console.log(this.keyword)
+			// 	// key = key ? key : this.keyword ? this.keyword : this.defaultKeyword;
+			// 	// this.keyword = key;
+			// 	// this.saveKeyword(key); //保存为历史 
+			// 	// var TabCur = this.TabCur
+			// 	// uni.navigateTo({
+			// 	// 	url: `/pageA/product/querylist?keywords=${key}&TabCur=${TabCur}`
+			// 	// })
+			// },
 			tabcarchange(status){
 				this.TabCur=status
 				var param1 = ''

pageB/contract/contract.vue

@@ -1,10 +1,10 @@
 <template>
-	<view class="center">	
+	<view class="center">
 		<view v-for="(item , index) in lists" :Key="index" class="region">
 			<view>
 				<view class="c-row ">
 					<text class="tit" v-if="item.orderType == '采购'">{{item.orderType}}</text>
-						<text class="tit2" v-if="item.orderType == '销售'">{{item.orderType}}</text>
+					<text class="tit2" v-if="item.orderType == '销售'">{{item.orderType}}</text>
 					<view class="enterprise">
 						编号{{item.contractNo}}({{item.procurementPlanType}})
 					</view>
@@ -14,12 +14,12 @@
 					<text class="status status1" v-if="item.status == '审核中'">{{item.status}}</text>
 					<text class="status status1" v-if="item.status == '执行中'">{{item.status}}</text> -->
 					<text class="status status1">{{item.status}}</text>
-					
+
 				</view>
 			</view>
 			<view>
 				<view class="c-row ">
-					<text class="tit1" v-if="item.orderType == '采购'" >买方</text>
+					<text class="tit1" v-if="item.orderType == '采购'">买方</text>
 					<text class="tit1" v-if="item.orderType == '销售'">卖方</text>
 					<view class="enterprise">
 						{{item.contracter}}
@@ -32,9 +32,15 @@
 				<view class="title">基差:￥<text>{{item.basis}}</text></view>
 			</view>
 			<view class="c-row flex annius">
-				<text class="anniu" @click="commit"> 附件</text>
-				<text class="anniu" @click="someprice(item)" v-if="item.procurementPlanType == '期货' && (item.status == '已成交' || item.status == '已挂单')"> 点价</text>
+				<text class="anniu" @click="commit(item)"> 附件</text>
+				<text class="anniu" @click="someprice(item)"
+					v-if="item.procurementPlanType == '期货' && (item.status == '已成交' || item.status == '已挂单')"> 点价</text>
 				<text class="anniu1" @click="commit1(item)" v-if="item.orderType == '采购'"> 发货</text>
+
+			<!-- 	<text class="anniu" @click="commit"> 附件</text>
+				<text class="anniu" @click="someprice(item)" v-if="item.procurementPlanType == '期货' && (item.status == '已成交' || item.status == '已挂单')"> 点价</text>
+				<text class="anniu1" @click="commit1(item)" v-if="item.orderType == '采购'&&item.status != '待审核'"> 发货</text> -->
+
 				<text class="anniu1" @click="commit2(item)" v-if="item.orderType == '销售'"> 收货</text>
 			</view>
 		</view>
@@ -59,7 +65,7 @@
 					<view class="timeslot">15：20 ~ 20：00</view>
 					<view class="timeslot">23：00 ~ 08：00</view>
 				</view>
-				<view  class="cancel" @click='shadestatus=false'>知道了</view>
+				<view class="cancel" @click='shadestatus=false'>知道了</view>
 			</view>
 		</view>
 		<view class="padding flex flex-direction">
@@ -90,7 +96,7 @@
 					pageSize: 10,
 					currentPage: 1
 				},
-				price:"",
+				price: "",
 				tran: {
 					total: 0,
 					price: 0,
@@ -221,6 +227,11 @@
 					this.shadestatus = true
 				}
 			},
+			commit(item) {
+				uni.navigateTo({
+					url: `/pageB/contract/enclosures?id=${item.id}`
+				})
+			},
 			commit1(item) {
 				uni.navigateTo({
 					url: `/pageB/contract/look?id=${item.id}&contractNo=${item.contractNo}&contracter=${item.contracter}&goodsName=${item.goodsName}`
@@ -233,7 +244,7 @@
 			},
 			getList() {
 				this.goods.commonId = this.userInfo.id
-                 // this.goods.pcFlag = 0
+				// this.goods.pcFlag = 0
 				this.$api.doRequest('get', '/purchaseOrder/selectPurchaseOrderApp', this.goods).then(res => {
 						if (res.data.code == 200) {
 							this.lists = res.data.data.records
@@ -717,7 +728,7 @@
 		width: 100%;
 		background: rgba(0, 0, 0, 0.5);
 		height: 100%;
-		
+
 		z-index: 999999;
 	}
 
@@ -799,6 +810,7 @@
 		padding: 2px 3px;
 		border-radius: 5px;
 	}
+
 	.tit2 {
 		width: 34px;
 		height: 24px;
@@ -813,12 +825,14 @@
 		font-weight: 600;
 		margin-left: 20px;
 	}
-	.annius{
+
+	.annius {
 		width: 70%;
-	    margin-left: 110px;
-		justify-content:flex-end;
+		margin-left: 110px;
+		justify-content: flex-end;
 	}
-	.anniu{
+
+	.anniu {
 		width: 50px;
 		font-size: 16px;
 		border: 1px solid #CDCDCD;
@@ -828,7 +842,8 @@
 		text-align: center;
 		line-height: 30px;
 	}
-	.anniu1{
+
+	.anniu1 {
 		width: 50px;
 		font-size: 16px;
 		border: 1px solid #22C572;
@@ -839,68 +854,79 @@
 		text-align: center;
 		line-height: 30px;
 	}
-	.titles{
+
+	.titles {
 		color: #333333;
 		font-size: 16px;
 		font-weight: 600;
 		margin-top: -16px;
 		margin-bottom: 10px;
-		
+
 	}
-	.timeslot{
+
+	.timeslot {
 		font-size: 14px;
 		color: #333333;
 		height: 20px;
 	}
-	.cancel{
+
+	.cancel {
 		text-align: center;
 		width: 100%;
-		color:#22C572;
+		color: #22C572;
 		border-top: 1px solid #EEEEEE;
 		margin-bottom: 6px;
 		font-size: 18px;
 		line-height: 40px;
-		display:inline-block;
-		}
-		.pointprice{
-			border-bottom: 1px solid #EEEEEE;
-			text-align: left;
-			padding-left: 10px;
-			width: 70%;
-			margin: 0 auto;
-		}
-		.titles1{
-			color: #333333;
-			font-size: 16px;
-			font-weight: 600;
-			margin-top: 10px;
-		}
-		.btns{
-			width: 50%;
-			line-height: 50px;
-			font-size: 18px;
-			border-top: 1px solid #EEEEEE;
-			margin-top: -20px;
-		}
-		.btn1{
-			color: #AFB3BF;
-			border-right: 1px solid #EEEEEE;
-		}
-		.btn2{
-			color: #22C572;
-		}
-		.status{
-			right: 20px;
-			position: absolute;
-		}
-		.status1{
-			color: #FE6430;
-		}
-		.status2{
-			color: #22C572;
-		}
-		.status3{
-			color: #AFB3BF;
-		}
-	
+		display: inline-block;
+	}
+
+	.pointprice {
+		border-bottom: 1px solid #EEEEEE;
+		text-align: left;
+		padding-left: 10px;
+		width: 70%;
+		margin: 0 auto;
+	}
+
+	.titles1 {
+		color: #333333;
+		font-size: 16px;
+		font-weight: 600;
+		margin-top: 10px;
+	}
+
+	.btns {
+		width: 50%;
+		line-height: 50px;
+		font-size: 18px;
+		border-top: 1px solid #EEEEEE;
+		margin-top: -20px;
+	}
+
+	.btn1 {
+		color: #AFB3BF;
+		border-right: 1px solid #EEEEEE;
+	}
+
+	.btn2 {
+		color: #22C572;
+	}
+
+	.status {
+		right: 20px;
+		position: absolute;
+	}
+
+	.status1 {
+		color: #FE6430;
+	}
+
+	.status2 {
+		color: #22C572;
+	}
+
+	.status3 {
+		color: #AFB3BF;
+	}
 </style>

pageB/contract/enclosures.vue

@@ -0,0 +1,13 @@
+<template>
+	<view class="center">
+		<view class="">
+			
+		</view>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

pageB/contract/look.vue

@@ -49,7 +49,7 @@
 						<text>{{item.deductionAmount}}</text>
 					</view>
 				</view>
-				<view class="c-row b-b" v-if=" item.deductionItems == null && item.confirmFlag == 1">
+				<view class="c-row b-b" v-if=" item.deductionItems != null">
 					<text class="tit">扣款原因</text>
 					<view class="con-list">
 						<text>{{item.deductionItems}}</text>
@@ -62,22 +62,20 @@
 					</view>
 				</view>
 				<view  v-if='item.unloadPoundImg'>
-					<view class="poundtitle">发货磅单</view>
+					<view class="poundtitle">收货磅单</view>
 					<view class="poundlists">
-						<image :src="item.loadPoundImg" mode="" class="poundlist"></image>
+						<image :src="item.unloadPoundImg" mode="" class="poundlist"></image>
 					</view>
 				</view>
-
+				<button v-if='item.confirmFlag!=3' class=" btn btns unload" style="background-color: #22C572; color: #FFFFFF ;width:80%;"
+					@click="confirmunload(item)" >确认卸货</button>
 			</view>
 		</view>
 		<view class="c-list">
-				<button class=" btn btns" style="background-color: #FFFFFF; "
+				<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>
-			
 		</view>
 		<view v-if='imgstatus' class='shade'>
 			<view class='shade-content'>
@@ -198,6 +196,11 @@
 						id: item.id
 					}).then(res => {
 						if (res.data.code == 200) {
+							uni.showToast({
+								title: '卸货成功',
+								icon: 'none',
+								duration: 2000
+							})
 							item.confirmFlag = 3
 						}
 					})
@@ -980,6 +983,7 @@
 		background-color: #FFFFFF;
 		margin-top: 20px;
 		border-radius: 20px;
+		padding-bottom:20px;
 		/* 	padding: 5px 10px; */
 	}
 
@@ -1032,4 +1036,7 @@
 		margin-left: 14px;
 		margin-top: 10px;
 	}
+	.unload{
+		
+	}
 </style>

pageD/identity/companyIdentityThree.vue

@@ -12,7 +12,6 @@
 					</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">
@@ -67,13 +66,13 @@
 		<view class="c-row b-b">
 			<text class="tit">手机号</text>
 			<view class="con-list">
-				<input placeholder="请填写手机号" v-model="identityAuthenticationInfo.customerPhone"></input>
+				<input placeholder="请填写手机号" @input='phoneinput' v-model="identityAuthenticationInfo.customerPhone"></input>
 			</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>
-			<view style='width:70%;position:relative;margin-left: 200px;'>
-				<input v-model='verifyCode' placeholder="请输入验证码" type="number">
+			<view  class="con-list" style='width:70%;position:relative;'>
+				<input style='text-align:right;' v-model='verifyCode' placeholder="请输入验证码" type="number">
 			</view>
 		</view>
 		<view class="c-row b-b" v-if="identityAuthenticationInfo.customerTypeFlag == 2">
@@ -119,6 +118,7 @@
 				certificatesTwo: true,
 				zhihangStatus: true,
 				verification: true,
+				identityAuthenticationInfos:{},
 			}
 		},
 		computed: {
@@ -278,7 +278,7 @@
 					this.$api.msg('手机号填写不正确')
 					return
 				}
-				if(!this.verifyCode){
+				if (!this.verifyCode) {
 					this.$api.msg('请填写验证码')
 					return
 				}
@@ -324,6 +324,7 @@
 
 			},
 			phoneinput(e) {
+				console.log(e.detail.value.length)
 				if (e.detail.value.length == 11) {
 					this.codestatus = true
 				}
@@ -335,73 +336,79 @@
 						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.identityAuthenticationInfo.commonId = that.userInfo.id
+							that.identityAuthenticationInfo.payeeAddressUrl = that.bankid.toString()
+							that.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+							uni.showModal({
+								content: "粮商身份信息审核通过后不可修改，是否确定提交？",
+								showCancel: true,
+								confirmText: '确定',
+								success: function(res) {
+									if (res.confirm) {
+										that.identityAuthenticationInfos.customerPhone = that.identityAuthenticationInfo.customerPhone
+										that.$api.doRequest('get',
+												'/identityAuthenticationInfo/selectPhone', that
+												.identityAuthenticationInfos)
+											.then(res => {
+												if (res.data.code == '11018') {
+													uni.showModal({
+														title: '提示',
+														content: '该手机号已认证过个人粮商，再次认证将覆盖之前的认证信息，是否确定认证？',
+														success: function(res) {
+															if (res.confirm) {
+																that.$api.doRequest('post',
+																		'/identityAuthenticationInfo/api/addIdentityAuthenticationInfo',that.identityAuthenticationInfo)
+																	.then(res => {
+																		if (res.data.code == 200) {
+																			uni.showToast({
+																				title: '提交成功',
+																				icon: 'none',
+																				duration: 2000
+																			})
+																			uni.navigateTo({
+																				url: `/pages/attestation/indexTwo`,
+																			})
+																		}
+																	})
+															} else if (res.cancel) {
+																uni.showToast({
+																	title: '提交失败',
+																	icon: 'none',
+																	duration: 2000
+																})
+															}
+														}
+													});
+												} else if (res.data.code == 200) {
 													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
+															'/identityAuthenticationInfo/api/addIdentityAuthenticationInfo',
+															that.identityAuthenticationInfo)
+														.then(res => {
+															if (res.data.code == 200) {
+																uni.showToast({
+																	title: '提交成功',
+																	icon: 'none',
+																	duration: 2000
+																})
+																uni.navigateTo({
+																	url: `/pages/attestation/indexTwo`,
+
+																})
+															}
 														})
-													})
-												} 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 if (res.cancel) {
+										// console.log('用户点击取消');
 									}
-
-								}).catch(res => {
-									uni.showToast({
-										title: res.data.message,
-										icon: 'none',
-										duration: 2000
-									})
-								})
-
+								}
+							})
 						} else {
 							that.verification = false
 							uni.showToast({
@@ -484,6 +491,7 @@
 		align-items: center;
 		padding: 20rpx 30rpx;
 		position: relative;
+		font-size:14px;
 	}
 
 	.con-list {
@@ -501,7 +509,7 @@
 		line-height: 40rpx;
 		text-align: right;
 		padding-right: 20rpx;
-		font-size: 14px;
+		font-size: 12px;
 	}
 
 	.btn {
@@ -534,7 +542,8 @@
 	}
 
 	.getcode.active {
-		border: none;
+		background:#22C572;
+		color:#fff;
 	}
 
 	.words {

pageD/identity/driverIdentity.vue

@@ -39,7 +39,7 @@
 			<view class="c-row b-b">
 				<text class="tit">手机号</text>
 				<view class="con-list">
-					<input placeholder="请填写手机号" name="input" v-model="DriverViewInfo.driverPhone"></input>
+					<input placeholder="请填写手机号" maxlength = "11"  name="input" v-model="DriverViewInfo.driverPhone"></input>
 				</view>
 			</view>
 			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
@@ -48,7 +48,7 @@
 				<view style='width:70%;position:relative;margin-left: 200px;'>
 					<view class="con-list">
 						<!-- style='width:70%;position:relative;margin-left: 200px;' -->
-						<input v-model='verifyCode' placeholder="请输入验证码" type="text">
+						<input v-model='verifyCode' maxlength = "6"  placeholder="请输入验证码" type="text">
 					</view>
 				</view>
 			</view>

pageD/identity/driverIdentityEdit.vue

@@ -233,8 +233,8 @@
 				id2:"",
 				travels:"",
 				drives:"",
-				practices:"",
 				operates:"",
+				practices:"",
 				// bank1:"",
 				// bank2:"",
 				// bankid:[],
@@ -358,8 +358,8 @@
 							this.address = this.drivers.addressUrl.split(","),
 								this.travels = this.address[0]
 							this.drives = this.address[1]
-							this.practices = this.address[2]
-							this.operates = this.address[3]
+							this.operates = this.address[2]
+							this.practices = this.address[3]
 						}
 					})
 					.catch(res => {

pageD/identity/driverIdentityThree.vue

@@ -1,43 +1,47 @@
 <template>
 	<view class="center">
 		<view class="picture">
-			<view style="margin: 0 auto;height: 240px;" v-if="travels != ''"  @click="travel">
-				<image v-bind:src = "travels"  class="picture"></image>
+			<view style="margin: 0 auto;height: 240px;" v-if="travels != ''" @click="travel">
+				<image v-bind:src="travels" class="picture"></image>
 				<view class="floats" v-if="certificates == true">
-					<image src="../../static/img/authentication/xiangji@3x.png" style="width: 60px;height: 50px;"></image>
-				   <view class="words">
-				   	上传行驶证
-				   </view>
+					<image src="../../static/img/authentication/xiangji@3x.png" style="width: 60px;height: 50px;">
+					</image>
+					<view class="words">
+						上传行驶证
+					</view>
 				</view>
 			</view>
-			<view style="margin: 0 auto;height: 240px;" v-if="drives != ''"  @click="drive">
-				<image v-bind:src = "drives"  class="picture"></image>
+			<view style="margin: 0 auto;height: 240px;" v-if="drives != ''" @click="drive">
+				<image v-bind:src="drives" class="picture"></image>
 				<view class="floats" v-if="certificatesTwo == true">
-					<image src="../../static/img/authentication/xiangji@3x.png" style="width: 60px;height: 50px;"></image>
-				   <view class="words">
-				   	上传驾驶证
-				   </view>
+					<image src="../../static/img/authentication/xiangji@3x.png" style="width: 60px;height: 50px;">
+					</image>
+					<view class="words">
+						上传驾驶证
+					</view>
 				</view>
 			</view>
-			<view style="margin: 0 auto;height: 240px;" v-if="practices != ''"  @click="practice">
-				<image v-bind:src = "practices"  class="picture"></image>
+			<view style="margin: 0 auto;height: 240px;" v-if="practices != ''" @click="practice">
+				<image v-bind:src="practices" class="picture"></image>
 				<view class="floats" v-if="certificatesThree == true">
-					<image src="../../static/img/authentication/xiangji@3x.png" style="width: 60px;height: 50px;"></image>
-				   <view class="words">
-				   	上传道路运营证
-				   </view>
+					<image src="../../static/img/authentication/xiangji@3x.png" style="width: 60px;height: 50px;">
+					</image>
+					<view class="words">
+						上传道路运营证
+					</view>
 				</view>
 			</view>
 			<view style="margin: 0 auto;height: 240px;" v-if="operates != ''" class="fujian" @click="operate">
-				<image v-bind:src = "operates"  class="picture"></image> 
+				<image v-bind:src="operates" class="picture"></image>
 				<view class="floats" v-if="certificatesFour == true">
-					<image src="../../static/img/authentication/xiangji@3x.png" style="width: 60px;height: 50px;"></image>
-				   <view class="words">
-				   	上传从业资格证
-				   </view>
+					<image src="../../static/img/authentication/xiangji@3x.png" style="width: 60px;height: 50px;">
+					</image>
+					<view class="words">
+						上传从业资格证
+					</view>
 				</view>
 			</view>
-			 <button class="btns btn"  @click="commit">提交</button>
+			<button class="btns btn" @click="commit">提交</button>
 
 		</view>
 
@@ -55,41 +59,37 @@
 				drives: "../../static/img/authentication/drive(3).png",
 				practices: "../../static/img/authentication/business@3x.png",
 				operates: "../../static/img/authentication/business@3x.png",
-				DriverViewInfo: {	
-				},
-				addressUrl:[],
-				certificates:true,
-				certificatesTwo:true,
-				certificatesThree:true,
-				certificatesFour:true,
+				DriverViewInfo: {},
+				addressUrl: [],
+				certificates: true,
+				certificatesTwo: true,
+				certificatesThree: true,
+				certificatesFour: true,
+				identityAuthenticationInfo:{},
 			}
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
-		onLoad(options){
+		onLoad(options) {
 			this.DriverViewInfo = JSON.parse(options.DriverViewInfo)
 		},
-		methods:{
+		methods: {
 			commit() {
 				var that = this
 				if (this.addressUrl[0] == "" || this.addressUrl[0] == null) {
-					console.log(this.addressUrl)
 					this.$api.msg('请上传行驶证！')
 					return
 				}
 				if (this.addressUrl[1] == "" || this.addressUrl[1] == null) {
-					console.log(this.addressUrl)
 					this.$api.msg('请上传驾驶证！')
 					return
 				}
 				if (this.addressUrl[2] == "" || this.addressUrl[2] == null) {
-					console.log(this.addressUrl)
 					this.$api.msg('请上传道路运营证！')
 					return
 				}
 				if (this.addressUrl[3] == "" || this.addressUrl[3] == null) {
-					console.log(this.addressUrl)
 					this.$api.msg('请上传从业资格证')
 					return
 				}
@@ -97,92 +97,227 @@
 				this.DriverViewInfo.commonId = this.userInfo.id
 				this.DriverViewInfo.pcFlag = 0
 				this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
-				this.$api.doRequest('post', '/driverViewInfo/api/addInfo', this.DriverViewInfo).then(res => {
-					if(res.data.code=='ERROR001'){
-						uni.showModal({
-							title: '提示',
-							content: '该手机号已认证过司机，再次认证将覆盖之前的认证信息，是否确定认证？',
-							success: function (res) {
+
+				var that = this
+				that.identityAuthenticationInfo.driverPhone = that.DriverViewInfo.driverPhone
+				uni.showModal({
+							content: "确认提交司机信息？",
+							showCancel: true,
+							confirmText: '确定',
+							success: function(res) {
 								if (res.confirm) {
-									that.DriverViewInfo.cover=1
-										that.$api.doRequest('post', '/driverViewInfo/api/editInfo', that.DriverViewInfo).then(res => {
+									that.$api.doRequest('get', '/driverViewInfo/selectPhone', that.identityAuthenticationInfo)
+										.then(res => {
+											if (res.data.code == '11018') {
+												uni.showModal({
+													title: '提示',
+													content: '该手机号已认证过司机，再次认证将覆盖之前的认证信息，是否确定认证？',
+													success: function(res) {
+														if (res.confirm) {
+													
+															console.log(that.identityAuthenticationInfo, "已覆盖")
+															that.$api.doRequest('post','/driverViewInfo/api/addInfo', that.DriverViewInfo).then(res => {
+																if (res.data.code == 200) {
+																	uni.showToast({
+																		title: '提交成功',
+																		icon: 'none',
+																		duration: 2000
+																	})
+																	uni.navigateTo({
+																		url: `/pages/attestation/indexThree`
+																	})
+																} else if (res.data.code ==
+																	'ERROR002') {
+																	uni.showModal({
+																		title: '提示',
+																		content: '司机身份证号重复,添加失败',
+																	});
+																	uni.navigateTo({
+																		url: `/pages/attestation/indexThree`
+																	})
+																} else if (res.data.code == 'ERROR003') {
+																	uni.showModal({
+																		title: '提示',
+																		content: '收款人身份证号重复,添加失败',
+																	});
+																	uni.navigateTo({
+																		url: `/pages/attestation/indexThree`
+																	})
+																}
+															})
+														} else if (res.cancel) {
+															uni.showToast({
+																title: '提交失败',
+																icon: 'none',
+																duration: 2000
+															})
+														}
+													}
+												});
+											}else if(res.data.code == 200){
+												that.$api.doRequest('post','/driverViewInfo/api/addInfo', that.DriverViewInfo).then(res => {
+														if (res.data.code == 200) {
+															uni.showToast({
+																title: '提交成功',
+																icon: 'none',
+																duration: 2000
+															})
+															uni.navigateTo({
+																url: `/pages/attestation/indexThree`
+															})
+														} else if (res.data.code =='ERROR002') {
+															uni.showModal({
+																title: '提示',
+																content: '司机身份证号重复,添加失败',
+															});
+															uni.navigateTo({
+																url: `/pages/attestation/indexThree`
+															})
+														} else if (res.data.code == 'ERROR003') {
+															uni.showModal({
+																title: '提示',
+																content: '收款人身份证号重复,添加失败',
+															});
+															uni.navigateTo({
+																url: `/pages/attestation/indexThree`
+															})
+														}
+													})
+												// } else if (res.cancel) {
+												// 	uni.showToast({
+												// 		title: '提交失败',
+												// 		icon: 'none',
+												// 		duration: 2000
+												// 	})
+												// }
+											}
 										}).catch(res => {
 											uni.showToast({
-												title: '提交成功',
+												title: res.data.message,
 												icon: 'none',
 												duration: 2000
 											})
-											uni.navigateTo({
-												url: `/pages/attestation/indexThree` 
-											})
 										})
-							        } 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/indexThree` 
-						})
-					}
-					
-				}).catch(res => {
-						uni.showToast({
-							title: res.data.message,
-							icon: 'none',
-							duration: 2000
-						})
-				})
-			},
-			travel(){
-				var that = this
-				wx.chooseImage({
-					success: function(res) {
-						wx.uploadFile({
-							url: 'https://www.zthymaoyi.com/upload/admin',
-							filePath: res.tempFilePaths[0],
-							name: 'file',
-							success(res) {
-								var data = res.data
-								var strToObj = JSON.parse(data)			
-								that.travels = strToObj.url
-								that.addressUrl[0] = strToObj.url
-								that.certificates = false
+
+
+
+									// 	that.$api.doRequest('post', '/driverViewInfo/api/addInfo', that.DriverViewInfo)
+									// 		.then(res => {
+									// 			if (res.data.code == 'ERROR001') {
+									// 				uni.showModal({
+									// 					title: '提示',
+									// 					content: '该手机号已认证过司机，再次认证将覆盖之前的认证信息，是否确定认证？',
+									// 					success: function(res) {
+									// 						if (res.confirm) {
+									// 							that.DriverViewInfo.cover = 1
+									// 							that.$api.doRequest('post',
+									// 								'/driverViewInfo/api/editInfo',
+									// 								that.DriverViewInfo).then(
+									// 								res => {}).catch(res => {
+									// 								uni.showToast({
+									// 									title: '提交成功',
+									// 									icon: 'none',
+									// 									duration: 2000
+									// 								})
+									// 								uni.navigateTo({
+									// 									url: `/pages/attestation/indexThree`
+									// 								})
+									// 							})
+									// 						} else if (res.cancel) {
+									// 							uni.showToast({
+									// 								title: '提交失败',
+									// 								icon: 'none',
+									// 								duration: 2000
+									// 							})
+									// 						}
+									// 					}
+									// 				});
+									// 			} else if (res.data.code == 'ERROR002') {
+									// 				uni.showModal({
+									// 					title: '提示',
+									// 					content: '司机身份证号重复',
+									// 				});
+									// 			} else if (res.data.code == 'ERROR003') {
+									// 				uni.showModal({
+									// 					title: '提示',
+									// 					content: '收款人身份证号重复',
+									// 				});
+									// 			} else if (res.data.code == 200) {
+									// 				uni.showToast({
+									// 					title: '提交成功',
+									// 					icon: 'none',
+									// 					duration: 2000
+									// 				})
+									// 				uni.navigateTo({
+									// 					url: `/pages/attestation/indexThree`
+									// 				})
+									// 			} else if (res.data.code == 200) {
+									// 				uni.showToast({
+									// 					title: '提交成功',
+									// 					icon: 'none',
+									// 					duration: 2000
+									// 				})
+									// 				uni.navigateTo({
+									// 					url: `/pages/attestation/indexThree`
+									// 				})
+									// 			}
+
+									// 		}).catch(res => {
+									// 			uni.showToast({
+									// 				title: res.data.message,
+									// 				icon: 'none',
+									// 				duration: 2000
+									// 			})
+									// 		})
+									} else if (res.cancel) {
+										// console.log('用户点击取消');
+									}
+								},
+
+							})
+
+
+
+					},
+					travel() {
+						var that = this
+						wx.chooseImage({
+							success: function(res) {
+								wx.uploadFile({
+									url: 'https://www.zthymaoyi.com/upload/admin',
+									filePath: res.tempFilePaths[0],
+									name: 'file',
+									success(res) {
+										var data = res.data
+										var strToObj = JSON.parse(data)
+										that.travels = strToObj.url
+										that.addressUrl[0] = strToObj.url
+										that.certificates = false
+									}
+								})
 							}
 						})
-					}
-				})
-				},
-				drive(){
-					var that = this
-					wx.chooseImage({
-						success: function(res) {
-							wx.uploadFile({
-								url: 'https://www.zthymaoyi.com/upload/admin',
-								filePath: res.tempFilePaths[0],
-								name: 'file',
-								success(res) {
-									var data = res.data
-									var strToObj = JSON.parse(data)			
-									that.drives = strToObj.url
+					},
+					drive() {
+						var that = this
+						wx.chooseImage({
+							success: function(res) {
+								wx.uploadFile({
+									url: 'https://www.zthymaoyi.com/upload/admin',
+									filePath: res.tempFilePaths[0],
+									name: 'file',
+									success(res) {
+										var data = res.data
+										var strToObj = JSON.parse(data)
+										that.drives = strToObj.url
 										that.addressUrl[1] = strToObj.url
-									that.certificatesTwo = false
-								}
-							})
-						}
-					})
+										that.certificatesTwo = false
+									}
+								})
+							}
+						})
 					},
-					practice(){
+					practice() {
 						var that = this
 						wx.chooseImage({
 							success: function(res) {
@@ -192,16 +327,16 @@
 									name: 'file',
 									success(res) {
 										var data = res.data
-										var strToObj = JSON.parse(data)			
+										var strToObj = JSON.parse(data)
 										that.practices = strToObj.url
-											that.addressUrl[2] = strToObj.url
+										that.addressUrl[2] = strToObj.url
 										that.certificatesThree = false
 									}
 								})
 							}
 						})
 					},
-					operate(){
+					operate() {
 						var that = this
 						wx.chooseImage({
 							success: function(res) {
@@ -211,18 +346,18 @@
 									name: 'file',
 									success(res) {
 										var data = res.data
-										var strToObj = JSON.parse(data)			
+										var strToObj = JSON.parse(data)
 										that.operates = strToObj.url
-											that.addressUrl[3] = strToObj.url
+										that.addressUrl[3] = strToObj.url
 										that.certificatesFour = false
 									}
 								})
 							}
 						})
 					},
-					
+
+			}
 		}
-	}
 </script>
 
 <style lang="scss" scoped>
@@ -230,31 +365,35 @@
 		padding: 10px 20px;
 		background-color: #F5F6FA;
 	}
-	.picture{
+
+	.picture {
 		width: 100%;
-		 height: 220px;
-		 text-align: center;
-		 margin-top: 10px;
+		height: 220px;
+		text-align: center;
+		margin-top: 10px;
 	}
 
-		
-	
+
+
 	.btn {
 		margin-top: 10px;
 		background-color: #FFFFFF;
 		border-radius: 25px;
 		border: none;
 	}
-	.btns{
+
+	.btns {
 		background-color: #22C572;
 	}
-	.words{
+
+	.words {
 		font-size: 18px;
 		font-weight: 600;
 		color: #617E8B;
-		}
-		.floats{
-			position: relative;
-			top: -150px;
-		}
+	}
+
+	.floats {
+		position: relative;
+		top: -150px;
+	}
 </style>

pageD/identity/driverIdentityTwo.vue

@@ -56,7 +56,7 @@
 				<text class="tit">出厂年份</text>
 				<view class="con-list">
 					<view @click='yearchange'>{{year[index] == null?"请选择出厂年份":year[index]}}</view>
-					<u-picker :params='params' @confirm='yearpicker($event,index)' v-model="show" mode="time">
+					<u-picker :params='params' @confirm='yearpicker($event,index)' v-model="show" mode="time" :start-year="startData" :end-year="endData">
 					</u-picker>
 				</view>
 			</view>
@@ -176,6 +176,7 @@
 				}],
 				driverPayeeInfoList: [{
 					accountType: "个人账户",
+					accountTypeFlag: "1",
 					accountIndex: '0',
 					binkindex: 0,
 					cardAddressUrl: "",
@@ -204,14 +205,23 @@
 				subBranch:true,
 				params: {
 					year: true,
-					month: false,
-					day: false,
 				},
 				year: [],
+				default_time:'',
 				carModelType: [],
 				carLengtharr: [],
 			}
 		},
+		computed:{
+			startData(){
+				var data = new Date()
+				return data.getFullYear() - 30
+			},
+			endData(){
+				var data = new Date()
+				return data.getFullYear()
+			}
+		},
 		onLoad(options) {
 			this.DriverViewInfo = JSON.parse(options.DriverViewInfo)
 			this.driverPayeeInfoList[0].payeeName = this.DriverViewInfo.driverName
@@ -235,6 +245,7 @@
 				this.driverPayeeInfoList[index].accountIndex = e.detail.value
 				this.driverPayeeInfoList[index].accountType = this.accountType[this.driverPayeeInfoList[index]
 					.accountIndex];
+				this.driverPayeeInfoList[index].accountTypeFlag= e.detail.value+1;
 				this.accountarr[index] = this.accountType[e.detail.value];
 			},
 			bankimgs(items) {
@@ -353,23 +364,26 @@
 						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
+					if(this.driverPayeeInfoList[i].accountTypeFlag==1){
+						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

pageD/myRelease/buyDetails.vue

@@ -228,11 +228,11 @@
 	    -webkit-box-direction: normal;
 	    -webkit-flex-direction: column;
 	    flex-direction: column;
-	    color: #303133;
+	    color: #AFB3BF;
 	    line-height: 40rpx;
 	    text-align: right;
 	    padding-right: 20rpx;
-		font-size: 14px;
+	    font-size: 14px;
 	}
 	.title{
 		font-size: 18px;

pageD/myRelease/buyEdit.vue

@@ -243,7 +243,7 @@
 		onLoad(options){
 			this.id=options.id
 			if(options.customerName){
-				this.deptList.procurementPlanNo = options.customerName
+				this.deptList.buyer = options.customerName
 			}
 			
 		},
@@ -253,9 +253,9 @@
 			this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo',{commonId:this.userInfo.id}).then(res => {
 				if(res.data.code==200){
 					if(res.data.data.customerTypeFlag==1){
-						that.$set(this.deptList,'procurementPlanNo',res.data.data.customerName)
+						that.$set(this.deptList,'buyer',res.data.data.customerName)
 					}else{
-						that.$set(this.deptList,'procurementPlanNo',res.data.data.compName)
+						that.$set(this.deptList,'buyer',res.data.data.compName)
 					}
 					this.goods=res.data.data
 				}
@@ -446,16 +446,16 @@
 					return
 				}
 				if(this.deptList.procurementPlanType == '现货'){
-					if (!this.deptList.unitPrice) {
+					if (!this.deptList.procurementPrice) {
 						this.$api.msg('单价不能为空')
 						return
 					}
-					if (this.deptList.unitPrice>100000||this.deptList.unitPrice<1) {
+					if (this.deptList.procurementPrice>100000||this.deptList.procurementPrice<1) {
 						this.$api.msg('单价输入错误')
 						return
 					}
-					if (this.deptList.unitPrice.indexOf('.')!=-1) {
-						if(this.deptList.unitPrice.split('.')[1].length>2){
+					if (this.deptList.procurementPrice.indexOf('.')!=-1) {
+						if(this.deptList.procurementPrice.split('.')[1].length>2){
 							this.$api.msg('单价输入错误')
 							return
 						}
@@ -657,7 +657,7 @@
 		-webkit-box-direction: normal;
 		-webkit-flex-direction: column;
 		flex-direction: column;
-		color: #303133;
+		color: #AFB3BF;
 		line-height: 40rpx;
 		text-align: right;
 		padding-right: 20rpx;

pageD/myRelease/buyGrain.vue

@@ -175,7 +175,7 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='checked&&baoIndex==2||checked&&baoIndex==3' class="c-row b-b">
+			<view v-if='checked&&baoIndex!=0' class="c-row b-b">
 				<text class="tit">袋装备注</text>
 				<view class="con-list">
 					<input placeholder="请填写袋装备注" name="input" v-model="deptList.baggingNotes"></input>
@@ -227,13 +227,13 @@
 					province: true,
 					city: true,
 				},
-				checked: true,
+				checked: false,
 				insertProcurementPlanInfo: {},
-				liIndex: 0,
+				liIndex: -1,
 				liType: ['塔粮', '筛粮', '中粒', '大粒'],
-				pinIndex: 0,
-				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
-				nianIndex: 3,
+				pinIndex: -1,
+				pinType: ['一等品', '二等品', '三等品', '等外'],
+				nianIndex: -1,
 				nianType: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014', '2013', '2012',
 					'2011'
 				],
@@ -241,8 +241,9 @@
 				show1: false,
 				region: '请选择收货地区',
 				region1: '请选择产地',
-				baoIndex: 0,
-				baoType: ['不限（默认）', '散装', '大袋', '小袋'],
+				region2:"",
+				baoIndex: -1,
+				baoType: ['散装', '大袋', '小袋'],
 				chengIndex: -1,
 				chengType: ['可议', '买方承担', '卖方承担'],
 				codestatus: false,
@@ -353,6 +354,7 @@
 				this.deptList.receiveCity = e.city.label
 				this.deptList.receiveArea = e.area.label
 				this.region = e.province.label + '-' + e.city.label + '-' + e.area.label
+				this.region2 = e.province.label + '-' + e.city.label + '-' + e.area.label
 			},
 			regionchange() {
 				this.show = true
@@ -469,6 +471,11 @@
 						}
 					}
 				}
+				
+				if (!this.region2) {
+					this.$api.msg('收货地区不能为空')
+					return
+				}
 				if (!this.deptList.buyerPhone) {
 					this.$api.msg('买方手机号不能为空')
 					return
@@ -554,10 +561,6 @@
 						}
 					}
 				}
-				// if(this.amendprice() == false){
-				// 	this.$api.msg('验证码输入有误！')
-				// 	return
-				// }
 				this.insertProcurementPlanInfo = this.deptList
 				this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
 				this.insertProcurementPlanInfo.commonId = this.userInfo.id
@@ -635,9 +638,9 @@
 				this.deptList.grade = this.pinType[this.pinIndex]
 			},
 			nianChange(e) {
-				this.nianIndex = e.detail.value
+				this.nianType = e.detail.value
 				this.niantypes = this.nianType[this.nianIndex];
-				this.deptList.outputYear = this.baoType[this.baoIndex]
+				this.deptList.outputYear = this.nianType[this.nianType]
 			},
 
 			baoChange(e) {

pageD/myRelease/sellDetails.vue

@@ -7,7 +7,7 @@
 			<view class="c-row b-b">
 				<text class="tit">名头</text>
 				<view class="con-list">
-					<text @click="navToDetailPage">{{deptList.seller}}</text>
+					{{deptList.seller}}
 				</view>
 			</view>
 			<view class="c-row b-b">

pageD/myRelease/sellEdit.vue

@@ -510,7 +510,7 @@
 				}
 				this.insertProcurementPlanInfo = this.deptList
 				if (this.deptList.salePlanType == '期货') {
-					this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
+					this.insertProcurementPlanInfo.basisPrice = this.insertProcurementPlanInfo.basisPrice
 				}
 				this.insertProcurementPlanInfo.commonId = this.userInfo.id
 				this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"

pageD/myRelease/sellGrain.vue

@@ -179,13 +179,13 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='checked&&baoIndex==2||checked&&baoIndex==3' class="c-row b-b">
+			<view v-if='checked&&baoIndex!=0' class="c-row b-b">
 				<text class="tit">袋装备注</text>
 				<view class="con-list">
 					<input placeholder="请填写袋装备注" name="input" v-model="deptList.baggingNotes"></input>
 				</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='checked' class="c-row ">
 				<text class="tit">运费承担方</text>
 				<picker @change="chengChange" :value="chengIndex" :range="chengType" class="con-list">
 					<view class="con-list">
@@ -233,22 +233,24 @@
 					province: true,
 					city: true,
 				},
-				checked: true,
+				checked: false,
 				insertSalePlanInfo: {},
-				liIndex: 0,
+				liIndex: -1,
 				liType: ['塔粮', '筛粮', '中粒', '大粒'],
-				pinIndex: 0,
-				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
-				nianIndex: 3,
+				pinIndex: -1,
+				pinType: ['一等品', '二等品', '三等品', '等外'],
+				nianIndex: -1,
 				nianType: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014', '2013', '2012',
 					'2011'
 				],
 				show: false,
 				show1: false,
 				region: '请选择发货地区',
+				regions: "",
 				region1: '请选择产地',
-				baoIndex: 0,
-				baoType: ['不限（默认）', '散装', '大袋', '小袋'],
+				region2 :"",
+				baoIndex: -1,
+				baoType: ['散装', '大袋', '小袋'],
 				chengIndex: -1,
 				chengType: ['可议', '买方承担', '卖方承担'],
 				codestatus: false,
@@ -358,6 +360,7 @@
 				this.deptList.sendCity = e.city.label
 				this.deptList.sendArea = e.area.label
 				this.region = e.province.label + '-' + e.city.label + '-' + e.area.label
+				this.regions = e.province.label + '-' + e.city.label + '-' + e.area.label
 			},
 			regionchange() {
 				this.show = true
@@ -366,6 +369,7 @@
 				this.deptList.outputPrivate = e.province.label
 				this.deptList.outputCity = e.city.label
 				this.region1 = e.province.label + '-' + e.city.label
+				this.region2 = e.province.label + '-' + e.city.label
 			},
 			regionchange1() {
 				this.show1 = true
@@ -476,6 +480,14 @@
 						}
 					}
 				}
+				if (!this.regions) {
+					this.$api.msg('发货地区不能为空')
+					return
+				}
+				if (!this.region2) {
+					this.$api.msg('产地不能为空')
+					return
+				}
 
 				if (!this.deptList.sellerPhone) {
 					this.$api.msg('卖方手机号不能为空')
@@ -724,6 +736,7 @@
 		-webkit-box-direction: normal;
 		-webkit-flex-direction: column;
 		flex-direction: column;
+		color: #AFB3BF;
 		line-height: 40rpx;
 		text-align: right;
 		padding-right: 20rpx;

pageD/warehousings/warehousings.vue

@@ -85,13 +85,13 @@
 				<view class="c-row b-b">
 					<view class="title">扣款金额</view>
 					<view class="con-list">
-						<input placeholder-style="font-size:14px" placeholder="请输入扣款金额" name="input" v-model="WarehouseInOutInfo.deductionAmount"></input>
+						<input style="font-size:14px" placeholder="请输入扣款金额" name="input" v-model="WarehouseInOutInfo.deductionAmount"></input>
 					</view>
 				</view>
 				<view class="c-row b-b">
 					<view class="title">扣款项</view>
 					<view class="con-list">
-						<input maxlength='16' placeholder="请输入扣款项" name="input" v-model="WarehouseInOutInfo.deductionItems"></input>
+						<input style="font-size:14px" maxlength='16' placeholder="请输入扣款项" name="input" v-model="WarehouseInOutInfo.deductionItems"></input>
 					</view>
 				</view>
 				<view class="c-row b-b">
@@ -128,49 +128,49 @@
 				<view class="c-row b-b">
 					<view class="title">质检员</view>
 					<view class="con-list">
-						<input maxlength='10' minlength='2' placeholder-style="font-size:14px" placeholder="请输入质检员姓名" name="input" v-model="list.qualityInspector"></input>
+						<input maxlength='10' minlength='2' style="font-size:14px" placeholder="请输入质检员姓名" name="input" v-model="list.qualityInspector"></input>
 					</view>
 				</view>
 				<view class="c-row b-b">
 					<view class="title">蛋白(%)>=</view>
 					<view class="con-list">
-						<input placeholder-style="font-size:14px" placeholder="请输入蛋白占比" name="input" v-model="list.protein"></input>
+						<input style="font-size:14px" placeholder="请输入蛋白占比" name="input" v-model="list.protein"></input>
 					</view>
 				</view>
 				<view class="c-row b-b">
 					<view class="title">水分(%)<= </view>
 					<view class="con-list">
-						<input placeholder-style="font-size:14px" placeholder="请输入水分占比" name="input" v-model="list.waterContent"></input>
+						<input style="font-size:14px" placeholder="请输入水分占比" name="input" v-model="list.waterContent"></input>
 					</view>
 				</view>
 				<view class="c-row b-b">
 					<view class="title">容重(克/升)>= </view>
 					<view class="con-list">
-						<input placeholder-style="font-size:14px" placeholder="请输入容重" name="input" v-model="list.bulkDensity"></input>
+						<input style="font-size:14px" placeholder="请输入容重" name="input" v-model="list.bulkDensity"></input>
 					</view>
 				</view>
 				<view class="c-row b-b">
 					<view class="title">热损伤(%)<= </view>
 					<view class="con-list">
-						<input placeholder-style="font-size:14px" placeholder="请输入热损伤占比" name="input" v-model="list.jiaorenli"></input>
+						<input style="font-size:14px" placeholder="请输入热损伤占比" name="input" v-model="list.jiaorenli"></input>
 					</view>
 				</view>
 				<view class="c-row b-b">
 					<view class="title">杂质(%)<= </view>
 					<view class="con-list">
-						<input placeholder-style="font-size:14px" placeholder="请输入杂质占比" name="input" v-model="list.impurity"></input>
+						<input style="font-size:14px" placeholder="请输入杂质占比" name="input" v-model="list.impurity"></input>
 					</view>
 				</view>
 				<view class="c-row b-b">
 					<view class="title">霉变粒(%)<= </view>
 					<view class="con-list">
-						<input placeholder-style="font-size:14px" placeholder="请输入霉变粒占比" name="input" v-model="list.mildewGrain"></input>
+						<input style="font-size:14px" placeholder="请输入霉变粒占比" name="input" v-model="list.mildewGrain"></input>
 					</view>
 				</view>
 				<view class="c-row b-b">
 					<view class="title">不完整粒(%)<= </view>
 					<view class="con-list">
-						<input placeholder-style="font-size:14px" placeholder="请输入不完整粒占比" name="input"
+						<input style="font-size:14px" placeholder="请输入不完整粒占比" name="input"
 							v-model="list.imperfectGrain"></input>
 					</view>
 				</view>

pages.json

@@ -752,6 +752,12 @@
 						"navigationBarTitleText": "添加"
 					}
 				},
+				// {
+				// 	"path": "contract/warehousings",
+				// 	"style": {
+				// 		"navigationBarTitleText": "附件"
+				// 	}
+				// },
 				{
 					"path": "contract/contract",
 					"style": {
@@ -772,6 +778,13 @@
 						"enablePullDownRefresh": true
 					}
 				},
+				{
+					"path": "contract/enclosures",
+					"style": {
+						"navigationBarTitleText": "附件",
+						"enablePullDownRefresh": true
+					}
+				},
 				{
 					"path": "video/look",
 					"style": {

pages/attestation/indexThree.vue

@@ -153,48 +153,115 @@
 			},
 			amendprice(item) {
 				var that = this
+				that.identityAuthenticationInfo.driverPhone = that.price
 				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
 						phone: this.price,
 						verifyCode: this.verifyCode
 					}).then(res => {
 						if (res.data.code == 200) {
-							this.$api.doRequest('post', '/driverViewInfo/api/editInfo', {
-									driverPhone: this.price,
-									id: this.id,
-									commonId: this.userInfo.id
-								}, 'application/json;charset=UTF-8').then(res => {
-									if (res.data.code == 200) {
-										that.$api.msg('修改成功！')
-										that.pricestatusTwo = false
-										that.pricestatus = false
-										that.getList()
+							that.$api.doRequest('get','/driverViewInfo/selectPhone',that.identityAuthenticationInfo)
+							.then(res => {
+									if (res.data.code == '11018') {
+										uni.showModal({
+											title: '提示',
+											content: '该手机号已认证过司机，再次认证将覆盖之前的认证信息，是否确定认证？',
+											success: function(res) {										
+												if (res.confirm) {
+													that.identityAuthenticationInfo.id = item.id
+														console.log(that.identityAuthenticationInfo,"已覆盖")
+													that.$api.doRequest('post','/driverViewInfo/api/modifyPhone',that.identityAuthenticationInfo).then(
+														res => {
+															uni.showToast({
+																title: '提交成功',
+																icon: 'none',
+																duration: 2000
+															})
+															uni.navigateTo({
+																url: `/pages/attestation/indexThree`,
+															})
+														}).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){
+										that.identityAuthenticationInfo.id = item.id
+										console.log(that.identityAuthenticationInfo,"未覆盖")
+										that.$api.doRequest('post','/driverViewInfo/api/modifyPhone',that.identityAuthenticationInfo).then(
+											res => {
+												uni.showToast({
+													title: '提交成功',
+													icon: 'none',
+													duration: 2000
+												})
+												uni.navigateTo({
+													url: `/pages/attestation/indexThree`,
+												})
+											}).catch(res => {
+											uni.showToast({
+												title: res.data.message,
+												icon: 'none',
+												duration: 2000
+											})
+										})
 									}
-								})
-								.catch(res => {
+								}).catch(res => {
 									uni.showToast({
-										title: res.errmsg,
+										title: res.data.message,
 										icon: 'none',
 										duration: 2000
 									})
-									return
-								});
-						} else {
-							uni.showToast({
-								title: res.data.message,
-								icon: 'none',
-								duration: 2000
-							})
-							return
-						}
-					})
-					.catch(res => {
-							uni.showToast({
-								title: res.data.message,
-								icon: 'none',
-								duration: 2000
-							})
-							return
-					});
+								})
+							}
+						})
+					// 	if (res.data.code == 200) {
+					// 		that.$api.doRequest('post',
+					// 			'/identityAuthenticationInfo/api/modifyIdentityPhone',
+					// 			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 {
+					// 		uni.showToast({
+					// 			title: res.data.message,
+					// 			icon: 'none',
+					// 			duration: 2000
+					// 		})
+					// 		return
+					// 	}
+					// })
+					// .catch(res => {
+					// 		uni.showToast({
+					// 			title: res.data.message,
+					// 			icon: 'none',
+					// 			duration: 2000
+					// 		})
+					// 		return
+					// });
 			},
 			getcode() {
 					if (!this.price) {

pages/attestation/indexTwo.vue

@@ -105,6 +105,7 @@
 				id: "",
 				defaults1: "default1",
 				defaults2: "default2",
+				identityAuthenticationInfos:{},
 			}
 		},
 		computed: {
@@ -201,67 +202,105 @@
 					});
 			},
 			amendprice(item) {
+				this.identityAuthenticationInfo.id = item.id
+				this.identityAuthenticationInfo.customerPhone = this.price
 				var that = this
 				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
 						phone: this.price,
 						verifyCode: this.verifyCode
 					}).then(res => {
 						if (res.data.code == 200) {
-							this.$api.doRequest('post', '/identityAuthenticationInfo/api/modifyIdentityPhone', {
-									customerPhone: this.price,
-									id: this.id,
-									commonId: this.userInfo.id
-								}, 'application/json;charset=UTF-8').then(res => {
-									if (res.data.code == 200) {
-										that.$api.msg('修改成功！')
-										that.pricestatusTwo = false
-										that.pricestatus = false
-										that.getList()
-										// uni.navigateTo({
-										// 	url: '/pages/attestation/indexTwo'
-										// });
-
-									} else {
-										uni.showToast({
-											title: res.errmsg,
-											icon: 'none',
-											duration: 2000
+							that.identityAuthenticationInfos.customerPhone = that.price
+							that.$api.doRequest('get','/identityAuthenticationInfo/selectPhone', that.identityAuthenticationInfos)
+								.then(res => {
+									if (res.data.code == '11018') {
+										uni.showModal({
+											title: '提示',
+											content: '该手机号已认证过个人粮商，再次认证将覆盖之前的认证信息，是否确定认证？',
+											success: function(res) {										
+												if (res.confirm) {
+													that.$api.doRequest('post',
+														'/identityAuthenticationInfo/api/modifyIdentityPhone',
+														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) {
+										that.$api.doRequest('post',
+											'/identityAuthenticationInfo/api/modifyIdentityPhone',
+											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
+											})
 										})
-										return
-									}
-									if (res.data.code == "ERROR") {
+									} else {
 										uni.showToast({
-											title: res.message,
+											title: res.data.message,
 											icon: 'none',
 											duration: 2000
 										})
-										return
 									}
-								})
-								.catch(res => {
+					
+								}).catch(res => {
 									uni.showToast({
-										title: res.errmsg,
+										title: res.data.message,
 										icon: 'none',
 										duration: 2000
 									})
-								});
-
-							// uni.hideLoading()
+								})
+					
 						} else {
-							// uni.hideLoading()1
+							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() {

pages/release/release.vue

@@ -18,7 +18,7 @@
 					<view class="flex ">
 						<view class="weight">{{item.plannedVolume > 0 ? item.plannedVolume : 0}}吨</view>
 						<view v-if='item.planType=="期货"'>
-							<text class="unitPrice">{{item.basisPrice}} <text class="amount">元/吨</text></text>
+							<!-- <text class="unitPrice">{{item.basisPrice}} <text class="amount">元/吨</text></text> -->
 						</view>
 						<view v-if='item.planType=="现货"'>
 							<text class="unitPrice">{{item.unitPrice}} <text class="amount">元/吨</text></text>
@@ -86,7 +86,6 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
-
 							if (res.confirm) {
 								that.$api.doRequest('post', '/procurementPlanInfo/api/editStatus', {
 										id: item.id,