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

# Conflicts:
#	pageD/warehousings/warehousingDetails.vue
#	pageD/warehousings/warehousings.vue
#	pages/task/my_task.vue

components/uview-ui/libs/util/province.js

@@ -1 +1 @@
-var provinceData=[{"label":"北京市","value":"11"},{"label":"天津市","value":"12"},{"label":"河北省","value":"13"},{"label":"山西省","value":"14"},{"label":"内蒙古自治区","value":"15"},{"label":"辽宁省","value":"21"},{"label":"吉林省","value":"22"},{"label":"黑龙江省","value":"23"},{"label":"上海市","value":"31"},{"label":"江苏省","value":"32"},{"label":"浙江省","value":"33"},{"label":"安徽省","value":"34"},{"label":"福建省","value":"35"},{"label":"江西省","value":"36"},{"label":"山东省","value":"37"},{"label":"河南省","value":"41"},{"label":"湖北省","value":"42"},{"label":"湖南省","value":"43"},{"label":"广东省","value":"44"},{"label":"广西壮族自治区","value":"45"},{"label":"海南省","value":"46"},{"label":"重庆市","value":"50"},{"label":"四川省","value":"51"},{"label":"贵州省","value":"52"},{"label":"云南省","value":"53"},{"label":"西藏自治区","value":"54"},{"label":"陕西省","value":"61"},{"label":"甘肃省","value":"62"},{"label":"青海省","value":"63"},{"label":"宁夏回族自治区","value":"64"},{"label":"新疆维吾尔自治区","value":"65"},{"label":"台湾","value":"66"},{"label":"香港","value":"67"},{"label":"澳门","value":"68"}];export default provinceData;
+var provinceData=[{"label":"全国","value":"10"},{"label":"北京市","value":"11"},{"label":"天津市","value":"12"},{"label":"河北省","value":"13"},{"label":"山西省","value":"14"},{"label":"内蒙古自治区","value":"15"},{"label":"辽宁省","value":"21"},{"label":"吉林省","value":"22"},{"label":"黑龙江省","value":"23"},{"label":"上海市","value":"31"},{"label":"江苏省","value":"32"},{"label":"浙江省","value":"33"},{"label":"安徽省","value":"34"},{"label":"福建省","value":"35"},{"label":"江西省","value":"36"},{"label":"山东省","value":"37"},{"label":"河南省","value":"41"},{"label":"湖北省","value":"42"},{"label":"湖南省","value":"43"},{"label":"广东省","value":"44"},{"label":"广西壮族自治区","value":"45"},{"label":"海南省","value":"46"},{"label":"重庆市","value":"50"},{"label":"四川省","value":"51"},{"label":"贵州省","value":"52"},{"label":"云南省","value":"53"},{"label":"西藏自治区","value":"54"},{"label":"陕西省","value":"61"},{"label":"甘肃省","value":"62"},{"label":"青海省","value":"63"},{"label":"宁夏回族自治区","value":"64"},{"label":"新疆维吾尔自治区","value":"65"},{"label":"台湾","value":"66"},{"label":"香港","value":"67"},{"label":"澳门","value":"68"}];export default provinceData;

pageA/product/business_buy.vue

@@ -175,6 +175,7 @@
 			onLoad(options) {
 				console.log(options)
 				this.id=options.id
+				this.purchaseOrder.planId=options.id
 				this.purchaseOrder.seller = options.seller
 				this.purchaseOrder.goodsName = options.goodsName
 				this.purchaseOrder.receivePrivate = options.receivePrivate
@@ -263,6 +264,7 @@
 						}
 					}
 					var that=this
+					this.purchaseOrder.pcFlag=0
 					uni.showModal({
 						content: '订单提交后将发送给买方，是否确定提交？',
 						success: function (res) {

pageB/contract/contract.vue

@@ -1,59 +1,63 @@
 <template>
-	<view class="container">
+	<view class="center">
 		<!-- <block v-if="TabCur==2"> -->
-		<view v-for="(item , index) in lists" :Key="index">
-			
-		
-		<view class="cu-form-group">
-			<view class="title">采购</view>
-	
-			<text style="margin-left: -30%;">编号{{item.contractNo}}{{item.procurementPlanType}}</text>
-			<text>{{item.status}}</text>
-		</view>
-		<view class="cu-form-group">
-			<view class="title">买方</view>
-			<text style="margin-left: -45%;">{{item.customer}}</text>
-			<text></text>
-		</view>
-		<view class="cu-form-group">
-			<view class="title">{{item.goodsName}}:<text>{{item.goodsName}}</text></view>
-			<view class="title">单价:<text>{{item.unitPrice}}</text></view>
-			<view class="title">基差:<text>{{item.basis}}</text></view>
-		</view>
-		<view class="c-row b-b">
-			<text><button class="cu-btn commit margin-tb-sm lg" style=" width: 75px;height: 25px; margin-left: 15px;"
-					@click="commit">附件</button></text>
-					
-
-			<text><button class="cu-btn commit margin-tb-sm lg" style=" margin-left: 15px; width: 75px;height: 25px;"
-					@click="someprice(item)">点价</button></text>
-					
-					
-			<text><button class="cu-btn commit margin-tb-sm lg" style=" margin-left: 15px; width: 75px;height: 25px;"
-					@click="commit1(item)">发货</button></text>
-					
-		</view>
-		
+		<view v-for="(item , index) in lists" :Key="index" class="region">
+			<view>
+				<view class="c-row ">
+					<text class="tit">采购</text>
+					<view class="enterprise">
+						编号{{item.contractNo}}{{item.procurementPlanType}}
+					</view>
+				</view>
+				<text>{{item.status}}</text>
+			</view>
+			<view>
+				<view class="c-row ">
+					<text class="tit1">买方</text>
+					<view class="enterprise">
+						{{item.customer}}
+					</view>
+				</view>
+			</view>
+			<view class="forList flex">
+				<view class="title">{{item.goodsName}}:<text>{{item.goodsName}}</text></view>
+				<view class="title">单价:￥<text>{{item.unitPrice}}</text></view>
+				<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)"> 点价</text>
+				<text class="anniu1" @click="commit1(item)"> 发货</text>
+				<!-- <text><button class="cu-btn commit margin-tb-sm lg"
+						style=" width: 75px;height: 25px; margin-left: 15px;" @click="commit">附件</button></text>
+				<text><button class="cu-btn commit margin-tb-sm lg"
+						style=" margin-left: 15px; width: 75px;height: 25px;"
+						@click="someprice(item)">点价</button></text>
+				<text><button class="cu-btn commit margin-tb-sm lg"
+						style=" margin-left: 15px; width: 75px;height: 25px;" @click="commit1(item)">发货</button></text>
+ -->
+			</view>
+
 		</view>
-        <view v-if='pricestatus' class='shade'>
-        	<view class='shade-content'>
-        		<view class='shade-content-item'>
-        			<input v-model='price' placeholder="请输入点价价格" type="number">元/吨
-        		</view>
+		<view v-if='pricestatus' class='shade'>
+			<view class='shade-content'>
+				<view class='shade-content-item'>
+					<input v-model='price' placeholder="请输入点价价格" type="number">元/吨
+				</view>
 				<view>
 					<button style='width:50%;display:inline-block;' @click='pricestatus=false'>取消</button>
-					<button  style='width:50%;display:inline-block;' @click='amendprice'>确定</button>
+					<button style='width:50%;display:inline-block;' @click='amendprice'>确定</button>
 				</view>
 
-        	</view>
-        </view>
+			</view>
+		</view>
 		<view v-if='shadestatus' class='shade'>
 			<view class='shade-content'>
 				<view class='shade-content-item'>
 					<view>请于以下时间段进行点价操作：</view>
-					<view>11：30  ~  12：30</view>
-					<view>15：30  ~  20：00</view>
-					<view>23：00  ~  08：00</view>
+					<view>11：30 ~ 12：30</view>
+					<view>15：30 ~ 20：00</view>
+					<view>23：00 ~ 08：00</view>
 				</view>
 				<button style='width:50%;display:inline-block;' @click='shadestatus=false'>取消</button>
 			</view>
@@ -66,7 +70,6 @@
 </template>
 
 <script>
-	
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	import {
 		mapState
@@ -75,19 +78,19 @@
 		name: "trust",
 		data() {
 			return {
-				lists:[],
-				shadestatus:false,
-				pricestatus:false,
+				lists: [],
+				shadestatus: false,
+				pricestatus: false,
 				goods: {
-					pageSize:10,
-					currentPage:1,
-					id:"41651544",
+					pageSize: 10,
+					currentPage: 1,
+					id: "41651544",
 					// pcFlag : 0,
 				},
-				procurementPlanInfo:{
-				     pageSize:10,
-				     currentPage:1
-				    },
+				procurementPlanInfo: {
+					pageSize: 10,
+					currentPage: 1
+				},
 				tran: {
 					total: 0,
 					price: 0,
@@ -111,7 +114,7 @@
 					carNoImg1: ''
 
 				},
-				id:0,
+				id: 0,
 				PageCur: "trust",
 				TabCur: 0,
 				priceTypeIndex: -1,
@@ -162,89 +165,93 @@
 		// onShow() {
 		// 	this.loadData()
 		// },
-		onLoad(){
+		onLoad() {
 			this.getList()
 		},
 		methods: {
-			amendprice(){
-				this.$api.doRequest('post','/purchaseOrder/api/pointPrice',{id:this.id,unitPrice:Number(this.price)}).then(res => {
-						if(res.data.code==200){
-							this.pricestatus=false
-						}else{
+			amendprice() {
+				this.$api.doRequest('post', '/purchaseOrder/api/pointPrice', {
+						id: this.id,
+						unitPrice: Number(this.price)
+					}).then(res => {
+						if (res.data.code == 200) {
+							this.pricestatus = false
+						} else {
 							uni.showToast({
-							 title: res.data.message,
-							 icon:'none',
-							 duration: 2000
+								title: res.data.message,
+								icon: 'none',
+								duration: 2000
 							})
 						}
-				    })
-				    .catch(res => {
-				     uni.showToast({
-				      title: res.errmsg,
-				      icon:'none',
-				      duration: 2000
-				     })
-				    });
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					});
 			},
-			someprice(item){
-				var time=new Date().getTime()
-				var time1=new Date(new Date(new Date().toLocaleDateString()).getTime()-(1*60*60*1000))
-				var time2=new Date()
+			someprice(item) {
+				var time = new Date().getTime()
+				var time1 = new Date(new Date(new Date().toLocaleDateString()).getTime() - (1 * 60 * 60 * 1000))
+				var time2 = new Date()
 				time2.setHours(8);
 				time2.setMinutes(0);
 				time2.setSeconds(0);
-				var time3=new Date()
+				var time3 = new Date()
 				time3.setHours(11);
 				time3.setMinutes(30);
 				time3.setSeconds(0);
-				var time4=new Date()
+				var time4 = new Date()
 				time4.setHours(12);
 				time4.setMinutes(30);
 				time4.setSeconds(0);
-				var time5=new Date()
+				var time5 = new Date()
 				time5.setHours(15);
 				time5.setMinutes(30);
 				time5.setSeconds(0);
-				var time6=new Date()
+				var time6 = new Date()
 				time6.setHours(20);
 				time6.setMinutes(0);
 				time6.setSeconds(0);
-				if(time<time2.getTime()&&time>time1||time<time4.getTime()&&time>time3.getTime()||time<time6.getTime()&&time>time5.getTime()){
-					this.id=item.id
-					this.pricestatus=true
-				}else{
-					this.shadestatus=true
+				if (time < time2.getTime() && time > time1 || time < time4.getTime() && time > time3.getTime() || time <
+					time6.getTime() && time > time5.getTime()) {
+					this.id = item.id
+					this.pricestatus = true
+				} else {
+					this.shadestatus = true
 				}
 			},
-			commit1(item){
+			commit1(item) {
 				uni.navigateTo({
 					url: `/pageB/contract/look?id=${item.id}&contractNo=${item.contractNo}&customer=${item.customer}&goodsName=${item.goodsName}`
 				})
 			},
-			getList(){
+			getList() {
 				this.goods.commonId = this.userInfo.id
-	
-			this.$api.doRequest('get','/purchaseOrder/selectPurchaseOrder',this.goods).then(res => {
-					if(res.data.code==200){
-						this.lists = res.data.data.records
-					}else{
+
+				this.$api.doRequest('get', '/purchaseOrder/selectPurchaseOrder', this.goods).then(res => {
+						if (res.data.code == 200) {
+							this.lists = res.data.data.records
+						} else {
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					})
+					.catch(res => {
 						uni.showToast({
-						 title: res.data.message,
-						 icon:'none',
-						 duration: 2000
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
 						})
-					}
-			    })
-			    .catch(res => {
-			     uni.showToast({
-			      title: res.errmsg,
-			      icon:'none',
-			      duration: 2000
-			     })
-			    });
-			   },
-			
-					
+					});
+			},
+
+
 			ChooseImageCar() {
 				uni.chooseImage({
 					count: 1, //默认9
@@ -300,7 +307,7 @@
 			// 		}
 			// 	})
 			// },
-			
+
 			commit11() {
 				if (this.hasLogin) {
 					uni.showModal({
@@ -318,8 +325,7 @@
 						fail: () => {},
 						complete: () => {}
 					})
-				} 
-				else {
+				} else {
 					const that = this
 					if (this.TabCur == 0) {
 						// if (!that.seller) {
@@ -634,44 +640,58 @@
 			}
 		},
 	}
-	
-	
-	
 </script>
 
 <style scoped>
+	.center {
+		padding: 10px 20px;
+		background-color: #F5F6FA;
+	}
+
+	.region {
+		background-color: #FFFFFF;
+		border-radius: 20px;
+		margin-top: 10px;
+	}
+
 	.zan-dialog__mask {
-	    position: fixed;
-	    top: 0;
-	    left: 0;
-	    right: 0;
-	    bottom: 0;
-	    z-index: 10;
-	    background: rgba(0, 0, 0, 0);   /*设置阴影半透明背景如： background: rgba(0, 0, 0, 0.4);*/
-	    display: none;
-	  }
-	  
-	  .zan-dialog__container {
-	    position: fixed;
-	    bottom: 400rpx;
-	    width: 650rpx;    /*弹窗布局宽*/
-	    height: 350rpx;   /*弹窗布局高，与下面弹出距离transform有关*/
-	    margin-left: 50rpx;
-	    background: #f8f8f8;
-	    transform: translateY(300%);  /*弹框弹出距离，与弹框布局高度有关，如300%表示弹起距离为3倍弹窗高度 */
-	    transition: all 0.4s ease;
-	    z-index: 12;
-	    border-radius: 20rpx;
-	    box-shadow: 0px 3px 3px 2px gainsboro;  /*弹框的悬浮阴影效果，如不需要可注释该行*/
-	  }
-	  
-	  .zan-dialog--show .zan-dialog__container {
-	    transform: translateY(0);
-	  }
-	  
-	  .zan-dialog--show .zan-dialog__mask {
-	    display: block;
-	  }
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 10;
+		background: rgba(0, 0, 0, 0);
+		/*设置阴影半透明背景如： background: rgba(0, 0, 0, 0.4);*/
+		display: none;
+	}
+
+	.zan-dialog__container {
+		position: fixed;
+		bottom: 400rpx;
+		width: 650rpx;
+		/*弹窗布局宽*/
+		height: 350rpx;
+		/*弹窗布局高，与下面弹出距离transform有关*/
+		margin-left: 50rpx;
+		background: #f8f8f8;
+		transform: translateY(300%);
+		/*弹框弹出距离，与弹框布局高度有关，如300%表示弹起距离为3倍弹窗高度 */
+		transition: all 0.4s ease;
+		z-index: 12;
+		border-radius: 20rpx;
+		box-shadow: 0px 3px 3px 2px gainsboro;
+		/*弹框的悬浮阴影效果，如不需要可注释该行*/
+	}
+
+	.zan-dialog--show .zan-dialog__container {
+		transform: translateY(0);
+	}
+
+	.zan-dialog--show .zan-dialog__mask {
+		display: block;
+	}
+
 	.container {
 		padding-bottom: 160rpx;
 	}
@@ -694,27 +714,125 @@
 		background: linear-gradient(45deg, #DF331C, #DA611A);
 		color: #fff;
 	}
-	.shade{
-		position:fixed;
-		top:0;
-		left:0;
-		width:100%;background:rgba(0,0,0,0.5);
-		height:100%;
-		z-index:999999;
+
+	.shade {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		background: rgba(0, 0, 0, 0.5);
+		height: 100%;
+		z-index: 999999;
 	}
-	.shade-content{
-		background:#fff;
-		position:absolute;
-		top:50%;
-		left:50%;
+
+	.shade-content {
+		background: #fff;
+		position: absolute;
+		top: 50%;
+		left: 50%;
 		transform: translateX(-50%) translateY(-50%);
-		z-index:999999;
-		text-align:center;
+		z-index: 999999;
+		text-align: center;
 	}
-	.shade-content-item{
+
+	.shade-content-item {
 		width: 277px;
-		text-align:center;
-		height:121px;
-		padding:35px 10px;
+		text-align: center;
+		height: 121px;
+		padding: 35px 10px;
+	}
+
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+
+	.con-list {
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
+		font-size: 14px;
+	}
+
+	.forList {
+		width: 90%;
+		height: 30px;
+		margin: 0 auto;
+		background-color: #F9F9FA;
+		border-radius: 10px;
+	}
+
+	.forList .title {
+		line-height: 30px;
+		margin-left: 15px;
+		color: #9698A2;
+	}
+
+	.tit {
+		width: 34px;
+		height: 24px;
+		background-color: #E9F8F0;
+		color: #22C572;
+		padding: 2px 3px;
+		border-radius: 5px;
+	}
+
+	.tit1 {
+		width: 34px;
+		height: 24px;
+		background-color: #FEECE6;
+		color: #FE6430;
+		padding: 2px 3px;
+		border-radius: 5px;
+	}
+
+	.enterprise {
+		font-size: 16px;
+		font-weight: 600;
+		margin-left: 20px;
+	}
+	.annius{
+		width: 70%;
+	margin-left: 110px;
+	}
+	.anniu{
+		width: 50px;
+		font-size: 16px;
+		border: 1px solid #CDCDCD;
+		border-radius: 15px;
+		/* margin-left: 20px; */
+		position: relative;
+		margin-right: 10px;
+		text-align: center;
+		line-height: 30px;
+	}
+	.anniu1{
+		width: 50px;
+		font-size: 16px;
+		border: 1px solid #22C572;
+		border-radius: 15px;
+		color: #22C572;
+		/* margin-left: 20px; */
+		position: relative;
+		margin-right: 10px;
+		text-align: center;
+		line-height: 30px;
 	}
 </style>

pageB/contract/contract_detail.vue

@@ -1,41 +1,64 @@
 <template>
 	<view class="container">
+		<view class="information">
 		<!-- <block v-if="TabCur==2"> -->
-			<view class="cu-form-group">
+		<view class="c-row">
+			<view class="title1">发车信息</view>
+			
+		</view>
+			<view class="c-row b-b">
 				<view class="title">派车编号</view>
-				<input disabled  name="input" v-model="goods.tranCarNo"></input>
+				<view class="con-list">
+					<input disabled  name="input" v-model="goods.tranCarNo"></input>
+				</view>
 			</view>
-			<view class="cu-form-group">
+			<view class="c-row b-b">
 				<view class="title">车牌号</view>
 				<input maxlength='7' placeholder="请输入车牌号" name="input" v-model="goods.carNo"></input>
 			</view>
-			<view class="cu-form-group">
+			<view class="c-row b-b">
 				<view class="title">司机手机号</view>
+				<view class="con-list">
 				<input  maxlength='11' placeholder="请输入司机身份认证的手机号" name="input" v-model="goods.driverPhone"></input>
+			  </view>
 			</view>
-			<view class="cu-form-group">
+			<view class="c-row b-b">
 				<view class="title">毛重(吨)</view>
+				<view class="con-list">
 				<input placeholder="请输入毛重" type="mobile" name="input"  @input="grossWeightchange" v-model="goods.grossWeight"></input>
 			</view>
-			<view class="cu-form-group">
+			</view>
+			<view class="c-row b-b">
 				<view class="title">皮重(吨)</view>
+				<view class="con-list">
 				<input placeholder="请输入皮重" type="mobile" name="input"  @input="tarechange" v-model="goods.tare"></input>
 			</view>
-			<view class="cu-form-group">
+			</view>
+			<view class="c-row b-b">
 				<view class="title">净重(吨)</view>
+				<view class="con-list">
+				<view class="con-list">
 				<input placeholder="自动计算" type="mobile" name="input" v-model="goods.loadNetWeight"></input>
+				</view>
+			</view>
 			</view>
-			<view class="cu-form-group">
+			<view class="c-row ">
 				<view class="title">发货日期</view>
+				<view class="con-list">
 				<view @click="show = true">{{goods.sendDateStart!=''?goods.sendDateStart:time}}</view>
 				<u-picker  :params='params' :default-time='time' @confirm="DateChange" v-model="show" mode="time"></u-picker>
 			</view>
-			<view class="cu-bar bg-white margin-top">
+			</view>
+			
+				
+			</view>
+			<view class="information">
+			<view class="c-row">
 				<view class="action">
 					上传磅单照片
 				</view>
 			</view>
-			<view class="cu-form-group">
+			<view class="c-row">
 				<view class="grid col-4 grid-square flex-sub">
 					<view class="bg-img" v-if="goods.loadPoundImg != ''" @tap="ViewImage" :data-url="goods.loadPoundImg">
 					 <image :src="goods.loadPoundImg" mode="aspectFit"></image>
@@ -48,9 +71,10 @@
 					</view>
 				</view>
 			</view>
-			<view class="padding flex flex-direction">
-				<button class="cu-btn commit margin-tb-sm lg" @click="getList">提交</button>
 			</view>
+			
+				<button class="btn btns" @click="getList">提交</button>
+			
 		<!-- </block> -->
 	</view>
 </template>
@@ -138,6 +162,9 @@
 						if(month+1<10){
 							month="0"+(month+1)
 						}
+						if(date1+1<10){
+							date1="0"+date1
+						}
 						return year+'-'+month+"-"+date1
 					},
 					startDate() {
@@ -152,6 +179,7 @@
 			onShow() {
 			},
 			onLoad(option) {
+				this.goods.planId=options.planId
 				this.goodsName=option.goodsName
 				this.contractNo = option.contractNo
 				this.goods.goodsName=option.goodsName
@@ -208,6 +236,14 @@
 						this.$api.msg('司机手机号输入错误')
 						return
 					}
+					if(this.goods.grossWeight==''){
+						this.$api.msg('毛重不能为空')
+						return
+					}
+					if(this.goods.tare==''){
+						this.$api.msg('皮重不能为空')
+						return
+					}
 					if(this.goods.grossWeight>100){
 						this.$api.msg('毛重输入错误')
 						return
@@ -381,8 +417,13 @@
 
 <style scoped>
 	.container{
-		padding-bottom: 160rpx;
+		padding: 10px 10px;
+		background-color: #F5F6FA;
 	}
+	.title1{
+		font-size: 18px;
+		font-weight: 600;
+		}
 	.cu-form-group input {
 		text-align: right;
 	}
@@ -398,4 +439,43 @@
 		background: linear-gradient(45deg, #DF331C, #DA611A);
 		color:#fff;
 	}
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+	.con-list {
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
+		font-size: 14px;
+	}
+	.information{
+		background-color: #FFFFFF;
+		border-radius: 20px;
+		margin-top: 10px;
+	}
+	.btn{
+		margin-top: 10px;
+		border-radius: 25px;
+		background-color: #22C572;
+		border: none;
+		color: #FFFFFF;
+	}
 </style>

pageD/identity/companyIdentity.vue

@@ -1,20 +1,13 @@
 <template>
 	<view class="center">
 		<view>
-			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;'
-				:src="consentStatus==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'"
-				alt=""></image>
-			<text>公司</text>
-			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;'
-				:src="consentStatus1==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'"
-				alt=""></image>
-			<text>个人</text>
+			<text @click='consent' v-bind:class="switchs1">公司</text>
+			<text  @click='consent' v-bind:class="switchs2">个人</text>
 		</view>
 		<view v-if="consentStatus == true">
 			<view>
-				<button type="default" @click="license">上传营业执照</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="license1 != ''">
-					<image v-bind:src = "license1" style="width: 100px;height: 100px;"></image>
+				<view style="margin: 0 auto;" v-if="license1 != ''" @click="license">
+					<image v-bind:src = "license1" class="picture"></image>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -29,87 +22,14 @@
 					<input placeholder="请填写纳税人识别号" name="input"v-model="identityAuthenticationInfo.payTaxesCard"></input>
 				</view>
 			</view>
-			<view>
-				<button type="default" @click="idUp">上传身份证正面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="id1 != ''">
-					<image v-bind:src = "id1" style="width: 100px;height: 100px;"></image>
-				</view>
-				<button type="default" @click="idLow">上传身份证反面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="id2 != ''">
-					<image v-bind:src = "id2" style="width: 100px;height: 100px;"></image>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">姓名</text>
-				<view class="con-list">
-					<input placeholder="请填写姓名" name="input" v-model="identityAuthenticationInfo.customerName"></input>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">身份证号</text>
-				<view class="con-list">
-					<input placeholder="请填写身份证号" name="input"
-						v-model="identityAuthenticationInfo.customerNumberCard"></input>
-				</view>
-			</view>
-			<view>
-				<button type="default" @click="bankUp()">上传银行卡正面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="bank1 != ''">
-					<image v-bind:src = "bank1" style="width: 100px;height: 100px;"></image>
-				</view>
-				<button type="default" @click="bankLow()">上传银行卡反面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="bank2 != ''">
-					<image v-bind:src = "bank2" style="width: 100px;height: 100px;"></image>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">银行卡号</text>
-				<view class="con-list">
-					<input placeholder="请填写银行卡号" name="input" v-model="identityAuthenticationInfo.bankCard"></input>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">开户行</text>
-				<view class="con-list">
-					<input placeholder="请填写开户行" name="input" v-model="identityAuthenticationInfo.bankDeposit"></input>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">开户支行</text>
-				<view class="con-list">
-					<input placeholder="请填写开户支行" name="input"
-						v-model="identityAuthenticationInfo.bankDepositBranch"></input>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">手机号</text>
-				<view class="con-list">
-					<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='getcode'
-					class='getcode'>{{sendText}}</button>
-				<view style='width:70%;position:relative;margin-left: 200px;'>
-					<input v-model='verifyCode' placeholder="请输入验证码" type="text">
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">公司地址</text>
-				<view class="con-list">
-					<input placeholder="请填写公司地址" name="input" v-model="identityAuthenticationInfo.compAddress"></input>
-				</view>
-			</view>
 		</view>
-		<view v-else>
+		 <view v-else>
 			<view>
-				<button type="default" @click="idUp">上传身份证正面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="id1 != ''">
-					<image v-bind:src = "id1" style="width: 100px;height: 100px;"></image>
+				<view style="margin: 0 auto;" @click="idUp">
+					<image v-bind:src = "id1" class="picture"></image>
 				</view>
-				<button type="default" @click="idLow">上传身份证反面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="id2 != ''">
-					<image v-bind:src = "id2" style="width: 100px;height: 100px;"></image>
+				<view style="margin: 0 auto;" @click="idLow">
+					<image v-bind:src = "id2" class="picture"></image>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -125,72 +45,10 @@
 						v-model="identityAuthenticationInfo.customerNumberCard"></input>
 				</view>
 			</view>
-			<view>
-				<button type="default" @click="bankUp()">上传银行卡正面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="bank1 != ''">
-					<image v-bind:src = "bank1" style="width: 100px;height: 100px;"></image>
-				</view>
-				<button type="default" @click="bankLow()">上传银行卡反面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="bank2 != ''">
-					<image v-bind:src = "bank2" style="width: 100px;height: 100px;"></image>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">银行卡号</text>
-				<view class="con-list">
-					<input placeholder="请填写银行卡号" name="input" v-model="identityAuthenticationInfo.bankCard"></input>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">开户行</text>
-				<view class="con-list">
-					<input placeholder="请填写开户行" name="input" v-model="identityAuthenticationInfo.bankDeposit"></input>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">开户支行</text>
-				<view class="con-list">
-					<input placeholder="请填写开户支行" name="input"
-						v-model="identityAuthenticationInfo.bankDepositBranch"></input>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">收款人姓名</text>
-				<view class="con-list">
-					<input placeholder="请填写收款人姓名" name="input" v-model="identityAuthenticationInfo.payeeName"></input>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">收款人身份证号</text>
-				<view class="con-list">
-					<input placeholder="请填写收款身份证号" name="input"
-						v-model="identityAuthenticationInfo.payeeNumberCard"></input>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">手机号</text>
-				<view class="con-list">
-					<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='getcode'
-					class='getcode'>{{sendText}}</button>
-				<view style='width:70%;position:relative;margin-left: 200px;'>
-					<input v-model='verifyCode' placeholder="请输入验证码" type="text">
-				</view>
-
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">联系地址</text>
-				<view class="con-list">
-					<input placeholder="请填写联系地址" name="input" v-model="identityAuthenticationInfo.compAddress"></input>
-				</view>
 			</view>
-		</view>
-		<view class="padding flex flex-direction">
-			<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">提交</button>
-		</view>
+		<!-- <view class="padding flex flex-direction"> -->
+			 <button class="btns btn"  @click="jumpUrl">下一步</button>
+	
 	</view>
 
 </template>
@@ -214,25 +72,17 @@
 				sendText: '获取验证码',
 				platform: '',
 				sendDisabled: false,
+				license1:"../../static/img/authentication/business@3x.png",
+				switchs1:"switchs1",
+				switchs2:"switchs2",
 				id:[],
-				id1:"",
-				id2:"",
-				license1:"",
-				bank1:"",
-				bank2:"",
-				bankid:[],
+				id1:"../../static/img/authentication/identityup(3).png",
+				id2:"../../static/img/authentication/identitylow(3).png",
+				identityImgs1:{},
 
-				identityAuthenticationInfo: {
-					customerPhone: '',
-			
-				},
+				identityAuthenticationInfo: {},
 				tempFilePaths: [],
 				businessLicenseAddressUrl:"",
-
-				// userInfo:{
-				// 	phone: ''
-				// },
-				identityAuthenticationInfo: {},
 			};
 
 		},
@@ -240,13 +90,64 @@
 			...mapState(['hasLogin','userInfo'])
 		},
 		methods: {
+			jumpUrl(){ 
+				if(this.consentStatus ){
+					if (!this.identityAuthenticationInfo.compName) {
+						this.$api.msg('公司名称不能为空')
+						return
+					}
+					if (!this.identityAuthenticationInfo.payTaxesCard) {
+						this.$api.msg('纳税人识别号不能为空')
+						return
+					}
+					if (this.identityAuthenticationInfo.businessLicenseAddressUrl == "" || this.identityAuthenticationInfo.businessLicenseAddressUrl == null) {
+						this.$api.msg('请上传营业执照')
+						return
+					}
+					this.identityAuthenticationInfo.customerTypeFlag = "2"
+					this.identityAuthenticationInfo.customerType = "企业"
+					this.identityAuthenticationInfo.businessLicenseAddressUrl = this.businessLicenseAddressUrl
+					var model = JSON.stringify(this.identityAuthenticationInfo);
+					uni.navigateTo({
+						url: `/pageD/identity/companyIdentityTwo?identityAuthenticationInfo=` + model,
+					})
+				}else if(this.consentStatus1 ){
+					this.identityAuthenticationInfo.cardAddressUrl = this.id.toString()
+					if(this.id[0] == '' || this.id[0] == null){
+						this.$api.msg('请上传身份证正面')
+						return
+					}
+					if(this.id[1] == '' || this.id[1] == null){
+						this.$api.msg('请上传身份证反面')
+						return
+					}
+					if (!this.identityAuthenticationInfo.customerName) {
+						this.$api.msg('姓名不能为空')
+						return
+					}
+					if (!this.identityAuthenticationInfo.customerNumberCard) {
+						this.$api.msg('身份证号不能为空')
+						return
+					}	
+					this.identityAuthenticationInfo.customerTypeFlag = "1"
+					this.identityAuthenticationInfo.customerType = "个人"
+					var model = JSON.stringify(this.identityAuthenticationInfo);
+					uni.navigateTo({
+						url: `/pageD/identity/companyIdentityThree?identityAuthenticationInfo=` + model,
+					})
+				}			
+			},
 			consent() {
 				if (this.consentStatus == false && this.consentStatus1 == true) {
 					this.consentStatus = true
 					this.consentStatus1 = false
+					this.switchs1 = "switchs1"
+					this.switchs2 = "switchs2"
 				} else if (this.consentStatus == true && this.consentStatus1 == false) {
 					this.consentStatus = false
 					this.consentStatus1 = true
+					this.switchs1 = "switchs2"
+					this.switchs2 = "switchs1"
 				}
 			},
 
@@ -282,6 +183,17 @@
 								var strToObj = JSON.parse(data)			
 								that.id[0] = strToObj.url
 								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)
+								}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								})
 							}
 						})
 					}
@@ -305,107 +217,6 @@
 					}
 				})
 			},
-			bankUp(){
-				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.bankid[0] = strToObj.url
-								that.bank1 = strToObj.url
-							}
-						})
-					}
-				})
-			},
-			bankLow(){
-				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.bankid[1] = strToObj.url
-								that.bank2 = strToObj.url
-							}
-						})
-					}
-				})
-			},
-			commit() {
-				this.identityAuthenticationInfo.commonId = this.userInfo.id
-				this.identityAuthenticationInfo.cardAddressUrl = this.id.toString()
-				this.identityAuthenticationInfo.payeeAddressUrl = this.bankid.toString()
-				if(this.consentStatus1 == true){
-					this.identityAuthenticationInfo.customerTypeFlag = "1"
-					this.identityAuthenticationInfo.customerType = "个人"
-				}else if(this.consentStatus == true){
-					this.identityAuthenticationInfo.customerTypeFlag = "2"
-					this.identityAuthenticationInfo.customerType = "企业"
-				}
-				this.$api.doRequest('post', '/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', this
-						.identityAuthenticationInfo)
-					.then(res => {
-						console.log(12545645)
-					}).catch(res => {
-						uni.showToast({
-							title: res.data.message,
-							icon: 'none',
-							duration: 2000
-						})
-					})
-			},
-
-			getcode() {
-				var that = this
-				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.identityAuthenticationInfo.customerPhone)) {
-					this.$api.doRequest('get', '/commonUser/sendVerifyCode', {
-							phone: this.identityAuthenticationInfo.customerPhone
-						}).then(res => {
-							if (res.data.code == 200) {
-								that.sendDisabled = true
-								let sec = 60
-								let interval = setInterval(() => {
-									sec--;
-									that.sendText = sec + 's后重发'
-									if (sec <= 0) {
-										that.sendDisabled = false
-										that.sendText = "获取验证码"
-										clearInterval(interval)
-									}
-								}, 1000)
-							} 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: '请输入正确的手机号',
-						icon: 'none',
-						duration: 2000
-					})
-				}
-			},
 			phoneinput(e){
 				if(e.detail.value.length==11){
 					this.codestatus=true
@@ -455,19 +266,6 @@
 		padding-right: 20rpx;
 		font-size: 14px;
 	}
-	.getcode {
-		font-size: 14px;
-		position: absolute;
-		top: 50%;
-		transform: translateY(-50%);
-		color: #AFB3BF;
-		background: #F5F6F9;
-		height: 30px;
-		line-height: 30px;
-	}
-	.getcode.active {
-		border: none;
-	}
 	.uni-navigator{
 		display:inline-block;
 		color:#22C572;
@@ -476,4 +274,28 @@
 		background: #22C572;
 		color: #fff;
 	}
+	.btn {
+		margin-top: 10px;
+		background-color: #FFFFFF;
+		border-radius: 25px;
+		border: none;
+	}
+	.btns{
+		background-color: #22C572;
+	}
+	.switchs1{
+		font-size: 20px;
+		font-weight: 700;
+		margin-right: 16px;
+	}
+	.switchs2{
+		font-size: 20px;
+		margin-right: 16px;
+	}
+	.picture{
+		width: 100%;
+		 height: 220px;
+		 text-align: center;
+		 margin-top: 10px;
+	}
 </style>

pageD/identity/companyIdentityEdit.vue

@@ -1,19 +1,17 @@
 <template>
 	<view class="center">
-		<view>
-			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'" alt=""></image>
-			<text>公司</text>
-			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus1==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'" alt=""></image>
-			<text>个人</text>
-
+		<view>	
+			<text @click='consent' v-bind:class="switchs1">公司</text>
+			<text  @click='consent' v-bind:class="switchs2">个人</text>
 		</view>
 		<view v-if="consentStatus == true">
 			<view>
-				<button type="default" @click="license">营业执照</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="license1 != ''">
-					<image v-bind:src = "license1" style="width: 100px;height: 100px;"></image>
+				<view style="margin: 0 auto;" v-if="license1 != ''" @click="license">
+					<image v-bind:src = "license1" class="picture"></image>
 				</view>
 			</view>
+			
+			<view class="personalcss">
 			<view class="c-row b-b">
 				<text class="tit">公司名称</text>
 				<view class="con-list">
@@ -26,16 +24,19 @@
 				<input placeholder="请填写纳税人识别号" name="input" v-model="deptList.payTaxesCard"></input>
 				</view>
 			</view>
+			</view>
+			
 			<view>
-				<button type="default" @click="idUp">身份证正面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="idup != ''">
-					<image v-bind:src = "idup" style="width: 100px;height: 100px;"></image>
+			
+				<view style="margin: 0 auto;" v-if="idup != ''" @click="idUp">
+					<image v-bind:src = "idup" class="picture"></image>
 				</view>
-				<button type="default"  @click="idLow">身份证反面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="idlow != ''">
-					<image v-bind:src = "idlow" style="width: 100px;height: 100px;"></image>
+		
+				<view style="margin: 0 auto;" v-if="idlow != ''" @click="idLow">
+					<image v-bind:src = "idlow" class="picture"></image>
 				</view>
 			</view>
+			<view class="personalcss">
 			<view class="c-row b-b">
 				<text class="tit">姓名</text>
 				<view class="con-list">
@@ -49,16 +50,18 @@
 						v-model="deptList.customerNumberCard"></input>
 				</view>
 			</view>
+			</view>
 			<view>
-				<button type="default"  @click="bankUp()">银行卡正面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="bank1 != ''">
-					<image v-bind:src = "bank1" style="width: 100px;height: 100px;"></image>
+		
+				<view style="margin: 0 auto;" v-if="bank1 != ''"  @click="bankUp()">
+					<image v-bind:src = "bank1" class="picture"></image>
 				</view>
-				<button type="default" @click="bankLow()">银行卡反面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="bank2 != ''">
-					<image v-bind:src = "bank2" style="width: 100px;height: 100px;"></image>
+
+				<view style="margin: 0 auto;" v-if="bank2 != ''" @click="bankLow()">
+					<image v-bind:src = "bank2" class="picture"></image>
 				</view>
 			</view>
+			<view class="personalcss">
 			<view class="c-row b-b">
 				<text class="tit">银行卡号</text>
 				<view class="con-list">
@@ -91,17 +94,18 @@
 				</view>
 			</view>
 		</view>
+		</view>
 		<view v-else>
 			<view>
-				<button type="default" @click="idUp">上传身份证正面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="idup != ''">
-					<image v-bind:src = "idup" style="width: 100px;height: 100px;"></image>
+				<view style="margin: 0 auto;" v-if="idup != ''" @click="idUp">
+					<image v-bind:src = "idup" class="picture"></image>
 				</view>
-				<button type="default" @click="idLow">上传身份证反面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="idlow != ''">
-					<image v-bind:src = "idlow" style="width: 100px;height: 100px;"></image>
+						
+				<view style="margin: 0 auto;" v-if="idlow != ''" @click="idLow">
+					<image v-bind:src = "idlow" class="picture"></image>
 				</view>
 			</view>
+			<view class="personalcss">
 			<view class="c-row b-b">
 				<text class="tit">姓名</text>
 				<view class="con-list">
@@ -115,16 +119,17 @@
 						v-model="deptList.customerNumberCard"></input>
 				</view>
 			</view>
+			</view>
 			<view>
-				<button type="default" @click="bankUp()">上传银行卡正面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="bank1 != ''">
-					<image v-bind:src = "bank1" style="width: 100px;height: 100px;"></image>
+				<view style="margin: 0 auto;" v-if="bank1 != ''"  @click="bankUp()">
+					<image v-bind:src = "bank1" class="picture"></image>
 				</view>
-				<button type="default" @click="bankLow()">上传银行卡反面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="bank2 != ''">
-					<image v-bind:src = "bank2" style="width: 100px;height: 100px;"></image>
+				
+				<view style="margin: 0 auto;" v-if="bank2 != ''" @click="bankLow()">
+					<image v-bind:src = "bank2" class="picture"></image>
 				</view>
 			</view>
+			<view class="personalcss">
 			<view class="c-row b-b">
 				<text class="tit">银行卡号</text>
 				<view class="con-list">
@@ -150,7 +155,7 @@
 					<input placeholder="请填写收款人姓名" name="input" v-model="deptList.payeeName"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row">
 				<text class="tit">收款人身份证号</text>
 				<view class="con-list">
 					<input placeholder="请填写收款身份证号" name="input"
@@ -163,7 +168,7 @@
 				<input placeholder="请填写手机号" @input='phoneinput' v-model="deptList.customerPhone"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<text class="tit">联系地址</text>
 				<view class="con-list">
 					<input placeholder="请填写联系地址" name="input" v-model="deptList.compAddress"></input>
@@ -171,9 +176,9 @@
 			</view>
 		
 		</view>
-		<view class="padding flex flex-direction">
-			<button class="cu-btn bg-red margin-tb-sm lg" @click="commitEdit">修改</button>
-		</view>
+</view>
+			<button class="btn btns" @click="commitEdit">修改</button>
+
 	</view>
 </template>
 
@@ -202,7 +207,9 @@
 				bank2:"",
 				bankid:[],
 				payeeAddress:[],
-				commitEdits:{}
+				commitEdits:{},
+				switchs1:"switchs1",
+				switchs2:"switchs2",
 			};
 		},
 		onLoad(option) {
@@ -341,7 +348,6 @@
 							console.log("成功连接")
 				
 							this.deptList = res.data.data
-					console.log(this.deptList)
 							if(this.deptList.businessLicenseAddressUrl != ""){
 								this.license1 = this.deptList.businessLicenseAddressUrl
 							}
@@ -355,6 +361,18 @@
 							this.bank1 = this.payeeAddress[0]
 							this.bank2 = this.payeeAddress[1]
 							}
+							console.log(this.deptList.customerTypeFlag,"判断")
+							if(this.deptList.customerTypeFlag == 2){
+								this.consentStatus = true
+								this.consentStatus1 = false
+								this.switchs1 = "switchs1"
+								this.switchs2 = "switchs2"
+							}else{
+								this.consentStatus = false
+								this.consentStatus1 = true
+								this.switchs1 = "switchs2"
+								this.switchs2 = "switchs1"
+							}
 		
 						})
 						.catch(res => {
@@ -369,9 +387,13 @@
 				if(this.consentStatus == false && this.consentStatus1 == true){
 					this.consentStatus = true
 					this.consentStatus1 = false
+					this.switchs1 = "switchs1"
+					this.switchs2 = "switchs2"
 				}else if(this.consentStatus == true && this.consentStatus1 == false){
 					this.consentStatus = false
 					this.consentStatus1 = true
+					this.switchs1 = "switchs2"
+					this.switchs2 = "switchs1"
 				}
 				
 			},
@@ -413,4 +435,45 @@
 		padding-right: 20rpx;
 		font-size: 14px;
 	}
+	.picture{
+		width: 100%;
+		 height: 220px;
+		 text-align: center;
+		 margin-top: 10px;
+	}
+	.fujians{
+		margin: 0 auto;
+		background-color: #FFFFFF;
+		margin-top: 30px;
+		border-radius: 20px;
+		padding: 10px 10px;
+	}
+	.picturebiaoti{
+		font-size: 17px;
+		font-weight: 700;
+	}
+	.personalcss{
+		background-color: #FFFFFF;
+		border-radius: 20px;
+		margin-top: 10px;
+	}
+	.btn {
+		margin-top: 10px;
+		background-color: #FFFFFF;
+		border-radius: 25px;
+		border: none;
+	}
+	
+	.btns {
+		background-color: #22C572;
+	}
+	.switchs1{
+		font-size: 20px;
+		font-weight: 700;
+		margin-right: 16px;
+	}
+	.switchs2{
+		font-size: 20px;
+		margin-right: 16px;
+	}
 </style>

pageD/identity/companyIdentityLook.vue

@@ -1,127 +1,68 @@
 <template>
 	<view class="center">
-		<view>
-			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'" alt=""></image>
-			<text>公司</text>
-			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus1==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'" alt=""></image>
-			<text>个人</text>
-
-		</view>
-		<view v-if="consentStatus == true">
-			<view>
-				<button type="default" @click="license">营业执照</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="license1 != ''">
-					<image v-bind:src = "license1" style="width: 100px;height: 100px;"></image>
+		<view v-if="deptList.customerTypeFlag == 2">
+			<view  class="fujians" v-if="license1 != ''">
+				<view class="c-row b-b">
+					<text class="picturebiaoti">营业执照</text>			
 				</view>
+				<image v-bind:src="license1" class="picture"></image>
 			</view>
+			<view class="personalcss">
 			<view class="c-row b-b">
 				<text class="tit">公司名称</text>
 				<view class="con-list">
 					{{deptList.compName}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<text class="tit">纳税人识别号</text>
 				<view class="con-list">
 				{{deptList.payTaxesCard}}
 				</view>
 			</view>
-			<view>
-				<button type="default">身份证正面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="idup != ''">
-					<image v-bind:src = "idup" style="width: 100px;height: 100px;"></image>
-				</view>
-				<button type="default">身份证反面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="idlow != ''">
-					<image v-bind:src = "idlow" style="width: 100px;height: 100px;"></image>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">姓名</text>
-				<view class="con-list">
-					{{deptList.customerName}}
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">身份证号</text>
-				<view class="con-list">
-					{{deptList.customerNumberCard}}
-				</view>
-			</view>
-			<view>
-				<button type="default">银行卡正面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="bank1 != ''">
-					<image v-bind:src = "bank1" style="width: 100px;height: 100px;"></image>
-				</view>
-				<button type="default">银行卡反面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="bank2 != ''">
-					<image v-bind:src = "bank2" style="width: 100px;height: 100px;"></image>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">银行卡号</text>
-				<view class="con-list">
-					{{deptList.bankCard}}
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">开户行</text>
-				<view class="con-list">
-					{{deptList.bankDeposit}}
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">开户支行</text>
-				<view class="con-list">
-					{{deptList.bankDepositBranch}}
-				</view>
 			</view>
-			<view class="c-row b-b">
-				<text class="tit">手机号</text>
-				<view class="con-list">
-					{{deptList.customerPhone}}
-				</view>
 			</view>
-			<view class="c-row b-b">
-				<text class="tit">公司地址</text>
-				<view class="con-list">
-					{{deptList.compAddress}}
+			<view  class="fujians" v-if="idup != ''">
+				<view class="c-row b-b">
+					<text class="picturebiaoti">身份证正面</text>			
 				</view>
+				<image v-bind:src="idup" class="picture"></image>
 			</view>
-		</view>
-		<view v-else>
-			<view>
-				<button type="default">上传身份证正面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="id1 != ''">
-					<image v-bind:src = "id1" style="width: 100px;height: 100px;"></image>
-				</view>
-				<button type="default">上传身份证反面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="id2 != ''">
-					<image v-bind:src = "id2" style="width: 100px;height: 100px;"></image>
+			<view  class="fujians" v-if="idlow != ''">
+				<view class="c-row b-b">
+					<text class="picturebiaoti">身份证反面</text>			
 				</view>
+				<image v-bind:src="idlow" class="picture"></image>
 			</view>
+			<view class="personalcss">
+				
+			
 			<view class="c-row b-b">
 				<text class="tit">姓名</text>
 				<view class="con-list">
 					{{deptList.customerName}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<text class="tit">身份证号</text>
 				<view class="con-list">
 					{{deptList.customerNumberCard}}
 				</view>
 			</view>
-			<view>
-				<button type="default">上传银行卡正面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="bank1 != ''">
-					<image v-bind:src = "bank1" style="width: 100px;height: 100px;"></image>
+			</view>
+			<view  class="fujians" v-if="bank1 != ''">
+				<view class="c-row b-b">
+					<text class="picturebiaoti">银行卡正面</text>			
 				</view>
-				<button type="default">上传银行卡反面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="bank2 != ''">
-					<image v-bind:src = "bank2" style="width: 100px;height: 100px;"></image>
+				<image v-bind:src="bank1" class="picture"></image>
+			</view>
+			<view  class="fujians" v-if="bank2 != ''">
+				<view class="c-row b-b">
+					<text class="picturebiaoti">银行卡反面</text>			
 				</view>
+				<image v-bind:src="bank2" class="picture"></image>
 			</view>
+			<view class="personalcss">
 			<view class="c-row b-b">
 				<text class="tit">银行卡号</text>
 				<view class="con-list">
@@ -140,16 +81,17 @@
 					{{deptList.bankDepositBranch}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row b-b" v-if="deptList.customerTypeFlag == 1">
 				<text class="tit">收款人姓名</text>
 				<view class="con-list">
-					{{ deptList.payeeName}}
+					<input placeholder="请填写收款人姓名" name="input" v-model="deptList.payeeName"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row b-b" v-if="deptList.customerTypeFlag == 1">
 				<text class="tit">收款人身份证号</text>
 				<view class="con-list">
-					{{deptList.payeeNumberCard}}
+					<input placeholder="请填写收款人身份证号" name="input"
+						v-model="deptList.payeeNumberCard"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -158,13 +100,19 @@
 					{{deptList.customerPhone}}
 				</view>
 			</view>
-			<view class="c-row b-b">
-				<text class="tit">联系地址</text>
+			<view class="c-row b-b" v-if="deptList.customerTypeFlag == 2">
+				<text class="tit">公司地址</text>
 				<view class="con-list">
 					{{deptList.compAddress}}
 				</view>
 			</view>
-		</view>
+			<view class="c-row b-b" v-if="deptList.customerTypeFlag == 1">
+				<text class="tit">联系地址</text>
+				<view class="con-list">
+					<input placeholder="请填写联系地址" name="input" v-model="deptList.compAddress"></input>
+				</view>
+			</view>
+			</view>
 	</view>
 </template>
 
@@ -201,17 +149,6 @@
 		},
 		methods: {
 			getList(ids) {		
-				// this.$api.doRequest('get', '/identityAuthenticationInfo/api/getIdentityAuthenticationInfo', this.parameter).then(res => {
-				// 		console.log("成功连接")
-				// 		this.businessman = res.data.data
-				// 	})
-				// 	.catch(res => {
-				// 		uni.showToast({
-				// 			title: res.errmsg,
-				// 			icon: 'none',
-				// 			duration: 2000
-				// 		})
-				// 	});
 					this.$api.doRequest('get', '/identityAuthenticationInfo/api/getIdentityAuthenticationInfo', this.parameter, 'application/json;charset=UTF-8').then(res => {
 							console.log("成功连接")
 							// this.procurementPlanInfos = res.data.data
@@ -290,4 +227,26 @@
 		padding-right: 20rpx;
 		font-size: 14px;
 	}
+	.picture {
+		width: 100%;
+		height: 220px;
+		text-align: center;
+		margin-top: 10px;
+	}
+	.fujians{
+		margin: 0 auto;
+		background-color: #FFFFFF;
+		margin-top: 30px;
+		border-radius: 20px;
+		padding: 10px 10px;
+	}
+	.picturebiaoti{
+		font-size: 17px;
+		font-weight: 700;
+	}
+	.personalcss{
+		background-color: #FFFFFF;
+		border-radius: 20px;
+		margin-top: 10px;
+	}
 </style>

pageD/identity/companyIdentityThree.vue

@@ -0,0 +1,343 @@
+<template>
+	<view class="center">
+		<view>
+		
+			<view style="margin: 0 auto;" v-if="bank1 != ''" @click="bankUp()">
+				<image v-bind:src="bank1" class="picture"></image>
+			</view>
+		
+			<view style="margin: 0 auto;" v-if="bank2 != ''" @click="bankLow()">
+				<image v-bind:src="bank2" class="picture"></image>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">银行卡号</text>
+			<view class="con-list">
+				<input placeholder="请填写银行卡号" name="input" v-model="identityAuthenticationInfo.bankCard"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">开户行</text>
+			<view class="con-list">
+				<input placeholder="请填写开户行" name="input" v-model="identityAuthenticationInfo.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]:'请选择开户支行'}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b" v-if="identityAuthenticationInfo.customerTypeFlag == 1">
+			<text class="tit">收款人姓名</text>
+			<view class="con-list">
+				<input placeholder="请填写收款人姓名" name="input" v-model="identityAuthenticationInfo.payeeName"></input>
+			</view>
+		</view>
+		<view class="c-row b-b" v-if="identityAuthenticationInfo.customerTypeFlag == 1">
+			<text class="tit">收款人身份证号</text>
+			<view class="con-list">
+				<input placeholder="请填写收款人身份证号" name="input"
+					v-model="identityAuthenticationInfo.payeeNumberCard"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">手机号</text>
+			<view class="con-list">
+				<input placeholder="请填写手机号" 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='getcode'
+				class='getcode'>{{sendText}}</button>
+			<view style='width:70%;position:relative;margin-left: 200px;'>
+				<input v-model='verifyCode' placeholder="请输入验证码" type="text">
+			</view>
+		</view>
+		<view class="c-row b-b" v-if="identityAuthenticationInfo.customerTypeFlag == 2">
+			<text class="tit">公司地址</text>
+			<view class="con-list">
+				<input placeholder="请填写公司地址" name="input" v-model="identityAuthenticationInfo.compAddress"></input>
+			</view>
+		</view>
+		<view class="c-row b-b" v-if="identityAuthenticationInfo.customerTypeFlag == 1">
+			<text class="tit">联系地址</text>
+			<view class="con-list">
+				<input placeholder="请填写联系地址" name="input" v-model="identityAuthenticationInfo.compAddress"></input>
+			</view>
+		</view>
+		<button class="btns btn" @click="commit">提交</button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		name: "buy",
+		data() {
+			return {
+				bank1: "../../static/img/authentication/bankup(3).png",
+				bank2: "../../static/img/authentication/banklow(3).png",
+				bankid: [],
+				consentStatus: true,
+				consentStatus1: false,
+				codestatus: false,
+				verifyCode: null,
+				inputStatus: 'none',
+				sendText: '获取验证码',
+				platform: '',
+				sendDisabled: false,
+				identityAuthenticationInfo: {},
+				bankImgs1: {},
+				bankIndex: -1,
+				bankType: [],
+			}
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		onLoad(options) {
+			this.identityAuthenticationInfo = JSON.parse(options.identityAuthenticationInfo)
+			console.log(this.identityAuthenticationInfo)
+		},
+		methods: {
+			bankUp() {
+				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.bankid[0] = strToObj.url
+								that.bank1 = strToObj.url
+								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
+								}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								})
+							}
+						})
+					}
+				})
+			},
+			bankLow() {
+				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.bankid[1] = strToObj.url
+								that.bank2 = strToObj.url
+							}
+						})
+					}
+				})
+			},
+			bankChange(e) {
+				this.bankIndex = e.detail.value
+				this.Model = this.bankType[this.bankIndex];
+				this.identityAuthenticationInfo.bankDepositBranch = this.bankType[this.bankIndex];
+			},
+			commit() {
+				if (this.bankid[0] == '' || this.bankid[0] == null) {
+					this.$api.msg('请上传银行卡正面')
+					return
+				}
+				if (this.bankid[1] == '' || this.bankid[1] == null) {
+					this.$api.msg('请上传银行卡反面')
+					return
+				}
+				if (!this.identityAuthenticationInfo.bankCard) {
+					this.$api.msg('银行卡号不能为空')
+					return
+				}
+				if (!this.identityAuthenticationInfo.bankDeposit) {
+					this.$api.msg('开户行不能为空')
+					return
+				}
+				if (!this.identityAuthenticationInfo.bankDepositBranch) {
+					this.$api.msg('开户支行不能为空')
+					return
+				}
+				if (!this.identityAuthenticationInfo.customerPhone) {
+					this.$api.msg('手机号不能为空')
+					return
+				}
+				if(this.identityAuthenticationInfo.customerTypeFlag == 1){
+					if (!this.identityAuthenticationInfo.payeeName) {
+						this.$api.msg('收款人姓名不能为空')
+						return
+					}
+					if (!this.identityAuthenticationInfo.payeeNumberCard) {
+						this.$api.msg('收款人身份证号不能为空')
+						return
+					}
+					if (!this.identityAuthenticationInfo.compAddress) {
+						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.$api.doRequest('post', '/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', this
+						.identityAuthenticationInfo)
+					.then(res => {
+						uni.navigateTo({
+							url: `/pages/attestation/index` ,
+						})
+						
+					}).catch(res => {
+						uni.showToast({
+							title: res.data.message,
+							icon: 'none',
+							duration: 2000
+						})
+					})
+			},
+			phoneinput(e){
+				if(e.detail.value.length==11){
+					this.codestatus=true
+				}
+			},
+			getcode() {
+				var that = this
+				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.identityAuthenticationInfo.customerPhone)) {
+					this.$api.doRequest('get', '/commonUser/sendVerifyCode', {
+							phone: this.identityAuthenticationInfo.customerPhone
+						}).then(res => {
+							if (res.data.code == 200) {
+								that.sendDisabled = true
+								let sec = 60
+								let interval = setInterval(() => {
+									sec--;
+									that.sendText = sec + 's后重发'
+									if (sec <= 0) {
+										that.sendDisabled = false
+										that.sendText = "获取验证码"
+										clearInterval(interval)
+									}
+								}, 1000)
+							} 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: '请输入正确的手机号',
+						icon: 'none',
+						duration: 2000
+					})
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+	.center {
+		padding: 10px 20px;
+		background-color: #F5F6FA;
+	}
+
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+
+	.con-list {
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
+		font-size: 14px;
+	}
+
+	.btn {
+		margin-top: 10px;
+		background-color: #FFFFFF;
+		border-radius: 25px;
+		border: none;
+	}
+
+	.btns {
+		background-color: #22C572;
+	}
+
+	.picture {
+		width: 100%;
+		height: 220px;
+		text-align: center;
+		margin-top: 10px;
+	}
+	.getcode {
+		font-size: 14px;
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		color: #AFB3BF;
+		background: #F5F6F9;
+		height: 30px;
+		line-height: 30px;
+	}
+	.getcode.active {
+		border: none;
+	}
+	
+</style>

pageD/identity/companyIdentityTwo.vue

@@ -0,0 +1,172 @@
+<template>
+	<view class="center">
+		<view>
+			<view style="margin: 0 auto;" @click="idUp">
+				<image v-bind:src = "id1" class="picture"></image>
+			</view>
+			<view style="margin: 0 auto;" @click="idLow">
+				<image v-bind:src = "id2" class="picture"></image>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">姓名</text>
+			<view class="con-list">
+				<input placeholder="请填写姓名" name="input" v-model="identityAuthenticationInfo.customerName"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">身份证号</text>
+			<view class="con-list">
+				<input placeholder="请填写身份证号" name="input"
+					v-model="identityAuthenticationInfo.customerNumberCard"></input>
+			</view>
+		</view>
+		 <button class="btns btn"  @click="jumpUrl">下一步</button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		name: "buy",
+		data() {
+			return {
+				
+				id:[],
+				id1:"../../static/img/authentication/identityup(3).png",
+				id2:"../../static/img/authentication/identitylow(3).png",
+				identityImgs1:{},
+				identityAuthenticationInfo:{},
+			}
+		},
+		onLoad(options){
+			this.identityAuthenticationInfo = JSON.parse(options.identityAuthenticationInfo)
+			console.log(this.identityAuthenticationInfo)
+		},
+		methods:{
+			jumpUrl(){
+				this.identityAuthenticationInfo.cardAddressUrl = this.id.toString()
+				if(this.id[0] == '' || this.id[0] == null){
+					this.$api.msg('请上传身份证正面')
+					return
+				}
+				if(this.id[1] == '' || this.id[1] == null){
+					this.$api.msg('请上传身份证反面')
+					return
+				}
+				if (!this.identityAuthenticationInfo.customerName) {
+					this.$api.msg('姓名不能为空')
+					return
+				}
+				if (!this.identityAuthenticationInfo.customerNumberCard) {
+					this.$api.msg('身份证号不能为空')
+					return
+				}	
+				var model = JSON.stringify(this.identityAuthenticationInfo);
+				uni.navigateTo({
+					url: `/pageD/identity/companyIdentityThree?identityAuthenticationInfo=` + model,
+				})
+			},
+			idUp(){
+				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.id[0] = strToObj.url
+								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)
+								}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								})
+							}
+						})
+					}
+				})
+			},
+			idLow(){
+				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.id[1] = strToObj.url
+								that.id2 = strToObj.url
+							}
+						})
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	.center {
+		padding: 10px 20px;
+		background-color: #F5F6FA;
+	}
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+	.con-list {
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
+		font-size: 14px;
+	}
+
+	.btn {
+		margin-top: 10px;
+		background-color: #FFFFFF;
+		border-radius: 25px;
+		border: none;
+	}
+
+	.btns {
+		background-color: #22C572;
+	}
+	.picture{
+		width: 100%;
+		 height: 220px;
+		 text-align: center;
+		 margin-top: 10px;
+	}
+</style>

pageD/identity/driverIdentity.vue

@@ -45,138 +45,6 @@
 					<input placeholder="请填写常驻城市" name="input" v-model="DriverViewInfo.residentCityProvincial"></input>
 				</view>
 			</view>
-
-
-			<!-- </view>
-		<view class="margin-top">
-		<view class="information">	
-			<view class="c-row ">
-				<text class="tit">车辆 -？</text>
-				<view class="con-list">
-					<image src="../../static/img/jiaoyi/shanchu@2x.png" class="eliminate"></image>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">车牌号</text>
-				<view class="con-list">
-					<input placeholder="请填写车牌号" name="input" v-model="driverCarInfoList.carNumber"></input>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">车型</text>
-
-				<picker @change="ModelChange" :value="ModelIndex" :range="ModelType" class="con-list">
-					<view class="picker ">
-						{{ModelIndex>-1?ModelType[ModelIndex]:'请选择车型'}}
-					</view>
-				</picker>
-
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">不含车头车长（米）</text>
-
-				<picker @change="carLongChange" :value="carLongIndex" :range="carLongType" class="con-list">
-					<view class="picker">
-						{{carLongIndex>-1?carLongType[carLongIndex]:'请选择车长'}}
-					</view>
-				</picker>
-			
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">载重（吨）</text>
-				<view class="con-list">
-					<input placeholder="请填写载重（吨）" name="input" v-model="driverCarInfoList.carLoad"></input>
-				</view>
-			</view>
-			<view class="c-row ">
-				<text class="tit">出厂年份</text>
-				<view class="con-list">
-					<input placeholder="请填写出厂年份" name="input" v-model="driverCarInfoList.yearManufacture"></input>
-				</view>
-			</view>
-			
-
-			
-			</view>	
-           <button  class="btn">添加车辆</button>
-		</view> -->
-			<!-- <view class="margin-top">
-			<view class="information">	
-
-			<view class="c-row ">
-				<text class="tit">账户 -？</text>
-				<view class="con-list">
-					<image src="../../static/img/jiaoyi/shanchu@2x.png" class="eliminate"></image>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">账户类型</text>
-				<view class="con-list">
-					<input placeholder="请填写账户类型" name="input" v-model="driverPayeeInfoList.accountType"></input>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">银行卡照片（可选）</text>
-				<view class="con-list">
-					<input placeholder="请上传照片" name="input" v-model="driverPayeeInfoList.payeeAddressUrl"></input>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">银行卡号</text>
-				<view class="con-list">
-					<input placeholder="请输入银行卡号" name="input" v-model="driverPayeeInfoList.bankCard"></input>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">开户行</text>
-				<view class="con-list">
-					<input placeholder="请输入开户行" name="input" v-model="driverPayeeInfoList.bankDeposit"></input>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">开户支行</text>
-				<view class="con-list">
-					<input placeholder="请输入开户支行" name="input" v-model="driverPayeeInfoList.bankDepositBranch"></input>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">收款人姓名</text>
-				<view class="con-list">
-					<input placeholder="请输入收款人姓名" name="input" v-model="driverPayeeInfoList.payeeName"></input>
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">收款人身份证号</text>
-				<view class="con-list">
-					<input placeholder="请输入收款人身份证号" name="input" v-model="driverPayeeInfoList.payeeNumberCard"></input>
-				</view>
-			</view>
-			</view >	
-			<button class="btn">添加账号</button>
-		</view>
-		<view class="margin-top">
-			<view class="labels">上传附件</view>
-			<button type="default" @click="travel">行驶证</button>
-			<view style="width: 100px;margin: 0 auto;" v-if="travels != ''">
-				<image v-bind:src = "travels" style="width: 100px;height: 100px;"></image>
-			</view>
-			<button type="default" @click="drive">驾驶证</button>
-			<view style="width: 100px;margin: 0 auto;" v-if="drives != ''">
-				<image v-bind:src = "drives" style="width: 100px;height: 100px;"></image>
-			</view>
-			<button type="default" @click="operate">道路运营证</button>
-			<view style="width: 100px;margin: 0 auto;" v-if="operates != ''">
-				<image v-bind:src = "operates" style="width: 100px;height: 100px;"></image>
-			</view>
-			<button type="default" @click="practice">从业资格证</button>
-			<view style="width: 100px;margin: 0 auto;" v-if="practices != ''">
-				<image v-bind:src = "practices" style="width: 100px;height: 100px;"></image>
-			</view>
-		</view>
-		<view class="padding flex flex-direction">
-			<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">提交</button>
-		</view>-->
-
 		</view>
 		<button class="btns btn" @click="jumpUrl">下一步</button>
 	</view>
@@ -330,13 +198,8 @@
 								that.id1 = strToObj.url
 								that.personImgs.personImg = that.id[0]
 								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.personImgs).then(res => {
-									console.log("成功！")
-									console.log(that)
 									that.$set(that.DriverViewInfo,'driverName',res.data.data.recPerson)
 									that.$set(that.DriverViewInfo,'numberCard',res.data.data.recPersonNo)
-									 // that.DriverViewInfo.driverName = res.data.data.recPerson
-									 //  that.DriverViewInfo.numberCard = res.data.data.recPersonNo
-									  console.log(that.DriverViewInfo.driverName)
 								}).catch(res => {
 									uni.showToast({
 										title: res.data.message,

pageD/identity/driverIdentityEdit.vue

@@ -1,17 +1,19 @@
 <template>
 	<view class="center">
 		<view>
-			<view class="labels">司机信息</view>
+
 			<view>
-				<button type="default" @click="idUp">上传身份证正面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="id != ''">
-					<image v-bind:src = "id1" style="width: 100px;height: 100px;"></image>
+				<view style="margin: 0 auto;" v-if="id != ''"  @click="idUp">
+					<image v-bind:src = "id1" class="picture"></image>
 				</view>
-				<button type="default" @click="idLow">上传身份证反面</button>
-				<view style="width: 100px;margin: 0 auto;" v-if="id2 != ''">
-					<image v-bind:src = "id2" style="width: 100px;height: 100px;"></image>
+	
+				<view style="margin: 0 auto;" v-if="id2 != ''" @click="idLow">
+					<image v-bind:src = "id2" class="picture"></image>
 				</view>
 			</view>
+			<view class="personalcss">
+				
+			
 			<view class="c-row b-b">
 				<text class="tit">姓名</text>
 				<view class="con-list">
@@ -47,23 +49,37 @@
 					<input placeholder="请填写常驻城市" name="input" v-model="DriverViewInfo.residentCityProvincial"></input>
 				</view>
 			</view>
+			</view>
 
 
 		</view>
-		<view class="margin-top">
-			<view class="labels">货车信息</view>
-			<view class="labels"> 车辆 -？</view>
+		<!-- 车辆信息 -->
+		<view class="information">
+			<view class="c-row">
+				<text class="tit" style="line-height: 36px;">货车信息</text>
+				<view class="con-list">
+					<image v-bind:src="opencar" class="open" opencarboolean @click="opencarclick" ></image>
+				</view>
+			</view>
+		</view>
+		<view class="informations" v-if="opencarboolean == true" v-for="(item , index) in driverCarInfoList"
+			:Key="index">
+			<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>
+				</view>
+			</view>
 			<view class="c-row b-b">
 				<text class="tit">车牌号</text>
 				<view class="con-list">
-					<input placeholder="请填写车牌号" name="input" v-model="driverCarInfoList[0].carNumber"></input>
+					<input placeholder="请填写车牌号" name="input" v-model="item.carNumber"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">车型</text>
-				<!-- <view class="con-list"> -->
 				<picker @change="ModelChange" :value="ModelIndex" :range="ModelType" class="con-list">
-					<view class="picker ">
+					<view class="picker " v-model="item.carModel">
 						{{ModelIndex>-1?ModelType[ModelIndex]:'请选择车型'}}
 					</view>
 				</picker>
@@ -71,99 +87,132 @@
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">不含车头车长（米）</text>
-				<!-- 	 <view class="con-list"> -->
 				<picker @change="carLongChange" :value="carLongIndex" :range="carLongType" class="con-list">
-					<view class="picker">
+					<view class="picker" v-model="item.carLength">
 						{{carLongIndex>-1?carLongType[carLongIndex]:'请选择车长'}}
 					</view>
 				</picker>
-				<!-- </view> -->
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">载重（吨）</text>
 				<view class="con-list">
-					<input placeholder="请填写载重（吨）" name="input" v-model="driverCarInfoList[0].carLoad"></input>
+					<input placeholder="请填写载重（吨）" name="input" v-model="item.carLoad"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<text class="tit">出厂年份</text>
 				<view class="con-list">
-					<input placeholder="请填写出厂年份" name="input" v-model="driverCarInfoList[0].yearManufacture"></input>
+					<input placeholder="请填写出厂年份" name="input" v-model="item.yearManufacture"></input>
 				</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>
 
-			<button type="default">添加车辆</button>
-
+		
+		<!-- 账户信息 -->
+		<view class="information">
+			<view class="c-row">
+				<text class="tit">账户信息</text>
+				<view class="con-list">
+					<image v-bind:src="openuser" class="open" openuserboolean @click="openuserclick"></image>
+				</view>
+			</view>
 		</view>
-		<view class="margin-top">
-			<view class="labels">账户信息</view>
-			<view class="labels"> 账户 -？</view>
+		
+		<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>
+				</view>
+			</view>
 			<view class="c-row b-b">
 				<text class="tit">账户类型</text>
 				<view class="con-list">
-					<input placeholder="请填写账户类型" name="input" v-model="driverPayeeInfoList[0].accountType"></input>
+					<input placeholder="请填写账户类型" name="input" v-model="items.accountType"></input>
 				</view>
 			</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="driverPayeeInfoList[0].payeeAddressUrl"></input>
+					<!-- <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>
+					
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">银行卡号</text>
 				<view class="con-list">
-					<input placeholder="请输入银行卡号" name="input" v-model="driverPayeeInfoList[0].bankCard"></input>
+					<input placeholder="请输入银行卡号" name="input" v-model="items.bankCard"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">开户行</text>
+				
 				<view class="con-list">
-					<input placeholder="请输入开户行" name="input" v-model="driverPayeeInfoList[0].bankDeposit"></input>
+					<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">
-					<input placeholder="请输入开户支行" name="input" v-model="driverPayeeInfoList[0].bankDepositBranch"></input>
+					{{bankIndex>-1?bankType[bankIndex]:'请选择开户支行'}}
 				</view>
+					</picker>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">收款人姓名</text>
 				<view class="con-list">
-					<input placeholder="请输入收款人姓名" name="input" v-model="driverPayeeInfoList[0].payeeName"></input>
+					<input placeholder="请输入收款人姓名" name="input" v-model="items.payeeName"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<text class="tit">收款人身份证号</text>
 				<view class="con-list">
-					<input placeholder="请输入收款人身份证号" name="input" v-model="driverPayeeInfoList[0].payeeNumberCard"></input>
+					<input placeholder="请输入收款人身份证号" name="input" v-model="items.payeeNumberCard"></input>
 				</view>
 			</view>
-			<button type="default">添加账号</button>
 		</view>
-		<view class="margin-top">
-			<view class="labels">上传附件</view>
-			<button type="default" @click="travel">行驶证</button>
-			<view style="width: 100px;margin: 0 auto;" v-if="travels != ''">
-				<image v-bind:src = "travels" style="width: 100px;height: 100px;"></image>
+		<button class="btn" v-if="openuserboolean == true" @click="userAdd()">
+			 <image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add" style="top: 8px;"></image> 
+			<text style="margin-top: -2px;">添加账户</text>
+			</button>
+		<view  class="fujians" v-if="travels != ''" @click="travel">
+			<view class="c-row b-b">
+				<text class="picturebiaoti">行驶证</text>			
 			</view>
-			<button type="default" @click="drive">驾驶证</button>
-			<view style="width: 100px;margin: 0 auto;" v-if="drives != ''">
-				<image v-bind:src = "drives" style="width: 100px;height: 100px;"></image>
+			<image v-bind:src="travels" class="picture"></image>
+		</view>	
+		<view  class="fujians" v-if="drives != ''" @click="drive">
+			<view class="c-row b-b">
+				<text class="picturebiaoti">驾驶证</text>			
 			</view>
-			<button type="default" @click="operate">道路运营证</button>
-			<view style="width: 100px;margin: 0 auto;" v-if="operates != ''">
-				<image v-bind:src = "operates" style="width: 100px;height: 100px;"></image>
+			<image v-bind:src="drives" class="picture"></image>
+		</view>	
+		<view  class="fujians" v-if="operates != ''" @click="operate">
+			<view class="c-row b-b">
+				<text class="picturebiaoti">道路运营证</text>			
 			</view>
-			<button type="default" @click="practice">从业资格证</button>
-			<view style="width: 100px;margin: 0 auto;" v-if="practices != ''">
-				<image v-bind:src = "practices" style="width: 100px;height: 100px;"></image>
+			<image v-bind:src="operates" class="picture"></image>
+		</view>	
+		<view  class="fujians" v-if="practices != ''" @click="practice">
+			<view class="c-row b-b">
+				<text class="picturebiaoti">从业资格证</text>			
 			</view>
-		</view>
-		<view class="padding flex flex-direction">
-			<button class="cu-btn bg-red margin-tb-sm lg" @click="commitEdit">修改</button>
-		</view>
+			<image v-bind:src="practices" class="picture"></image>
+		</view>	
+			<button class="btn btns" @click="commitEdit">修改</button>
+
 	</view>
 	</view>
 </template>
@@ -210,6 +259,14 @@
 				codestatus:false,
 				customerPhone: '',
 				addressUrl:[],
+				opencarboolean:false,
+				openuserboolean:false,
+				opencar: "../../static/img/authentication/down2@3x.png",
+					openuser: "../../static/img/authentication/down2@3x.png",
+					bankimg:"",
+					bankImgs1:{},
+					bankIndex:-1,
+					bankType:[],
 			}
 		},
 		computed: {
@@ -219,11 +276,69 @@
 			this.getList(option.id)
 		},
 		methods: {
-			// phoneinput(e) {
-			// 	if (e.detail.value.length == 11) {
-			// 		this.codestatus = true
-			// 	}
-			// },
+			carAdd() {
+				this.driverCarInfoList.push({
+					carNumber: '',
+					carModel: "",
+					carLength: "",
+					carLoad: "",
+					yearManufacture: "",
+				})
+			},
+			userAdd() {
+				this.driverPayeeInfoList.push({
+					accountType:"",
+					cardAddressUrl:"",
+					bankCard:"",
+					bankDeposit:"",
+					bankDepositBranch:"",
+					payeeName:"",
+					payeeNumberCard:"",
+				})
+			},
+			carDel(index) {
+				if (this.driverCarInfoList.length > 1) {
+					this.driverCarInfoList.splice(index, 1)
+				}
+			},
+			userDel(index) {
+				if (this.driverPayeeInfoList.length > 1) {
+					this.driverPayeeInfoList.splice(index, 1)
+				}
+			},
+			opencarclick() {
+				if (this.opencarboolean == false) {
+					this.opencarboolean = true;
+					this.opencar = "../../static/img/authentication/up2%20(3).png"
+				} else if (this.opencarboolean == true) {
+					this.opencarboolean = false;
+					this.opencar = "../../static/img/authentication/down2@3x.png"
+				}
+			},
+			openuserclick() {
+				if (this.openuserboolean == false) {
+					this.openuserboolean = true;
+					this.openuser = "../../static/img/authentication/up2%20(3).png"
+				} else if (this.openuserboolean == true) {
+					this.openuserboolean = false;
+					this.openuser = "../../static/img/authentication/down2@3x.png"
+				}
+			},
+			openfujianclick(){
+				if (this.openfujianboolean == false) {
+					this.openfujianboolean = true;
+					this.openfujian = "../../static/img/authentication/up2%20(3).png"
+				} else if (this.openfujianboolean == true) {
+					this.openfujianboolean = false;
+					this.openfujian = "../../static/img/authentication/down2@3x.png"
+				}
+			},
+			bankChange(e) {
+				console.log(e,"e是神恶魔")
+				this.bankIndex = e.detail.value
+				this.Model = this.bankType[this.bankIndex];	
+				this.driverPayeeInfoList[index].bankDepositBranch = this.bankType[this.bankIndex];
+			},
 			getList(ids) {
 				this.$api.doRequest('get', '/driverViewInfo/getDriver', {
 						id: ids
@@ -278,6 +393,40 @@
 					})
 				})
 			},
+			bankimgs(items){
+				console.log(items)
+				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.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)
+								}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								})
+							}
+						})
+					}
+				})	
+			},
 			idUp(){
 				var that = this
 				wx.chooseImage({
@@ -574,4 +723,63 @@
 		background: #22C572;
 		color: #fff;
 	}
+	.picture {
+		width: 100%;
+		height: 220px;
+		text-align: center;
+		margin-top: 10px;
+	}
+	.fujians{
+		margin: 0 auto;
+		background-color: #FFFFFF;
+		margin-top: 30px;
+		border-radius: 20px;
+		padding: 10px 10px;
+	}
+	.btn {
+		margin-top: 10px;
+		background-color: #FFFFFF;
+		border-radius: 25px;
+		border: none;
+	}
+	
+	.btns {
+		background-color: #22C572;
+	}
+	.information {
+		margin-top: 10px;
+		width: 100%;
+		height: 56px;
+		background-color: #FFFFFF;
+		border-radius: 16px;
+	}
+	.informations {
+		margin-top: 10px;
+		background-color: #FFFFFF;
+		border-radius: 20px;
+	}
+	.personalcss{
+		background-color: #FFFFFF;
+		border-radius: 20px;
+		margin-top: 10px;
+	}
+	.open {
+		width: 30px;
+		height: 20px;
+	}
+	.add{
+		width: 26px;
+		height: 26px;
+		/* background-image: url(../../static/img/jiaoyi/ic_fabu@3x.png); */
+	}
+	/* 清除 */
+	.eliminate {
+		width: 20px;
+		height: 20px;
+		float: right;
+	}
+	.bankImg{
+		width: 20px;
+		height: 20px;
+	}
 </style>

pageD/identity/driverIdentityLook.vue

@@ -1,15 +1,15 @@
 <template>
 	<view class="center">
 		<view>
-			<view class="labels">司机信息</view>
-			<button type="default">身份证正面</button>
-			<view style="width: 100px;margin: 0 auto;" v-if="idup != ''">
-				<image v-bind:src="idup" style="width: 100px;height: 100px;"></image>
-			</view>
-			<button type="default">身份证反面</button>
-			<view style="width: 100px;margin: 0 auto;" v-if="idlow != ''">
-				<image v-bind:src="idlow" style="width: 100px;height: 100px;"></image>
+			<view style="margin: 0 auto;" v-if="idup != ''">
+				<image v-bind:src="idup" class="picture"></image>
 			</view>
+			<view style="margin: 0 auto;" v-if="idlow != ''">
+				<image v-bind:src="idlow" class="picture"></image>
+			</view>	
+			<view class="personalcss">
+				
+			
 			<view class="c-row b-b">
 				<text class="tit">姓名</text>
 				<view class="con-list">
@@ -28,21 +28,30 @@
 					{{drivers.driverPhone}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row">
 				<text class="tit">常驻城市</text>
 				<view class="con-list">
 					{{drivers.residentCityProvincial}}
 				</view>
 			</view>
-
+           </view>
+        <!-- 车辆信息 -->
+        <view class="information">
+        	<view class="c-row">
+        		<text class="tit" style="line-height: 36px;">货车信息</text>
+        		<view class="con-list">
+        			<image v-bind:src="opencar" class="open" opencarboolean @click="opencarclick"></image>
+        		</view>
+        	</view>
+        </view>
 
 		</view>
-		<view class="margin-top">
-			<view class="labels">货车信息</view>
-			<view v-for="(item , index) in  drivers.driverCarInfoList" :Key="index">
-
-
-				<view class="labels"> 车辆 -{{index+1}}</view>
+		<view class="informations" v-if="opencarboolean == true">
+			<view v-for="(item , index) in  drivers.driverCarInfoList" :Key="index" >
+				<view class="c-row ">
+					<text class="tit">车辆 -{{index+1}}</text>
+					
+				</view>
 				<view class="c-row b-b">
 					<text class="tit">车牌号</text>
 					<view class="con-list">
@@ -76,12 +85,22 @@
 			</view>
 
 		</view>
-		<view class="margin-top">
-			<view class="labels">账户信息</view>
+		
+		<view class="information">
+			<view class="c-row">
+				<text class="tit" style="line-height: 36px;">账户信息</text>
+				<view class="con-list">
+					<image v-bind:src="openuser" class="open" openuserboolean @click="openuserclick"></image>
+				</view>
+			</view>
+		</view>
+		
+		<view class="informations" v-if="openuserboolean == true">
+			<!-- <view class="labels">账户信息</view> -->
 			<view v-for="(items , index) in  drivers.driverPayeeInfoList" :Key="index">
-
-
-				<view class="labels"> 账户 - {{index+1}}</view>
+				<view class="c-row b-b">
+					<text class="tit">账户 - {{index+1}}</text>	
+				</view>
 				<view class="c-row b-b">
 					<text class="tit">账户类型</text>
 					<view class="con-list">
@@ -89,9 +108,10 @@
 					</view>
 				</view>
 				<view class="c-row b-b">
-					<text class="tit">银行卡照片（可选）</text>
-					<view class="con-list">
-						真的没做呐
+					<text class="tit">银行卡照片</text>
+					<view   @click="bankimgs(index)">
+						<text v-if="bankimg[index] == '' && bankimg[index] != null">未上传</text>
+						<image v-bind:src="bankimg[index]" style="width: 40px; height: 40px;" v-if="bankimg[index] != '' && bankimg[index] != null"></image>
 					</view>
 				</view>
 				<view class="c-row b-b">
@@ -126,24 +146,42 @@
 				</view>
 			</view>
 		</view>
-		<view class="margin-top">
-			<view class="labels">上传附件</view>
+		<view class="information">
+			<view class="c-row">
+				<text class="tit" style="line-height: 36px;">附件信息</text>
+				<view class="con-list">
+					<image v-bind:src="openfujian" class="open" openfujianboolean @click="openfujianclick"></image>
+				</view>
+			</view>
+		</view>
+			
+		
+		<view  v-if="openfujianboolean == true">
 
-			<button type="default">行驶证</button>
-			<view style="width: 100px;margin: 0 auto;" v-if="travels != ''">
-				<image v-bind:src="travels" style="width: 100px;height: 100px;"></image>
+			<view  class="fujians" v-if="travels != ''">
+				<view class="c-row b-b">
+					<text class="picturebiaoti">行驶证</text>			
+				</view>
+				<image v-bind:src="travels" class="picture"></image>
 			</view>
-			<button type="default">驾驶证</button>
-			<view style="width: 100px;margin: 0 auto;" v-if="drives != ''">
-				<image v-bind:src="drives" style="width: 100px;height: 100px;"></image>
+
+			<view class="fujians" v-if="drives != ''">
+				<view class="c-row b-b">
+					<text class="picturebiaoti">驾驶证</text>			
+				</view>
+				<image v-bind:src="drives" class="picture"></image>
 			</view>
-			<button type="default">道路运营证</button>
-			<view style="width: 100px;margin: 0 auto;" v-if="practices != ''">
-				<image v-bind:src="practices" style="width: 100px;height: 100px;"></image>
+			<view class="fujians" v-if="practices != ''">
+				<view class="c-row b-b">
+					<text class="picturebiaoti">道路运营证</text>			
+				</view>
+				<image v-bind:src="practices" class="picture"></image>
 			</view>
-			<button type="default">从业资格证</button>
-			<view style="width: 100px;margin: 0 auto;" v-if="operates != ''">
-				<image v-bind:src="operates" style="width: 100px;height: 100px;"></image>
+			<view class="fujians" v-if="operates != ''">
+				<view class="c-row b-b">
+					<text class="picturebiaoti">从业资格证</text>			
+				</view>
+				<image v-bind:src="operates" class="picture"></image>
 			</view>
 		</view>
 
@@ -163,14 +201,47 @@
 				operates: "",
 				idup: "",
 				idlow: "",
+				opencar: "../../static/img/authentication/down2@3x.png",
+				openuser: "../../static/img/authentication/down2@3x.png",
+				openfujian:"../../static/img/authentication/down2@3x.png",
+				opencarboolean:false,
+				openuserboolean:false,
+				openfujianboolean:false,
+				bankimg:[],
 			}
 		},
 		onLoad(option) {
 			this.getList(option.id)
 		},
 		methods: {
+			opencarclick() {
+				if (this.opencarboolean == false) {
+					this.opencarboolean = true;
+					this.opencar = "../../static/img/authentication/up2%20(3).png"
+				} else if (this.opencarboolean == true) {
+					this.opencarboolean = false;
+					this.opencar = "../../static/img/authentication/down2@3x.png"
+				}
+			},
+			openuserclick() {
+				if (this.openuserboolean == false) {
+					this.openuserboolean = true;
+					this.openuser = "../../static/img/authentication/up2%20(3).png"
+				} else if (this.openuserboolean == true) {
+					this.openuserboolean = false;
+					this.openuser = "../../static/img/authentication/down2@3x.png"
+				}
+			},
+			openfujianclick(){
+				if (this.openfujianboolean == false) {
+					this.openfujianboolean = true;
+					this.openfujian = "../../static/img/authentication/up2%20(3).png"
+				} else if (this.openfujianboolean == true) {
+					this.openfujianboolean = false;
+					this.openfujian = "../../static/img/authentication/down2@3x.png"
+				}
+			},
 			getList(ids) {
-
 				this.$api.doRequest('get', '/driverViewInfo/getDriver', {
 						id: ids
 					}, 'application/json;charset=UTF-8').then(res => {
@@ -189,6 +260,7 @@
 							this.practices = this.address[2]
 							this.operates = this.address[3]
 						}
+						this.bankimg = this.procurementPlanInfos.driverPayeeInfoList.payeeAddressUrl.split(",")
 					})
 					.catch(res => {
 						uni.showToast({
@@ -206,6 +278,7 @@
 <style>
 	.center {
 		padding: 10px 20px;
+		background-color: #F5F6FA;
 	}
 
 	.labels {
@@ -235,10 +308,52 @@
 		-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;
 	}
+	.picture {
+		width: 100%;
+		height: 220px;
+		text-align: center;
+		margin-top: 10px;
+	}
+	.tit{
+		font-size: 14px;
+		color: #333333;
+	}
+	.personalcss{
+		background-color: #FFFFFF;
+		border-radius: 20px;
+		margin-top: 10px;
+	}
+	.open {
+		width: 30px;
+		height: 20px;
+	}
+	.information {
+		margin-top: 10px;
+		width: 100%;
+		height: 56px;
+		background-color: #FFFFFF;
+		border-radius: 16px;
+	}
+	.informations {
+		margin-top: 10px;
+		background-color: #FFFFFF;
+		border-radius: 20px;
+	}
+	.fujians{
+		margin: 0 auto;
+		background-color: #FFFFFF;
+		margin-top: 30px;
+		border-radius: 20px;
+		padding: 10px 10px;
+	}
+	.picturebiaoti{
+		font-size: 17px;
+		font-weight: 700;
+	}
 </style>

pageD/identity/driverIdentityTwo.vue

@@ -14,7 +14,7 @@
 			<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">
@@ -54,7 +54,7 @@
 			</view>
 		</view>
 		<button class="btn" v-if="opencarboolean == true" @click="carAdd">
-				 <image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add"></image> 
+				 <image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add" style="top: 8px;"></image> 
 				 <texe>添加车辆</texe>
 				 </button>
 		<!-- 账户信息 -->
@@ -82,10 +82,15 @@
 					<input placeholder="请填写账户类型" name="input" v-model="items.accountType"></input>
 				</view>
 			</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"></input>
+					<!-- <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>
+					
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -96,15 +101,19 @@
 			</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">
-					<input placeholder="请输入开户支行" name="input" v-model="items.bankDepositBranch"></input>
+					{{bankIndex>-1?bankType[bankIndex]:'请选择开户支行'}}
 				</view>
+					</picker>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">收款人姓名</text>
@@ -120,7 +129,7 @@
 			</view>
 		</view>
 		<button class="btn" v-if="openuserboolean == true" @click="userAdd()">
-			 <image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add"></image> 
+			 <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>
@@ -165,12 +174,50 @@
 				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:[],
 			}
 		},
 		onLoad(options){
 			this.DriverViewInfo = JSON.parse(options.DriverViewInfo)
 		},
 		methods: {
+			bankimgs(items){
+				console.log(items)
+				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.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)
+								}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								})
+							}
+						})
+					}
+				})	
+			},
 			jumpUrl(){
 				for(var i = 0 ; i < this.driverCarInfoList.length ; i++){
 					if (!this.driverCarInfoList[i].carNumber) {
@@ -226,8 +273,10 @@
 				}
 					this.DriverViewInfo.driverCarInfoList = this.driverCarInfoList
 					this.DriverViewInfo.driverPayeeInfoList = this.driverPayeeInfoList
+					this.DriverViewInfo.driverPayeeInfoList.payeeAddressUrl = this.bankimg
 					var model = JSON.stringify(this.DriverViewInfo);
 					console.log(this.DriverViewInfo,"sjijsoi")
+					return
 				uni.navigateTo({
 					url: `/pageD/identity/driverIdentityThree?DriverViewInfo=` + model
 				})
@@ -268,6 +317,11 @@
 				
 				this.driverCarInfoList[this.driverCarInfoList.length - 1].carModel = 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];
+			},
 			carLongChange(e) {
 				this.carLongIndex = e.detail.value
 				this.carLong = this.carLongType[this.carLongIndex];
@@ -362,7 +416,7 @@
 	.add{
 		width: 26px;
 		height: 26px;
-		margin-top: 10px;
+
 		/* background-image: url(../../static/img/jiaoyi/ic_fabu@3x.png); */
 	}
 
@@ -372,4 +426,9 @@
 		height: 20px;
 		float: right;
 	}
+	.bankImg{
+		width: 20px;
+		height: 20px;
+	}
+
 </style>

pageD/myRelease/Identity_switching.vue

@@ -0,0 +1,193 @@
+<template>
+	<view class="center">
+		<view v-for="(item , index) in lists" :Key="index">
+			<view>
+				<view class="company">{{item.customerType}}</view>
+				<view class="guess-item" @click="navToDetailPage(item)">
+					<view class="infos">
+
+						<view class="info">{{item.customerName}}
+							<view class='cu-tag radius line-pink but'>{{item.authenticationStatus}}</view>
+						</view>
+						<view class="info">{{item.customerPhone}}</view>
+						<label>
+							<checkbox style='transform: scale(0.8);' :value='item.id' :checked="item.checked" @click.stop="checkBox($event,item)" ></checkbox>
+							<text>设置默认</text>
+						</label>
+						
+					</view>
+
+				</view>
+			</view>
+		</view>
+	</view>
+
+	</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		name: "buy",
+		data() {
+			return {
+				lists:[],
+				PageCur: "buy",
+				buyInfo: [],
+				pages: 1, //页数
+				limit: 10, //每次取条目数
+				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
+				isLoadMore: false, //是否加载中
+				showTran: true,
+				scrollTop: 0,
+				TabCur: 0,
+				current: 1,
+				id:0,
+				checked:false,
+				goodsName:'',
+				receivePrivate:'',
+				receiveCity:'',
+				receiveArea:'',
+				minimumVolume:'',
+				basis:'',
+				buyer:'',
+				unitPrice:'',
+				receiveWarehouse:'',
+				procurementPlanType:'',
+				procurementPlan:'',
+				identityAuthenticationInfo: {
+					pageSize: 10,
+					currentPage: 1,
+					commonId: "",
+					
+					
+				},
+			};
+		},
+		onShow(){
+			this.getList()
+		},
+		onLoad(options) {
+			this.id=options.id
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		methods: {
+			getList() {
+				this.identityAuthenticationInfo.commonId = this.userInfo.id
+				this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {
+						pageSize: 10,
+						currentPage: 1,
+						commonId: this.userInfo.id
+					}, 'application/json;charset=UTF-8').then(res => {
+						if(res.data.code==200){
+							for(var i=0;i<res.data.data.records.length;i++){
+								if(res.data.data.records[i].defaultFlag!=1){
+									res.data.data.records[i].checked=false
+								}else{
+									res.data.data.records[i].checked=true
+								}
+							}
+							this.lists = res.data.data.records
+						}
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			checkBox(e,item){
+				for(var i=0;i<this.lists.length;i++){
+					this.lists[i].checked=true
+				}
+				item.checked=true
+				this.$api.doRequest('post', '/identityAuthenticationInfo/api/setDefault', {
+						id:item.id,
+						commonId: this.userInfo.id
+					}).then(res => {
+						if(res.data.code==200){
+							// this.lists = res.data.data.records
+						}
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			// adddriver(index) {
+			// 	if (index == 1) {
+			// 		uni.navigateTo({
+			// 			url: `/pageD/identity/companyIdentity`
+			// 		})
+			// 	} else {
+			// 		uni.navigateTo({
+			// 			url: `/pageD/identity/driverIdentity`
+			// 		})
+			// 	}
+			// },
+			navToDetailPage(item) {
+				// if (index == 1) {
+					if(item.customerTypeFlag==1){
+						uni.navigateTo({
+						url: `/pageD/myRelease/buyGrain?id=${item.id}&customerName=${item.customerName}`
+					})
+					}else{
+						uni.navigateTo({
+							url: `/pageD/myRelease/buyGrain?id=${item.id}&customerName=${item.compName}`
+						})
+					}
+					
+					},
+				// } else {
+				// 	uni.navigateTo({
+				// 		url: `/pageD/identity/driverIdentityLook`
+				// 	})
+				
+
+			// }
+		}
+	}
+</script>
+
+<style>
+	.center {
+		padding: 10px 20px;
+	}
+
+	.title {
+		font-size: 18px;
+		font-weight: 900;
+		margin-right: 20px;
+		display: initial;
+	}
+
+	.company {
+		font-size: 16px;
+		margin-top: 10px;
+	}
+
+	.infos {
+		/* margin: 10px 20px; */
+		width: 100%;
+		display: inline-table;
+	}
+
+	.info {
+		line-height: 20px;
+	}
+
+	.but {
+		right: 3px;
+		float: right;
+	}
+</style>

pageD/myRelease/buyDetails.vue

@@ -33,157 +33,120 @@
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">类型</text>
-			
-				<view class="picker">
+			<view class="con-list">
 				{{procurementPlanInfos.procurementPlanType}}
-				</view>
+			</view>
 			
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">价格类型</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					{{procurementPlanInfos.priceType}}
-				</view>
-			</picker>
+			<view class="con-list">
+				{{procurementPlanInfos.priceType}}
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">基差（元/吨）</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					{{procurementPlanInfos.basisPrice}}
-				</view>
-			</picker>
+			<view class="con-list">
+				{{procurementPlanInfos.basisPrice}}
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">产地</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					{{procurementPlanInfos.outputPrivate}}
-				</view>
-			</picker>
+			<view class="con-list">
+				{{procurementPlanInfos.outputPrivate}}{{procurementPlanInfos.outputCity}}
+			</view>
 		</view>
 		<view class="c-row b-b">
-			<text class="tit">发货地区</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					<input placeholder="请填写发货地区" name="input" @input="addressInput"></input>
-				</view>
-			</picker>
+			<text class="tit">收货地区</text>
+			<view class="con-list">
+				{{procurementPlanInfos.receivePrivate}}{{procurementPlanInfos.receiveCity}}{{procurementPlanInfos.receiveArea}}
+			</view>
 		</view>
 		<view class="c-row b-b">
-			<text class="tit">卖方手机号</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					<input placeholder="请填写卖方手机号" name="input" @input="addressInput"></input>
-				</view>
-			</picker>
+			<text class="tit">买方手机号</text>
+			<view class="con-list">
+				{{procurementPlanInfos.buyerPhone}}
+			</view>
 		</view>
 		<text class="title">附加要求</text>
 		<view class="c-row b-b">
 			<text class="tit">水分（%）<= </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					{{procurementPlanInfos.waterContent}}
-				</view>
-			</picker>
+			<view class="con-list">
+				{{procurementPlanInfos.waterContent}}
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">容重（g/L）<= </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					{{procurementPlanInfos.bulkDensity}}
-				</view>
-			</picker>
+			<view class="con-list">
+				{{procurementPlanInfos.bulkDensity}}
+			</view>
 		</view>
 
 		<view class="c-row b-b">
 			<text class="tit">热损伤（%）<= </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					{{procurementPlanInfos.jiaorenli}}
-				</view>
-			</picker>
+			<view class="con-list">
+				{{procurementPlanInfos.jiaorenli}}
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">杂质（%）<= </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
+			<view class="con-list">
 					{{procurementPlanInfos.impurity}}
-				</view>
-			</picker>
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">霉变粒（%）<= </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					{{procurementPlanInfos.mildewGrain}}
-				</view>
-			</picker>
+			<view class="con-list">
+				{{procurementPlanInfos.mildewGrain}}
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">不完整粒（%）<= </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					{{procurementPlanInfos.imperfectGrain}}
-				</view>
-			</picker>
+			<view class="con-list">
+				{{procurementPlanInfos.imperfectGrain}}
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">蛋白（%）<= </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					{{procurementPlanInfos.protein}}
-				</view>
-			</picker>
+			<view class="con-list">
+				{{procurementPlanInfos.protein}}
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">粒型 </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					{{procurementPlanInfos.grain}}
-				</view>
-			</picker>
+			<view class="con-list">
+				{{procurementPlanInfos.grain}}
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">品级 </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					{{procurementPlanInfos.procurementPlanInfos}}
-				</view>
-			</picker>
+			<view class="con-list">
+				{{procurementPlanInfos.procurementPlanInfos}}
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">产出年份</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
+			<view class="con-list">
 				{{procurementPlanInfos.outputYear}}
-				</view>
-			</picker>
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">包装方式</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					{{procurementPlanInfos.packingType}}
-				</view>
-			</picker>
+			<view class="con-list">
+				{{procurementPlanInfos.packingType}}
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">袋装备注</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					{{procurementPlanInfos.baggingNotes}}
-				</view>
-			</picker>
+			<view class="con-list">
+				{{procurementPlanInfos.baggingNotes}}
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">运费承担方</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					{{procurementPlanInfos.freightPayer}}
-				</view>
-			</picker>
+			<view class="con-list">
+				{{procurementPlanInfos.freightPayer}}
+			</view>
 		</view>
 	</view>
 </template>

pageD/myRelease/buyEdit.vue

@@ -0,0 +1,649 @@
+<template>
+	<view class="center">
+		<view class="c-row b-b">
+			<text class="tit">名头</text>
+			<view class="con-list">
+				<text @click="navToDetailPage">{{deptList.procurementPlanNo}}</text>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">标题</text>
+			<view class="con-list">
+				<input maxlength='16' minlength='2' placeholder="请输入标题，不超过16个字" name="input" v-model="deptList.title"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">货名</text>
+			<view class="con-list">
+				<input placeholder="请输入货名，如玉米" name="input" v-model="deptList.goodsName"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">采购量（吨）</text>
+			<view class="con-list">
+				<input placeholder="请输入采购重量，如1000" name="input" v-model="deptList.plannedPurchaseVolume"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">最小成交量（吨）</text>
+			<view class="con-list">
+				<input placeholder="请输入最小成交量" name="input" v-model="deptList.minimumVolume"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">类型</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list"
+				>
+				<view class="picker" v-model="deptList.procurementPlanType">
+					{{typesIndex>-1?typesType[typesIndex]:'请选择类型'}}
+				</view>
+			</picker>
+		</view>
+		<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">
+			<text class="tit">单价（元/吨）</text>
+			<view class="con-list">
+				<input placeholder="请填写单价" name="input" v-model="deptList.unitPrice"></input>
+			</view>
+		</view>
+		<view class="c-row b-b" v-if="this.typesIndex == 1">
+			<text class="tit">基差（元/吨）</text>
+			<view class="con-list">
+				<input placeholder="请输入基差" name="input" v-model="deptList.basisPrice"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">产地</text>
+			<view class="con-list">
+				<view @click='regionchange1'>{{region1}}</view>
+				<u-picker :params='params1' @confirm='regionpicker1' mode="region" v-model="show1" ></u-picker>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">收货地区</text>
+			<view class="con-list">
+				<view @click='regionchange'>{{region}}</view>
+				<u-picker :params='params' @confirm='regionpicker' mode="region" v-model="show" ></u-picker>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">买方手机号</text>
+			<view class="con-list">
+				<input placeholder="请输入买方手机号" name="input" v-model="deptList.buyerPhone"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<button @click='getcode' type="default">{{sendText}}</button>
+			<view class="con-list">
+				<input placeholder="请填写6位短信验证码" name="input" v-model="deptList.title1"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<checkbox style='transform: scale(0.8);'  :checked="checked" @click='checkedbox'></checkbox>完善更多信息（选填，可由客服人员代为完善）
+		</view>
+		<view v-if='checked' class="c-row b-b">
+			<text class="tit">水分（%）<= </text>
+					<view class="con-list">
+						<input placeholder="请填写水分占比" name="input" v-model="deptList.waterContent"></input>
+					</view>
+		</view>
+		<view  v-if='checked'  class="c-row b-b">
+			<text class="tit">容重（g/L）<= </text>
+					<view class="con-list">
+						<input placeholder="请填写容重" name="input" v-model="deptList.bulkDensity"></input>
+					</view>
+		</view>
+		<view  v-if='checked'  class="c-row b-b">
+			<text class="tit">热损伤（%）<= </text>
+					<view class="con-list">
+						<input placeholder="请填写热损伤占比" name="input" v-model="deptList.jiaorenli"></input>
+					</view>
+		</view>
+		<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>
+					</view>
+		</view>
+		<view  v-if='checked'  class="c-row b-b">
+			<text class="tit">霉变粒（%）<= </text>
+					<view class="con-list">
+						<input placeholder="请填写霉变粒占比" name="input" v-model="deptList.mildewGrain"></input>
+					</view>
+		</view>
+		<view  v-if='checked'  class="c-row b-b">
+			<text class="tit">不完整粒（%）<= </text>
+					<view class="con-list">
+						<input placeholder="请填写不完整粒占比" name="input" v-model="deptList.imperfectGrain"></input>
+					</view>
+		</view>
+		<view  v-if='checked'  class="c-row b-b">
+			<text class="tit">蛋白（%）<= </text>
+					<view class="con-list">
+						<input placeholder="请填写蛋白占比" name="input" v-model="deptList.protein"></input>
+					</view>
+		</view>
+		<view  v-if='checked'  class="c-row b-b">
+			<text class="tit">粒型 </text>
+			<picker @change="liChange" :value="liIndex" :range="liType" class="con-list" v-model="deptList.grain">
+				<view class="con-list">
+					{{liIndex>-1?liType[liIndex]:'请选择粒型'}}
+				</view>
+			</picker>
+		</view>
+		<view  v-if='checked'  class="c-row b-b">
+			<text class="tit">品级 </text>
+			<picker @change="pinChange" :value="pinIndex" :range="pinType" class="con-list">
+				<view class="con-list">
+					{{pinIndex>-1?pinType[pinIndex]:'请选择品级'}}
+				</view>
+			</picker>
+		</view>
+		<view  v-if='checked'  class="c-row b-b">
+			<text class="tit">产出年份</text>
+			<picker @change="nianChange" :value="nianIndex" :range="nianType" class="con-list">
+				<view class="con-list">
+					{{nianIndex>-1?nianType[nianIndex]:'请选择产出年份'}}
+				</view>
+			</picker>
+		</view>
+		<view  v-if='checked'  class="c-row b-b">
+			<text class="tit">包装方式</text>
+			<picker @change="baoChange" :value="baoIndex" :range="baoType" class="con-list">
+				<view class="con-list">
+					{{baoIndex>-1?baoType[baoIndex]:'请选择包装方式'}}
+				</view>
+			</picker>
+		</view>
+		<view  v-if='checked&&baoIndex==2||!checked&&baoIndex==3'  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">
+			<text class="tit">运费承担方</text>
+			<picker @change="chengChange" :value="chengIndex" :range="chengType" class="con-list">
+				<view class="con-list">
+					{{chengIndex>-1?chengType[chengIndex]:'请选择运费承担方'}}
+				</view>
+			</picker>
+		</view>
+
+		<button @click="commit()">重新发布</button>
+	</view>
+</template>
+
+<script>
+	import {
+	    mapState 
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				types: '',
+				goods:{},
+				typesType: ["现货", "期货"],
+				typesIndex: 0,
+				deptList: {
+					priceType: "定价采购",
+					procurementPlanType:"现货",
+					grain:"不限",
+					grainKey:1,
+					grade:"不限",
+					gradeKey:1,
+					outputYear:"2020",
+					packingType:"不限",
+					packingTypeKey:0,
+					freightPayer:"",
+				},
+				params:{
+					province: true,
+					city: true,
+					area: true,
+				},
+				params1:{
+					province: true,
+					city: true,
+				},
+				checked:true,
+				insertProcurementPlanInfo: {},
+				liIndex: 0,
+				liType: ['不限','塔粮', '筛粮', '中粒', '大粒'],
+				pinIndex: 0,
+				pinType: ['不限', '一等品', '二等品', '三等品', '等外'],
+				nianIndex: 3,
+				nianType: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014', '2013', '2012',
+					'2011'
+				],
+				id:0,
+				sendText:'获取验证码',
+				show:false,
+				show1:false,
+				region:'请选择收货地区',
+				region1:'请选择产地',
+				baoIndex: 0,
+				baoType: ['不限', '散装', '大袋', '小袋'],
+				chengIndex: -1,
+				chengType: ['可议', '买方承担', '卖方承担']
+			}
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo'])
+		},
+		onLoad(options){
+			this.id=options.id
+			if(options.customerName){
+				this.deptList.procurementPlanNo=options.customerName
+			}
+			
+		},
+		onShow(){
+			this.getList()
+			var that=this
+			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)
+					}else{
+						that.$set(this.deptList,'procurementPlanNo',res.data.data.compName)
+					}
+					this.goods=res.data.data
+				}
+				uni.hideLoading()
+			})
+		},
+		methods: {
+			getList(){
+				this.$api.doRequest('get','/procurementPlanInfo/getProcurementPlan',{id:this.id}).then(res => {
+					if(res.data.code==200){
+						this.deptList = res.data.data
+						this.region1=this.deptList.outputPrivate+'-'+this.deptList.outputCity
+						this.region=this.deptList.receivePrivate+'-'+this.deptList.receiveCity+'-'+this.deptList.receiveArea
+						if(this.deptList.procurementPlanTypeKey==2){
+							this.typesIndex=0
+						}else if(this.deptList.procurementPlanTypeKey==1){
+							this.typesIndex=1
+						}
+						if(this.deptList.grainKey==1){
+							this.liIndex=0
+						}else if(this.deptList.grainKey==2){
+							this.liIndex=1
+						}else if(this.deptList.grainKey==3){
+							this.liIndex=2
+						}else if(this.deptList.grainKey==4){
+							this.liIndex=3
+						}else if(this.deptList.grainKey==5){
+							this.liIndex=4
+						}
+						this.baoIndex=this.deptList.packingTypeKey
+						this.pinIndex=this.deptList.gradeKey
+						if(this.deptList.freightPayerKey==1){
+							this.chengIndex=0
+						}else if(this.deptList.freightPayerKey==2){
+							this.chengIndex=1
+						}else if(this.deptList.freightPayerKey==3){
+							this.chengIndex=2
+						}
+					}
+				})
+				.catch(res => {
+					uni.showToast({
+						title: res.errmsg,
+						icon:'none',
+						duration: 2000
+					})
+				});
+			},
+			getcode(){
+				var that = this
+				if(/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.deptList.buyerPhone)){
+					this.$api.doRequest('get','/commonUser/sendVerifyCode',{phone:this.deptList.buyerPhone}).then(res => {
+						if(res.data.code==200){
+							that.sendDisabled = true
+							let sec = 60
+							let interval = setInterval(() => {
+								sec--;
+								that.sendText = sec + 's后重发'
+								if (sec <= 0) {
+									that.sendDisabled = false
+									that.sendText = "获取验证码"
+									clearInterval(interval)
+								}
+							}, 1000)
+						}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: '请输入正确的手机号',
+						icon:'none',
+						duration: 2000
+					})
+				}
+				
+			},
+			regionpicker(e){
+				this.deptList.receivePrivate=e.province.label
+				this.deptList.receiveCity=e.city.label
+				this.deptList.receiveArea=e.area.label
+				this.region=e.province.label+'-'+e.city.label+'-'+e.area.label
+			},
+			regionchange(){
+				this.show=true
+			},
+			regionpicker1(e){
+				this.deptList.outputPrivate=e.province.label
+				this.deptList.outputCity=e.city.label
+				this.region1=e.province.label+'-'+e.city.label
+			},
+			regionchange1(){
+				this.show1=true
+			},
+			checkedbox(e){
+				this.checked=!this.checked
+			},
+			typeChange(e) {
+				this.typesIndex = e.detail.value
+				if(e.detail.value==0){
+					this.deptList.priceType = '定价采购'
+					this.deptList.procurementPlanTypeKey =2
+				}else{
+					this.deptList.priceType = '期货盘面价+基差'
+					this.deptList.procurementPlanTypeKey =1
+				}
+				this.deptList.procurementPlanType = this.typesType[this.typesIndex];
+			},
+			navToDetailPage() {
+				// if (index == 1) {
+					uni.navigateTo({
+						url: `/pageD/myRelease/Identity_switching?id=`+this.id
+					})
+					},
+			commit() {
+				this.insertProcurementPlanInfo = this.deptList
+				// if (!this.deptList.goodsName) {
+				// 	this.$api.msg('货名1不能为空')
+				// 	return
+				// }
+				if (!this.deptList.title) {
+					this.$api.msg('标题不能为空')
+					return
+				}
+				if (this.deptList.title.length>16||this.deptList.title.length<2) {
+					this.$api.msg('标题输入错误')
+					return
+				}
+				if (!this.deptList.goodsName) {
+					this.$api.msg('货名不能为空')
+					return
+				}
+				if (this.deptList.goodsName.length>6||this.deptList.goodsName.length<1) {
+					this.$api.msg('货名输入错误')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.plannedPurchaseVolume) {
+					this.$api.msg('采购量不能为空')
+					return
+				}
+				if (this.deptList.plannedPurchaseVolume>100000||this.deptList.plannedPurchaseVolume<1) {
+					this.$api.msg('采购量输入错误')
+					return
+				}
+				if (this.deptList.plannedPurchaseVolume.indexOf('.')!=-1) {
+					if(this.deptList.plannedPurchaseVolume.split('.')[1].length>2){
+						this.$api.msg('采购量输入错误')
+						return
+					}
+				}
+				if (!this.insertProcurementPlanInfo.minimumVolume) {
+					this.$api.msg('最小成交量不能为空')
+					return
+				}
+				if (this.insertProcurementPlanInfo.minimumVolume>100000||this.insertProcurementPlanInfo.minimumVolume<1) {
+					this.$api.msg('最小成交量输入错误')
+					return
+				}
+				if (this.insertProcurementPlanInfo.minimumVolume.indexOf('.')!=-1) {
+					if(this.insertProcurementPlanInfo.minimumVolume.split('.')[1].length>2){
+						this.$api.msg('最小成交量输入错误')
+						return
+					}
+				}
+				if (!this.insertProcurementPlanInfo.procurementPlanType) {
+					this.$api.msg('类型不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.priceType) {
+					this.$api.msg('价格类型不能为空')
+					return
+				}
+				if(this.insertProcurementPlanInfo.procurementPlanType == '现货'){
+					if (!this.insertProcurementPlanInfo.unitPrice) {
+						this.$api.msg('单价不能为空')
+						return
+					}
+					if (this.insertProcurementPlanInfo.unitPrice>100000||this.insertProcurementPlanInfo.unitPrice<1) {
+						this.$api.msg('单价输入错误')
+						return
+					}
+					if (this.insertProcurementPlanInfo.unitPrice.indexOf('.')!=-1) {
+						if(this.insertProcurementPlanInfo.unitPrice.split('.')[1].length>2){
+							this.$api.msg('单价输入错误')
+							return
+						}
+					}
+				}else if(this.insertProcurementPlanInfo.procurementPlanType == '期货'){
+					if (!this.insertProcurementPlanInfo.basisPrice) {
+						this.$api.msg('基差不能为空')
+						return
+					}
+					if (this.insertProcurementPlanInfo.basisPrice>10000||this.insertProcurementPlanInfo.basisPrice<1) {
+						this.$api.msg('基差输入错误')
+						return
+					}
+					if (this.insertProcurementPlanInfo.basisPrice.indexOf('.')!=-1) {
+						if(this.insertProcurementPlanInfo.basisPrice.split('.')[1].length>2){
+							this.$api.msg('基差输入错误')
+							return
+						}
+					}
+				}
+			
+				if (!this.insertProcurementPlanInfo.buyerPhone) {
+					this.$api.msg('买方手机号不能为空')
+					return
+				}
+				if (this.insertProcurementPlanInfo.waterContent&&this.insertProcurementPlanInfo.waterContent<1||
+				this.insertProcurementPlanInfo.waterContent&&this.insertProcurementPlanInfo.waterContent>40) {
+					this.$api.msg('水分输入错误')
+					return
+				}
+				if (this.insertProcurementPlanInfo.waterContent&&this.insertProcurementPlanInfo.waterContent.indexOf('.')!=-1) {
+					if(this.insertProcurementPlanInfo.waterContent.split('.')[1].length>2){
+						this.$api.msg('水分输入错误')
+						return
+					}
+				}
+				if (this.insertProcurementPlanInfo.bulkDensity&&this.insertProcurementPlanInfo.bulkDensity<500||
+				this.insertProcurementPlanInfo.bulkDensity&&this.insertProcurementPlanInfo.bulkDensity>1000) {
+					this.$api.msg('容重输入错误')
+					return
+				}
+				if (this.insertProcurementPlanInfo.jiaorenli&&this.insertProcurementPlanInfo.jiaorenli<1||
+				this.insertProcurementPlanInfo.jiaorenli&&this.insertProcurementPlanInfo.jiaorenli>40) {
+					this.$api.msg('热损伤输入错误')
+					return
+				}
+				if (this.insertProcurementPlanInfo.jiaorenli&&this.insertProcurementPlanInfo.jiaorenli.indexOf('.')!=-1) {
+					if(this.insertProcurementPlanInfo.jiaorenli.split('.')[1].length>2){
+						this.$api.msg('热损伤输入错误')
+						return
+					}
+				}
+				if (this.insertProcurementPlanInfo.impurity&&this.insertProcurementPlanInfo.impurity<1||
+				this.insertProcurementPlanInfo.impurity&&this.insertProcurementPlanInfo.impurity>40) {
+					this.$api.msg('杂质输入错误')
+					return
+				}
+				if (this.insertProcurementPlanInfo.impurity&&this.insertProcurementPlanInfo.impurity.indexOf('.')!=-1) {
+					if(this.insertProcurementPlanInfo.impurity.split('.')[1].length>2){
+						this.$api.msg('杂质输入错误')
+						return
+					}
+				}
+				if (this.insertProcurementPlanInfo.mildewGrain&&this.insertProcurementPlanInfo.mildewGrain<1||
+				this.insertProcurementPlanInfo.mildewGrain&&this.insertProcurementPlanInfo.mildewGrain>40) {
+					this.$api.msg('霉变粒输入错误')
+					return
+				}
+				if (this.insertProcurementPlanInfo.mildewGrain&&this.insertProcurementPlanInfo.mildewGrain.indexOf('.')!=-1) {
+					if(this.insertProcurementPlanInfo.mildewGrain.split('.')[1].length>2){
+						this.$api.msg('霉变粒输入错误')
+						return
+					}
+				}
+				if (this.insertProcurementPlanInfo.imperfectGrain&&this.insertProcurementPlanInfo.imperfectGrain<1||
+				this.insertProcurementPlanInfo.imperfectGrain&&this.insertProcurementPlanInfo.imperfectGrain>40) {
+					this.$api.msg('不完整粒输入错误')
+					return
+				}
+				if (this.insertProcurementPlanInfo.imperfectGrain&&this.insertProcurementPlanInfo.imperfectGrain.indexOf('.')!=-1) {
+					if(this.insertProcurementPlanInfo.imperfectGrain.split('.')[1].length>2){
+						this.$api.msg('不完整粒输入错误')
+						return
+					}
+				}
+				if (this.deptList.protein&&this.deptList.protein<1||
+				this.deptList.protein&&this.deptList.protein>80) {
+					this.$api.msg('蛋白输入错误')
+					return
+				}
+				if (this.deptList.protein&&this.deptList.protein.indexOf('.')!=-1) {
+					if(this.deptList.protein.split('.')[1].length>2){
+						this.$api.msg('蛋白输入错误')
+						return
+					}
+				}
+				this.insertProcurementPlanInfo.basisPrice=-this.insertProcurementPlanInfo.basisPrice
+		         this.insertProcurementPlanInfo.commonId = this.userInfo.id
+				 this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+				 uni.showModal({
+				 	content: '重新发布后交易信息将进入待审核状态，是否确定重新发布？',
+				 	success: (res) => {
+						if(res.confirm) {  
+				this.$api.doRequest('post', '/procurementPlanInfo/api/editProcurementPlan', this
+						.insertProcurementPlanInfo).then(res => {
+							if(res.data.code==200){
+								uni.showToast({
+									title: "发布成功",
+									icon: 'none',
+								})
+								setTimeout(() => {
+									uni.navigateBack({})
+								}, 1000)
+							}else{
+								uni.showToast({
+									title: res.data.message,
+									icon: 'none',
+									duration: 2000
+								})
+							}
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+					}
+					}
+				})
+			},
+			liChange(e) {
+				this.liIndex = e.detail.value
+				this.litypes = this.liType[this.liIndex];
+				this.deptList.grainKey = e.detail.value+1
+				this.deptList.grain = this.liType[this.liIndex]
+			},
+			pinChange(e) {
+				this.pinIndex = e.detail.value
+				this.pintypes = this.pinType[this.pinIndex];
+				this.deptList.gradeKey = e.detail.value+1
+				this.deptList.grade = this.pinType[this.pinIndex]
+			},
+			nianChange(e) {
+				this.nianIndex = e.detail.value
+				this.niantypes = this.nianType[this.nianIndex];
+				this.deptList.outputYear = this.baoType[this.baoIndex]
+			},
+
+			baoChange(e) {
+				this.baoIndex = e.detail.value
+				this.baotypes = this.baoType[this.baoIndex];
+				this.deptList.packingTypeKey = e.detail.value
+				this.deptList.packingType = this.chengType[this.chengIndex];
+			},
+			chengChange(e) {
+				this.chengIndex = e.detail.value
+				this.chengtypes = this.chengType[this.chengIndex];
+				this.deptList.freightPayerKey = e.detail.value+1
+					this.deptList.freightPayer = this.chengType[this.chengIndex];
+			}
+		}
+	}
+</script>
+
+<style>
+	.center {
+		padding: 10px 20px;
+	}
+
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+
+	.con-list {
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
+		font-size: 14px;
+	}
+</style>

pageD/myRelease/buyGrain.vue

@@ -3,31 +3,31 @@
 		<view class="c-row b-b">
 			<text class="tit">名头</text>
 			<view class="con-list">
-				<input placeholder="请填写名头" name="input" v-model="deptList.procurementPlanNo"></input>
+				<text @click="navToDetailPage">{{deptList.procurementPlanNo}}</text>
 			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">标题</text>
 			<view class="con-list">
-				<input placeholder="请填写标题,2-16个字" name="input" v-model="deptList.title"></input>
+				<input maxlength='16' minlength='2' placeholder="请输入标题，不超过16个字" name="input" v-model="deptList.title"></input>
 			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">货名</text>
 			<view class="con-list">
-				<input placeholder="请填写货名" name="input" v-model="deptList.goodsName"></input>
+				<input placeholder="请输入货名，如玉米" name="input" v-model="deptList.goodsName"></input>
 			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">采购量（吨）</text>
 			<view class="con-list">
-				<input placeholder="请填写采购重量" name="input" v-model="deptList.plannedPurchaseVolume"></input>
+				<input placeholder="请输入采购重量，如1000" name="input" v-model="deptList.plannedPurchaseVolume"></input>
 			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">最小成交量（吨）</text>
 			<view class="con-list">
-				<input placeholder="请填写最小成交量" name="input" v-model="deptList.minimumVolume"></input>
+				<input placeholder="请输入最小成交量" name="input" v-model="deptList.minimumVolume"></input>
 			</view>
 		</view>
 		<view class="c-row b-b">
@@ -49,76 +49,87 @@
 		<view class="c-row b-b" v-if="this.typesIndex != 1">
 			<text class="tit">单价（元/吨）</text>
 			<view class="con-list">
-				<input placeholder="请填写单价（元/吨）" name="input" v-model="deptList.unitPrice"></input>
+				<input placeholder="请填写单价" name="input" v-model="deptList.unitPrice"></input>
 			</view>
 		</view>
 		<view class="c-row b-b" v-if="this.typesIndex == 1">
 			<text class="tit">基差（元/吨）</text>
 			<view class="con-list">
-				<input placeholder="请填写单价（元/吨）" name="input" v-model="deptList.basisPrice"></input>
+				<input placeholder="请输入基差" name="input" v-model="deptList.basisPrice"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">产地</text>
+			<view class="con-list">
+				<view @click='regionchange1'>{{region1}}</view>
+				<u-picker :params='params1' @confirm='regionpicker1' mode="region" v-model="show1" ></u-picker>
 			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">收货地区</text>
 			<view class="con-list">
-				<input placeholder="请填写收货地区" name="input" v-model="deptList.receiveArea"></input>
+				<view @click='regionchange'>{{region}}</view>
+				<u-picker :params='params' @confirm='regionpicker' mode="region" v-model="show" ></u-picker>
 			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">买方手机号</text>
 			<view class="con-list">
-				<input placeholder="请填写卖方手机号" name="input" v-model="deptList.buyerPhone"></input>
+				<input placeholder="请输入买方手机号" name="input" v-model="deptList.buyerPhone"></input>
 			</view>
 		</view>
 		<view class="c-row b-b">
-			<button type="default">获取验证码</button>
+			<button @click='getcode' type="default">{{sendText}}</button>
 			<view class="con-list">
 				<input placeholder="请填写6位短信验证码" name="input" v-model="deptList.title1"></input>
 			</view>
 		</view>
 		<view class="c-row b-b">
+			<checkbox style='transform: scale(0.8);'  :checked="checked" @click='checkedbox'></checkbox>完善更多信息（选填，可由客服人员代为完善）
+		</view>
+		<view v-if='checked' class="c-row b-b">
 			<text class="tit">水分（%）<= </text>
 					<view class="con-list">
 						<input placeholder="请填写水分占比" name="input" v-model="deptList.waterContent"></input>
 					</view>
 		</view>
-		<view class="c-row b-b">
+		<view  v-if='checked'  class="c-row b-b">
 			<text class="tit">容重（g/L）<= </text>
 					<view class="con-list">
 						<input placeholder="请填写容重" name="input" v-model="deptList.bulkDensity"></input>
 					</view>
 		</view>
-		<view class="c-row b-b">
+		<view  v-if='checked'  class="c-row b-b">
 			<text class="tit">热损伤（%）<= </text>
 					<view class="con-list">
 						<input placeholder="请填写热损伤占比" name="input" v-model="deptList.jiaorenli"></input>
 					</view>
 		</view>
-		<view class="c-row b-b">
+		<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>
 					</view>
 		</view>
-		<view class="c-row b-b">
+		<view  v-if='checked'  class="c-row b-b">
 			<text class="tit">霉变粒（%）<= </text>
 					<view class="con-list">
 						<input placeholder="请填写霉变粒占比" name="input" v-model="deptList.mildewGrain"></input>
 					</view>
 		</view>
-		<view class="c-row b-b">
+		<view  v-if='checked'  class="c-row b-b">
 			<text class="tit">不完整粒（%）<= </text>
 					<view class="con-list">
 						<input placeholder="请填写不完整粒占比" name="input" v-model="deptList.imperfectGrain"></input>
 					</view>
 		</view>
-		<view class="c-row b-b">
+		<view  v-if='checked'  class="c-row b-b">
 			<text class="tit">蛋白（%）<= </text>
 					<view class="con-list">
 						<input placeholder="请填写蛋白占比" name="input" v-model="deptList.protein"></input>
 					</view>
 		</view>
-		<view class="c-row b-b">
+		<view  v-if='checked'  class="c-row b-b">
 			<text class="tit">粒型 </text>
 			<picker @change="liChange" :value="liIndex" :range="liType" class="con-list" v-model="deptList.grain">
 				<view class="con-list">
@@ -126,7 +137,7 @@
 				</view>
 			</picker>
 		</view>
-		<view class="c-row b-b">
+		<view  v-if='checked'  class="c-row b-b">
 			<text class="tit">品级 </text>
 			<picker @change="pinChange" :value="pinIndex" :range="pinType" class="con-list">
 				<view class="con-list">
@@ -134,7 +145,7 @@
 				</view>
 			</picker>
 		</view>
-		<view class="c-row b-b">
+		<view  v-if='checked'  class="c-row b-b">
 			<text class="tit">产出年份</text>
 			<picker @change="nianChange" :value="nianIndex" :range="nianType" class="con-list">
 				<view class="con-list">
@@ -142,7 +153,7 @@
 				</view>
 			</picker>
 		</view>
-		<view class="c-row b-b">
+		<view  v-if='checked'  class="c-row b-b">
 			<text class="tit">包装方式</text>
 			<picker @change="baoChange" :value="baoIndex" :range="baoType" class="con-list">
 				<view class="con-list">
@@ -150,13 +161,13 @@
 				</view>
 			</picker>
 		</view>
-		<view class="c-row b-b">
+		<view  v-if='checked&&baoIndex==2||!checked&&baoIndex==3'  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 class="c-row b-b">
+		<view  v-if='checked'  class="c-row b-b">
 			<text class="tit">运费承担方</text>
 			<picker @change="chengChange" :value="chengIndex" :range="chengType" class="con-list">
 				<view class="con-list">
@@ -177,28 +188,47 @@
 		data() {
 			return {
 				types: '',
+				goods:{},
 				typesType: ["现货", "期货"],
 				typesIndex: 0,
 				deptList: {
 					priceType: "定价采购",
 					procurementPlanType:"现货",
-					grain:"塔粮",
-					grade:"不限（默认）",
+					grain:"不限",
+					grainKey:1,
+					grade:"不限",
+					gradeKey:1,
 					outputYear:"2020",
-					packingType:"不限（默认）",
+					packingType:"不限",
+					packingTypeKey:0,
 					freightPayer:"",
 				},
+				params:{
+					province: true,
+					city: true,
+					area: true,
+				},
+				params1:{
+					province: true,
+					city: true,
+				},
+				checked:true,
 				insertProcurementPlanInfo: {},
 				liIndex: 0,
-				liType: ['塔粮', '筛粮', '中粒', '大粒'],
+				liType: ['不限','塔粮', '筛粮', '中粒', '大粒'],
 				pinIndex: 0,
-				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
+				pinType: ['不限', '一等品', '二等品', '三等品', '等外'],
 				nianIndex: 3,
 				nianType: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014', '2013', '2012',
 					'2011'
 				],
+				sendText:'获取验证码',
+				show:false,
+				show1:false,
+				region:'请选择收货地区',
+				region1:'请选择产地',
 				baoIndex: 0,
-				baoType: ['不限（默认）', '散装', '大袋', '小袋'],
+				baoType: ['不限', '散装', '大袋', '小袋'],
 				chengIndex: -1,
 				chengType: ['可议', '买方承担', '卖方承担']
 			}
@@ -206,40 +236,153 @@
 		computed: {
 			...mapState(['hasLogin','userInfo'])
 		},
+		onLoad(options){
+			if(options.customerName){
+				this.deptList.procurementPlanNo=options.customerName
+			}
+		},
+		onShow(){
+			var that=this
+			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)
+					}else{
+						that.$set(this.deptList,'procurementPlanNo',res.data.data.compName)
+					}
+					this.goods=res.data.data
+				}
+				uni.hideLoading()
+			})
+		},
 		methods: {
+			getcode(){
+				var that = this
+				if(/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.deptList.buyerPhone)){
+					this.$api.doRequest('get','/commonUser/sendVerifyCode',{phone:this.deptList.buyerPhone}).then(res => {
+						if(res.data.code==200){
+							that.sendDisabled = true
+							let sec = 60
+							let interval = setInterval(() => {
+								sec--;
+								that.sendText = sec + 's后重发'
+								if (sec <= 0) {
+									that.sendDisabled = false
+									that.sendText = "获取验证码"
+									clearInterval(interval)
+								}
+							}, 1000)
+						}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: '请输入正确的手机号',
+						icon:'none',
+						duration: 2000
+					})
+				}
+				
+			},
+			regionpicker(e){
+				this.deptList.receivePrivate=e.province.label
+				this.deptList.receiveCity=e.city.label
+				this.deptList.receiveArea=e.area.label
+				this.region=e.province.label+'-'+e.city.label+'-'+e.area.label
+			},
+			regionchange(){
+				this.show=true
+			},
+			regionpicker1(e){
+				this.deptList.outputPrivate=e.province.label
+				this.deptList.outputCity=e.city.label
+				this.region1=e.province.label+'-'+e.city.label
+			},
+			regionchange1(){
+				this.show1=true
+			},
+			checkedbox(e){
+				this.checked=!this.checked
+			},
 			typeChange(e) {
 				this.typesIndex = e.detail.value
-				this.types = this.typesType[this.typesIndex];
-				this.deptList.procurementPlanType = this.typesType[this.typesIndex];
-				if (this.typesIndex == 0) {
+				if(e.detail.value==0){
 					this.deptList.priceType = '定价采购'
-				} else {
+					this.deptList.procurementPlanTypeKey =2
+				}else{
 					this.deptList.priceType = '期货盘面价+基差'
+					this.deptList.procurementPlanTypeKey =1
 				}
-
+				this.deptList.procurementPlanType = this.typesType[this.typesIndex];
 			},
+			navToDetailPage() {
+				// if (index == 1) {
+					uni.navigateTo({
+						url: `/pageD/myRelease/Identity_switching`
+					})
+					},
 			commit() {
 				this.insertProcurementPlanInfo = this.deptList
 				// if (!this.deptList.goodsName) {
 				// 	this.$api.msg('货名1不能为空')
 				// 	return
 				// }
-			// 	if (!this.deptList.title) {
-			// 		this.$api.msg('标题不能为空')
-			// 		return
-			// 	}
+				if (!this.deptList.title) {
+					this.$api.msg('标题不能为空')
+					return
+				}
+				if (this.deptList.title.length>16||this.deptList.title.length<2) {
+					this.$api.msg('标题输入错误')
+					return
+				}
 				if (!this.deptList.goodsName) {
 					this.$api.msg('货名不能为空')
 					return
 				}
+				if (this.deptList.goodsName.length>6||this.deptList.goodsName.length<1) {
+					this.$api.msg('货名输入错误')
+					return
+				}
 				if (!this.insertProcurementPlanInfo.plannedPurchaseVolume) {
 					this.$api.msg('采购量不能为空')
 					return
 				}
+				if (this.deptList.plannedPurchaseVolume>100000||this.deptList.plannedPurchaseVolume<1) {
+					this.$api.msg('采购量输入错误')
+					return
+				}
+				if (this.deptList.plannedPurchaseVolume.indexOf('.')!=-1) {
+					if(this.deptList.plannedPurchaseVolume.split('.')[1].length>2){
+						this.$api.msg('采购量输入错误')
+						return
+					}
+				}
 				if (!this.insertProcurementPlanInfo.minimumVolume) {
 					this.$api.msg('最小成交量不能为空')
 					return
 				}
+				if (this.insertProcurementPlanInfo.minimumVolume>100000||this.insertProcurementPlanInfo.minimumVolume<1) {
+					this.$api.msg('最小成交量输入错误')
+					return
+				}
+				if (this.insertProcurementPlanInfo.minimumVolume.indexOf('.')!=-1) {
+					if(this.insertProcurementPlanInfo.minimumVolume.split('.')[1].length>2){
+						this.$api.msg('最小成交量输入错误')
+						return
+					}
+				}
 				if (!this.insertProcurementPlanInfo.procurementPlanType) {
 					this.$api.msg('类型不能为空')
 					return
@@ -253,75 +396,132 @@
 						this.$api.msg('单价不能为空')
 						return
 					}
+					if (this.insertProcurementPlanInfo.unitPrice>100000||this.insertProcurementPlanInfo.unitPrice<1) {
+						this.$api.msg('单价输入错误')
+						return
+					}
+					if (this.insertProcurementPlanInfo.unitPrice.indexOf('.')!=-1) {
+						if(this.insertProcurementPlanInfo.unitPrice.split('.')[1].length>2){
+							this.$api.msg('单价输入错误')
+							return
+						}
+					}
 				}else if(this.insertProcurementPlanInfo.procurementPlanType == '期货'){
 					if (!this.insertProcurementPlanInfo.basisPrice) {
-						this.$api.msg('基差（元/吨）不能为空')
+						this.$api.msg('基差不能为空')
+						return
+					}
+					if (this.insertProcurementPlanInfo.basisPrice>10000||this.insertProcurementPlanInfo.basisPrice<1) {
+						this.$api.msg('基差输入错误')
 						return
 					}
+					if (this.insertProcurementPlanInfo.basisPrice.indexOf('.')!=-1) {
+						if(this.insertProcurementPlanInfo.basisPrice.split('.')[1].length>2){
+							this.$api.msg('基差输入错误')
+							return
+						}
+					}
 				}
 			
 				if (!this.insertProcurementPlanInfo.buyerPhone) {
 					this.$api.msg('买方手机号不能为空')
 					return
 				}
-				if (!this.insertProcurementPlanInfo.waterContent) {
-					this.$api.msg('水分不能为空')
+				if (this.insertProcurementPlanInfo.waterContent&&this.insertProcurementPlanInfo.waterContent<1||
+				this.insertProcurementPlanInfo.waterContent&&this.insertProcurementPlanInfo.waterContent>40) {
+					this.$api.msg('水分输入错误')
 					return
 				}
-				if (!this.insertProcurementPlanInfo.bulkDensity) {
-					this.$api.msg('容重不能为空')
-					return
+				if (this.insertProcurementPlanInfo.waterContent&&this.insertProcurementPlanInfo.waterContent.indexOf('.')!=-1) {
+					if(this.insertProcurementPlanInfo.waterContent.split('.')[1].length>2){
+						this.$api.msg('水分输入错误')
+						return
+					}
 				}
-				if (!this.insertProcurementPlanInfo.jiaorenli) {
-					this.$api.msg('热损伤不能为空')
+				if (this.insertProcurementPlanInfo.bulkDensity&&this.insertProcurementPlanInfo.bulkDensity<500||
+				this.insertProcurementPlanInfo.bulkDensity&&this.insertProcurementPlanInfo.bulkDensity>1000) {
+					this.$api.msg('容重输入错误')
 					return
 				}
-				if (!this.insertProcurementPlanInfo.impurity) {
-					this.$api.msg('杂质不能为空')
+				if (this.insertProcurementPlanInfo.jiaorenli&&this.insertProcurementPlanInfo.jiaorenli<1||
+				this.insertProcurementPlanInfo.jiaorenli&&this.insertProcurementPlanInfo.jiaorenli>40) {
+					this.$api.msg('热损伤输入错误')
 					return
 				}
-				if (!this.insertProcurementPlanInfo.mildewGrain) {
-					this.$api.msg('霉变粒不能为空')
-					return
+				if (this.insertProcurementPlanInfo.jiaorenli&&this.insertProcurementPlanInfo.jiaorenli.indexOf('.')!=-1) {
+					if(this.insertProcurementPlanInfo.jiaorenli.split('.')[1].length>2){
+						this.$api.msg('热损伤输入错误')
+						return
+					}
 				}
-				if (!this.insertProcurementPlanInfo.imperfectGrain) {
-					this.$api.msg('不完整粒不能为空')
+				if (this.insertProcurementPlanInfo.impurity&&this.insertProcurementPlanInfo.impurity<1||
+				this.insertProcurementPlanInfo.impurity&&this.insertProcurementPlanInfo.impurity>40) {
+					this.$api.msg('杂质输入错误')
 					return
 				}
-				if (!this.insertProcurementPlanInfo.bulkDensity) {
-					this.$api.msg('蛋白不能为空')
-					return
+				if (this.insertProcurementPlanInfo.impurity&&this.insertProcurementPlanInfo.impurity.indexOf('.')!=-1) {
+					if(this.insertProcurementPlanInfo.impurity.split('.')[1].length>2){
+						this.$api.msg('杂质输入错误')
+						return
+					}
 				}
-				if (!this.insertProcurementPlanInfo.grain) {
-					this.$api.msg('粒型不能为空')
+				if (this.insertProcurementPlanInfo.mildewGrain&&this.insertProcurementPlanInfo.mildewGrain<1||
+				this.insertProcurementPlanInfo.mildewGrain&&this.insertProcurementPlanInfo.mildewGrain>40) {
+					this.$api.msg('霉变粒输入错误')
 					return
 				}
-				if (!this.insertProcurementPlanInfo.grade) {
-					this.$api.msg('品级不能为空')
-					return
+				if (this.insertProcurementPlanInfo.mildewGrain&&this.insertProcurementPlanInfo.mildewGrain.indexOf('.')!=-1) {
+					if(this.insertProcurementPlanInfo.mildewGrain.split('.')[1].length>2){
+						this.$api.msg('霉变粒输入错误')
+						return
+					}
 				}
-				if (!this.insertProcurementPlanInfo.outputYear) {
-					this.$api.msg('产出年份不能为空')
+				if (this.insertProcurementPlanInfo.imperfectGrain&&this.insertProcurementPlanInfo.imperfectGrain<1||
+				this.insertProcurementPlanInfo.imperfectGrain&&this.insertProcurementPlanInfo.imperfectGrain>40) {
+					this.$api.msg('不完整粒输入错误')
 					return
 				}
-				if (!this.insertProcurementPlanInfo.packingType) {
-					this.$api.msg('包装方式不能为空')
-					return
+				if (this.insertProcurementPlanInfo.imperfectGrain&&this.insertProcurementPlanInfo.imperfectGrain.indexOf('.')!=-1) {
+					if(this.insertProcurementPlanInfo.imperfectGrain.split('.')[1].length>2){
+						this.$api.msg('不完整粒输入错误')
+						return
+					}
 				}
-				if (!this.insertProcurementPlanInfo.baggingNotes) {
-					this.$api.msg('装袋备注不能为空')
+				if (this.deptList.protein&&this.deptList.protein<1||
+				this.deptList.protein&&this.deptList.protein>80) {
+					this.$api.msg('蛋白输入错误')
 					return
 				}
-				if (!this.insertProcurementPlanInfo.freightPayer) {
-					this.$api.msg('运费承担方不能为空')
-					return
+				if (this.deptList.protein&&this.deptList.protein.indexOf('.')!=-1) {
+					if(this.deptList.protein.split('.')[1].length>2){
+						this.$api.msg('蛋白输入错误')
+						return
+					}
 				}
+				this.insertProcurementPlanInfo.basisPrice=-this.insertProcurementPlanInfo.basisPrice
 		         this.insertProcurementPlanInfo.commonId = this.userInfo.id
 				 this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+				 uni.showModal({
+				 	content: '确定发布交易信息？',
+				 	success: (res) => {
+						if(res.confirm) {  
 				this.$api.doRequest('post', '/procurementPlanInfo/api/insertProcurementPlanInfo', this
 						.insertProcurementPlanInfo).then(res => {
-						console.log("添加成功")
-						this.procurementPlanInfos = res.data.data
+							if(res.data.code==200){
+								uni.showToast({
+									title: "发布成功",
+									icon: 'none',
+								})
+								setTimeout(() => {
+									uni.navigateBack({})
+								}, 2000)
+							}else{
+								uni.showToast({
+									title: res.data.message,
+									icon: 'none',
+									duration: 2000
+								})
+							}
 					})
 					.catch(res => {
 						uni.showToast({
@@ -330,15 +530,20 @@
 							duration: 2000
 						})
 					});
+					}
+					}
+				})
 			},
 			liChange(e) {
 				this.liIndex = e.detail.value
 				this.litypes = this.liType[this.liIndex];
+				this.deptList.grainKey = e.detail.value+1
 				this.deptList.grain = this.liType[this.liIndex]
 			},
 			pinChange(e) {
 				this.pinIndex = e.detail.value
 				this.pintypes = this.pinType[this.pinIndex];
+				this.deptList.gradeKey = e.detail.value+1
 				this.deptList.grade = this.pinType[this.pinIndex]
 			},
 			nianChange(e) {
@@ -350,11 +555,13 @@
 			baoChange(e) {
 				this.baoIndex = e.detail.value
 				this.baotypes = this.baoType[this.baoIndex];
+				this.deptList.packingTypeKey = e.detail.value
 				this.deptList.packingType = this.chengType[this.chengIndex];
 			},
 			chengChange(e) {
 				this.chengIndex = e.detail.value
 				this.chengtypes = this.chengType[this.chengIndex];
+				this.deptList.freightPayerKey = e.detail.value+1
 					this.deptList.freightPayer = this.chengType[this.chengIndex];
 			}
 		}

pageD/warehousings/warehousingDetails.vue

@@ -97,55 +97,55 @@
 			<view class="c-row ">
 				<text class="tit">质检员</text>
 				<view class="con-list">
-					<text>{{WarehouseInOutDetail.qualityInspector}}</text>
+					<text>{{warehouseInOutInfo.qualityInspector}}</text>
 				</view>
 			</view>
 			<view class="c-row ">
 				<text class="tit">蛋白(%){{'>='}}</text>
 				<view class="con-list">
-					<text>{{WarehouseInOutDetail.protein}}</text>
+					<text>{{warehouseInOutInfo.protein}}</text>
 				</view>
 			</view>
 			<view class="c-row ">
 				<text class="tit">水分(%){{'<='}}</text>
 				<view class="con-list">
-					<text>{{WarehouseInOutDetail.waterContent}}</text>
+					<text>{{warehouseInOutInfo.waterContent}}</text>
 				</view>
 			</view>
 			<view class="c-row ">
 				<text class="tit">容重(g/L){{'<='}}</text>
 				<view class="con-list">
-					<text>{{WarehouseInOutDetail.bulkDensity}}</text>
+					<text>{{warehouseInOutInfo.bulkDensity}}</text>
 				</view>
 			</view>
 			<view class="c-row ">
 				<text class="tit">热损伤(%){{'<='}}</text>
 				<view class="con-list">
-					<text>{{WarehouseInOutDetail.jiaorenli}}</text>
+					<text>{{warehouseInOutInfo.jiaorenli}}</text>
 				</view>
 			</view>
 			<view class="c-row ">
 				<text class="tit">杂质(%){{'<='}}</text>
 				<view class="con-list">
-					<text>{{WarehouseInOutDetail.impurity}}</text>
+					<text>{{warehouseInOutInfo.impurity}}</text>
 				</view>
 			</view>
 			<view class="c-row ">
 				<text class="tit">霉变粒(%){{'<='}}</text>
 				<view class="con-list">
-					<text>{{WarehouseInOutDetail.mildewGrain}}</text>
+					<text>{{warehouseInOutInfo.mildewGrain}}</text>
 				</view>
 			</view>
 			<view class="c-row ">
 				<text class="tit">不完整粒(%){{'<='}} </text>
 				<view class="con-list">
-					<text>{{WarehouseInOutDetail.imperfectGrain}}</text>
+					<text>{{warehouseInOutInfo.imperfectGrain}}</text>
 				</view>
 			</view>
 			<view class="c-row ">
 				<text class="tit">品级</text>
 				<view class="con-list">
-					<text>{{WarehouseInOutDetail.grade}}</text>
+					<text>{{warehouseInOutInfo.grade}}</text>
 				</view>
 			</view>
 		</view>
@@ -157,8 +157,11 @@
 
 		data() {
 			return {
-				warehouseInOutInfo: {},
-				WarehouseInOutDetail: {},
+				warehouseInOutInfo: {
+					warehouseInOutDetail:{
+						qualityInspector:''
+					}
+				}
 			}
 		},
 		onLoad(options){
@@ -172,10 +175,10 @@
 				this.types = this.typesType[this.typesIndex];
 			},
 			getList(id1){
+				var that=this
 				this.$api.doRequest('get','/warehouseInOutInfo/getInfo',{id:id1}).then(res => {
 					console.log(res)
-					this.warehouseInOutInfo = res.data.data
-					this.WarehouseInOutDetail = this.warehouseInOutInfo.warehouseInOutDetail
+					that.warehouseInOutInfo = res.data.data
 					
 				})
 				.catch(res => {
@@ -185,6 +188,7 @@
 						duration: 2000
 					})
 				});
+				console.log(this.warehouseInOutInfo)
 			}
 		}
 		}

pageD/warehousings/warehousings.vue

@@ -188,7 +188,6 @@
 import upload from '@/components/upload.vue';
 	export default {
 	components:{upload},
-	
 		data() {
 			return {
 				packingType: [],
@@ -226,7 +225,6 @@ import upload from '@/components/upload.vue';
 			}
 		},
 		computed: {
-			
 				time() {
 					var date=new Date()
 					var year=date.getFullYear()

pages.json

@@ -168,6 +168,20 @@
 				"enablePullDownRefresh": true
 			}
 		},
+		{
+			"path": "pages/attestation/indexTwo",
+			"style": {
+				"navigationBarTitleText": "粮商身份",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/attestation/indexThree",
+			"style": {
+				"navigationBarTitleText": "司机身份",
+				"enablePullDownRefresh": true
+			}
+		},
 		{
             "path" : "pages/tran/tran",
             "style" : {
@@ -379,6 +393,21 @@
 		        "enablePullDownRefresh": false
 		    }   
 		},
+		{
+		    "path" : "pageD/identity/companyIdentityTwo",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "粮商认证",
+		        "enablePullDownRefresh": false
+		    }   
+		},{
+		    "path" : "pageD/identity/companyIdentityThree",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "粮商认证",
+		        "enablePullDownRefresh": false
+		    }   
+		},
 		{
 		    "path" : "pageD/identity/companyIdentityLook",
 		    "style" :                                                                                    
@@ -412,7 +441,26 @@
                 "enablePullDownRefresh": false
             }
             
-        }
+        },
+		{
+		    "path" : "pageD/myRelease/Identity_switching",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pageD/myRelease/buyEdit",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "买粮",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
+
 		
     ],
 	"subpackages": [
@@ -627,13 +675,13 @@
 				{
 				    "path" : "contract/contract_detail",
 				    "style" : {
-						"navigationBarTitleText": "添加发车信息"
+						"navigationBarTitleText": "添加"
 						}
 				},
 				{
 				    "path" : "contract/contract",
 				    "style" : {
-						"navigationBarTitleText": "合同管理",
+						"navigationBarTitleText": "我的合同",
 						"enablePullDownRefresh": true
 						}
 				},{

pages/attestation/index.vue

@@ -1,63 +1,92 @@
 <template>
 	<view class="center">
-		<view >
+		<!-- <view class="homePage">
+			<view class="title">
+				粮商身份
+			</view>
+			<view class="arrows">
+				<text style="margin-right: 30px;">新增身份</text>
+					<image src="../../static/img/authentication/jiantou@3x.png" class="arrow"></image>
+			</view>	
+			<image src="../../static/img/authentication/liangshang@3x.png" class="portrait"></image>
+		</view> -->
+		<view class="homePage">
+			<image src="../../static/img/authentication/bg@2x.png" class="background"></image>
+			<view class="title">
+				粮商身份
+			</view>
+			<view class="arrows1" @click="liangShang">
+				<text style="margin-right: 30px;">新增身份</text>
+				<image src="../../static/img/authentication/jiantou@3x.png" class="arrow"></image>
+			</view>
+			<image src="../../static/img/authentication/liangshang@3x.png" class="portrait1"></image>
+		</view>
+
+		<view class="homePage1">
+			<image src="../../static/img/authentication/bg@2x.png" class="background"></image>
+			<view class="title">
+				司机身份
+			</view>
+			<view class="arrows1" @click="siJi">
+				<text style="margin-right: 30px;">新增身份</text>
+				<image src="../../static/img/authentication/jiantou@3x.png" class="arrow"></image>
+			</view>
+			<image src="../../static/img/authentication/siji@3x.png" class="portrait1"></image>
+		</view>
+		<!-- <view>
 			<view class="title">粮商身份</view>
 			<view class='cu-tag radius line-pink' @click="adddriver(1)">新增</view>
-			<view v-for="(item , index) in businessman" :Key="index" >
-				
-			
-			<view class="company">{{item.compName}}</view>
-			<view class="guess-item" >
-				<view class="infos" @click="navToDetailPage(1,item)">
+			<view v-for="(item , index) in businessman" :Key="index">
+
+
+				<view class="company">{{item.compName}}</view>
+				<view class="guess-item">
+					<view class="infos" @click="navToDetailPage(1,item)">
 
-					<view class="info">{{item.customerName}}
-						<view class='cu-tag radius line-pink but'>{{item.authenticationStatus}}</view>
+						<view class="info">{{item.customerName}}
+							<view class='cu-tag radius line-pink but'>{{item.authenticationStatus}}</view>
+						</view>
+						<view class="info">{{item.customerPhone}}</view>
 					</view>
-					<view class="info">{{item.customerPhone}}</view>
-					
-					
-				</view>
-				<label>
-					<checkbox :value="1" /><text>设置默认</text>
-				</label>
-				<view class='cu-tag radius line-pink ' @click="deleteLS(item)">删除</view>
-				<view class='cu-tag radius line-pink ' @click="companyEdit(item)" >修改</view>
-				<view class='cu-tag radius line-pink but'>更换手机号</view>
+					<label>
+						<checkbox :value="1" /><text>设置默认</text>
+					</label>
+					<view class='cu-tag radius line-pink ' @click="deleteLS(item)">删除</view>
+					<view class='cu-tag radius line-pink ' @click="companyEdit(item)">修改</view>
+					<view class='cu-tag radius line-pink but'>更换手机号</view>
 
+				</view>
+				<hr>
 			</view>
-			<hr>
-			</view>
-		</view>
+		</view> -->
 
-		<view class="margin-top" >
+		<!-- <view class="margin-top">
 			<view class="title">司机身份</view>
 			<view class='cu-tag radius line-pink' @click="adddriver(2)">新增</view>
 			<view v-for="(items , index) in drivers" :Key="index">
-				
-			
-			<view class="guess-item" @click="navToDetailPage(2,items)">
-				<view class="infos">
-					<view class="info">{{items.driverName}}
-						<view class='cu-tag radius line-pink but'>{{items.authenticationStatus}}</view>
+
+
+				<view class="guess-item" @click="navToDetailPage(2,items)">
+					<view class="infos">
+						<view class="info">{{items.driverName}}
+							<view class='cu-tag radius line-pink but'>{{items.authenticationStatus}}</view>
+						</view>
+						<view class="info">{{items.driverPhone}}</view>
 					</view>
-					<view class="info">{{items.driverPhone}}</view>		
 				</view>
+				<view class='cu-tag radius line-pink ' @click="deleteSJ(items)">删除</view>
+				<view class='cu-tag radius line-pink ' @click="driverIdentityEdit(items)">修改</view>
+				<view class='cu-tag radius line-pink but'>更换手机号</view>
+				<hr>
 			</view>
-			<view class='cu-tag radius line-pink ' @click="deleteSJ(items)">删除</view>
-			<view class='cu-tag radius line-pink ' @click="driverIdentityEdit(items)">修改</view>
-			<view class='cu-tag radius line-pink but'>更换手机号</view>
-			<hr>
-			</view>
-		</view>
-	</view>
+		</view> -->
 
 	</view>
-	</view>
 </template>
 
 <script>
 	import {
-	    mapState 
+		mapState
 	} from 'vuex';
 	export default {
 		name: "buy",
@@ -73,120 +102,141 @@
 				scrollTop: 0,
 				TabCur: 0,
 				current: 1,
-				identityAuthenticationInfo:{
-					pageSize:10,
-					currentPage:1,
-					commonId:"",
+				identityAuthenticationInfo: {
+					pageSize: 10,
+					currentPage: 1,
+					commonId: "",
 				},
-				businessman:[],
-				drivers:[],
-				deletes:{
-					id:"",
+				businessman: [],
+				drivers: [],
+				deletes: {
+					id: "",
 				},
 			};
 		},
-		onLoad(){
-			this.getList()
-		},
 		computed: {
-			...mapState(['hasLogin','userInfo'])
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		onLoad() {
+			this.getList()
 		},
+		
 		methods: {
-			driverIdentityEdit(items){
+			liangShang(){
+			
 				uni.navigateTo({
-					url: `/pageD/identity/driverIdentityEdit?id=${items.id}`
+					url: `/pages/attestation/indexTwo`
 				})
 			},
-			companyEdit(item){
+			siJi(){
 				uni.navigateTo({
-					url: `/pageD/identity/companyIdentityEdit?id=${item.id}`
+					url: `/pages/attestation/indexThree`
 				})
 			},
-			deleteLS(item){	
-					uni.showModal({
-						// title: '登录提示',
-						content: '身份信息删除后不可恢复，是否确定删除？',
-						showCancel: true,
-						confirmText: '确定',
-						success: (e) => {
-							this.$api.doRequest('post','/identityAuthenticationInfo/api/deleteIdentityAuthenticationInfo',{id:item.id},'application/json;charset=UTF-8').then(res => {
+			driverIdentityEdit(items) {
+				uni.navigateTo({
+					url: `/pageD/identity/driverIdentityEdit?id=${items.id}`
+				})
+			},
+			// companyEdit(item) {
+			// 	uni.navigateTo({
+			// 		url: `/pageD/identity/companyIdentityEdit?id=${item.id}`
+			// 	})
+			// },
+			deleteLS(item) {
+				uni.showModal({
+					// title: '登录提示',
+					content: '身份信息删除后不可恢复，是否确定删除？',
+					showCancel: true,
+					confirmText: '确定',
+					success: (e) => {
+						this.$api.doRequest('post',
+								'/identityAuthenticationInfo/api/deleteIdentityAuthenticationInfo', {
+									id: item.id
+								}, 'application/json;charset=UTF-8').then(res => {
 								this.procurementPlanInfos = res.data.data.records
 								if (res.errmsg == "Success") {
 									this.$api.msg('删除成功！')
 									this.getList()
 									return
 								}
-								
+
 							})
 							.catch(res => {
 								uni.showToast({
 									title: res.errmsg,
-									icon:'none',
+									icon: 'none',
 									duration: 2000
 								})
 							});
-						},
-						fail: () => {},
-						complete: () => {}
-					})
+					},
+					fail: () => {},
+					complete: () => {}
+				})
 			},
-			deleteSJ(item){
+			deleteSJ(item) {
 				console.log(item.driverName)
 				this.deletes = {}
 				this.deletes.id = item.id
-					uni.showModal({
-						// title: '登录提示',
-						content: '身份信息删除后不可恢复，是否确定删除？',
-						showCancel: true,
-						confirmText: '确定',
-						success: (e) => {
-							this.$api.doRequest('get','/driverViewInfo/api/deleteDriver',this.deletes,'application/json;charset=UTF-8').then(res => {
+				uni.showModal({
+					// title: '登录提示',
+					content: '身份信息删除后不可恢复，是否确定删除？',
+					showCancel: true,
+					confirmText: '确定',
+					success: (e) => {
+						this.$api.doRequest('get', '/driverViewInfo/api/deleteDriver', this.deletes,
+								'application/json;charset=UTF-8').then(res => {
 								this.procurementPlanInfos = res.data.data.records
 								if (res.errmsg == "Success") {
 									this.$api.msg('删除成功！')
 									this.getList()
 									return
 								}
-								
+
 							})
 							.catch(res => {
 								uni.showToast({
 									title: res.errmsg,
-									icon:'none',
+									icon: 'none',
 									duration: 2000
 								})
 							});
-						},
-						fail: () => {},
-						complete: () => {}
-					})
-				},
-			getList(){
-				this.identityAuthenticationInfo.commonId = this.userInfo.id
-			this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {pageSize:10,
-					currentPage:1,
-					commonId:this.userInfo.id},'application/json;charset=UTF-8').then(res => {
-				console.log("成功连接")
-			
-					
-					this.businessman = res.data.data.records
+					},
+					fail: () => {},
+					complete: () => {}
 				})
-				.catch(res => {
-					uni.showToast({
-						title: res.errmsg,
-						icon: 'none',
-						duration: 2000
+			},
+			getList() {
+				this.identityAuthenticationInfo.commonId = this.userInfo.id
+				this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {
+						pageSize: 10,
+						currentPage: 1,
+						commonId: this.userInfo.id
+					}, 'application/json;charset=UTF-8').then(res => {
+						console.log("成功连接")
+
+
+						this.businessman = res.data.data.records
 					})
-				});
-				
-				this.$api.doRequest('get', '/driverViewInfo/selectDriverInfoPage', {pageSize:10,
-						currentPage:1,
-						commonId:this.userInfo.id,flag:0},'application/json;charset=UTF-8').then(res => {
-					console.log("成功连接")
-					
+					.catch(res => {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+
+				this.$api.doRequest('get', '/driverViewInfo/selectDriverInfoPage', {
+						pageSize: 10,
+						currentPage: 1,
+						commonId: this.userInfo.id,
+						flag: 0
+					}, 'application/json;charset=UTF-8').then(res => {
+						console.log("成功连接")
+
 						this.drivers = res.data.data.records
-						
-						console.log(this.drivers,"skalkdkk")
+
+						console.log(this.drivers, "skalkdkk")
 					})
 					.catch(res => {
 						uni.showToast({
@@ -195,7 +245,7 @@
 							duration: 2000
 						})
 					});
-				},
+			},
 			adddriver(index) {
 				if (index == 1) {
 					uni.navigateTo({
@@ -207,7 +257,7 @@
 					})
 				}
 			},
-			navToDetailPage(index,item) {
+			navToDetailPage(index, item) {
 				if (index == 1) {
 					uni.navigateTo({
 						url: `/pageD/identity/companyIdentityLook?id=${item.id}`
@@ -229,10 +279,13 @@
 	}
 
 	.title {
-		font-size: 18px;
+		font-size: 22px;
 		font-weight: 900;
-		margin-right: 20px;
-		display: initial;
+		/* margin-top: 30px; */
+		top: 50px;
+		left: 24px;
+		position: relative;
+
 	}
 
 	.company {
@@ -245,11 +298,65 @@
 		width: 100%;
 		display: inline-table;
 	}
+
 	.info {
 		line-height: 20px;
 	}
+
 	.but {
 		right: 3px;
 		float: right;
 	}
+
+	.homePage {
+		width: 101%;
+		height: 200px;
+
+		margin: 20px auto;
+
+	}
+
+	.arrows {
+		font-size: 14px;
+		font-weight: 600;
+		float: right;
+		margin-top: 130px;
+	}
+
+	.arrow {
+		width: 16px;
+		height: 16px;
+		float: right;
+		right: 20px;
+	}
+
+	.portrait {
+		width: 75px;
+		height: 75px;
+		float: right;
+		right: -70px;
+	}
+
+	.homePage1 {
+		width: 101%;
+	}
+
+	.background {
+		width: 100%;
+		height: 200px;
+		position: fixed;
+	}
+
+	.arrows1 {
+		position: absolute;
+		right: 30px;
+		margin-top: 120px;
+	}
+
+	.portrait1 {
+		width: 75px;
+		height: 75px;
+		float: right;
+
+	}
 </style>

pages/attestation/indexThree.vue

@@ -0,0 +1,240 @@
+<template>
+	<view class="center">
+		<view v-for="(item , index) in drivers" :Key="index" class="forList">
+			<view class='flex' @click="navToDetailPage(item)">
+				<view class="logo">
+					粮商
+				</view>
+				<view class = "company" >{{item.driverName}}</view>
+				<view class = "geren" >{{item.driverPhone}}</view>
+				<!-- <view class = "company" v-if="item.customerTypeFlag == 1">{{item.customerName}}</view>
+				<view class = "geren" v-if="item.customerTypeFlag == 1">  {{item.customerPhone}}</view>
+				<view class = "geren" v-if="item.customerTypeFlag == 2">{{item.customerName}}    {{item.customerPhone}}</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>
+				<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>
+			<hr style="margin: 10px 0;">
+			<view class="cu-tag yuan">
+				<image src="../../static/img/authentication/selected(2).png" style="width: 16px;height: 16px;">设置默认</image>
+			</view>
+			<view class='cu-tag but'>更换手机号</view>
+			<view class='cu-tag but' @click="companyEdit(item)">修改</view>
+			<view class='cu-tag but' @click="deleteSJ(item)">删除</view>
+			
+
+
+		</view>
+		<button class="btn btns"  @click="Add">新增</button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		name: "buy",
+		data() {
+			return {
+				businessman: {},
+				identityAuthenticationInfo: {},
+				drivers:{},
+			}
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		onLoad() {
+			this.getList()
+		},
+		methods: {
+			Add(){
+				uni.navigateTo({
+					url: `/pageD/identity/driverIdentity`
+				})
+			},
+			getList() {
+				this.identityAuthenticationInfo.commonId = this.userInfo.id
+				this.$api.doRequest('get', '/driverViewInfo/selectDriverInfoPage', {
+						pageSize: 10,
+						currentPage: 1,
+						commonId: this.userInfo.id,
+						flag: 0
+					}, 'application/json;charset=UTF-8').then(res => {
+						console.log("成功连接")
+				
+						this.drivers = res.data.data.records
+				
+						console.log(this.drivers, "skalkdkk")
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			navToDetailPage(item){
+				uni.navigateTo({
+					url: `/pageD/identity/driverIdentityLook?id=${item.id}`
+				})
+			},
+			deleteSJ(item) {
+				this.deletes = {}
+				this.deletes.id = item.id
+				uni.showModal({
+					// title: '登录提示',
+					content: '身份信息删除后不可恢复，是否确定删除？',
+					showCancel: true,
+					confirmText: '确定',
+					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") {
+									this.$api.msg('删除成功！')
+									this.getList()
+									return
+								}
+				
+							})
+							.catch(res => {
+								uni.showToast({
+									title: res.errmsg,
+									icon: 'none',
+									duration: 2000
+								})
+							});
+					},
+					fail: () => {},
+					complete: () => {}
+				})
+			},
+			companyEdit(item) {
+				uni.navigateTo({
+					url: `/pageD/identity/driverIdentityEdit?id=${item.id}`
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	.center {
+		padding: 10px 20px;
+		background-color: #F5F6FA;
+	}
+
+	.title {
+		font-size: 22px;
+		font-weight: 900;
+		/* margin-top: 30px; */
+		top: 50px;
+		left: 24px;
+		position: relative;
+
+	}
+
+	.company {
+		font-size: 16px;
+	    font-weight: 600;
+		margin-top: 10px;
+		display: inline-block;
+		margin-left: 10px;
+	}
+	.geren{
+		color: #AFB3BF;
+		font-size: 14px;
+		margin-top: 34px;
+		margin-left: -10px;
+	}
+
+	.infos {
+		width: 100%;
+		display: inline-table;
+	}
+
+	.info {
+		line-height: 20px;
+	}
+
+	.but {
+		border: 1px solid #CDCDCD;
+		border-radius: 10px;
+		
+	}
+
+	.homePage {
+		width: 101%;
+		height: 200px;
+		margin: 20px auto;
+	}
+
+	.logo {
+		width: 35px;
+		height: 35px;
+		background-color: #E9F8F0;
+		color: #22C572;
+		text-align: center;
+		line-height: 35px;
+		padding: 0 3px;
+		border-radius: 6px;
+		display: inline-block;
+		margin-top: 10px;
+	}
+
+	.forList {
+		background: #FFFFFF;
+		margin-top: 10px;
+		padding: 10px 10px;
+		border-radius: 16px;
+
+	}
+	.status{
+	position: absolute;
+	margin-top: 10px;
+	right: 36px;
+		color:#22C572;
+	}
+	.status1{
+	position: absolute;
+	margin-top: 10px;
+	right: 36px;
+	color:#FE6430;
+	}
+	.status2{
+	position: absolute;
+	margin-top: 10px;
+	right: 36px;
+	color: #FB1E1E;
+	}
+	.status3{
+	position: absolute;
+	margin-top: 10px;
+	right: 36px;
+	color: #AFB3BF;
+	}	
+	.btn {
+		margin-top: 10px;
+		background-color: #FFFFFF;
+		border-radius: 25px;
+		border: none;
+	}
+	
+	.btns {
+		background-color: #22C572;
+	}
+</style>

pages/attestation/indexTwo.vue

@@ -0,0 +1,234 @@
+<template>
+	<view class="center">
+		<view v-for="(item , index) in businessman" :Key="index" class="forList">
+			<view class='flex' @click="navToDetailPage(item)">
+				<view class="logo">
+					粮商
+				</view>
+				<view class = "company" >{{item.compName}}</view>
+				<view class = "company" v-if="item.customerTypeFlag == 1">{{item.customerName}}</view>
+				<view class = "geren" v-if="item.customerTypeFlag == 1">  {{item.customerPhone}}</view>
+				<view class = "geren" v-if="item.customerTypeFlag == 2">{{item.customerName}}    {{item.customerPhone}}</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>
+				<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>
+			<hr style="margin: 10px 0;">
+			<view class="cu-tag yuan">
+				<image src="../../static/img/authentication/selected(2).png" style="width: 16px;height: 16px;">设置默认</image>
+			</view>
+			<view class='cu-tag but'>更换手机号</view>
+			<view class='cu-tag but' @click="companyEdit(item)">修改</view>
+			<view class='cu-tag but' @click="deleteLS(item)">删除</view>
+			
+
+
+		</view>
+		<button class="btn btns"  @click="Add">新增</button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		name: "buy",
+		data() {
+			return {
+				businessman: {},
+				identityAuthenticationInfo: {},
+				judge:"geren",
+			}
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		onLoad() {
+			this.getList()
+		},
+		methods: {
+			Add(){
+				uni.navigateTo({
+					url: `/pageD/identity/companyIdentity`
+				})
+			},
+			getList() {
+				this.identityAuthenticationInfo.commonId = this.userInfo.id
+				this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {
+						pageSize: 10,
+						currentPage: 1,
+						commonId: this.userInfo.id
+					}, 'application/json;charset=UTF-8').then(res => {
+						console.log("成功连接")
+						this.businessman = res.data.data.records
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			navToDetailPage(item){
+				uni.navigateTo({
+					url: `/pageD/identity/companyIdentityLook?id=${item.id}`
+				})
+			},
+			deleteLS(item) {
+				uni.showModal({
+					// title: '登录提示',
+					content: '身份信息删除后不可恢复，是否确定删除？',
+					showCancel: true,
+					confirmText: '确定',
+					success: (e) => {
+						this.$api.doRequest('post',
+								'/identityAuthenticationInfo/api/deleteIdentityAuthenticationInfo', {
+									id: item.id
+								}, 'application/json;charset=UTF-8').then(res => {
+								this.procurementPlanInfos = res.data.data.records
+								if (res.errmsg == "Success") {
+									this.$api.msg('删除成功！')
+									this.getList()
+									return
+								}
+			
+							})
+							.catch(res => {
+								uni.showToast({
+									title: res.errmsg,
+									icon: 'none',
+									duration: 2000
+								})
+							});
+					},
+					fail: () => {},
+					complete: () => {}
+				})
+			},
+			companyEdit(item) {
+				uni.navigateTo({
+					url: `/pageD/identity/companyIdentityEdit?id=${item.id}`
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	.center {
+		padding: 10px 20px;
+		background-color: #F5F6FA;
+	}
+
+	.title {
+		font-size: 22px;
+		font-weight: 900;
+		/* margin-top: 30px; */
+		top: 50px;
+		left: 24px;
+		position: relative;
+
+	}
+
+	.company {
+		font-size: 16px;
+	    font-weight: 600;
+		margin-top: 10px;
+		display: inline-block;
+		margin-left: 10px;
+	}
+	.geren{
+		color: #AFB3BF;
+		font-size: 14px;
+		margin-top: 34px;
+		margin-left: -54px;
+	}
+
+	.infos {
+		width: 100%;
+		display: inline-table;
+	}
+
+	.info {
+		line-height: 20px;
+	}
+
+	.but {
+		border: 1px solid #CDCDCD;
+		border-radius: 10px;
+		
+	}
+
+	.homePage {
+		width: 101%;
+		height: 200px;
+		margin: 20px auto;
+	}
+
+	.logo {
+		width: 35px;
+		height: 35px;
+		background-color: #E9F8F0;
+		color: #22C572;
+		text-align: center;
+		line-height: 35px;
+		padding: 0 3px;
+		border-radius: 6px;
+		display: inline-block;
+		margin-top: 10px;
+	}
+
+	.forList {
+		background: #FFFFFF;
+		margin-top: 10px;
+		padding: 10px 10px;
+		border-radius: 16px;
+
+	}
+	.status{
+	position: absolute;
+	margin-top: 10px;
+	right: 36px;
+		color:#22C572;
+	}
+	.status1{
+	position: absolute;
+	margin-top: 10px;
+	right: 36px;
+	color:#FE6430;
+	}
+	.status2{
+	position: absolute;
+	margin-top: 10px;
+	right: 36px;
+	color: #FB1E1E;
+	}
+	.status3{
+	position: absolute;
+	margin-top: 10px;
+	right: 36px;
+	color: #AFB3BF;
+	}	
+	.btn {
+		margin-top: 10px;
+		background-color: #FFFFFF;
+		border-radius: 25px;
+		border: none;
+	}
+	
+	.btns {
+		background-color: #22C572;
+	}
+</style>

pages/release/release.vue

@@ -8,10 +8,13 @@
 				<view class="labels">{{item.unitPrice}}</view>
 				<view class="title">{{item.receivePrivate}}{{item.receiveCity}}{{item.receiveArea}}</view>
 				</view>
-				<view class='cu-tag radius line-pink'>编辑</view>
-				<view class='cu-tag radius line-pink' @click="switch1(item)">显示/隐藏</view>
+				<view @click='edit(item)' v-if='item.status!="待审核"' class='cu-tag radius line-pink'>编辑</view>
+				<view class='cu-tag radius line-pink' @click="switch1(item)">隐藏</view>
+				<view class='cu-tag radius line-pink' @click="switch1(item)">显示</view>
 			    <view class='cu-tag radius line-pink' @click="deleteRelease(item)">删除</view>
-				<view class='cu-tag radius line-pink put'>{{item.status}}</view>
+				<view v-if='item.status=="已驳回"' class='cu-tag radius line-pink put'>未通过</view>
+				<view v-if='item.status=="待审核"' class='cu-tag radius line-pink put'>审核中</view>
+				<view v-if='item.status=="已认证"' class='cu-tag radius line-pink put'>已通过</view>
 			</view>
 		</view>
 		<view class="page-bottom">
@@ -80,8 +83,11 @@
 					})
 				// }
 			},
-			
-			
+			edit(item){
+				uni.navigateTo({
+					url: `/pageD/myRelease/buyEdit?id=${item.id}`
+				})
+			},
 			deleteRelease(item){
 				// if (!this.hasLogin) {
 					uni.showModal({

pages/task/my_task.vue

@@ -61,7 +61,52 @@
 			};
 		},
 		onLoad(options) {
-			this.getIndexBuyData();
+			this.getIndexBuyData()
+		},
+		filters: {
+			formatDate (date) {
+				var date=new Date(date)
+				var time=new Date()
+				var newdate=''
+				if(time.getMonth() + 1>=10){
+					newdate=time.getFullYear()+'-'+(time.getMonth()+1)+'-'+time.getDate()
+				}else{
+					newdate=time.getFullYear()+'-0'+(time.getMonth()+1)+'-'+time.getDate()
+				}
+			     //把时间戳改为yyyy-MM-dd格式
+			     //判断是否今天
+				 var datatime=''
+				 if(date.getMonth() + 1>=10){
+				 	datatime=date.getFullYear()+'-'+(date.getMonth()+1)+'-'+date.getDate()
+				 }else{
+				 	datatime=date.getFullYear()+'-0'+(date.getMonth()+1)+'-'+date.getDate()
+				 }
+				 console.log(datatime ,newdate)
+			     if(datatime == newdate){
+			          var h = date.getHours();
+			             h = h < 10 ? '0' + h : h;
+			             var m = date.getMinutes();
+			             m = m < 10 ? '0' + m : m;
+			             var s = date.getSeconds();
+			             s = s < 10 ? '0' + s : s;
+			             return h + ':' + m + ':' + s;
+			     }else{
+					 if(date.getMonth() + 1>=10){
+						 return date.getFullYear()+'-'+(date.getMonth()+1)+'-'+date.getDate()
+					 }else{
+						  return date.getFullYear()+'-0'+(date.getMonth()+1)+'-'+date.getDate()
+					 }
+					 
+				 }
+			 let o = {
+			  'Y': date.getFullYear(),
+			  'M+': date.getMonth() + 1,
+			  'd+': date.getDate(),
+			  // 'H+': date.getHours(),
+			  // 'm+': date.getMinutes(),
+			  // 's+': date.getSeconds()
+			 }
+			},
 		},
 		methods: {
 			searchKeyWord(){