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

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

@@ -1 +1 @@
-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;
+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/freightTransport/addpaygoods.vue

@@ -0,0 +1,429 @@
+<template>
+	<view class="container">
+		<view class="information">
+			<view class="c-row b-b">
+				<view class="title">收货人姓名</view>
+				<view class="con-list">
+				<input maxlength='7' placeholder="请输入收货人姓名" name="input" v-model="goods.carNo"></input>
+				</view>
+			</view>
+			<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>
+			<view class="c-row b-b">
+				<view class="title">全部收货人（3）</view>
+			</view>
+			<view class="information">
+				<view class="c-row b-b">
+					<view class="title">我的用户昵称</view>
+					<view class="con-list">
+						182 1242 1234
+					</view>
+				</view>
+			</view>
+	</view>
+</template>
+<script>
+	import uploadImage from '@/components/ossutil/uploadFile.js';
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+			name: "trust",
+			data() {
+				return {
+					goods: {
+						tranCarNo:'',
+						carNo:'',
+						grossWeight:'',
+						tare:'',
+						loadNetWeight:'',
+						loadPoundImg:'',
+						 contractNo:'',
+						 goodsName:'',
+						 sendDateStart:''
+						
+					},
+					params:{
+						year: true,
+						month: true,
+						day: true,
+					},
+					carNo:'',
+					PageCur: "trust",
+					TabCur: 0,
+					priceTypeIndex:-1,
+					priceType: ['库内价', '到库价', '到港价'],
+					unitPrice:0,
+					price:'',
+					seller:'',
+					sellerPhone:'',
+					minSale:'',
+					exsitCount:0,
+					origin:'',
+					stock:'',
+					show:false,
+					goodsName:'',
+					verifyCode:'',
+					sendText0:'获取验证码',
+					sendText1:'获取验证码',
+					sendText2:'获取验证码',
+					sendText3:'获取验证码',
+					sendDisabled0: false,
+					sendDisabled1: false,
+					sendDisabled2: false,
+					sendDisabled3: false,
+					buyer:'',
+					buyerPhone:'',
+					level:'',
+					sender:'',
+					senderPhone:'',
+					receiver:'',
+					receiverPhone:'',
+					total:0,
+					startPlace:'',
+					endPlace:'',
+					driver:'',
+					driverPhone:'',
+					carNo:'',
+					personNoImg:'',
+					personNoImg1:'',
+					driverNoImg:'',
+					driverNoImg1:'',
+					carNoImg:'',
+					carNoImg1:'',
+					goodsName:'',
+					showTran:true
+				};
+			},
+			computed: {
+				...mapState(['hasLogin','userInfo']),
+					time() {
+						var date=new Date()
+						var year=date.getFullYear()
+						var month=date.getMonth()
+						var date1=date.getDate()
+						if(month+1<10){
+							month="0"+(month+1)
+						}
+						if(date1+1<10){
+							date1="0"+date1
+						}
+						return year+'-'+month+"-"+date1
+					},
+					startDate() {
+					//限制开始时间;
+					//也可以直接限定为当天日期 var date= new Date(); return date
+						return new Date(new Date(new Date().toLocaleDateString()).getTime()-(1*60*60*1000))
+					},
+					endDate() {
+						return new Date()
+					}
+				},	
+			onShow() {
+			},
+			onLoad(option) {
+				this.goods.planId=option.planId
+				this.goodsName=option.goodsName
+				this.contractNo = option.contractNo
+				this.goods.goodsName=option.goodsName
+				this.goods.contractNo = option.contractNo
+				this.goods.tranCarNo=option.tranCarNo
+				console.log(this.goods.tranCarNo)
+				
+			},
+			methods: {
+				 DateChange(e) {
+					 this.goods.sendDateStart=e.year+'-'+e.month+'-'+e.day
+				 	// this.goods.sendDateStart = e.detail.value
+				 },
+				commit1(item){
+					uni.navigateTo({				
+						url: `/pageB/contract/look?id=${item.id}&netWeight=${item.netWeight}&carNo=${item.carNo}&sendDateStart=${item.sendDateStart}`
+					})
+				},
+				grossWeightchange(e) {
+				      if (this.goods.grossWeight && this.goods.tare) {
+				        this.goods.loadNetWeight = Number(
+				          this.goods.grossWeight - this.goods.tare
+				        )
+				      }
+				    },
+				tarechange(e) {
+				      if (this.goods.grossWeight && this.goods.tare) {
+				        this.goods.loadNetWeight = Number(
+				          this.goods.grossWeight - this.goods.tare
+				        )
+				      }
+				    },
+				getList(){
+					// tranCarNo:'',
+					// carNo:'',
+					// grossWeight:'',
+					// tare:'',
+					// loadNetWeight:'',
+					// loadPoundImg:'',
+					//  contractNo:'',
+					//  goodsName:'',
+					if(this.goods.carNo.length==0){
+						this.$api.msg('车牌号不能为空')
+						return
+					}
+					if(this.goods.carNo.length!=7){
+						this.$api.msg('车牌号输入错误')
+						return
+					}
+					if(this.goods.driverPhone.length==0){
+						this.$api.msg('手机号不能为空')
+						return
+					}
+					if(this.goods.driverPhone.length!=11){
+						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
+					}
+					if(this.goods.tare>50){
+						this.$api.msg('皮重输入错误')
+						return
+					}
+					var that=this
+					uni.showModal({
+						content: '确定提交发车信息？',
+						success: function (res) {
+							if (res.confirm) {
+								that.$api.doRequest('post','/tranCarInfo/api/addTranTask',that.goods).then(res => {
+								    if(res.data.code==200){
+										console.log(that.goods)
+										uni.showModal({
+											content: '提交成功！',
+											success: function (res) {
+												if (res.confirm) {
+													var result = that.goods.tranCarNo.substr(that.goods.tranCarNo.indexOf("C") + 1,that.goods.tranCarNo.length);
+												    var num=Number(result)+1
+													if(num<=9){
+														num='C00'+num
+													}else if(num<100&&num>9){
+														num='C0'+num
+													}else  if(num<1000&&num>99){
+														num='C'+num
+													}
+													that.goods={
+														tranCarNo:num,
+														carNo:'',
+														grossWeight:'',
+														tare:'',
+														loadNetWeight:'',
+														loadPoundImg:'',
+														 contractNo:that.contractNo,
+														 goodsName:that.goodsName,
+														 sendDateStart:''	
+													}
+												}else if (res.cancel) {
+													uni.navigateBack();
+												}
+											}
+										});
+									}else if(res.data.code==11015){
+										uni.showToast({
+										 title: '该司机未认证身份，请司机认证后再操作',
+										 icon:'none',
+										 duration: 2000
+										})
+									}
+								    })
+								    .catch(res => {
+								     uni.showToast({
+								      title: res.errmsg,
+								      icon:'none',
+								      duration: 2000
+								     })
+								    });
+							} else if (res.cancel) {
+							
+							}
+						}
+					});
+				},
+				ChooseImagePerson() {
+					uni.chooseImage({
+						count: 1, //默认9
+						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+						sourceType: ['album','camera'], //从相册选择
+						success: (res) => {
+							//上传图片
+							//图片路径可自行修改
+							
+							uploadImage(res.tempFilePaths[0], 'loadPoundImg/',
+								result => {
+	
+								 	this.goods.loadPoundImg = result
+								 uni.hideLoading();
+								}
+							)
+						}
+					});
+				},
+				ChooseImageDriver() {
+					uni.chooseImage({
+						count: 1, //默认9
+						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+						sourceType: ['album','camera'], //从相册选择
+						success: (res) => {
+							//上传图片
+							//图片路径可自行修改
+							uploadImage(res.tempFilePaths[0], 'driverNoImg/',
+								result => {
+									if (this.driverNoImg.length != 0) {
+										this.driverNoImg1 = result
+									} else {
+										this.driverNoImg = result
+									}
+									uni.hideLoading();
+								}
+							)
+						}
+					});
+				},
+				ChooseImageCar() {
+					uni.chooseImage({
+						count: 1, //默认9
+						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+						sourceType: ['album','camera'], //从相册选择
+						success: (res) => {
+							//上传图片
+							//图片路径可自行修改
+							uploadImage(res.tempFilePaths[0], 'carNoImg/',
+								result => {
+									if (this.carNoImg.length != 0) {
+										this.carNoImg1 = result
+									} else {
+										this.carNoImg = result
+									}
+									uni.hideLoading();
+								}
+							)
+						}
+					});
+				},
+				ViewImage(e) {
+					var img = [];
+					img = e.currentTarget.dataset.url.split(' ')
+					uni.previewImage({
+						current:0,
+						urls: img
+					});
+				},
+				DelImg(e) {
+					uni.showModal({
+						title: '提示',
+						content: '确定要删除该照片吗？',
+						cancelText: '取消',
+						confirmText: '确定',
+						success: res => {
+							if (res.confirm) {
+								if(e.currentTarget.dataset.index == 0){
+									this.personNoImg = "";
+								}
+								else if(e.currentTarget.dataset.index == 1){
+									this.personNoImg1 = "";
+								}
+								else if(e.currentTarget.dataset.index == 2){
+									this.driverNoImg = "";
+								}
+								else if(e.currentTarget.dataset.index == 3){
+									this.driverNoImg1 = "";
+								}
+								else if(e.currentTarget.dataset.index == 4){
+									this.carNoImg = "";
+								}
+								else if(e.currentTarget.dataset.index == 5){
+									this.carNoImg1 = "";
+								}
+								
+							}
+						}
+					})
+				},
+			},
+		}
+</script>
+
+<style scoped>
+	.container{
+		padding: 10px 10px;
+		background-color: #F5F6FA;
+	}
+	.title1{
+		font-size: 18px;
+		font-weight: 600;
+		}
+	.cu-form-group input {
+		text-align: right;
+	}
+	.text-white text{
+		background: linear-gradient(45deg, #3DC146, #B2D612);
+		padding:5px 10px;
+		border-radius: 38rpx;
+	}
+	.cu-form-group textarea {
+		text-align: right;
+	}
+	.commit{
+		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>

pageA/freightTransport/addsendgoods.vue

@@ -0,0 +1,522 @@
+<template>
+	<view class="center">
+		<view class="transaction">
+			<view class="c-row b-b margin-top">
+				<view class="title">业务编号</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入业务编号" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+			<view  class="c-row b-b">
+				<view class="title">收货方</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入收货方名称" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+			<view  class="c-row b-b">
+				<view class="title">发货方</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入发货方名称" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+			<view  class="c-row b-b">
+				<view class="title">货名</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入货名，如玉米" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+			<view  class="c-row b-b">
+				<view class="title">货物单价（元/吨）</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入货物单价" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+			<view  class="c-row b-b">
+				<view class="title">运费单价（元/吨）</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入运费单价" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+			<view  class="c-row b-b">
+				<view class="title">运费承担方</view>
+				<view class="con-list">
+				<picker @change="packingChange" :value="packingIndex" :range="packingType">
+					<view class="picker">
+						{{packingIndex>-1?packingType[packingIndex]:'请选择'}}
+					</view>
+				</picker>
+				</view>
+			</view>
+			<view  class="c-row b-b">
+				<view class="title">收货地址</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入收货地址" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">收货人账号</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入收货人账号" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+		</view>
+	<view class='footer'>
+		<button class="btn" @click="commit()">提交</button>
+	</view>
+			
+	
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "business",
+		data() {
+			return {
+				purchaseOrder:{}
+			}
+		},
+		onShow() {
+			
+		},
+		onLoad(options) {
+			
+		},
+		onPageScroll(e) {
+			
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+		},
+		onReachBottom() { //上拉触底函数
+		},
+		methods: {
+			
+
+		}
+	}
+</script>
+
+<style lang='scss'>
+	page,
+	.content {
+		background: #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;
+	}
+	.transaction{
+		background-color: #FFFFFF;
+		margin: 10px;
+		padding-bottom: 10px;
+		border-radius: 20px;
+	}
+	.line {
+		display: inline-block;
+		padding: 5px;
+		position: relative;
+		font-size: 17px;
+	}
+
+	.line.active {
+		font-size: 19px;
+		font-weight: 900;
+	}
+
+	.line.active:after {
+		content: '';
+		display: block;
+		position: absolute;
+		width: 38px;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 0;
+		border-bottom: 1px solid #22C572;
+	}
+
+	.cu-tag.badge {
+		right: 26rpx;
+	}
+
+	.cu-item {
+		height: 80rpx;
+		display: inline-block;
+		line-height: 80rpx;
+	}
+
+	.search-form {
+		background: #F5F6F9;
+		padding-left: 20rpx;
+	}
+
+	.title-tip {
+		color: #E63113;
+		text-align: right;
+	}
+
+	.tag1 {
+		background: #F5F6F9;
+		padding: 5px;
+		color: #333333;
+		display: inline-flex;
+		font-size: 22rpx;
+		border-radius: 3px;
+		margin: 3px;
+	}
+
+	.tag {
+		background: #F5F6F9;
+		padding: 7px 12px;
+		color: #333333;
+		display: inline-flex;
+		font-size: 22rpx;
+		border-radius: 15px;
+		margin: 3px;
+	}
+
+	.tag-bule {
+		background: #EBEEFA;
+		color: #5C76DF;
+	}
+
+	.tag-green {
+		background: #C6F7BC;
+		color: #065112;
+	}
+
+	.tag-yellow {
+		background: #F9F2EA;
+		color: #BE9C69;
+	}
+
+	.tag-red {
+		background: #FEECE6;
+		color: #FE6430;
+	}
+
+	.text-white {
+		color: #fff;
+	}
+
+	.text-white text {
+		position: relative;
+		z-index: 2;
+		background: linear-gradient(45deg, #3DC146, #B2D612);
+		padding: 5px 10px;
+		border-radius: 38rpx;
+	}
+
+	.guess-section {
+		padding-bottom: 100upx;
+		display: flex;
+		flex-wrap: wrap;
+		padding:30upx;
+		background: #fff;
+		margin:10px;
+		border-radius:6px;
+		.type{
+			border-radius:10px;
+			padding:5px;
+			wdith:22px;height:22px;
+			line-height:14px;
+			font-size:12px;
+		}
+		.type.send{
+			background:#22C572;
+			color:#fff;
+		}
+		.type.put{
+			background:#FD714F;
+			color:#fff;
+		}
+		.businessnumber{
+			font-size:16px;
+			font-weight:600;
+		}
+		.consigner{
+			font-size:12px;
+		}
+		.time{
+			color:#878C9C;
+		}
+		.goods{
+			font-size:12px;
+		}
+		.goodsstatus{
+			background:#F9F9FA;
+			color:#9698A2;
+			padding:10px 0;
+			padding-left:47px;
+			margin:10px 0;
+		}
+		.del{
+			width:60px;
+			height: 33px;
+			line-height:33px;
+			font-size:14px;
+			background: #fff;
+			border:1px solid #CDCDCD;
+			border-radius:30px;
+			text-align:center;
+		}
+	}
+
+	.navbar {
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		display: flex;
+		width: 100%;
+		height: 80upx;
+		background: #fff;
+		box-shadow: 0 2upx 10upx rgba(0, 0, 0, .06);
+		z-index: 10;
+
+		.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 30upx;
+			color: $font-color-dark;
+			position: relative;
+
+			&.current {
+				color: $base-color;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 120upx;
+					height: 0;
+					border-bottom: 4upx solid $base-color;
+				}
+			}
+		}
+
+		.p-box {
+			display: flex;
+			flex-direction: column;
+
+			.yticon {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 30upx;
+				height: 14upx;
+				line-height: 1;
+				margin-left: 4upx;
+				font-size: 26upx;
+				color: #888;
+
+				&.active {
+					color: $base-color;
+				}
+			}
+
+			.xia {
+				transform: scaleY(-1);
+			}
+		}
+
+		.cate-item {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			width: 80upx;
+			position: relative;
+			font-size: 44upx;
+
+			&:after {
+				content: '';
+				position: absolute;
+				left: 0;
+				top: 50%;
+				transform: translateY(-50%);
+				border-left: 1px solid #ddd;
+				width: 0;
+				height: 36upx;
+			}
+		}
+	}
+
+	/* 分类 */
+	.cate-mask {
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		bottom: 0;
+		width: 100%;
+		background: rgba(0, 0, 0, 0);
+		z-index: 95;
+		transition: .3s;
+
+		.cate-content {
+			width: 630upx;
+			height: 100%;
+			background: #fff;
+			float: right;
+			transform: translateX(100%);
+			transition: .3s;
+		}
+
+		&.none {
+			display: none;
+		}
+
+		&.show {
+			background: rgba(0, 0, 0, .4);
+
+			.cate-content {
+				transform: translateX(0);
+			}
+		}
+	}
+
+	.cate-list {
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+
+		.cate-item {
+			display: flex;
+			align-items: center;
+			height: 90upx;
+			padding-left: 30upx;
+			font-size: 28upx;
+			color: #555;
+			position: relative;
+		}
+
+		.two {
+			height: 64upx;
+			color: #303133;
+			font-size: 30upx;
+			background: #f8f8f8;
+		}
+
+		.active {
+			color: $base-color;
+		}
+	}
+
+	.introduce-section .title {
+		font-size: 17px;
+		font-weight: bold;
+		height: 40px;
+		line-height: 40px;
+		flex: 2.5;
+		border-bottom: 1px solid #EEEEEE;
+	}
+
+	.introduce-section .address {
+		color: #878C9C;
+		font-size: 12px;
+		padding: 10px 0 10px;
+	}
+
+	.introduce-section .price {
+		padding: 10px 0 10px;
+		color: #FD714F;
+		font-size: 19px;
+		font-weight: 700;
+	}
+
+	.introduce-section .guess-item {
+		border-radius: 10px;
+		background: #fff;
+		padding: 0upx 30upx 20upx;
+		margin: 8px;
+		border-bottom: 1px solid #ccc;
+	}
+
+	/* 销售信息 */
+	.introduce-section {
+		.title-tip {
+			flex: 1;
+		}
+
+		.price-box {
+			display: flex;
+			align-items: baseline;
+			font-size: 26upx;
+		}
+
+		.price {
+			font-size: $font-lg + 2upx;
+		}
+
+		.m-price {
+			margin: 0 12upx;
+			color: $font-color-light;
+			text-decoration: line-through;
+		}
+
+		.coupon-tip {
+			align-items: center;
+			padding: 4upx 10upx;
+			background: $uni-color-primary;
+			font-size: $font-sm;
+			color: #fff;
+			border-radius: 6upx;
+			line-height: 1;
+			transform: translateY(-4upx);
+		}
+
+		.bot-row {
+			display: flex;
+			align-items: center;
+			height: 50upx;
+			font-size: $font-sm;
+			color: $font-color-light;
+
+			view {
+				flex: 1;
+			}
+		}
+	}
+	.footer{
+		position:fixed;
+		bottom:0;
+		width: 100%;
+		padding:20px 0;
+	}
+	.btn{
+		width:90%;
+		background:#22C572;
+		color:#fff;
+		border-radius:30px;
+	}
+	.btn:after{
+		border:none;
+	}
+</style>
+

pageA/freightTransport/confirmpaygoods.vue

@@ -0,0 +1,459 @@
+<template>
+	<view class="container">
+		<view class="information">
+			<view class="c-row b-b">
+				<view class="title">车牌号</view>
+				<view class="con-list">
+				<input maxlength='7' placeholder="请输入车牌号" name="input" v-model="goods.carNo"></input>
+				</view>
+			</view>
+
+			<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>
+			<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>
+			<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>
+			<view class="information">
+			<view class="c-row">
+				<view class="action">
+					上传磅单照片
+				</view>
+			</view>
+			<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>
+						<view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="0">
+							<text class='cuIcon-close'></text>
+						</view>
+					</view>
+					<view class="solids" @tap="ChooseImagePerson" v-if="goods.loadPoundImg == ''">
+						<text class='cuIcon-cameraadd'></text>
+					</view>
+				</view>
+			</view>
+			</view>
+			
+				<button class="btn btns" @click="getList">提交</button>
+			
+		<!-- </block> -->
+	</view>
+</template>
+
+<script>
+	import uploadImage from '@/components/ossutil/uploadFile.js';
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+			name: "trust",
+			data() {
+				return {
+					goods: {
+						tranCarNo:'',
+						carNo:'',
+						grossWeight:'',
+						tare:'',
+						loadNetWeight:'',
+						loadPoundImg:'',
+						 contractNo:'',
+						 goodsName:'',
+						 sendDateStart:''
+						
+					},
+					params:{
+						year: true,
+						month: true,
+						day: true,
+					},
+					carNo:'',
+					PageCur: "trust",
+					TabCur: 0,
+					priceTypeIndex:-1,
+					priceType: ['库内价', '到库价', '到港价'],
+					unitPrice:0,
+					price:'',
+					seller:'',
+					sellerPhone:'',
+					minSale:'',
+					exsitCount:0,
+					origin:'',
+					stock:'',
+					show:false,
+					goodsName:'',
+					verifyCode:'',
+					sendText0:'获取验证码',
+					sendText1:'获取验证码',
+					sendText2:'获取验证码',
+					sendText3:'获取验证码',
+					sendDisabled0: false,
+					sendDisabled1: false,
+					sendDisabled2: false,
+					sendDisabled3: false,
+					buyer:'',
+					buyerPhone:'',
+					level:'',
+					sender:'',
+					senderPhone:'',
+					receiver:'',
+					receiverPhone:'',
+					total:0,
+					startPlace:'',
+					endPlace:'',
+					driver:'',
+					driverPhone:'',
+					carNo:'',
+					personNoImg:'',
+					personNoImg1:'',
+					driverNoImg:'',
+					driverNoImg1:'',
+					carNoImg:'',
+					carNoImg1:'',
+					goodsName:'',
+					showTran:true
+				};
+			},
+			computed: {
+				...mapState(['hasLogin','userInfo']),
+					time() {
+						var date=new Date()
+						var year=date.getFullYear()
+						var month=date.getMonth()
+						var date1=date.getDate()
+						if(month+1<10){
+							month="0"+(month+1)
+						}
+						if(date1+1<10){
+							date1="0"+date1
+						}
+						return year+'-'+month+"-"+date1
+					},
+					startDate() {
+					//限制开始时间;
+					//也可以直接限定为当天日期 var date= new Date(); return date
+						return new Date(new Date(new Date().toLocaleDateString()).getTime()-(1*60*60*1000))
+					},
+					endDate() {
+						return new Date()
+					}
+				},	
+			onShow() {
+			},
+			onLoad(option) {
+				this.goods.planId=option.planId
+				this.goodsName=option.goodsName
+				this.contractNo = option.contractNo
+				this.goods.goodsName=option.goodsName
+				this.goods.contractNo = option.contractNo
+				this.goods.tranCarNo=option.tranCarNo
+				console.log(this.goods.tranCarNo)
+				
+			},
+			methods: {
+				 DateChange(e) {
+					 this.goods.sendDateStart=e.year+'-'+e.month+'-'+e.day
+				 	// this.goods.sendDateStart = e.detail.value
+				 },
+				commit1(item){
+					uni.navigateTo({				
+						url: `/pageB/contract/look?id=${item.id}&netWeight=${item.netWeight}&carNo=${item.carNo}&sendDateStart=${item.sendDateStart}`
+					})
+				},
+				grossWeightchange(e) {
+				      if (this.goods.grossWeight && this.goods.tare) {
+				        this.goods.loadNetWeight = Number(
+				          this.goods.grossWeight - this.goods.tare
+				        )
+				      }
+				    },
+				tarechange(e) {
+				      if (this.goods.grossWeight && this.goods.tare) {
+				        this.goods.loadNetWeight = Number(
+				          this.goods.grossWeight - this.goods.tare
+				        )
+				      }
+				    },
+				getList(){
+					// tranCarNo:'',
+					// carNo:'',
+					// grossWeight:'',
+					// tare:'',
+					// loadNetWeight:'',
+					// loadPoundImg:'',
+					//  contractNo:'',
+					//  goodsName:'',
+					if(this.goods.carNo.length==0){
+						this.$api.msg('车牌号不能为空')
+						return
+					}
+					if(this.goods.carNo.length!=7){
+						this.$api.msg('车牌号输入错误')
+						return
+					}
+					if(this.goods.driverPhone.length==0){
+						this.$api.msg('手机号不能为空')
+						return
+					}
+					if(this.goods.driverPhone.length!=11){
+						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
+					}
+					if(this.goods.tare>50){
+						this.$api.msg('皮重输入错误')
+						return
+					}
+					var that=this
+					uni.showModal({
+						content: '确定提交发车信息？',
+						success: function (res) {
+							if (res.confirm) {
+								that.$api.doRequest('post','/tranCarInfo/api/addTranTask',that.goods).then(res => {
+								    if(res.data.code==200){
+										console.log(that.goods)
+										uni.showModal({
+											content: '提交成功！',
+											success: function (res) {
+												if (res.confirm) {
+													var result = that.goods.tranCarNo.substr(that.goods.tranCarNo.indexOf("C") + 1,that.goods.tranCarNo.length);
+												    var num=Number(result)+1
+													if(num<=9){
+														num='C00'+num
+													}else if(num<100&&num>9){
+														num='C0'+num
+													}else  if(num<1000&&num>99){
+														num='C'+num
+													}
+													that.goods={
+														tranCarNo:num,
+														carNo:'',
+														grossWeight:'',
+														tare:'',
+														loadNetWeight:'',
+														loadPoundImg:'',
+														 contractNo:that.contractNo,
+														 goodsName:that.goodsName,
+														 sendDateStart:''	
+													}
+												}else if (res.cancel) {
+													uni.navigateBack();
+												}
+											}
+										});
+									}else if(res.data.code==11015){
+										uni.showToast({
+										 title: '该司机未认证身份，请司机认证后再操作',
+										 icon:'none',
+										 duration: 2000
+										})
+									}
+								    })
+								    .catch(res => {
+								     uni.showToast({
+								      title: res.errmsg,
+								      icon:'none',
+								      duration: 2000
+								     })
+								    });
+							} else if (res.cancel) {
+							
+							}
+						}
+					});
+				},
+				ChooseImagePerson() {
+					uni.chooseImage({
+						count: 1, //默认9
+						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+						sourceType: ['album','camera'], //从相册选择
+						success: (res) => {
+							//上传图片
+							//图片路径可自行修改
+							
+							uploadImage(res.tempFilePaths[0], 'loadPoundImg/',
+								result => {
+	
+								 	this.goods.loadPoundImg = result
+								 uni.hideLoading();
+								}
+							)
+						}
+					});
+				},
+				ChooseImageDriver() {
+					uni.chooseImage({
+						count: 1, //默认9
+						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+						sourceType: ['album','camera'], //从相册选择
+						success: (res) => {
+							//上传图片
+							//图片路径可自行修改
+							uploadImage(res.tempFilePaths[0], 'driverNoImg/',
+								result => {
+									if (this.driverNoImg.length != 0) {
+										this.driverNoImg1 = result
+									} else {
+										this.driverNoImg = result
+									}
+									uni.hideLoading();
+								}
+							)
+						}
+					});
+				},
+				ChooseImageCar() {
+					uni.chooseImage({
+						count: 1, //默认9
+						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+						sourceType: ['album','camera'], //从相册选择
+						success: (res) => {
+							//上传图片
+							//图片路径可自行修改
+							uploadImage(res.tempFilePaths[0], 'carNoImg/',
+								result => {
+									if (this.carNoImg.length != 0) {
+										this.carNoImg1 = result
+									} else {
+										this.carNoImg = result
+									}
+									uni.hideLoading();
+								}
+							)
+						}
+					});
+				},
+				ViewImage(e) {
+					var img = [];
+					img = e.currentTarget.dataset.url.split(' ')
+					uni.previewImage({
+						current:0,
+						urls: img
+					});
+				},
+				DelImg(e) {
+					uni.showModal({
+						title: '提示',
+						content: '确定要删除该照片吗？',
+						cancelText: '取消',
+						confirmText: '确定',
+						success: res => {
+							if (res.confirm) {
+								if(e.currentTarget.dataset.index == 0){
+									this.personNoImg = "";
+								}
+								else if(e.currentTarget.dataset.index == 1){
+									this.personNoImg1 = "";
+								}
+								else if(e.currentTarget.dataset.index == 2){
+									this.driverNoImg = "";
+								}
+								else if(e.currentTarget.dataset.index == 3){
+									this.driverNoImg1 = "";
+								}
+								else if(e.currentTarget.dataset.index == 4){
+									this.carNoImg = "";
+								}
+								else if(e.currentTarget.dataset.index == 5){
+									this.carNoImg1 = "";
+								}
+								
+							}
+						}
+					})
+				},
+			},
+		}
+</script>
+
+<style scoped>
+	.container{
+		padding: 10px 10px;
+		background-color: #F5F6FA;
+	}
+	.title1{
+		font-size: 18px;
+		font-weight: 600;
+		}
+	.cu-form-group input {
+		text-align: right;
+	}
+	.text-white text{
+		background: linear-gradient(45deg, #3DC146, #B2D612);
+		padding:5px 10px;
+		border-radius: 38rpx;
+	}
+	.cu-form-group textarea {
+		text-align: right;
+	}
+	.commit{
+		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>

pageA/freightTransport/contract_detail.vue

@@ -0,0 +1,483 @@
+<template>
+	<view class="container">
+		<view class="information">
+		<!-- <block v-if="TabCur==2"> -->
+		<view class="c-row">
+			<view class="title1">发车信息</view>
+			
+		</view>
+			<view class="c-row b-b">
+				<view class="title">派车编号</view>
+				<view class="con-list">
+					<input disabled  name="input" v-model="goods.tranCarNo"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">车牌号</view>
+				<view class="con-list">
+				<input maxlength='7' placeholder="请输入车牌号" name="input" v-model="goods.carNo"></input>
+				</view>
+			</view>
+			<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="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>
+			<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>
+			<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="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>
+			
+				
+			</view>
+			<view class="information">
+			<view class="c-row">
+				<view class="action">
+					上传磅单照片
+				</view>
+			</view>
+			<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>
+						<view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="0">
+							<text class='cuIcon-close'></text>
+						</view>
+					</view>
+					<view class="solids" @tap="ChooseImagePerson" v-if="goods.loadPoundImg == ''">
+						<text class='cuIcon-cameraadd'></text>
+					</view>
+				</view>
+			</view>
+			</view>
+			
+				<button class="btn btns" @click="getList">提交</button>
+			
+		<!-- </block> -->
+	</view>
+</template>
+
+<script>
+	import uploadImage from '@/components/ossutil/uploadFile.js';
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+			name: "trust",
+			data() {
+				return {
+					goods: {
+						tranCarNo:'',
+						carNo:'',
+						grossWeight:'',
+						tare:'',
+						loadNetWeight:'',
+						loadPoundImg:'',
+						 contractNo:'',
+						 goodsName:'',
+						 sendDateStart:''
+						
+					},
+					params:{
+						year: true,
+						month: true,
+						day: true,
+					},
+					carNo:'',
+					PageCur: "trust",
+					TabCur: 0,
+					priceTypeIndex:-1,
+					priceType: ['库内价', '到库价', '到港价'],
+					unitPrice:0,
+					price:'',
+					seller:'',
+					sellerPhone:'',
+					minSale:'',
+					exsitCount:0,
+					origin:'',
+					stock:'',
+					show:false,
+					goodsName:'',
+					verifyCode:'',
+					sendText0:'获取验证码',
+					sendText1:'获取验证码',
+					sendText2:'获取验证码',
+					sendText3:'获取验证码',
+					sendDisabled0: false,
+					sendDisabled1: false,
+					sendDisabled2: false,
+					sendDisabled3: false,
+					buyer:'',
+					buyerPhone:'',
+					level:'',
+					sender:'',
+					senderPhone:'',
+					receiver:'',
+					receiverPhone:'',
+					total:0,
+					startPlace:'',
+					endPlace:'',
+					driver:'',
+					driverPhone:'',
+					carNo:'',
+					personNoImg:'',
+					personNoImg1:'',
+					driverNoImg:'',
+					driverNoImg1:'',
+					carNoImg:'',
+					carNoImg1:'',
+					goodsName:'',
+					showTran:true
+				};
+			},
+			computed: {
+				...mapState(['hasLogin','userInfo']),
+					time() {
+						var date=new Date()
+						var year=date.getFullYear()
+						var month=date.getMonth()
+						var date1=date.getDate()
+						if(month+1<10){
+							month="0"+(month+1)
+						}
+						if(date1+1<10){
+							date1="0"+date1
+						}
+						return year+'-'+month+"-"+date1
+					},
+					startDate() {
+					//限制开始时间;
+					//也可以直接限定为当天日期 var date= new Date(); return date
+						return new Date(new Date(new Date().toLocaleDateString()).getTime()-(1*60*60*1000))
+					},
+					endDate() {
+						return new Date()
+					}
+				},	
+			onShow() {
+			},
+			onLoad(option) {
+				this.goods.planId=option.planId
+				this.goodsName=option.goodsName
+				this.contractNo = option.contractNo
+				this.goods.goodsName=option.goodsName
+				this.goods.contractNo = option.contractNo
+				this.goods.tranCarNo=option.tranCarNo
+				console.log(this.goods.tranCarNo)
+				
+			},
+			methods: {
+				 DateChange(e) {
+					 this.goods.sendDateStart=e.year+'-'+e.month+'-'+e.day
+				 	// this.goods.sendDateStart = e.detail.value
+				 },
+				commit1(item){
+					uni.navigateTo({				
+						url: `/pageB/contract/look?id=${item.id}&netWeight=${item.netWeight}&carNo=${item.carNo}&sendDateStart=${item.sendDateStart}`
+					})
+				},
+				grossWeightchange(e) {
+				      if (this.goods.grossWeight && this.goods.tare) {
+				        this.goods.loadNetWeight = Number(
+				          this.goods.grossWeight - this.goods.tare
+				        )
+				      }
+				    },
+				tarechange(e) {
+				      if (this.goods.grossWeight && this.goods.tare) {
+				        this.goods.loadNetWeight = Number(
+				          this.goods.grossWeight - this.goods.tare
+				        )
+				      }
+				    },
+				getList(){
+					// tranCarNo:'',
+					// carNo:'',
+					// grossWeight:'',
+					// tare:'',
+					// loadNetWeight:'',
+					// loadPoundImg:'',
+					//  contractNo:'',
+					//  goodsName:'',
+					if(this.goods.carNo.length==0){
+						this.$api.msg('车牌号不能为空')
+						return
+					}
+					if(this.goods.carNo.length!=7){
+						this.$api.msg('车牌号输入错误')
+						return
+					}
+					if(this.goods.driverPhone.length==0){
+						this.$api.msg('手机号不能为空')
+						return
+					}
+					if(this.goods.driverPhone.length!=11){
+						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
+					}
+					if(this.goods.tare>50){
+						this.$api.msg('皮重输入错误')
+						return
+					}
+					var that=this
+					uni.showModal({
+						content: '确定提交发车信息？',
+						success: function (res) {
+							if (res.confirm) {
+								that.$api.doRequest('post','/tranCarInfo/api/addTranTask',that.goods).then(res => {
+								    if(res.data.code==200){
+										console.log(that.goods)
+										uni.showModal({
+											content: '提交成功！',
+											success: function (res) {
+												if (res.confirm) {
+													var result = that.goods.tranCarNo.substr(that.goods.tranCarNo.indexOf("C") + 1,that.goods.tranCarNo.length);
+												    var num=Number(result)+1
+													if(num<=9){
+														num='C00'+num
+													}else if(num<100&&num>9){
+														num='C0'+num
+													}else  if(num<1000&&num>99){
+														num='C'+num
+													}
+													that.goods={
+														tranCarNo:num,
+														carNo:'',
+														grossWeight:'',
+														tare:'',
+														loadNetWeight:'',
+														loadPoundImg:'',
+														 contractNo:that.contractNo,
+														 goodsName:that.goodsName,
+														 sendDateStart:''	
+													}
+												}else if (res.cancel) {
+													uni.navigateBack();
+												}
+											}
+										});
+									}else if(res.data.code==11015){
+										uni.showToast({
+										 title: '该司机未认证身份，请司机认证后再操作',
+										 icon:'none',
+										 duration: 2000
+										})
+									}
+								    })
+								    .catch(res => {
+								     uni.showToast({
+								      title: res.errmsg,
+								      icon:'none',
+								      duration: 2000
+								     })
+								    });
+							} else if (res.cancel) {
+							
+							}
+						}
+					});
+				},
+				ChooseImagePerson() {
+					uni.chooseImage({
+						count: 1, //默认9
+						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+						sourceType: ['album','camera'], //从相册选择
+						success: (res) => {
+							//上传图片
+							//图片路径可自行修改
+							
+							uploadImage(res.tempFilePaths[0], 'loadPoundImg/',
+								result => {
+	
+								 	this.goods.loadPoundImg = result
+								 uni.hideLoading();
+								}
+							)
+						}
+					});
+				},
+				ChooseImageDriver() {
+					uni.chooseImage({
+						count: 1, //默认9
+						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+						sourceType: ['album','camera'], //从相册选择
+						success: (res) => {
+							//上传图片
+							//图片路径可自行修改
+							uploadImage(res.tempFilePaths[0], 'driverNoImg/',
+								result => {
+									if (this.driverNoImg.length != 0) {
+										this.driverNoImg1 = result
+									} else {
+										this.driverNoImg = result
+									}
+									uni.hideLoading();
+								}
+							)
+						}
+					});
+				},
+				ChooseImageCar() {
+					uni.chooseImage({
+						count: 1, //默认9
+						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+						sourceType: ['album','camera'], //从相册选择
+						success: (res) => {
+							//上传图片
+							//图片路径可自行修改
+							uploadImage(res.tempFilePaths[0], 'carNoImg/',
+								result => {
+									if (this.carNoImg.length != 0) {
+										this.carNoImg1 = result
+									} else {
+										this.carNoImg = result
+									}
+									uni.hideLoading();
+								}
+							)
+						}
+					});
+				},
+				ViewImage(e) {
+					var img = [];
+					img = e.currentTarget.dataset.url.split(' ')
+					uni.previewImage({
+						current:0,
+						urls: img
+					});
+				},
+				DelImg(e) {
+					uni.showModal({
+						title: '提示',
+						content: '确定要删除该照片吗？',
+						cancelText: '取消',
+						confirmText: '确定',
+						success: res => {
+							if (res.confirm) {
+								if(e.currentTarget.dataset.index == 0){
+									this.personNoImg = "";
+								}
+								else if(e.currentTarget.dataset.index == 1){
+									this.personNoImg1 = "";
+								}
+								else if(e.currentTarget.dataset.index == 2){
+									this.driverNoImg = "";
+								}
+								else if(e.currentTarget.dataset.index == 3){
+									this.driverNoImg1 = "";
+								}
+								else if(e.currentTarget.dataset.index == 4){
+									this.carNoImg = "";
+								}
+								else if(e.currentTarget.dataset.index == 5){
+									this.carNoImg1 = "";
+								}
+								
+							}
+						}
+					})
+				},
+			},
+		}
+</script>
+
+<style scoped>
+	.container{
+		padding: 10px 10px;
+		background-color: #F5F6FA;
+	}
+	.title1{
+		font-size: 18px;
+		font-weight: 600;
+		}
+	.cu-form-group input {
+		text-align: right;
+	}
+	.text-white text{
+		background: linear-gradient(45deg, #3DC146, #B2D612);
+		padding:5px 10px;
+		border-radius: 38rpx;
+	}
+	.cu-form-group textarea {
+		text-align: right;
+	}
+	.commit{
+		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>

pageA/freightTransport/index.vue

@@ -0,0 +1,502 @@
+<template>
+	<view class="">
+		<view class="content">
+			<view style='background:#fff;display:flex;' class="cu-bar search">
+				<view style='flex:6;' class="search-form round" >
+					<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
+					<input type="text" v-model="searchKeyWord" @input="doSearch" placeholder="请输入业务编号或对方名称" confirm-type="search"></input>
+					
+				</view>
+				<view style="width:4%;flex:1;">{{content}}</view>
+				<text  v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text>
+			</view>
+			<view style='background:#fff;padding:0 15px;'>
+				<view @click='tabcarchange(0)' class='line' :class='status==0?"active":""'>全部</view>
+				<view @click='tabcarchange(1)' class='line' :class='status==1?"active":""'>待签收</view>
+				<view @click='tabcarchange(1)' class='line' :class='status==1?"active":""'>待结算</view>
+			</view>
+			<view @click='sendreceiverecord({status:0})' class="guess-section">
+				<view style='width:100%;align-items:center;' class="flex justify-between">
+					<view class='type send'>发</view>
+					<view>
+						<view class='businessnumber'>我是业务编号最长这么长</view>
+						<view class='consigner'>发货方名称最多十个字</view>
+					</view>
+					<view>
+						<view class='time'>2021-07-05</view>
+						<view class='goods'>优质玉米淀粉</view>
+					</view>
+				</view>
+				<view style='width:100%;' class='goodsstatus'>
+					<text style='margin-right:10px;'>待签收：3</text>
+					<text>待结算：0</text>
+				</view>
+				<view style='width:100%;' class='flex justify-end'>
+					<view class='del'>删除</view>
+				</view>
+			</view>
+			<view @click='sendreceiverecord({status:1})' class="guess-section">
+				<view style='width:100%;align-items:center;' class="flex justify-between">
+					<view class='type put'>收</view>
+					<view>
+						<view>我是业务编号最长这么长</view>
+						<view>发货方名称最多十个字</view>
+					</view>
+					<view>
+						<view>2021-07-05</view>
+						<view>优质玉米淀粉</view>
+					</view>
+				</view>
+				<view class='goodsstatus'>
+					<text style='margin-right:10px;'>待签收：3</text>
+					<text>待结算：0</text>
+				</view>
+				<view style='width:100%;' class='flex justify-end'>
+					<view class='del'>删除</view>
+				</view>
+			</view>
+		</view>
+		<view class="footer">
+			<button @click='addgoods' class='addgoods'>新建发货任务</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "business",
+		data() {
+			return {
+				searchKeyWord:'',
+				content:'搜索',
+				status:0,
+			}
+		},
+		onShow() {
+			
+		},
+		onLoad(options) {
+			
+		},
+		onPageScroll(e) {
+			
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+		},
+		onReachBottom() { //上拉触底函数
+		},
+		methods: {
+			addgoods(){
+				uni.navigateTo({
+					url:'/pageA/freightTransport/addsendgoods'
+				})
+			},
+			sendreceiverecord(item){
+				if(item.status==0){
+					uni.navigateTo({
+						url:'/pageA/freightTransport/sendrecord'
+					})
+				}else{
+					uni.navigateTo({
+						url:'/pageA/freightTransport/payrecord'
+					})
+				}
+			}
+
+		}
+	}
+</script>
+
+<style lang='scss'>
+	page,
+	.content {
+		background: #F5F6FA;
+	}
+
+	.line {
+		display: inline-block;
+		padding: 5px;
+		position: relative;
+		font-size: 17px;
+	}
+
+	.line.active {
+		font-size: 19px;
+		font-weight: 900;
+	}
+
+	.line.active:after {
+		content: '';
+		display: block;
+		position: absolute;
+		width: 38px;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 0;
+		border-bottom: 1px solid #22C572;
+	}
+
+	.cu-tag.badge {
+		right: 26rpx;
+	}
+
+	.cu-item {
+		height: 80rpx;
+		display: inline-block;
+		line-height: 80rpx;
+	}
+
+	.search-form {
+		background: #F5F6F9;
+		padding-left: 20rpx;
+	}
+
+	.title-tip {
+		color: #E63113;
+		text-align: right;
+	}
+
+	.tag1 {
+		background: #F5F6F9;
+		padding: 5px;
+		color: #333333;
+		display: inline-flex;
+		font-size: 22rpx;
+		border-radius: 3px;
+		margin: 3px;
+	}
+
+	.tag {
+		background: #F5F6F9;
+		padding: 7px 12px;
+		color: #333333;
+		display: inline-flex;
+		font-size: 22rpx;
+		border-radius: 15px;
+		margin: 3px;
+	}
+
+	.tag-bule {
+		background: #EBEEFA;
+		color: #5C76DF;
+	}
+
+	.tag-green {
+		background: #C6F7BC;
+		color: #065112;
+	}
+
+	.tag-yellow {
+		background: #F9F2EA;
+		color: #BE9C69;
+	}
+
+	.tag-red {
+		background: #FEECE6;
+		color: #FE6430;
+	}
+
+	.text-white {
+		color: #fff;
+	}
+
+	.text-white text {
+		position: relative;
+		z-index: 2;
+		background: linear-gradient(45deg, #3DC146, #B2D612);
+		padding: 5px 10px;
+		border-radius: 38rpx;
+	}
+
+	.guess-section {
+		padding-bottom: 100upx;
+		display: flex;
+		flex-wrap: wrap;
+		padding:30upx;
+		background: #fff;
+		margin:10px;
+		border-radius:6px;
+		.type{
+			border-radius:10px;
+			padding:5px;
+			wdith:22px;height:22px;
+			line-height:14px;
+			font-size:12px;
+		}
+		.type.send{
+			background:#22C572;
+			color:#fff;
+		}
+		.type.put{
+			background:#FD714F;
+			color:#fff;
+		}
+		.businessnumber{
+			font-size:16px;
+			font-weight:600;
+		}
+		.consigner{
+			font-size:12px;
+		}
+		.time{
+			color:#878C9C;
+		}
+		.goods{
+			font-size:12px;
+		}
+		.goodsstatus{
+			background:#F9F9FA;
+			color:#9698A2;
+			padding:10px 0;
+			padding-left:47px;
+			margin:10px 0;
+		}
+		.del{
+			width:60px;
+			height: 33px;
+			line-height:33px;
+			font-size:14px;
+			background: #fff;
+			border:1px solid #CDCDCD;
+			border-radius:30px;
+			text-align:center;
+		}
+	}
+
+	.navbar {
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		display: flex;
+		width: 100%;
+		height: 80upx;
+		background: #fff;
+		box-shadow: 0 2upx 10upx rgba(0, 0, 0, .06);
+		z-index: 10;
+
+		.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 30upx;
+			color: $font-color-dark;
+			position: relative;
+
+			&.current {
+				color: $base-color;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 120upx;
+					height: 0;
+					border-bottom: 4upx solid $base-color;
+				}
+			}
+		}
+
+		.p-box {
+			display: flex;
+			flex-direction: column;
+
+			.yticon {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 30upx;
+				height: 14upx;
+				line-height: 1;
+				margin-left: 4upx;
+				font-size: 26upx;
+				color: #888;
+
+				&.active {
+					color: $base-color;
+				}
+			}
+
+			.xia {
+				transform: scaleY(-1);
+			}
+		}
+
+		.cate-item {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			width: 80upx;
+			position: relative;
+			font-size: 44upx;
+
+			&:after {
+				content: '';
+				position: absolute;
+				left: 0;
+				top: 50%;
+				transform: translateY(-50%);
+				border-left: 1px solid #ddd;
+				width: 0;
+				height: 36upx;
+			}
+		}
+	}
+
+	/* 分类 */
+	.cate-mask {
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		bottom: 0;
+		width: 100%;
+		background: rgba(0, 0, 0, 0);
+		z-index: 95;
+		transition: .3s;
+
+		.cate-content {
+			width: 630upx;
+			height: 100%;
+			background: #fff;
+			float: right;
+			transform: translateX(100%);
+			transition: .3s;
+		}
+
+		&.none {
+			display: none;
+		}
+
+		&.show {
+			background: rgba(0, 0, 0, .4);
+
+			.cate-content {
+				transform: translateX(0);
+			}
+		}
+	}
+
+	.cate-list {
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+
+		.cate-item {
+			display: flex;
+			align-items: center;
+			height: 90upx;
+			padding-left: 30upx;
+			font-size: 28upx;
+			color: #555;
+			position: relative;
+		}
+
+		.two {
+			height: 64upx;
+			color: #303133;
+			font-size: 30upx;
+			background: #f8f8f8;
+		}
+
+		.active {
+			color: $base-color;
+		}
+	}
+
+	.introduce-section .title {
+		font-size: 17px;
+		font-weight: bold;
+		height: 40px;
+		line-height: 40px;
+		flex: 2.5;
+		border-bottom: 1px solid #EEEEEE;
+	}
+
+	.introduce-section .address {
+		color: #878C9C;
+		font-size: 12px;
+		padding: 10px 0 10px;
+	}
+
+	.introduce-section .price {
+		padding: 10px 0 10px;
+		color: #FD714F;
+		font-size: 19px;
+		font-weight: 700;
+	}
+
+	.introduce-section .guess-item {
+		border-radius: 10px;
+		background: #fff;
+		padding: 0upx 30upx 20upx;
+		margin: 8px;
+		border-bottom: 1px solid #ccc;
+	}
+
+	/* 销售信息 */
+	.introduce-section {
+		.title-tip {
+			flex: 1;
+		}
+
+		.price-box {
+			display: flex;
+			align-items: baseline;
+			font-size: 26upx;
+		}
+
+		.price {
+			font-size: $font-lg + 2upx;
+		}
+
+		.m-price {
+			margin: 0 12upx;
+			color: $font-color-light;
+			text-decoration: line-through;
+		}
+
+		.coupon-tip {
+			align-items: center;
+			padding: 4upx 10upx;
+			background: $uni-color-primary;
+			font-size: $font-sm;
+			color: #fff;
+			border-radius: 6upx;
+			line-height: 1;
+			transform: translateY(-4upx);
+		}
+
+		.bot-row {
+			display: flex;
+			align-items: center;
+			height: 50upx;
+			font-size: $font-sm;
+			color: $font-color-light;
+
+			view {
+				flex: 1;
+			}
+		}
+	}
+	.footer{
+		background:#fff;
+		position:fixed;
+		bottom:0;
+		width: 100%;
+		padding:20px 0;
+	}
+	.addgoods{
+		width:90%;
+		background:#22C572;
+		color:#fff;
+		border-radius:30px;
+	}
+	.addgoods:after{
+		border:none;
+	}
+</style>

pageA/freightTransport/payrecord.vue

@@ -0,0 +1,630 @@
+<template>
+	<view class="center">
+		<view class="transaction">
+			<view style='padding-top:10px;' class="c-row">
+				<view class="title">业务编号</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入业务编号" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">货名</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入货名，如玉米" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">收货方</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入收货方名称" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">货物单价（元/吨）</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入货物单价" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">运费单价（元/吨）</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入运费单价" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">累计收发</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入收货地址" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+				
+			</view>
+			<view  class="c-row">
+				<view class="title">收货地址</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入收货人账号" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+		</view>
+		<view class="transaction">
+			<view  style='padding-top:10px;' class="c-row b-b justify-between">
+				<view class="title">辽H12345（C003）</view>
+				<view style='align-items: center;' class="flex">
+					<text style='color:#878C9C;'>2021-07-05</text>
+					<text class='type send'>发</text>
+				</view>
+			</view>
+			<view class="c-row  justify-between">
+				<view style='flex:1;'  class="title-black">净重</view>
+				<view  style='align-items: center;flex:2;' class="flex">
+					<view style='flex:1;text-align:right;'>
+						<text>33</text>
+						<text class='type send'>发</text>
+						<view class='weightnotes'>查看磅单</view>
+					</view>
+					<view style='flex:1;text-align:right;'>
+						<text>30</text>
+						<text class='type send'>发</text>
+						<view class='weightnotes'>查看磅单</view>
+					</view>
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title-black">贷款</view>
+				<view class="con-list">
+				¥10000.00
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">已付贷款</view>
+				<view style='color:#22C572;' class="con-list">
+					¥10000.00
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">贷款扣款</view>
+				<view class="con-list">
+					¥10000.00
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title-black">运费</view>
+				<view class="con-list">
+					¥10000.00
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">已付运费</view>
+				<view style='color:#22C572;' class="con-list">
+					¥10000.00
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">运费扣款</view>
+				<view class="con-list">
+					¥10000.00
+				</view>
+			</view>
+			<view  class="c-row flex justify-end">
+				<view style='flex:1;' class='deductfreight'>扣运费</view>
+				<view style='flex:1;' class='payfreight'>付运费</view>
+				<view style='flex:1;' class='deductfreight'>扣货款</view>
+				<view style='flex:1;' class='payfreight'>付货款</view>
+				<view @click='confirmpaygoods' style='flex:2;' class='payfreight'>确认收货</view>
+			</view>
+		</view>
+	<view class='footer'>
+		<button class="btn" @click="commit()">添加收货人</button>
+	</view>
+			
+	
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "business",
+		data() {
+			return {
+				purchaseOrder:{}
+			}
+		},
+		onShow() {
+			
+		},
+		onLoad(options) {
+			
+		},
+		onPageScroll(e) {
+			
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+		},
+		onReachBottom() { //上拉触底函数
+		},
+		methods: {
+			confirmpaygoods(){
+				uni.navigateTo({
+					url:'/pageA/freightTransport/confirmpaygoods'
+				})
+			},
+			commit(){
+				console.log(1111)
+				uni.navigateTo({
+					url:'/pageA/freightTransport/addpaygoods'
+				})
+			}
+
+		}
+	}
+</script>
+
+<style lang='scss'>
+	page,
+	.content {
+		background: #F5F6FA;
+	}
+.c-row {
+	    display: -webkit-box;
+	    display: -webkit-flex;
+	    display: flex;
+	    -webkit-box-align: center;
+	    -webkit-align-items: center;
+	    align-items: center;
+	    padding: 10rpx 30rpx;
+	    position: relative;
+		.title{
+			color:#9698A2;
+		}
+		.title-black{
+			color:#333;
+		}
+	}
+	.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:12px;
+	}
+	.transaction{
+		background-color: #FFFFFF;
+		margin: 10px;
+		padding-bottom: 10px;
+		border-radius: 20px;
+		.type{
+			display:inline-block;
+			font-size:10px;
+			padding:1px 3px;
+			border-radius:50%;
+			width:19px;height:19px;
+			line-height:19px;
+		}
+		.type.send{
+			color:#22C572;
+			background:#E9F8F0;
+		}
+		.type.put{
+			color:#22C572;
+			background:#E9F8F0;
+		}
+		.weightnotes{
+			display:inline-block;
+			border:1px solid #CDCDCD;
+			padding:5px;
+			font-size:10px;
+			margin-left:3px;
+		}
+		.deductfreight,.payfreight{
+			width:75px;
+			height: 33px;
+			line-height:33px;
+			font-size:14px;
+			background: #fff;
+			border:1px solid #CDCDCD;
+			border-radius:30px;
+			text-align:center;
+			margin:0 5px;
+		}
+		.payfreight{
+			margin-right:0;
+		}
+	}
+	.line {
+		display: inline-block;
+		padding: 5px;
+		position: relative;
+		font-size: 17px;
+	}
+
+	.line.active {
+		font-size: 19px;
+		font-weight: 900;
+	}
+
+	.line.active:after {
+		content: '';
+		display: block;
+		position: absolute;
+		width: 38px;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 0;
+		border-bottom: 1px solid #22C572;
+	}
+
+	.cu-tag.badge {
+		right: 26rpx;
+	}
+
+	.cu-item {
+		height: 80rpx;
+		display: inline-block;
+		line-height: 80rpx;
+	}
+
+	.search-form {
+		background: #F5F6F9;
+		padding-left: 20rpx;
+	}
+
+	.title-tip {
+		color: #E63113;
+		text-align: right;
+	}
+
+	.tag1 {
+		background: #F5F6F9;
+		padding: 5px;
+		color: #333333;
+		display: inline-flex;
+		font-size: 22rpx;
+		border-radius: 3px;
+		margin: 3px;
+	}
+
+	.tag {
+		background: #F5F6F9;
+		padding: 7px 12px;
+		color: #333333;
+		display: inline-flex;
+		font-size: 22rpx;
+		border-radius: 15px;
+		margin: 3px;
+	}
+
+	.tag-bule {
+		background: #EBEEFA;
+		color: #5C76DF;
+	}
+
+	.tag-green {
+		background: #C6F7BC;
+		color: #065112;
+	}
+
+	.tag-yellow {
+		background: #F9F2EA;
+		color: #BE9C69;
+	}
+
+	.tag-red {
+		background: #FEECE6;
+		color: #FE6430;
+	}
+
+	.text-white {
+		color: #fff;
+	}
+
+	.text-white text {
+		position: relative;
+		z-index: 2;
+		background: linear-gradient(45deg, #3DC146, #B2D612);
+		padding: 5px 10px;
+		border-radius: 38rpx;
+	}
+	.center{
+		margin-bottom:100px;
+	}
+	.guess-section {
+		padding-bottom: 100upx;
+		display: flex;
+		flex-wrap: wrap;
+		padding:30upx;
+		background: #fff;
+		margin:10px;
+		border-radius:6px;
+		.type{
+			border-radius:10px;
+			padding:5px;
+			wdith:22px;height:22px;
+			line-height:14px;
+			font-size:12px;
+		}
+		.type.send{
+			background:#22C572;
+			color:#fff;
+		}
+		.type.put{
+			background:#FD714F;
+			color:#fff;
+		}
+		.businessnumber{
+			font-size:16px;
+			font-weight:600;
+		}
+		.consigner{
+			font-size:12px;
+		}
+		.time{
+			color:#878C9C;
+		}
+		.goods{
+			font-size:12px;
+		}
+		.goodsstatus{
+			background:#F9F9FA;
+			color:#9698A2;
+			padding:10px 0;
+			padding-left:47px;
+			margin:10px 0;
+		}
+		.del{
+			width:60px;
+			height: 33px;
+			line-height:33px;
+			font-size:14px;
+			background: #fff;
+			border:1px solid #CDCDCD;
+			border-radius:30px;
+			text-align:center;
+		}
+	}
+
+	.navbar {
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		display: flex;
+		width: 100%;
+		height: 80upx;
+		background: #fff;
+		box-shadow: 0 2upx 10upx rgba(0, 0, 0, .06);
+		z-index: 10;
+
+		.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 30upx;
+			color: $font-color-dark;
+			position: relative;
+
+			&.current {
+				color: $base-color;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 120upx;
+					height: 0;
+					border-bottom: 4upx solid $base-color;
+				}
+			}
+		}
+
+		.p-box {
+			display: flex;
+			flex-direction: column;
+
+			.yticon {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 30upx;
+				height: 14upx;
+				line-height: 1;
+				margin-left: 4upx;
+				font-size: 26upx;
+				color: #888;
+
+				&.active {
+					color: $base-color;
+				}
+			}
+
+			.xia {
+				transform: scaleY(-1);
+			}
+		}
+
+		.cate-item {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			width: 80upx;
+			position: relative;
+			font-size: 44upx;
+
+			&:after {
+				content: '';
+				position: absolute;
+				left: 0;
+				top: 50%;
+				transform: translateY(-50%);
+				border-left: 1px solid #ddd;
+				width: 0;
+				height: 36upx;
+			}
+		}
+	}
+
+	/* 分类 */
+	.cate-mask {
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		bottom: 0;
+		width: 100%;
+		background: rgba(0, 0, 0, 0);
+		z-index: 95;
+		transition: .3s;
+
+		.cate-content {
+			width: 630upx;
+			height: 100%;
+			background: #fff;
+			float: right;
+			transform: translateX(100%);
+			transition: .3s;
+		}
+
+		&.none {
+			display: none;
+		}
+
+		&.show {
+			background: rgba(0, 0, 0, .4);
+
+			.cate-content {
+				transform: translateX(0);
+			}
+		}
+	}
+
+	.cate-list {
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+
+		.cate-item {
+			display: flex;
+			align-items: center;
+			height: 90upx;
+			padding-left: 30upx;
+			font-size: 28upx;
+			color: #555;
+			position: relative;
+		}
+
+		.two {
+			height: 64upx;
+			color: #303133;
+			font-size: 30upx;
+			background: #f8f8f8;
+		}
+
+		.active {
+			color: $base-color;
+		}
+	}
+
+	.introduce-section .title {
+		font-size: 17px;
+		font-weight: bold;
+		height: 40px;
+		line-height: 40px;
+		flex: 2.5;
+		border-bottom: 1px solid #EEEEEE;
+	}
+
+	.introduce-section .address {
+		color: #878C9C;
+		font-size: 12px;
+		padding: 10px 0 10px;
+	}
+
+	.introduce-section .price {
+		padding: 10px 0 10px;
+		color: #FD714F;
+		font-size: 19px;
+		font-weight: 700;
+	}
+
+	.introduce-section .guess-item {
+		border-radius: 10px;
+		background: #fff;
+		padding: 0upx 30upx 20upx;
+		margin: 8px;
+		border-bottom: 1px solid #ccc;
+	}
+
+	/* 销售信息 */
+	.introduce-section {
+		.title-tip {
+			flex: 1;
+		}
+
+		.price-box {
+			display: flex;
+			align-items: baseline;
+			font-size: 26upx;
+		}
+
+		.price {
+			font-size: $font-lg + 2upx;
+		}
+
+		.m-price {
+			margin: 0 12upx;
+			color: $font-color-light;
+			text-decoration: line-through;
+		}
+
+		.coupon-tip {
+			align-items: center;
+			padding: 4upx 10upx;
+			background: $uni-color-primary;
+			font-size: $font-sm;
+			color: #fff;
+			border-radius: 6upx;
+			line-height: 1;
+			transform: translateY(-4upx);
+		}
+
+		.bot-row {
+			display: flex;
+			align-items: center;
+			height: 50upx;
+			font-size: $font-sm;
+			color: $font-color-light;
+
+			view {
+				flex: 1;
+			}
+		}
+	}
+	.footer{
+		position:fixed;
+		bottom:0;
+		width: 100%;
+		padding:20px 0;
+	}
+	.btn{
+		width:90%;
+		background:#22C572;
+		color:#fff;
+		border-radius:30px;
+	}
+	.btn:after{
+		border:none;
+	}
+</style>
+

pageA/freightTransport/sendrecord.vue

@@ -0,0 +1,621 @@
+<template>
+	<view class="center">
+		<view class="transaction">
+			<view style='padding-top:10px;' class="c-row">
+				<view class="title">业务编号</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入业务编号" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">货名</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入货名，如玉米" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">收货方</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入收货方名称" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">货物单价（元/吨）</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入货物单价" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">运费单价（元/吨）</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入运费单价" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">累计收发</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入收货地址" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+				
+			</view>
+			<view  class="c-row">
+				<view class="title">收货地址</view>
+				<view class="con-list">
+				<input v-model='purchaseOrder.transactionsNumber' placeholder="请输入收货人账号" placeholder-style="font-size: 12px;" name="input"></input>
+				</view>
+			</view>
+		</view>
+		<view class="transaction">
+			<view  style='padding-top:10px;' class="c-row b-b justify-between">
+				<view class="title">辽H12345（C003）</view>
+				<view style='align-items: center;' class="flex">
+					<text style='color:#878C9C;'>2021-07-05</text>
+					<text class='type send'>发</text>
+				</view>
+			</view>
+			<view class="c-row  justify-between">
+				<view style='flex:1;'  class="title-black">净重</view>
+				<view  style='align-items: center;flex:2;' class="flex">
+					<view style='flex:1;text-align:right;'>
+						<text>33</text>
+						<text class='type send'>发</text>
+						<view class='weightnotes'>查看磅单</view>
+					</view>
+					<view style='flex:1;text-align:right;'>
+						<text>30</text>
+						<text class='type send'>发</text>
+						<view class='weightnotes'>查看磅单</view>
+					</view>
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title-black">贷款</view>
+				<view class="con-list">
+				¥10000.00
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">已付贷款</view>
+				<view style='color:#22C572;' class="con-list">
+					¥10000.00
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">贷款扣款</view>
+				<view class="con-list">
+					¥10000.00
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title-black">运费</view>
+				<view class="con-list">
+					¥10000.00
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">已付运费</view>
+				<view style='color:#22C572;' class="con-list">
+					¥10000.00
+				</view>
+			</view>
+			<view  class="c-row">
+				<view class="title">运费扣款</view>
+				<view class="con-list">
+					¥10000.00
+				</view>
+			</view>
+			<view  class="c-row flex justify-end">
+				<view class='deductfreight'>扣运费</view>
+				<view class='payfreight'>付运费</view>
+			</view>
+		</view>
+	<view class='footer'>
+		<button class="btn" @click="commit()">添加发车信息</button>
+	</view>
+			
+	
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "business",
+		data() {
+			return {
+				purchaseOrder:{}
+			}
+		},
+		onShow() {
+			
+		},
+		onLoad(options) {
+			
+		},
+		onPageScroll(e) {
+			
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+		},
+		onReachBottom() { //上拉触底函数
+		},
+		methods: {
+			commit(){
+				uni.navigateTo({
+					url:'/pageA/freightTransport/contract_detail'
+				})
+			}
+
+		}
+	}
+</script>
+
+<style lang='scss'>
+	page,
+	.content {
+		background: #F5F6FA;
+	}
+.c-row {
+	    display: -webkit-box;
+	    display: -webkit-flex;
+	    display: flex;
+	    -webkit-box-align: center;
+	    -webkit-align-items: center;
+	    align-items: center;
+	    padding: 10rpx 30rpx;
+	    position: relative;
+		.title{
+			color:#9698A2;
+		}
+		.title-black{
+			color:#333;
+		}
+	}
+	.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:12px;
+	}
+	.transaction{
+		background-color: #FFFFFF;
+		margin: 10px;
+		padding-bottom: 10px;
+		border-radius: 20px;
+		.type{
+			display:inline-block;
+			font-size:10px;
+			padding:1px 3px;
+			border-radius:50%;
+			width:19px;height:19px;
+			line-height:19px;
+		}
+		.type.send{
+			color:#22C572;
+			background:#E9F8F0;
+		}
+		.type.put{
+			color:#22C572;
+			background:#E9F8F0;
+		}
+		.weightnotes{
+			display:inline-block;
+			border:1px solid #CDCDCD;
+			padding:5px;
+			font-size:10px;
+			margin-left:3px;
+		}
+		.deductfreight,.payfreight{
+			width:75px;
+			height: 33px;
+			line-height:33px;
+			font-size:14px;
+			background: #fff;
+			border:1px solid #CDCDCD;
+			border-radius:30px;
+			text-align:center;
+			margin:0 10px;
+		}
+		.payfreight{
+			margin-right:0;
+		}
+	}
+	.line {
+		display: inline-block;
+		padding: 5px;
+		position: relative;
+		font-size: 17px;
+	}
+
+	.line.active {
+		font-size: 19px;
+		font-weight: 900;
+	}
+
+	.line.active:after {
+		content: '';
+		display: block;
+		position: absolute;
+		width: 38px;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 0;
+		border-bottom: 1px solid #22C572;
+	}
+
+	.cu-tag.badge {
+		right: 26rpx;
+	}
+
+	.cu-item {
+		height: 80rpx;
+		display: inline-block;
+		line-height: 80rpx;
+	}
+
+	.search-form {
+		background: #F5F6F9;
+		padding-left: 20rpx;
+	}
+
+	.title-tip {
+		color: #E63113;
+		text-align: right;
+	}
+
+	.tag1 {
+		background: #F5F6F9;
+		padding: 5px;
+		color: #333333;
+		display: inline-flex;
+		font-size: 22rpx;
+		border-radius: 3px;
+		margin: 3px;
+	}
+
+	.tag {
+		background: #F5F6F9;
+		padding: 7px 12px;
+		color: #333333;
+		display: inline-flex;
+		font-size: 22rpx;
+		border-radius: 15px;
+		margin: 3px;
+	}
+
+	.tag-bule {
+		background: #EBEEFA;
+		color: #5C76DF;
+	}
+
+	.tag-green {
+		background: #C6F7BC;
+		color: #065112;
+	}
+
+	.tag-yellow {
+		background: #F9F2EA;
+		color: #BE9C69;
+	}
+
+	.tag-red {
+		background: #FEECE6;
+		color: #FE6430;
+	}
+
+	.text-white {
+		color: #fff;
+	}
+
+	.text-white text {
+		position: relative;
+		z-index: 2;
+		background: linear-gradient(45deg, #3DC146, #B2D612);
+		padding: 5px 10px;
+		border-radius: 38rpx;
+	}
+	.center{
+		margin-bottom:100px;
+	}
+	.guess-section {
+		padding-bottom: 100upx;
+		display: flex;
+		flex-wrap: wrap;
+		padding:30upx;
+		background: #fff;
+		margin:10px;
+		border-radius:6px;
+		.type{
+			border-radius:10px;
+			padding:5px;
+			wdith:22px;height:22px;
+			line-height:14px;
+			font-size:12px;
+		}
+		.type.send{
+			background:#22C572;
+			color:#fff;
+		}
+		.type.put{
+			background:#FD714F;
+			color:#fff;
+		}
+		.businessnumber{
+			font-size:16px;
+			font-weight:600;
+		}
+		.consigner{
+			font-size:12px;
+		}
+		.time{
+			color:#878C9C;
+		}
+		.goods{
+			font-size:12px;
+		}
+		.goodsstatus{
+			background:#F9F9FA;
+			color:#9698A2;
+			padding:10px 0;
+			padding-left:47px;
+			margin:10px 0;
+		}
+		.del{
+			width:60px;
+			height: 33px;
+			line-height:33px;
+			font-size:14px;
+			background: #fff;
+			border:1px solid #CDCDCD;
+			border-radius:30px;
+			text-align:center;
+		}
+	}
+
+	.navbar {
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		display: flex;
+		width: 100%;
+		height: 80upx;
+		background: #fff;
+		box-shadow: 0 2upx 10upx rgba(0, 0, 0, .06);
+		z-index: 10;
+
+		.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 30upx;
+			color: $font-color-dark;
+			position: relative;
+
+			&.current {
+				color: $base-color;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 120upx;
+					height: 0;
+					border-bottom: 4upx solid $base-color;
+				}
+			}
+		}
+
+		.p-box {
+			display: flex;
+			flex-direction: column;
+
+			.yticon {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 30upx;
+				height: 14upx;
+				line-height: 1;
+				margin-left: 4upx;
+				font-size: 26upx;
+				color: #888;
+
+				&.active {
+					color: $base-color;
+				}
+			}
+
+			.xia {
+				transform: scaleY(-1);
+			}
+		}
+
+		.cate-item {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			width: 80upx;
+			position: relative;
+			font-size: 44upx;
+
+			&:after {
+				content: '';
+				position: absolute;
+				left: 0;
+				top: 50%;
+				transform: translateY(-50%);
+				border-left: 1px solid #ddd;
+				width: 0;
+				height: 36upx;
+			}
+		}
+	}
+
+	/* 分类 */
+	.cate-mask {
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		bottom: 0;
+		width: 100%;
+		background: rgba(0, 0, 0, 0);
+		z-index: 95;
+		transition: .3s;
+
+		.cate-content {
+			width: 630upx;
+			height: 100%;
+			background: #fff;
+			float: right;
+			transform: translateX(100%);
+			transition: .3s;
+		}
+
+		&.none {
+			display: none;
+		}
+
+		&.show {
+			background: rgba(0, 0, 0, .4);
+
+			.cate-content {
+				transform: translateX(0);
+			}
+		}
+	}
+
+	.cate-list {
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+
+		.cate-item {
+			display: flex;
+			align-items: center;
+			height: 90upx;
+			padding-left: 30upx;
+			font-size: 28upx;
+			color: #555;
+			position: relative;
+		}
+
+		.two {
+			height: 64upx;
+			color: #303133;
+			font-size: 30upx;
+			background: #f8f8f8;
+		}
+
+		.active {
+			color: $base-color;
+		}
+	}
+
+	.introduce-section .title {
+		font-size: 17px;
+		font-weight: bold;
+		height: 40px;
+		line-height: 40px;
+		flex: 2.5;
+		border-bottom: 1px solid #EEEEEE;
+	}
+
+	.introduce-section .address {
+		color: #878C9C;
+		font-size: 12px;
+		padding: 10px 0 10px;
+	}
+
+	.introduce-section .price {
+		padding: 10px 0 10px;
+		color: #FD714F;
+		font-size: 19px;
+		font-weight: 700;
+	}
+
+	.introduce-section .guess-item {
+		border-radius: 10px;
+		background: #fff;
+		padding: 0upx 30upx 20upx;
+		margin: 8px;
+		border-bottom: 1px solid #ccc;
+	}
+
+	/* 销售信息 */
+	.introduce-section {
+		.title-tip {
+			flex: 1;
+		}
+
+		.price-box {
+			display: flex;
+			align-items: baseline;
+			font-size: 26upx;
+		}
+
+		.price {
+			font-size: $font-lg + 2upx;
+		}
+
+		.m-price {
+			margin: 0 12upx;
+			color: $font-color-light;
+			text-decoration: line-through;
+		}
+
+		.coupon-tip {
+			align-items: center;
+			padding: 4upx 10upx;
+			background: $uni-color-primary;
+			font-size: $font-sm;
+			color: #fff;
+			border-radius: 6upx;
+			line-height: 1;
+			transform: translateY(-4upx);
+		}
+
+		.bot-row {
+			display: flex;
+			align-items: center;
+			height: 50upx;
+			font-size: $font-sm;
+			color: $font-color-light;
+
+			view {
+				flex: 1;
+			}
+		}
+	}
+	.footer{
+		position:fixed;
+		bottom:0;
+		width: 100%;
+		padding:20px 0;
+	}
+	.btn{
+		width:90%;
+		background:#22C572;
+		color:#fff;
+		border-radius:30px;
+	}
+	.btn:after{
+		border:none;
+	}
+</style>
+

pageA/product/Identity_switching.vue

@@ -17,9 +17,7 @@
 							<view class='but but3' v-if="item.authenticationStatus == '未通过'">{{item.authenticationStatus}}</view>
 							<view class='but but4' v-if="item.authenticationStatus == '已覆盖'">{{item.authenticationStatus}}</view>
 						</view>
-						<view class="info2">{{item.customerPhone}}</view>
-					
-						
+						<view class="info2">{{item.customerPhone}}</view>	
 					</view>
 	
 				</view>
@@ -101,7 +99,8 @@
 				this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {
 						pageSize: 10,
 						currentPage: 1,
-						commonId: this.userInfo.id
+						commonId: this.userInfo.id,
+						flag:1
 					}, 'application/json;charset=UTF-8').then(res => {
 						if(res.data.code==200){
 							for(var i=0;i<res.data.data.records.length;i++){
@@ -129,10 +128,17 @@
 				item.checked=true
 				this.$api.doRequest('post', '/identityAuthenticationInfo/api/setDefault', {
 						id:item.id,
+						defaultFlag:1,
 						commonId: this.userInfo.id
 					}).then(res => {
 						if(res.data.code==200){
 							// this.lists = res.data.data.records
+							
+							wx.navigateBack({
+							 
+							  delta: 1
+							 
+})
 						}
 					})
 					.catch(res => {

pageA/product/business_buy.vue

@@ -55,7 +55,7 @@
 			<view   class="title">采购单价（元/吨）</view>
 			<view class="con-list">
 				<view class="picker">
-					<text>{{purchaseOrder.unitPrice}}</text>
+					<text>{{purchaseOrder.procurementPrice}}</text>
 				</view>
 				</view>
 		</view>
@@ -114,16 +114,11 @@
 		<view  v-if="purchaseOrder.procurementPlanType=='期货'"  class=" align-start ">
 			<view class="titles">结算价格</view>
 			<text class="textA">结算价格=点价+基差+发票费用+包装费</text>
-			<text style="font-size: 18px;color: #FD714F;margin-left: 120rpx;">￥{{purchaseOrder.settlementPrice}}</text>
+			<text style="font-size: 18px;color: #FD714F;margin-left: 25px;">￥{{purchaseOrder.settlementPrice}}</text>
 			<!-- <input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput' v-model="purchaseOrder.settlementPrice"></input> -->
 		</view>
-		<!-- <view style='background:#fff;'>
-			结算价格=点价+基差+发票费用+包装费
-		</view> -->
 		</view>
-	
 			<button class="btn" @click="commit()">提交</button>
-	
 	</view>
 </template>
 
@@ -140,7 +135,7 @@
 						memo:'',
 						buyer:'',
 						buyerPhone:'',
-						unitPrice:0,
+						procurementPrice:0,
 						address:'',
 						count:0,
 						province:'',
@@ -180,7 +175,7 @@
 					memo:'',
 					buyer:'',
 					buyerPhone:'',
-					unitPrice:0,
+					procurementPrice:0,
 					address:'',
 					count:0,
 					id:0,
@@ -211,7 +206,6 @@
 				};
 			},
 			onLoad(options) {
-				console.log(options)
 				this.id=options.id
 				this.purchaseOrder.planId=options.id
 				this.purchaseOrder.seller = options.seller
@@ -223,7 +217,7 @@
 				this.purchaseOrder.buyer = options.buyer
 				this.purchaseOrder.customer = options.customerName
 				this.purchaseOrder.basis = options.basisPrice
-				this.purchaseOrder.unitPrice = options.unitPrice
+				this.purchaseOrder.procurementPrice = options.procurementPrice
 				this.purchaseOrder.receiveWarehouse = options.receiveWarehouse
 				this.purchaseOrder.settlementPrice = options.basisPrice
 				this.purchaseOrder.procurementPlanType = options.procurementPlanType
@@ -254,7 +248,7 @@
 						url: `/pageA/product/Identity_switching?goodsName=${this.purchaseOrder.goodsName}
 						&receivePrivate=${this.purchaseOrder.receivePrivate}&receiveCity=${this.purchaseOrder.receiveCity}
 						&receiveArea=${this.purchaseOrder.receiveArea}&minimumVolume=${this.purchaseOrder.minimumVolume}
-						&buyer=${this.purchaseOrder.buyer}&basisPrice=${this.purchaseOrder.basis}&unitPrice=${this.purchaseOrder.unitPrice}
+						&buyer=${this.purchaseOrder.buyer}&basisPrice=${this.purchaseOrder.basis}&procurementPrice=${this.purchaseOrder.procurementPrice}
 						&receiveWarehouse=${this.purchaseOrder.receiveWarehouse}&procurementPlanType=${this.purchaseOrder.procurementPlanType}
 						&procurementPlanNo=${this.purchaseOrder.procurementPlan}`
 					})
@@ -282,6 +276,7 @@
 							return
 						}
 					}
+					this.purchaseOrder.packingFee=-this.purchaseOrder.packingFee
 					if(this.purchaseOrder.packingFee>0||this.purchaseOrder.packingFee<-2000){
 						this.$api.msg('包装费输入错误')
 						return
@@ -305,17 +300,36 @@
 					var that=this
 					this.purchaseOrder.commonId=that.userInfo.id
 					this.purchaseOrder.pcFlag=0
+					if(this.purchaseOrder.procurementPlanType == "期货"){
+					this.purchaseOrder.unitPrice = this.purchaseOrder.settlementPrice
+					}
 					uni.showModal({
 						content: '订单提交后将发送给买方，是否确定提交？',
 						success: function (res) {
 							if (res.confirm) {
 								that.$api.doRequest('post','/purchaseOrder/api/insertPurchaseOrder', that.purchaseOrder).then(res => {
 									if(res.data.code==200){
-										uni.showToast({
-											title: '提交成功，等待买方回复',
-											icon: 'none',
-											duration: 2000
-										})
+										// that.$api.doRequest('post','/purchaseOrder/api/submitPurchaseOrder', {id:res.data.data}).then(res1 => {
+										// 	if(res1.data.code==200){
+												uni.showToast({
+													title: '提交成功，等待买方回复',
+													icon: 'none',
+													duration: 2000
+												})
+										// 	}else{
+										// 		uni.showToast({
+										// 			title: res.data.message,
+										// 			icon: 'none',
+										// 			duration: 2000
+										// 		})
+										// 	}
+										// }).catch(res => {
+										// 	uni.showToast({
+										// 		title: res.data.message,
+										// 		icon: 'none',
+										// 		duration: 2000
+										// 	})
+										// })
 										// uni.navigateBack();
 									}else{
 										uni.showToast({
@@ -379,6 +393,9 @@
 							this.purchaseOrder.invoiceFee=0
 						}
 					}
+					else{
+						this.purchaseOrder.invoiceFee=0
+					}
 				},
 				changeZhihang(){
 					uni.navigateTo({
@@ -403,9 +420,6 @@
 				buyerPhoneInput(e){
 					this.buyerPhone = e.detail.value
 				},
-				unitPriceInput(e){
-					this.unitPrice = e.detail.value
-				},
 				addressInput(e){
 					this.address = e.detail.value
 				},

pageA/product/business_sale.vue

@@ -5,14 +5,13 @@
 		<view  class="c-row b-b">
 			<view class="title">买方</view>
 			<view class="con-list">
-			<view class="title">{{purchaseOrder.buyer}}</view>
+				<view v-if='goods.customerTypeFlag==1' class="title" @click="liang">{{purchaseOrder.customer?purchaseOrder.customer:goods.customerName}}></view>
+				<view v-if='goods.customerTypeFlag==2' class="title" @click="liang">{{purchaseOrder.compName?purchaseOrder.compName:goods.compName}}></view>
 			</view>
 		</view>
 		<view  class="c-row">
 			<view class="title">卖方</view>
 			<view class="con-list">
-				<!-- <view v-if='goods.customerTypeFlag==1' class="title" @click="liang">{{purchaseOrder.customer?purchaseOrder.customer:goods.customerName}}></view>
-				<view v-if='goods.customerTypeFlag==2' class="title" @click="liang">{{purchaseOrder.compName?purchaseOrder.compName:goods.compName}}></view> -->
 			{{purchaseOrder.seller}}
 			</view>
 		</view>
@@ -47,7 +46,7 @@
 			<view  class="title">今日基差（元/吨）</view>
 			<view class="con-list">
 				<view class="picker">
-					<text>{{purchaseOrder.basisPrice}}</text>
+					<text>{{purchaseOrder.basis}}</text>
 				</view>
 				</view>
 		</view>
@@ -56,7 +55,7 @@
 			<view   class="title">销售单价（元/吨）</view>
 			<view class="con-list">
 				<view class="picker">
-					<text>{{purchaseOrder.salePrice}}</text>
+					<text>{{purchaseOrder.unitPrice}}</text>
 				</view>
 				</view>
 		</view>
@@ -67,7 +66,7 @@
 			<view class="con-list">
 			<picker @change="invoiceChange" :value="invoiceIndex" :range="invoiceType">
 				<view class="picker">
-					{{packingIndex>-1?invoiceType[packingIndex]:'请选择'}}
+					{{invoiceIndex>-1?invoiceType[invoiceIndex]:'请选择'}}
 				</view>
 			</picker>
 			</view>
@@ -75,7 +74,7 @@
 		<view  class="c-row b-b">
 			<view class="title">采购数量（吨）</view>
 			<view class="con-list">
-			<input v-model='purchaseOrder.transactionsNumber' placeholder="请填写出售数量" name="input"></input>
+			<input v-model='purchaseOrder.transactionsNumber' placeholder="请填写采购数量" name="input"></input>
 			</view>
 		</view>
 		<view  class="c-row b-b">
@@ -88,7 +87,7 @@
 			</picker>
 			</view>
 		</view>
-		<view v-if='packingIndex==0' class="beizhu align-start">
+		<view v-if='purchaseOrder.packingType =="大袋" || purchaseOrder.packingType =="小袋"' class="beizhu align-start">
 			<view class="title">袋装备注</view>
 			<view >
 			<textarea maxlength="-1" v-model='purchaseOrder.baggingNotes' placeholder="请填写包装规格、质量、包装物要求。例:50kg袋装、大粒、彩包" class="textareas"></textarea>
@@ -115,9 +114,7 @@
 		<view  v-if="purchaseOrder.salePlanType=='期货'" class=" align-start ">
 			<view class="titles">结算价格</view>
 			<text class="textA">结算价格=点价+基差+发票费用+包装费</text>
-			<view class="con-list">
-			<text >{{purchaseOrder.settlementPrice}}</text>
-			</view>
+			<text style="font-size: 18px;color: #FD714F;margin-left: 25px;">￥{{purchaseOrder.settlementPrice}}</text>
 			<!-- <input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput' v-model="purchaseOrder.settlementPrice"></input> -->
 		</view>
 		<!-- <view style='background:#fff;'>
@@ -214,7 +211,6 @@
 				};
 			},
 			onLoad(options) {
-				console.log(options)
 				this.id=options.id
 				this.purchaseOrder.planId=options.id
 				this.purchaseOrder.seller = options.seller
@@ -226,13 +222,14 @@
 				this.purchaseOrder.buyer = options.buyer
 				this.purchaseOrder.customer = options.customerName
 				this.purchaseOrder.basis = options.basisPrice
-				this.purchaseOrder.salePrice = options.salePrice
+				this.purchaseOrder.unitPrice = options.unitPrice
 				this.purchaseOrder.receiveWarehouse = options.receiveWarehouse
 				this.purchaseOrder.settlementPrice = options.basisPrice
 				this.purchaseOrder.salePlanType = options.salePlanType
-				this.purchaseOrder.procurementPlan=options.procurementPlan
-				this.purchaseOrder.baggingNotes=options.baggingNotes
+				this.purchaseOrder.salePlan=options.salePlan
+				// this.purchaseOrder.baggingNotes=options.baggingNotes
 				this.purchaseOrder.sendWarehouse = options.sendWarehouse
+				this.purchaseOrder.compId=options.compId
 			},
 			computed: {
 				...mapState(['hasLogin','userInfo']),
@@ -242,10 +239,10 @@
 					if(res.data.code==200){
 						this.goods=res.data.data
 						if(this.goods.customerTypeFlag==1){
-							this.purchaseOrder.invoiceFee=-20
+							// this.purchaseOrder.invoiceFee=-20
 							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.invoiceFee)
 						}else{
-							this.purchaseOrder.invoiceFee=0
+							// this.purchaseOrder.invoiceFee=0
 							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.invoiceFee)
 						}
 					}
@@ -260,7 +257,7 @@
 						&receiveArea=${this.purchaseOrder.receiveArea}&minimumVolume=${this.purchaseOrder.minimumVolume}
 						&buyer=${this.purchaseOrder.buyer}&basisPrice=${this.purchaseOrder.basis}&unitPrice=${this.purchaseOrder.unitPrice}
 						&receiveWarehouse=${this.purchaseOrder.receiveWarehouse}&salePlanType=${this.purchaseOrder.salePlanType}
-						&procurementPlanNo=${this.purchaseOrder.procurementPlan}`
+						&salePlanNo=${this.purchaseOrder.salePlan}`
 					})
 				},
 				commit(){
@@ -272,24 +269,27 @@
 						this.$api.msg('采购数量输入错误')
 						return
 					}
-					if(!this.purchaseOrder.pointPrice){
-						this.$api.msg('点价不能为空')
-						return
-					}
-					if(this.purchaseOrder.pointPrice>10000){
-						this.$api.msg('点价输入错误')
-						return
-					}
-					if(this.purchaseOrder.pointPrice.indexOf('.')!=-1){
-						if(this.purchaseOrder.pointPrice.split(".")[1].length>2){
+					if(this.purchaseOrder.salePlanType=='期货'){
+						if(!this.purchaseOrder.pointPrice){
+							this.$api.msg('点价不能为空')
+							return
+						}
+						if(this.purchaseOrder.pointPrice>10000){
 							this.$api.msg('点价输入错误')
 							return
 						}
+						if(this.purchaseOrder.pointPrice.indexOf('.')!=-1){
+							if(this.purchaseOrder.pointPrice.split(".")[1].length>2){
+								this.$api.msg('点价输入错误')
+								return
+						}
 					}
-					if(this.purchaseOrder.packingFee>0||this.purchaseOrder.packingFee<= 2000){
+					this.purchaseOrder.packingFee=-this.purchaseOrder.packingFee
+					if(this.purchaseOrder.packingFee>0||this.purchaseOrder.packingFee<-2000){
 						this.$api.msg('包装费输入错误')
 						return
 					}
+				}
 					if(!this.purchaseOrder.customer){
 						if(this.goods.customerTypeFlag==1){
 							this.purchaseOrder.customer=this.goods.customerName
@@ -297,46 +297,50 @@
 							this.purchaseOrder.customer=this.goods.compName
 						}
 					}
-					if(!this.purchaseOrder.seller){
+					if(!this.purchaseOrder.buyer){
 						if(this.goods.customerTypeFlag==1){
-							this.purchaseOrder.seller=this.goods.customerName
-							this.purchaseOrder.sellerPhone=this.goods.customerPhone
+							this.purchaseOrder.buyer=this.goods.customerName
+							this.purchaseOrder.buyerPhone=this.goods.customerPhone
 						}else{
-							this.purchaseOrder.seller=this.goods.compName
-							this.purchaseOrder.sellerPhone=this.goods.customerPhone
+							this.purchaseOrder.buyer=this.goods.compName
+							this.purchaseOrder.buyerPhone=this.goods.customerPhone
 						}
 					}
 					var that=this
+					this.purchaseOrder.commonId=that.userInfo.id
 					this.purchaseOrder.pcFlag=0
-					// uni.showModal({
-					// 	content: '订单提交后将发送给买方，是否确定提交？',
-					// 	success: function (res) {
-					// 		if (res.confirm) {
-					// 			that.$api.doRequest('post','  ', that.purchaseOrder).then(res => {
-					// 				if(res.data.code==200){
-					// 					uni.showToast({
-					// 						title: '提交成功，等待买方回复',
-					// 						icon: 'none',
-					// 						duration: 2000
-					// 					})
-					// 					// uni.navigateBack();
-					// 				}else{
-					// 					uni.showToast({
-					// 						title: '提交失败：'+res.data.message,
-					// 						icon: 'none',
-					// 						duration: 2000
-					// 					})
-					// 				}
-					// 			}).catch(res => {
-					// 				uni.showToast({
-					// 					title: res.data.message,
-					// 					icon: 'none',
-					// 					duration: 2000
-					// 				})
-					// 			})
-					// 		}
-					// 	}
-					// })
+					if(this.purchaseOrder.salePlanType == "期货"){
+					this.purchaseOrder.unitPrice = this.purchaseOrder.settlementPrice
+					}
+					uni.showModal({
+						content: '订单提交后将发送给卖方，是否确定提交？',
+						success: function (res) {
+							if (res.confirm) {
+								that.$api.doRequest('post','/saleOrder/api/insertSaleOrder', that.purchaseOrder).then(res => {
+									if(res.data.code==200){
+										uni.showToast({
+											title: '提交成功，等待卖方回复',
+											icon: 'none',
+											duration: 2000
+										})
+										// uni.navigateBack();
+									}else{
+										uni.showToast({
+											title: '提交失败：'+res.data.message,
+											icon: 'none',
+											duration: 2000
+										})
+									}
+								}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								})
+							}
+						}
+					})
 				},
 				someprice(e){
 					if(this.purchaseOrder.pointPrice&&this.purchaseOrder.invoiceFee&&this.purchaseOrder.packingFee){
@@ -374,46 +378,14 @@
 					this.invoiceIndex = e.detail.value
 					this.purchaseOrder.typeKey=e.detail.value+1
 					this.purchaseOrder.type = this.invoiceType[this.invoiceIndex];
-					if(this.invoiceIndex == 0){
-						if(this.goods.customerTypeFlag==1){
-							this.purchaseOrder.invoiceFee=-20
-						}else{
-							this.purchaseOrder.invoiceFee=0
+					if(this.invoiceIndex == 1){
+						if(this.purchaseOrder.goodsName=='玉米'){
+							this.purchaseOrder.invoiceFee=10
+						}else if(this.purchaseOrder.goodsName=='大豆'){
+							this.purchaseOrder.invoiceFee=20
 						}
 					}
 				},
-				changeZhihang(){
-					uni.navigateTo({
-						url: '/pageA/pages/newcompany'
-					})
-				},
-				PriceTypeChange(e) {
-					this.priceTypeIndex = e.detail.value
-					this.price = this.priceType[this.priceTypeIndex]
-				},
-				RegionChange(e) {
-					this.region = e.detail.value
-					this.province = this.region[0];
-					this.area = this.region[0]+this.region[1]+this.region[2];
-				},
-				textareaInput(e) {
-					this.memo = e.detail.value
-				},
-				buyerInput(e){
-					this.buyer = e.detail.value
-				},
-				buyerPhoneInput(e){
-					this.buyerPhone = e.detail.value
-				},
-				unitPriceInput(e){
-					this.unitPrice = e.detail.value
-				},
-				addressInput(e){
-					this.address = e.detail.value
-				},
-				countInput(e){
-					this.count = e.detail.value
-				},
 			}
 		}
 </script>

pageA/product/detail.vue

@@ -6,11 +6,11 @@
 		<image style='width:100%;' src='../../static/img/jiaoyi/bg@3x.png'></image>
 		<view class="introduce-section">
 			<view style='height:70px;'>
-				<view class="title">{{goods.title}}(元/吨)</view>
+				<view class="title">{{goods.title}}</view>
 				<view class='flex justify-between'>
 					<view style='flex:1.5;color:#878C9C;'>{{goods.receivePrivate}}{{goods.receiveCity}}{{goods.receiveArea}}{{goods.receiveWarehouse}}</view>
 					<view  v-if='goods.procurementPlanType=="现货"' class="title-tip">
-						<text class="price">{{goods.unitPrice}}</text>
+						{{goods.procurementPrice}}
 					</view>
 					<view style='text-align:right;'  v-else class="title-tip">
 						{{goods.basisPrice}}
@@ -74,6 +74,18 @@
 						<text>{{goods.priceType}}</text>
 					</view>
 				</view>
+				<view v-if='goods.procurementPlanType=="现货"' class="c-row">
+					<text class="tit">采购价格(元/吨)</text>
+					<view class="con-list">
+						<text>{{goods.procurementPrice}}</text>
+					</view>
+				</view>
+				<view v-else class="c-row">
+					<text class="tit">基差(元/吨)</text>
+					<view class="con-list">
+						<text>{{goods.basisPrice}}</text>
+					</view>
+				</view>
 				<view class="c-row">
 					<text class="tit">收货地区</text>
 					<view class="con-list">
@@ -92,7 +104,7 @@
 						<text>{{goods.packingType}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view v-if='goods.baggingNotes' class="c-row">
 					<text class="tit">袋装备注</text>
 					<view class="con-list">
 						<text>{{goods.baggingNotes}}</text>
@@ -190,7 +202,7 @@
 				<view class='shade-content-item'>
 					您的粮商身份正在审核中，请耐心等待认证状态可在<text>我的-身份认证</text>中查看
 				</view>
-				<image @click='status==false' style='width:30px;height:30px;margin-top:10px;' src='../../static/img/jiaoyi/guanbi-2@3x.png'></image>
+				<image @click='status=false' style='width:30px;height:30px;margin-top:10px;' src='../../static/img/jiaoyi/guanbi-2@3x.png'></image>
 			</view>
 		</view>
 		<!-- 底部操作菜单 -->
@@ -198,7 +210,7 @@
 			<view>
 				<button type="primary" @click="contactUs">立即沟通</button>
 				<button  @click="salegrain" v-if="goods.pcFlag == 1" type="primary" class=" action-btn no-border add-cart-btn" >立即卖粮</button>
-				<button v-else type="primary" class=" action-btn no-border add-cart-btn" 
+				<button v-else type="primary" class="action-btn no-border add-cart-btn" 
 				@click="tradeNow">立即发车</button>
 			</view>
 		</view>
@@ -307,8 +319,7 @@
 					fail: (res) => {
 						console.log('调用失败!')
 					}
-				  });
-				
+				  });		
 			},
 			ViewImage(e) {
 				var img = [];
@@ -381,7 +392,7 @@
 							uni.navigateTo({
 								url: `/pageA/product/business_buy?id=${this.goods.id}&receiveArea=${this.goods.receiveArea}&minimumVolume=${this.goods.minimumVolume}
 										&goodsName=${this.goods.goodsName}&receiveCity=${this.goods.receiveCity}&receivePrivate=${this.goods.receivePrivate}&buyer=${this.goods.buyer}
-										&basisPrice=${this.goods.basisPrice}&unitPrice=${this.goods.unitPrice}&receiveWarehouse=${this.goods.receiveWarehouse}
+										&basisPrice=${this.goods.basisPrice}&procurementPrice=${this.goods.procurementPrice}&receiveWarehouse=${this.goods.receiveWarehouse}
 										&procurementPlanType=${this.goods.procurementPlanType}&procurementPlan=${this.goods.procurementPlanNo}&compId=${this.goods.compId}`
 							// 	url: `/pageA/product/business_buy?id=${this.goods.id}&packing=${this.goods.packing}}&province=${this.goods.province}
 							// 	&city=${this.goods.city}&area=${this.goods.area}&storeName=${this.goods.storeName}&seller=${this.goods.seller}
@@ -452,7 +463,6 @@
 					that.$api.msg('终止成功')
 					uni.hideLoading()
 					setTimeout(()=>{uni.navigateBack()},1000);
-					
 				})
 			},
 			navBack() {

pageA/product/lookup.vue

@@ -5,8 +5,10 @@
 			<view style='flex:6;' class="search-form round" >
 				<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
 				<input type="text" v-model="searchKeyWord" @input="doSearch" placeholder="请输入货名或标题" confirm-type="search"></input>
+				
 			</view>
-			<view style="width:4%;flex:1;">取消</view>
+			<view @click='emptysearch1' style="width:4%;flex:1;">{{content}}</view>
+			<text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text>
 			</view>
 			<!-- mSearch组件 如果使用原样式，删除组件元素-->
 			<!-- <mSearch class="mSearch-input-box" :mode="2" button="inside" :placeholder="defaultKeyword" @search="doSearch(false)" @input="inputChange" @confirm="doSearch(false)" v-model="keyword"></mSearch> -->
@@ -30,22 +32,35 @@
 						<view class="price-box">
 							<view class="title">{{item.title}}</view>
 							<view style='dsiplay:flex;' class='flex justify-between'>
-								<view class='address'>
+								<view v-if='TabCur==0' class='address'>
 									{{item.receivePrivate}}{{item.receiveCity}}{{item.receiveArea}}{{item.receiveWarehouse}}
 								</view>
-								<view class='price' v-if='item.procurementPlanType=="期货"'>{{item.basisPrice}}<text style='font-size:13px;color:#333333;'>元/吨</text></view>
-								<view class='price' v-if='item.procurementPlanType=="现货"'>{{item.unitPrice}}<text style='font-size:13px;color:#333;'>元/吨</text></view>
+								<view v-if='TabCur==1' class='address'>
+									{{item.sendPrivate}}{{item.sendCity}}{{item.sendArea}}{{item.sendWarehouse}}
+								</view>
+								<view class='price' v-if='item.procurementPlanType=="期货"'>{{item.basisPrice}}<text
+										style='font-size:13px;color:#333333;'>元/吨</text></view>
+								<view class='price' v-if='item.procurementPlanType=="现货"'>{{item.unitPrice}}<text
+										style='font-size:13px;color:#333;'>元/吨</text></view>
+								<view class='price' v-if='item.salePlanType=="期货"'>{{item.basisPrice}}<text
+									style='font-size:13px;color:#333333;'>元/吨</text></view>
+								<view class='price' v-if='item.salePlanType=="现货"'>{{item.unitPrice}}<text
+									style='font-size:13px;color:#333;'>元/吨</text></view>
 							</view>
 						</view>
 						<view class='flex justify-between'>
 							<view>
 								<view class='tag1 tag-bule radius line-pink' v-if='item.procurementPlanType=="现货"'>现货</view>
 								<view class='tag1 tag-bule radius line-pink' v-if='item.procurementPlanType=="期货"'>期货</view>
+								<view class='tag1 tag-bule radius line-pink' v-if='item.salePlanType=="现货"'>现货</view>
+								<view class='tag1 tag-bule radius line-pink' v-if='item.salePlanType=="期货"'>期货</view>
 								<view class='tag1 tag-yellow radius line-green'>{{item.goodsName}}</view>
 								<view class='tag1 tag-red radius line-yellow'>{{item.weight}}吨</view>
 							</view>
 							<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货"'>今日基差</view>
 							<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货"'>采购价格</view>
+							<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="期货"'>今日基差</view>
+							<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="现货"'>采购价格</view>
 						</view>
 					</view>
 					<view v-show="isLoadMore">
@@ -63,7 +78,7 @@
 				</view>
 			</view>
 			<scroll-view class="keyword-box" v-show="!isShowKeywordList" scroll-y>
-				<view class="keyword-block" v-if="oldKeywordList.length>0">
+				<view class="keyword-block" v-if="oldKeywordList.records.length>0">
 					<view class="keyword-list-header">
 						<view style='font-size:16px;font-weight:600;'>最近搜索</view>
 						<view>
@@ -74,7 +89,7 @@
 						</view>
 					</view>
 					<view class="keyword">
-						<view v-for="(keyword,index) in oldKeywordList" @tap="doSearch(keyword)" :key="index">{{keyword}}</view>
+						<view v-for="(keyword,index) in oldKeywordList.records" @tap="doSearch(keyword)" :key="index">{{keyword.searchContent}}</view>
 					</view>
 				</view>
 				 <view class="keyword-block">
@@ -85,7 +100,7 @@
 						</view>
 					</view>
 					<view class="keyword" v-if="forbid==''">
-						<view v-for="(keyword,index) in hotKeywordList" @tap="doSearch(keyword)" :key="index">{{keyword}}</view>
+						<view v-for="(keyword,index) in hotKeywordList" @tap="doSearch(keyword)" :key="index">{{keyword.searchContent}}</view>
 					</view>
 				</view> 
 			</scroll-view>
@@ -94,6 +109,9 @@
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	//引用mSearch组件，如不需要删除即可
 	import mSearch from '@/components/mehaotian-search-revision.vue';
 	export default {
@@ -104,28 +122,36 @@
 				pageSize:10,
 				currentPage:1,
 				oldKeywordList: [],
-				hotKeywordList: ["玉米","大豆","小麦","水稻","高粱","玉米淀粉","豆粕"],
+				hotKeywordList: [],
 				keywordList: [],
 				forbid: '',
 				isShowKeywordList: false,
 				TabCur:0,
 				isLoadMore:false,
 				loadStatus:'',
+				content:'搜索'
 			}
 		},
 		onLoad(options) {
-			this.searchKeyWord=options.searchKeyWord
+			if(options.searchKeyWord){
+				this.searchKeyWord=options.searchKeyWord
+			}
 			this.TabCur = options.TabCur
-			this.init();
 			if(this.searchKeyWord){
 				this.isShowKeywordList=true
 				this.getData()
 			}
 		},
+		onShow() {
+			this.init();
+		},
 		components: {
 			//引用mSearch组件，如不需要删除即可
 			mSearch
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
 		methods: {
 			//详情
 			navToDetailPage(item) {
@@ -148,13 +174,36 @@
 			init() {
 				this.loadDefaultKeyword();
 				this.loadOldKeyword();
-				// this.loadHotKeyword();
+				this.loadHotKeyword();
 
 			},
 			blur(){
 				uni.hideKeyboard()
 			},
-			
+			emptysearch1(){
+				if(this.content=='取消'){
+					this.searchKeyWord=''
+					this.content='搜索'
+				}
+			},
+			emptysearch(){
+				this.searchKeyWord=''
+				this.content='搜索'
+			},
+			loadHotKeyword(){
+				this.$api.doRequest('get', '/searchRecordsInfo/selectRecommendedSearchRecordsInfo',{pageSize:this.pageSize,
+				currentPage:this.currentPage,commonId:this.userInfo.id}).then(res => {
+					uni.hideLoading()
+					this.hotKeywordList=res.data.data.records
+				})
+				.catch(res => {
+					uni.showToast({
+						title: res.errmsg,
+						icon:'none',
+						duration: 2000
+					})
+				});
+			},
 			tabSelect(e) {
 				if(e.currentTarget.dataset.id){
 					this.TabCur = e.currentTarget.dataset.id;
@@ -171,7 +220,7 @@
 				if (this.TabCur == 0) {
 					param1 = '/procurementPlanInfo/selectProcurementPlanInfo'
 				} else {
-					param1 = 'buy'
+					param1 = '/salePlanInfo/selectSalePlanInfo'
 				}
 				this.$api.doRequest('get', param1,{pageSize:this.pageSize,
 				currentPage:this.currentPage,searchKeyWord:this.searchKeyWord}).then(res => {
@@ -193,13 +242,13 @@
 			},
 			//加载历史搜索,自动读取本地Storage
 			loadOldKeyword() {
-				uni.getStorage({
-					key: 'OldKeys',
-					success: (res) => {
-						var OldKeys = JSON.parse(res.data);
-						this.oldKeywordList = OldKeys;
-					}
-				});
+				var that=this
+				this.$api.doRequest('get', '/searchRecordsInfo/selectSearchRecordsInfo',{pageSize:this.pageSize,
+				currentPage:this.currentPage,commonId:this.userInfo.id}).then(res => {
+					uni.hideLoading()
+					that.oldKeywordList=res.data.data
+					console.log(that.oldKeywordList)
+				})
 			},
 			//监听输入
 			inputChange(event) {
@@ -242,14 +291,27 @@
 			},
 			//清除历史搜索
 			oldDelete() {
+				var that=this
 				uni.showModal({
 					content: '确定清除历史搜索记录？',
 					success: (res) => {
 						if (res.confirm) {
-							console.log('用户点击确定');
-							this.oldKeywordList = [];
-							uni.removeStorage({
-								key: 'OldKeys'
+							this.$api.doRequest('post', '/searchRecordsInfo/api/deleteSearchRecordsInfo',{commonId:this.userInfo.id}).then(res => {
+								if(res.data.code==200){
+									uni.showToast({
+										title: '清除历史搜索成功',
+										icon:'none',
+										duration: 2000
+									})
+									that.oldKeywordList.records=[]
+								}
+							})
+							.catch(res => {
+								uni.showToast({
+									title: '清除历史搜索成功',
+									icon:'none',
+									duration: 2000
+								})
 							});
 						} else if (res.cancel) {
 							console.log('用户点击取消');
@@ -265,17 +327,35 @@
 			doSearch(e) {
 				if(e.detail){
 					if(e.detail.value.length>0){
+						this.content='取消'
 						this.isShowKeywordList=true
+						this.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{commonId:this.userInfo.id,searchContent:e.detail.value}).then(res => {
+						})
+						.catch(res => {
+							
+						});
 					}else{
+						this.content='搜索'
 						this.isShowKeywordList=false
+						this.loadOldKeyword()
+						this.loadHotKeyword()
 					}
 				}
 				else if(e){
 					if(e.length>0){
 						this.isShowKeywordList=true
+						this.content='取消'
 						this.searchKeyWord = e
+						this.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{commonId:this.userInfo.id,searchContent:e}).then(res => {
+						})
+						.catch(res => {
+							
+						})
 					}else{
+						this.content='搜索'
 						this.isShowKeywordList=false
+						this.loadOldKeyword()
+						this.loadHotKeyword()
 					}
 				}
 				uni.showLoading({
@@ -422,7 +502,10 @@
 	.keyword-box .keyword-block .keyword {width:94%;padding:3px 3%;display:flex;flex-flow:wrap;justify-content:flex-start;}
 	.keyword-box .keyword-block .hide-hot-tis {display:flex;justify-content:center;font-size:28upx;color:#6b6b6b;}
 	.keyword-box .keyword-block .keyword>view {display:flex;justify-content:center;align-items:center;border-radius:60upx;padding:0 20upx;margin:10upx 20upx 10upx 0;height:60upx;font-size:28upx;background-color:rgb(242,242,242);color:#6b6b6b;}
-
+	.cuIcon-roundclosefill{
+		position:absolute;
+		right:80px;
+	}
 	.tag1 {
 		background:#F5F6F9;
 		padding: 5px;

pageA/product/sales_detail.vue

@@ -6,18 +6,18 @@
 		<image style='width:100%;' src='../../static/img/jiaoyi/bg@3x.png'></image>
 		<view class="introduce-section">
 			<view style='height:70px;'>
-				<view class="title">{{goods.title}}(元/吨)</view>
+				<view class="title">{{goods.title}}</view>
 				<view class='flex justify-between'>
-					<view style='flex:1.5;color:#878C9C;'>{{goods.receivePrivate}}{{goods.receiveCity}}{{goods.receiveArea}}{{goods.receiveWarehouse}}</view>
-					<view  v-if='goods.procurementPlanType=="现货"' class="title-tip">
-						<text class="price">{{goods.unitPrice}}</text>
+					<view style='flex:1.5;color:#878C9C;'>{{goods.sendPrivate}}{{goods.sendCity}}{{goods.sendArea}}{{goods.sendWarehouse}}</view>
+					<view  v-if='goods.salePlanType=="现货"' class="title-tip">
+						{{goods.salePrice}}
 					</view>
 					<view style='text-align:right;'  v-else class="title-tip">
-						{{goods.basisPrice}}
+						+{{goods.basisPrice}}
 					</view>
 				</view>
-				<view style='text-align:right;' v-if='goods.procurementPlanType=="现货"'>采购价格</view>
-				<view style='text-align:right;' v-if='goods.procurementPlanType=="期货"'>今日基差</view>
+				<view style='text-align:right;' v-if='goods.salePlanType=="现货"'>销售价格</view>
+				<view style='text-align:right;' v-if='goods.salePlanType=="期货"'>今日基差</view>
 			</view>
 		</view>
 		<view v-if="goods.storeImg" class="carousel-section">
@@ -83,7 +83,7 @@
 				<view class="c-row" v-if="goods.salePlanType == '现货'">
 					<text class="tit">销售价格（元/吨）</text>
 					<view class="con-list">
-						<text>{{goods.unitPrice}}</text>
+						<text>{{goods.salePrice}}</text>
 					</view>
 				</view>
 				<view class="c-row">
@@ -104,7 +104,7 @@
 						<text>{{goods.packingType}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.packingType == '大袋' || goods.packingType == '小袋'">
 					<text class="tit">袋装备注</text>
 					<view class="con-list">
 						<text>{{goods.baggingNotes}}</text>
@@ -202,7 +202,7 @@
 				<view class='shade-content-item'>
 					您的粮商身份正在审核中，请耐心等待认证状态可在<text>我的-身份认证</text>中查看
 				</view>
-				<image @click='status==false' style='width:30px;height:30px;margin-top:10px;' src='../../static/img/jiaoyi/guanbi-2@3x.png'></image>
+				<image @click='status=false' style='width:30px;height:30px;margin-top:10px;' src='../../static/img/jiaoyi/guanbi-2@3x.png'></image>
 			</view>
 		</view>
 		<!-- 底部操作菜单 -->
@@ -250,8 +250,8 @@
 					moldy: 0,
 					impurity: 0,
 					overFlow: 0,
-					seller:'',
-					sellerPhone:'',
+					buyer:'',
+					buyerPhone:'',
 					minSale: 0,
 					status:0
 				},
@@ -262,13 +262,12 @@
 				},
 				reason:"",
 				price:undefined,
-				
-
 			};
 		},
 		onShow() {
 		},
 		onLoad(options) {
+			this.goods.compId=options.compId
 			const that = this
 			uni.showLoading({
 				title: '正在加载',
@@ -385,8 +384,8 @@
 							uni.navigateTo({
 								url: `/pageA/product/business_sale?id=${this.goods.id}&sendArea=${this.goods.sendArea}&minimumVolume=${this.goods.minimumVolume}
 										&goodsName=${this.goods.goodsName}&sendCity=${this.goods.sendCity}&sendPrivate=${this.goods.sendPrivate}&seller=${this.goods.seller}
-										&basisPrice=${this.goods.basisPrice}&salePrice=${this.goods.salePrice}&sendWarehouse=${this.goods.sendWarehouse}
-										&salePlanType=${this.goods.salePlanType}&salePlanNo=${this.goods.salePlanNo}&baggingNotes=${this.goods.baggingNotes}`
+										&basisPrice=${this.goods.basisPrice}&salPrice=${this.goods.salePrice}&sendWarehouse=${this.goods.sendWarehouse}
+										&salePlanType=${this.goods.salePlanType}&salePlan=${this.goods.salePlanNo}&baggingNotes=${this.goods.baggingNotes}&compId=${this.goods.compId}`
 							// 	url: `/pageA/product/business_buy?id=${this.goods.id}&packing=${this.goods.packing}}&province=${this.goods.province}
 							// 	&city=${this.goods.city}&area=${this.goods.area}&storeName=${this.goods.storeName}&seller=${this.goods.seller}
 							// 	&companyId=${this.goods.companyId}&sellerPhone=${this.goods.sellerPhone}&minSale=${this.goods.minSale}
@@ -467,49 +466,51 @@
 				// 	uni.hideLoading()
 				// 	this.goods=res.data.data
 				// })
-				// if (!this.hasLogin) {
-				// 	uni.showModal({
-				// 		title: '登录提示',
-				// 		content: '您尚未登录，是否立即登录？',
-				// 		showCancel: true,
-				// 		confirmText: '登录',
-				// 		success: (e) => {
-				// 			if (e.confirm) {
-				// 				uni.navigateTo({
-				// 					url: '/pages/public/login'
-				// 				})
-				// 			}
-				// 		},
-				// 		fail: () => {},
-				// 		complete: () => {}
-				// 	})
-				// }
-				// else{
-				// 	uni.showModal({
-				// 		    title: '温馨提示',
-				// 		    content: '请在发车前认真核实买方身份，并在签订正规的交易合同后发起发车操作，是否继续发车？',
-				// 		    confirmText: "发车",
-				// 			confirmColor: '#22C572',
-				// 			success: function (res) {
-				// 		        if (res.confirm) {
-				// 					uni.navigateTo({//跳转页面
-				// 						url:"../index/index"
-				// 					})
-				// 		        } else if (res.cancel) {
-				// 		        }
-				// 		    }
-				// 		});
-				// 	const that = this
-				// 	uni.navigateTo({
-				// 		url: `/pageA/product/trade?id=${that.goods.id}&packing=${that.goods.packing}}&province=${that.goods.province}
-				// 		&city=${that.goods.city}&area=${that.goods.area}&storeName=${that.goods.storeName}&seller=${that.goods.seller}
-				// 		&companyId=${that.goods.companyId}&sellerPhone=${that.goods.sellerPhone}&minSale=${that.goods.minSale}
-				// 		&exsitCount=${that.goods.total}&isFutures=${that.goods.isFutures}
-				// 		&basis=${that.goods.basis}&basisSmall=${that.goods.basisSmall}&basisBig=${that.goods.basisBig}
-				// 		&unloadingFee=${that.goods.unloadingFee}`
-				// 	})
-				// }
-				
+				if (!this.hasLogin) {
+					uni.showModal({
+						title: '登录提示',
+						content: '您尚未登录，是否立即登录？',
+						showCancel: true,
+						confirmText: '登录',
+						success: (e) => {
+							if (e.confirm) {
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					})
+				}
+				else{
+					uni.showModal({
+						    title: '温馨提示',
+						    content: '请在发车前认真核实买方身份，并在签订正规的交易合同后发起发车操作，是否继续发车？',
+						    confirmText: "发车",
+							confirmColor: '#22C572',
+							success: function (res) {
+						        if (res.confirm) {
+									uni.navigateTo({//跳转页面
+										url:"../index/index"
+									})
+						        } else if (res.cancel) {
+						        }
+						    }
+						});
+					const that = this
+					uni.navigateTo({
+						// url: `/pageA/product/business_sale?id=${that.goods.id}&packing=${that.goods.packing}}&province=${that.goods.province}
+						// &city=${that.goods.city}&area=${that.goods.area}&storeName=${that.goods.storeName}&seller=${that.goods.seller}
+						// &companyId=${that.goods.companyId}&sellerPhone=${that.goods.sellerPhone}&minSale=${that.goods.minSale}
+						// &exsitCount=${that.goods.total}&isFutures=${that.goods.isFutures}
+						// &basis=${that.goods.basis}&basisSmall=${that.goods.basisSmall}&basisBig=${that.goods.basisBig}
+						// &unloadingFee=${that.goods.unloadingFee}`
+						url:`/pageA/product/business_sale?id=${that.goods.id}&buyer=${that.goods.buyer}&seller=${that.goods.seller}&sendPrivate=${that.goods.sendPrivate}
+						&sendCity=${that.goods.sendCity}&sendArea=${that.goods.sendArea}&sendWarehouse=${that.goods.sendWarehouse}&goodsName=${that.goods.goodsName}
+						&minimumVolume=${that.goods.minimumVolume}&unitPrice=${that.goods.unitPrice}&basisPrice=${that.goods.basisPrice}&salePlanType=${that.goods.salePlanType}`
+					})
+				}
 			}
 		},
 

pageB/contract/collectLook.vue

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

pageB/contract/contract.vue

@@ -1,34 +1,47 @@
 <template>
-	<view class="center">	
+	<view class="center">
 		<view v-for="(item , index) in lists" :Key="index" class="region">
 			<view>
 				<view class="c-row ">
-					<text class="tit">{{item.orderType}}</text>
+					<text class="tit" v-if="item.orderType == '采购'">{{item.orderType}}</text>
+					<text class="tit2" v-if="item.orderType == '销售'">{{item.orderType}}</text>
 					<view class="enterprise">
-						编号{{item.contractNo}}{{item.procurementPlanType}}
+						编号{{item.contractNo}}({{item.procurementPlanType}})
 					</view>
-					<text class="status">{{item.status}}</text>
+					<!-- <text class="status status1" v-if="item.status == '已挂单'">{{item.status}}</text>
+					<text class="status status2" v-if="item.status == '已成交'">{{item.status}}</text>
+					<text class="status status3" v-if="item.status == '已完成'">{{item.status}}</text>
+					<text class="status status1" v-if="item.status == '审核中'">{{item.status}}</text>
+					<text class="status status1" v-if="item.status == '执行中'">{{item.status}}</text> -->
+					<text class="status status1">{{item.status}}</text>
+
 				</view>
-				
 			</view>
 			<view>
 				<view class="c-row ">
-					<text class="tit1">买方</text>
+					<text class="tit1" v-if="item.orderType == '采购'">买方</text>
+					<text class="tit1" v-if="item.orderType == '销售'">卖方</text>
 					<view class="enterprise">
-						{{item.customer}}
+						{{item.contracter}}
 					</view>
 				</view>
 			</view>
 			<view class="forList flex">
-				<view class="title">{{item.goodsName}}:<text>{{item.goodsName}}</text></view>
+				<view class="title">{{item.goodsName}}:<text>{{item.transactionsNumber}}</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 class="anniu1" @click="commit2(item)"> 收货</text>
+				<text class="anniu" @click="commit(item)"> 附件</text>
+				<text class="anniu" @click="someprice(item)"
+					v-if="item.procurementPlanType == '期货' && (item.status == '已成交' || item.status == '已挂单')"> 点价</text>
+				<text class="anniu1" @click="commit1(item)" v-if="item.orderType == '采购'"> 发货</text>
+
+			<!-- 	<text class="anniu" @click="commit"> 附件</text>
+				<text class="anniu" @click="someprice(item)" v-if="item.procurementPlanType == '期货' && (item.status == '已成交' || item.status == '已挂单')"> 点价</text>
+				<text class="anniu1" @click="commit1(item)" v-if="item.orderType == '采购'&&item.status != '待审核'"> 发货</text> -->
+
+				<text class="anniu1" @click="commit2(item)" v-if="item.orderType == '销售'"> 收货</text>
 			</view>
 		</view>
 		<view v-if='pricestatus' class='shade'>
@@ -52,7 +65,7 @@
 					<view class="timeslot">15：20 ~ 20：00</view>
 					<view class="timeslot">23：00 ~ 08：00</view>
 				</view>
-				<view  class="cancel" @click='shadestatus=false'>知道了</view>
+				<view class="cancel" @click='shadestatus=false'>知道了</view>
 			</view>
 		</view>
 		<view class="padding flex flex-direction">
@@ -77,13 +90,13 @@
 				goods: {
 					pageSize: 10,
 					currentPage: 1,
-					id: "41651544",
 					// pcFlag : 0,
 				},
 				procurementPlanInfo: {
 					pageSize: 10,
 					currentPage: 1
 				},
+				price: "",
 				tran: {
 					total: 0,
 					price: 0,
@@ -214,19 +227,24 @@
 					this.shadestatus = true
 				}
 			},
+			commit(item) {
+				uni.navigateTo({
+					url: `/pageB/contract/enclosures?id=${item.id}`
+				})
+			},
 			commit1(item) {
 				uni.navigateTo({
-					url: `/pageB/contract/look?id=${item.id}&contractNo=${item.contractNo}&customer=${item.customer}&goodsName=${item.goodsName}`
+					url: `/pageB/contract/look?id=${item.id}&contractNo=${item.contractNo}&contracter=${item.contracter}&goodsName=${item.goodsName}`
 				})
 			},
 			commit2(item) {
 				uni.navigateTo({
-					url: `/pageB/contract/collectLook?id=${item.id}&contractNo=${item.contractNo}&customer=${item.customer}&goodsName=${item.goodsName}`
+					url: `/pageB/contract/collectLook?id=${item.id}&contractNo=${item.contractNo}&customer=${item.customer}&goodsName=${item.goodsName}&contracter=${item.contracter}`
 				})
 			},
 			getList() {
 				this.goods.commonId = this.userInfo.id
-
+				// this.goods.pcFlag = 0
 				this.$api.doRequest('get', '/purchaseOrder/selectPurchaseOrderApp', this.goods).then(res => {
 						if (res.data.code == 200) {
 							this.lists = res.data.data.records
@@ -298,7 +316,6 @@
 			// 				} else if (e.currentTarget.dataset.index == 5) {
 			// 					this.carNoImg1 = "";
 			// 				}
-
 			// 			}
 			// 		}
 			// 	})
@@ -711,7 +728,7 @@
 		width: 100%;
 		background: rgba(0, 0, 0, 0.5);
 		height: 100%;
-		
+
 		z-index: 999999;
 	}
 
@@ -772,7 +789,7 @@
 
 	.forList .title {
 		line-height: 30px;
-		margin-left: 15px;
+		margin-left: 25px;
 		color: #9698A2;
 	}
 
@@ -794,16 +811,28 @@
 		border-radius: 5px;
 	}
 
+	.tit2 {
+		width: 34px;
+		height: 24px;
+		background-color: #EBEEFA;
+		color: #5C76DF;
+		padding: 2px 3px;
+		border-radius: 5px;
+	}
+
 	.enterprise {
 		font-size: 16px;
 		font-weight: 600;
 		margin-left: 20px;
 	}
-	.annius{
+
+	.annius {
 		width: 70%;
-	margin-left: 110px;
+		margin-left: 110px;
+		justify-content: flex-end;
 	}
-	.anniu{
+
+	.anniu {
 		width: 50px;
 		font-size: 16px;
 		border: 1px solid #CDCDCD;
@@ -813,7 +842,8 @@
 		text-align: center;
 		line-height: 30px;
 	}
-	.anniu1{
+
+	.anniu1 {
 		width: 50px;
 		font-size: 16px;
 		border: 1px solid #22C572;
@@ -824,58 +854,79 @@
 		text-align: center;
 		line-height: 30px;
 	}
-	.titles{
+
+	.titles {
 		color: #333333;
 		font-size: 16px;
 		font-weight: 600;
 		margin-top: -16px;
 		margin-bottom: 10px;
-		
+
 	}
-	.timeslot{
+
+	.timeslot {
 		font-size: 14px;
 		color: #333333;
 		height: 20px;
 	}
-	.cancel{
+
+	.cancel {
 		text-align: center;
 		width: 100%;
-		color:#22C572;
+		color: #22C572;
 		border-top: 1px solid #EEEEEE;
 		margin-bottom: 6px;
 		font-size: 18px;
 		line-height: 40px;
-		display:inline-block;
-		}
-		.pointprice{
-			border-bottom: 1px solid #EEEEEE;
-			text-align: left;
-			padding-left: 10px;
-			width: 70%;
-			margin: 0 auto;
-		}
-		.titles1{
-			color: #333333;
-			font-size: 16px;
-			font-weight: 600;
-			margin-top: 10px;
-		}
-		.btns{
-			width: 50%;
-			line-height: 50px;
-			font-size: 18px;
-			border-top: 1px solid #EEEEEE;
-			margin-top: -20px;
-		}
-		.btn1{
-			color: #AFB3BF;
-			border-right: 1px solid #EEEEEE;
-		}
-		.btn2{
-			color: #22C572;
-		}
-		.status{
-			right: 20px;
-			position: absolute;
-		}
+		display: inline-block;
+	}
+
+	.pointprice {
+		border-bottom: 1px solid #EEEEEE;
+		text-align: left;
+		padding-left: 10px;
+		width: 70%;
+		margin: 0 auto;
+	}
+
+	.titles1 {
+		color: #333333;
+		font-size: 16px;
+		font-weight: 600;
+		margin-top: 10px;
+	}
+
+	.btns {
+		width: 50%;
+		line-height: 50px;
+		font-size: 18px;
+		border-top: 1px solid #EEEEEE;
+		margin-top: -20px;
+	}
+
+	.btn1 {
+		color: #AFB3BF;
+		border-right: 1px solid #EEEEEE;
+	}
+
+	.btn2 {
+		color: #22C572;
+	}
+
+	.status {
+		right: 20px;
+		position: absolute;
+	}
+
+	.status1 {
+		color: #FE6430;
+	}
+
+	.status2 {
+		color: #22C572;
+	}
+
+	.status3 {
+		color: #AFB3BF;
+	}
 </style>

pageB/contract/contract_detail.vue

@@ -14,12 +14,14 @@
 			</view>
 			<view class="c-row b-b">
 				<view class="title">车牌号</view>
+				<view class="con-list">
 				<input maxlength='7' placeholder="请输入车牌号" name="input" v-model="goods.carNo"></input>
+				</view>
 			</view>
 			<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>
+				<input  maxlength='11' placeholder="请输入司机手机号" name="input" v-model="goods.driverPhone"></input>
 			  </view>
 			</view>
 			<view class="c-row b-b">
@@ -179,12 +181,13 @@
 			onShow() {
 			},
 			onLoad(option) {
-				this.goods.planId=options.planId
+				this.goods.planId=option.planId
 				this.goodsName=option.goodsName
 				this.contractNo = option.contractNo
 				this.goods.goodsName=option.goodsName
 				this.goods.contractNo = option.contractNo
 				this.goods.tranCarNo=option.tranCarNo
+				console.log(this.goods.tranCarNo)
 				
 			},
 			methods: {
@@ -282,8 +285,7 @@
 														loadPoundImg:'',
 														 contractNo:that.contractNo,
 														 goodsName:that.goodsName,
-														 sendDateStart:''
-														
+														 sendDateStart:''	
 													}
 												}else if (res.cancel) {
 													uni.navigateBack();

pageB/contract/enclosures.vue

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

pageB/contract/look.vue

@@ -2,8 +2,6 @@
 	<view class="center">	
 		<view class="c-list">
 			<view class="xinxiup">
-
-
 				<view class="c-row b-b">
 					<text class="tit">合同编号:</text>
 					<view class="con-list">
@@ -13,7 +11,7 @@
 				<view class="c-row b-b">
 					<text class="tit">买方名称:</text>
 					<view class="con-list">
-						<text>{{goods.customer}}</text>
+						<text>{{goods.contracter}}</text>
 					</view>
 				</view>
 				<view class="c-row">
@@ -51,31 +49,32 @@
 						<text>{{item.deductionAmount}}</text>
 					</view>
 				</view>
-				<view class="c-row b-b">
+				<view class="c-row b-b" v-if=" item.deductionItems == null && item.confirmFlag == 1">
 					<text class="tit">扣款原因</text>
 					<view class="con-list">
 						<text>{{item.deductionItems}}</text>
 					</view>
 				</view>
-				<view class="c-row ">
-					<button v-if='item.loadPoundImg' class="cu-btn commit margin-tb-sm lg"
-						style="background-color:  #4CD964; width: 210rpx;height: 30px; "
-						@click="shipments(item)">发货磅单</button>
-					<button v-if='item.unloadPoundImg' class="cu-btn commit margin-tb-sm lg"
-						style="background-color:  #1CBBB4; margin-left: 15px; width: 210rpx;height: 30px;"
-						@click="unload(item)">收货磅单</button>
-					<!-- </view> -->
+				<view  v-if='item.loadPoundImg'>
+					<view class="poundtitle">发货磅单</view>
+					<view class="poundlists">
+						<image :src="item.loadPoundImg" mode="" class="poundlist"></image>
+					</view>
+				</view>
+				<view  v-if='item.unloadPoundImg'>
+					<view class="poundtitle">发货磅单</view>
+					<view class="poundlists">
+						<image :src="item.loadPoundImg" mode="" class="poundlist"></image>
+					</view>
 				</view>
 
 			</view>
 		</view>
 		<view class="c-list">
-			
 				<button class=" btn btns" style="background-color: #FFFFFF; "
 					@click="commit1(goods)">
 					<image src="../../static/img/jiaoyi/ic_fabu@2x.png" style="width: 24px; height: 24px;top: 7px;"></image>
 					添加发车信息</button>
-
 				<button class=" btn btns" style="background-color: #22C572; color: #FFFFFF ; "
 					@click="confirmunload(item)" >确认卸货</button>
 			
@@ -144,7 +143,7 @@
 		},
 		onLoad(option) {
 			this.goods.goodsName = option.goodsName
-			this.goods.customer = option.customer
+			this.goods.contracter = option.contracter
 			this.id = option.id
 			this.planId=option.planId
 			this.goods.contractNo = option.contractNo
@@ -1020,4 +1019,17 @@
 	.btns {
 		background-color: #22C572;
 	}
+	.poundlist{
+		width: 62px;
+		height: 85px;
+	}
+	.poundlists{
+		margin-left: 14px;
+		margin-top: 10px;
+		}
+	.poundtitle{
+		font-size: 15px;
+		margin-left: 14px;
+		margin-top: 10px;
+	}
 </style>

pageD/identity/companyIdentity.vue

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

pageD/identity/companyIdentityThree.vue

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

pageD/identity/companyIdentityTwo.vue

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

pageD/identity/driverIdentity.vue

@@ -39,7 +39,7 @@
 			<view class="c-row b-b">
 				<text class="tit">手机号</text>
 				<view class="con-list">
-					<input placeholder="请填写手机号" name="input" v-model="DriverViewInfo.driverPhone"></input>
+					<input placeholder="请填写手机号" maxlength = "11"  name="input" v-model="DriverViewInfo.driverPhone"></input>
 				</view>
 			</view>
 			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
@@ -48,15 +48,16 @@
 				<view style='width:70%;position:relative;margin-left: 200px;'>
 					<view class="con-list">
 						<!-- style='width:70%;position:relative;margin-left: 200px;' -->
-						<input v-model='verifyCode' placeholder="请输入验证码" type="text">
+						<input v-model='verifyCode' maxlength = "6"  placeholder="请输入验证码" type="text">
 					</view>
-
 				</view>
 			</view>
 			<view class="c-row ">
 				<text class="tit">常驻城市</text>
 				<view class="con-list">
-					<input placeholder="请填写常驻城市" name="input" v-model="DriverViewInfo.residentCityProvincial"></input>
+					<!-- <input placeholder="请填写常驻城市" name="input" v-model="DriverViewInfo.residentCityProvincial"></input> -->
+					<view @click='regionchange'>{{region}}</view>
+					<u-picker :params='params' @confirm='regionpicker' mode="region" v-model="show"></u-picker>
 				</view>
 			</view>
 		</view>
@@ -104,7 +105,12 @@
 				certificatesTwo:true,
 				certificates:true,
 				verification:true,
-
+				region:"请选择常驻城市",
+				show:false,
+				params: {
+					province: true,
+					city: true,
+				},
 			}
 		},
 		computed: {
@@ -116,6 +122,15 @@
 			// 		this.codestatus = true
 			// 	}
 			// },
+			regionchange() {
+				this.show = true
+			},
+			regionpicker(e) {
+				// this.deptList.outputPrivate = e.province.label
+				// this.deptList.outputCity = e.city.label
+				this.region = e.province.label + '-' + e.city.label
+				this.DriverViewInfo.residentCityProvincial = e.province.label + e.city.label
+			},
 			jumpUrl() {
 				if (this.id[0] == "" || this.id[0] == null) {
 					this.$api.msg('请上传身份证正面！')
@@ -129,54 +144,67 @@
 					this.$api.msg('姓名不能为空')
 					return
 				}
+				if (this.DriverViewInfo.driverName.length < 2 || this.DriverViewInfo.driverName.length > 10) {
+					this.$api.msg('姓名输入错误')
+					return
+				}
+			
 				if (!this.DriverViewInfo.numberCard) {
 					this.$api.msg('身份证号不能为空')
 					return
 				}
+				if (this.DriverViewInfo.numberCard.length != 18) {
+					this.$api.msg('身份证号输入错误')
+					return
+				}
 				if (!this.DriverViewInfo.driverPhone) {
 					this.$api.msg('手机号不能为空')
 					return
 				}
+				if (this.DriverViewInfo.driverPhone.length != 11) {
+					this.$api.msg('手机号输入错误')
+					return
+				}
+				if(!this.verifyCode){
+					this.$api.msg('验证码不能为空')
+					return
+				}
+				if(this.verifyCode.length != 6){
+					this.$api.msg('验证码输入错误')
+					return
+				}
 				if (!this.DriverViewInfo.residentCityProvincial) {
 					this.$api.msg('常住城市不能为空')
 					return
 				}
 				this.amendprice()
-				if(this.verification == false){
-					return
-				}
-				this.DriverViewInfo.cardAddressUrl = this.id.toString()
-				var model = JSON.stringify(this.DriverViewInfo);
-				uni.navigateTo({
-					url: `/pageD/identity/driverIdentityTwo?DriverViewInfo=` + model,
-				})
 			},
-			amendprice() {
+			async amendprice() {
 				var that = this
 				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
 						phone: this.DriverViewInfo.driverPhone,
 						verifyCode: this.verifyCode
 					}).then(res => {
 						if (res.data.code == 200) {
-							
+							that.DriverViewInfo.cardAddressUrl = that.id.toString()
+							var model = JSON.stringify(that.DriverViewInfo);
+							uni.navigateTo({
+								url: `/pageD/identity/driverIdentityTwo?DriverViewInfo=` + model,
+							})
 						} else {
-							that.verification = false
-							uni.showToast({
+							uni.showToast({		
 								title: res.data.message,
 								icon: 'none',
 								duration: 2000
 							})
-							return false
 						}
 					})
 					.catch(res => {
-						that.verification = false
 						uni.showToast({
 							title: res.data.message,
 							icon: 'none',
 							duration: 2000
 						})
-						return false
 					});
 			},
 			getcode() {
@@ -247,8 +275,16 @@
 								that.certificates = false
 								that.personImgs.personImg = that.id[0]
 								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.personImgs).then(res => {
-									that.$set(that.DriverViewInfo,'driverName',res.data.data.recPerson)
-									that.$set(that.DriverViewInfo,'numberCard',res.data.data.recPersonNo)
+									if(res.data.data.recPerson != null){
+										if(res.data.data.recPerson != ""){
+											that.$set(that.DriverViewInfo,'driverName',res.data.data.recPerson)
+										}
+									}
+									if(res.data.data.recPersonNo != null){
+										if(res.data.data.recPersonNo != ""){
+											that.$set(that.DriverViewInfo,'numberCard',res.data.data.recPersonNo)
+										}
+									}
 								}).catch(res => {
 									uni.showToast({
 										title: res.data.message,
@@ -275,6 +311,25 @@
 								that.id[1] = strToObj.url
 								that.id2 = strToObj.url
 								that.certificatesTwo = false
+								that.personImgs.personImg = that.id[1]
+								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.personImgs).then(res => {
+									if(res.data.data.recPerson != null){
+										if(res.data.data.recPerson != ""){
+											that.$set(that.DriverViewInfo,'driverName',res.data.data.recPerson)
+										}
+									}
+									if(res.data.data.recPersonNo != null){
+										if(res.data.data.recPersonNo != ""){
+											that.$set(that.DriverViewInfo,'numberCard',res.data.data.recPersonNo)
+										}
+									}
+								}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								})
 							}
 						})
 					}

pageD/identity/driverIdentityEdit.vue

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

pageD/identity/driverIdentityThree.vue

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

pageD/identity/driverIdentityTwo.vue

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

pageD/myRelease/Identity_switching.vue

@@ -1,38 +1,40 @@
 <template>
 	<view class="center">
-		<view v-for="(item , index) in lists" :Key="index">
-			<view class="forList">
-				<view class="flex">
-					<view class="company" v-if="item.customerType == '企业'">{{item.customerType}}</view>
-					<view class="company1" v-if="item.customerType == '个人'">{{item.customerType}}</view>
-					<view class="guess-item" @click="navToDetailPage(item)">
-				</view>
-				
-					<view class="infos">
-
-						<view class="info1">{{item.customerName}}
-							<view class='but but1' v-if="item.authenticationStatus == '已认证'">{{item.authenticationStatus}}</view>
-							<view class='but but2' v-if="item.authenticationStatus == '审核中'">{{item.authenticationStatus}}</view>
-							<view class='but but3' v-if="item.authenticationStatus == '未通过'">{{item.authenticationStatus}}</view>
-							<view class='but but4' v-if="item.authenticationStatus == '已覆盖'">{{item.authenticationStatus}}</view>
-						</view>
-						<view class="info2">{{item.customerPhone}}</view>
-					
+		<view v-if='lists.length>0'>
+			<view v-for="(item , index) in lists" :Key="index">
+				<view @click="navToDetailPage(item)" class="forList">
+					<view class="flex">
+						<view class="company" v-if="item.customerType == '企业'">{{item.customerType}}</view>
+						<view class="company1" v-if="item.customerType == '个人'">{{item.customerType}}</view>
+						<view class="infos">
+							<view class="info1">
+							<text v-if='item.customerTypeFlag==1'>{{item.customerName}}</text>
+							<text v-if='item.customerTypeFlag==2'>{{item.compName}}</text>
+								<view class='but but1' v-if="item.authenticationStatus == '已认证'">{{item.authenticationStatus}}</view>
+								<view class='but but2' v-if="item.authenticationStatus == '审核中'">{{item.authenticationStatus}}</view>
+								<view class='but but3' v-if="item.authenticationStatus == '未通过'">{{item.authenticationStatus}}</view>
+								<view class='but but4' v-if="item.authenticationStatus == '已覆盖'">{{item.authenticationStatus}}</view>
+							</view>
+							<view class="info2">{{item.customerPhone}}</view>
 						
-					</view>
+							
+						</view>
 
+					</view>
+						<hr style="margin: 10px 0px;">
+					<label>
+						<checkbox style='transform: scale(0.8);' :value='item.id' :checked="item.checked" @click.stop="checkBox($event,item)" ></checkbox>
+						<text>设置默认</text>
+					</label>
 				</view>
-					<hr style="margin: 10px 0px;">
-				<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 style='text-align:center;' v-else>
+			当前暂无已认证的粮商身份
+		</view>
 	</view>
 
-	</view>
-	</view>
 </template>
 
 <script>
@@ -76,22 +78,24 @@
 				},
 			};
 		},
-		onShow(){
-			this.getList()
-		},
 		onLoad(options) {
 			this.id=options.id
 		},
+		onShow(){
+			this.getList()
+		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		methods: {
 			getList() {
+				console.log(this.userInfo)
 				this.identityAuthenticationInfo.commonId = this.userInfo.id
 				this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {
 						pageSize: 10,
 						currentPage: 1,
-						commonId: this.userInfo.id
+						commonId: this.userInfo.id,
+						flag:1
 					}, 'application/json;charset=UTF-8').then(res => {
 						if(res.data.code==200){
 							for(var i=0;i<res.data.data.records.length;i++){
@@ -145,6 +149,7 @@
 			// 	}
 			// },
 			navToDetailPage(item) {
+				console.log(11111)
 				// if (index == 1) {
 					if(item.customerTypeFlag==1){
 						uni.navigateTo({

pageD/myRelease/buyDetails.vue

@@ -1,15 +1,13 @@
 <template>
 	<view class="center">
 		<view class="buyup">
-			
-		
 			<view class="c-row b-b">
 				<text class="title">基本信息</text>
 			</view>
 		<view class="c-row b-b">
 			<text class="tit">名头</text>
 			<view class="con-list">
-				{{procurementPlanInfos.title}}
+				{{procurementPlanInfos.buyer}}
 			</view>
 		</view>
 		<view class="c-row b-b">
@@ -43,13 +41,20 @@
 			</view>
 			
 		</view>
+		
 		<view class="c-row b-b">
 			<text class="tit">价格类型</text>
 			<view class="con-list">
 				{{procurementPlanInfos.priceType}}
 			</view>
 		</view>
-		<view class="c-row b-b">
+		<view class="c-row b-b" v-if="procurementPlanInfos.procurementPlanType == '现货'">
+			<text class="tit">单价（元/吨）</text>
+			<view class="con-list">
+				{{procurementPlanInfos.procurementPrice}}
+			</view>
+		</view>
+		<view class="c-row b-b" v-if="procurementPlanInfos.procurementPlanType == '期货'">
 			<text class="tit">基差（元/吨）</text>
 			<view class="con-list">
 				{{procurementPlanInfos.basisPrice}}
@@ -223,11 +228,11 @@
 	    -webkit-box-direction: normal;
 	    -webkit-flex-direction: column;
 	    flex-direction: column;
-	    color: #303133;
+	    color: #AFB3BF;
 	    line-height: 40rpx;
 	    text-align: right;
 	    padding-right: 20rpx;
-		font-size: 14px;
+	    font-size: 14px;
 	}
 	.title{
 		font-size: 18px;

pageD/myRelease/buyEdit.vue

@@ -5,7 +5,7 @@
 		<view class="c-row b-b">
 			<text class="tit">名头</text>
 			<view class="con-list">
-				<text @click="navToDetailPage">{{deptList.procurementPlanNo}}</text>
+				<text @click="navToDetailPage">{{deptList.buyer}}</text>
 			</view>
 		</view>
 		<view class="c-row b-b">
@@ -34,12 +34,9 @@
 		</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 class="con-list">
+				{{deptList.procurementPlanType}}
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">价格类型</text>
@@ -51,7 +48,7 @@
 		<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.procurementPrice"></input>
 			</view>
 		</view>
 		<view class="c-row b-b" v-if="this.typesIndex == 1">
@@ -246,7 +243,7 @@
 		onLoad(options){
 			this.id=options.id
 			if(options.customerName){
-				this.deptList.procurementPlanNo = options.customerName
+				this.deptList.buyer = options.customerName
 			}
 			
 		},
@@ -256,9 +253,9 @@
 			this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo',{commonId:this.userInfo.id}).then(res => {
 				if(res.data.code==200){
 					if(res.data.data.customerTypeFlag==1){
-						that.$set(this.deptList,'procurementPlanNo',res.data.data.customerName)
+						that.$set(this.deptList,'buyer',res.data.data.customerName)
 					}else{
-						that.$set(this.deptList,'procurementPlanNo',res.data.data.compName)
+						that.$set(this.deptList,'buyer',res.data.data.compName)
 					}
 					this.goods=res.data.data
 				}
@@ -449,16 +446,16 @@
 					return
 				}
 				if(this.deptList.procurementPlanType == '现货'){
-					if (!this.deptList.unitPrice) {
+					if (!this.deptList.procurementPrice) {
 						this.$api.msg('单价不能为空')
 						return
 					}
-					if (this.deptList.unitPrice>100000||this.deptList.unitPrice<1) {
+					if (this.deptList.procurementPrice>100000||this.deptList.procurementPrice<1) {
 						this.$api.msg('单价输入错误')
 						return
 					}
-					if (this.deptList.unitPrice.indexOf('.')!=-1) {
-						if(this.deptList.unitPrice.split('.')[1].length>2){
+					if (this.deptList.procurementPrice.indexOf('.')!=-1) {
+						if(this.deptList.procurementPrice.split('.')[1].length>2){
 							this.$api.msg('单价输入错误')
 							return
 						}
@@ -558,7 +555,9 @@
 				}
 				}
 				this.insertProcurementPlanInfo = this.deptList
-				this.insertProcurementPlanInfo.basisPrice=-this.insertProcurementPlanInfo.basisPrice
+				if(this.deptList.procurementPlanType == '期货'){
+								this.insertProcurementPlanInfo.basisPrice=-this.insertProcurementPlanInfo.basisPrice
+					}
 		         this.insertProcurementPlanInfo.commonId = this.userInfo.id
 				 this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 				 uni.showModal({
@@ -658,7 +657,7 @@
 		-webkit-box-direction: normal;
 		-webkit-flex-direction: column;
 		flex-direction: column;
-		color: #303133;
+		color: #AFB3BF;
 		line-height: 40rpx;
 		text-align: right;
 		padding-right: 20rpx;

pageD/myRelease/buyGrain.vue

@@ -4,7 +4,7 @@
 			<view class="c-row b-b">
 				<text class="tit">名头</text>
 				<view class="con-list">
-					<text @click="navToDetailPage">{{deptList.procurementPlanNo}}</text>
+					<text @click="navToDetailPage">{{deptList.buyer}}<text class='tip_text cuIcon-right'></text></text>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -43,14 +43,13 @@
 			<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>
+					<input placeholder="请填写单价" name="input" v-model="deptList.procurementPrice"></input>
 				</view>
 			</view>
 			<view class="c-row b-b" v-if="this.typesIndex == 1">
@@ -72,11 +71,21 @@
 					<input placeholder="请输入买方手机号" name="input" v-model="deptList.buyerPhone"></input>
 				</view>
 			</view>
-			<view class="c-row ">
+			<!-- <view class="c-row ">
 				<text class="validate">获取验证码</text>
 				<view class="con-list">
 					<input placeholder="请填写6位短信验证码" name="input" v-model="deptList.title1"></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;'>
+					<view class="con-list">
+						<input v-model='verifyCode' placeholder="请输入验证码" type="text">
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="buylow">
@@ -85,49 +94,49 @@
 					style="font-size: 14px; ">完善更多信息<text
 						style="font-size: 10px; color: #AFB3BF;">（选填，可由客服人员代为完善）</text></text>
 			</view>
-			<view v-if='!checked' 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.waterContent"></input>
 						</view>
 			</view>
-			<view v-if='!checked' 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 v-if='!checked' 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 v-if='!checked' 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 v-if='!checked' 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 v-if='!checked' 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 v-if='!checked' 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 v-if='!checked' 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">
@@ -135,7 +144,7 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='!checked' 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">
@@ -143,14 +152,14 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' 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 v-if='!checked' 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">
@@ -158,7 +167,7 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='!checked' 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">
@@ -166,13 +175,13 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='!checked&&baoIndex==2||!checked&&baoIndex==3' class="c-row b-b">
+			<view v-if='checked&&baoIndex!=0' class="c-row b-b">
 				<text class="tit">袋装备注</text>
 				<view class="con-list">
 					<input placeholder="请填写袋装备注" name="input" v-model="deptList.baggingNotes"></input>
 				</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row b-b">
 				<text class="tit">运费承担方</text>
 				<picker @change="chengChange" :value="chengIndex" :range="chengType" class="con-list">
 					<view class="con-list">
@@ -218,13 +227,13 @@
 					province: true,
 					city: true,
 				},
-				checked: true,
+				checked: false,
 				insertProcurementPlanInfo: {},
-				liIndex: 0,
+				liIndex: -1,
 				liType: ['塔粮', '筛粮', '中粒', '大粒'],
-				pinIndex: 0,
-				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
-				nianIndex: 3,
+				pinIndex: -1,
+				pinType: ['一等品', '二等品', '三等品', '等外'],
+				nianIndex: -1,
 				nianType: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014', '2013', '2012',
 					'2011'
 				],
@@ -232,10 +241,17 @@
 				show1: false,
 				region: '请选择收货地区',
 				region1: '请选择产地',
-				baoIndex: 0,
-				baoType: ['不限（默认）', '散装', '大袋', '小袋'],
+				region2:"",
+				baoIndex: -1,
+				baoType: ['散装', '大袋', '小袋'],
 				chengIndex: -1,
-				chengType: ['可议', '买方承担', '卖方承担']
+				chengType: ['可议', '买方承担', '卖方承担'],
+				codestatus: false,
+				sendDisabled: false,
+				sendText: '获取验证码',
+				verifyCode:"",
+				verification:true,
+				// DriverViewInfo:{},
 			}
 		},
 		computed: {
@@ -243,31 +259,102 @@
 		},
 		onLoad(options) {
 			if (options.customerName) {
-				this.deptList.procurementPlanNo = options.customerName
+				this.deptList.buyer = options.customerName
 			}
 		},
 		onShow() {
 			var that = this
 			this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo', {
-				commonId: this.userInfo.id
+				commonId: that.userInfo.id
 			}).then(res => {
 				if (res.data.code == 200) {
 					if (res.data.data.customerTypeFlag == 1) {
-						that.$set(this.deptList, 'procurementPlanNo', res.data.data.customerName)
+						that.$set(that.deptList, 'buyer', res.data.data.customerName)
 					} else {
-						that.$set(this.deptList, 'procurementPlanNo', res.data.data.compName)
+						that.$set(that.deptList, 'buyer', res.data.data.compName)
 					}
-					this.goods = res.data.data
+					that.goods = res.data.data
 				}
 				uni.hideLoading()
 			})
 		},
 		methods: {
+			// async amendprice() {
+			// 	var that = this
+			// 	this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
+			// 			phone: this.deptList.buyerPhone,
+			// 			verifyCode: this.verifyCode
+			// 		}).then(res => {
+			// 			if (res.data.code == 200) {	
+			// 			} else {
+			// 				that.verification = false
+			// 				uni.showToast({
+			// 					title: res.data.message,
+			// 					icon: 'none',
+			// 					duration: 2000
+			// 				})
+			// 				return false
+			// 			}
+			// 		})
+			// 		.catch(res => {
+			// 			that.verification = false
+			// 			uni.showToast({
+			// 				title: res.data.message,
+			// 				icon: 'none',
+			// 				duration: 2000
+			// 			})
+			// 			return false
+			// 		});
+			// },
+			getcode() {
+				var that = this
+				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(that.deptList.buyerPhone)) {
+					this.$api.doRequest('get', '/commonUser/sendVerifyCode', {
+							phone: that.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
+								})
+								return
+							}
+						})
+						.catch(res => {
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none',
+								duration: 2000
+							})
+							return
+						});
+				} 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
+				this.region2 = e.province.label + '-' + e.city.label + '-' + e.area.label
 			},
 			regionchange() {
 				this.show = true
@@ -354,16 +441,16 @@
 					return
 				}
 				if (this.deptList.procurementPlanType == '现货') {
-					if (!this.deptList.unitPrice) {
+					if (!this.deptList.procurementPrice) {
 						this.$api.msg('单价不能为空')
 						return
 					}
-					if (this.deptList.unitPrice > 100000 || this.deptList.unitPrice < 1) {
+					if (this.deptList.procurementPrice > 100000 || this.deptList.procurementPrice < 1) {
 						this.$api.msg('单价输入错误')
 						return
 					}
-					if (this.deptList.unitPrice.indexOf('.') != -1) {
-						if (this.deptList.unitPrice.split('.')[1].length > 2) {
+					if (this.deptList.procurementPrice.indexOf('.') != -1) {
+						if (this.deptList.procurementPrice.split('.')[1].length > 2) {
 							this.$api.msg('单价输入错误')
 							return
 						}
@@ -384,10 +471,23 @@
 						}
 					}
 				}
+				
+				if (!this.region2) {
+					this.$api.msg('收货地区不能为空')
+					return
+				}
 				if (!this.deptList.buyerPhone) {
 					this.$api.msg('买方手机号不能为空')
 					return
 				}
+				if (this.deptList.buyerPhone.length!=11) {
+					this.$api.msg('买方手机号输入错误')
+					return
+				}
+				if(!this.verifyCode){
+					this.$api.msg('验证码不能为空')
+					return
+				}
 				if (this.checked == false) {
 					if (this.deptList.waterContent && this.deptList.waterContent < 1 ||
 						this.deptList.waterContent && this.deptList.waterContent > 40) {
@@ -464,33 +564,62 @@
 				this.insertProcurementPlanInfo = this.deptList
 				this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
 				this.insertProcurementPlanInfo.commonId = this.userInfo.id
+				this.insertProcurementPlanInfo.procurementPlanNo='CGJH'+this.getdate()+this.verifyinit()
 				this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
-				this.$api.doRequest('post', '/procurementPlanInfo/api/insertProcurementPlanInfo', this
-						.insertProcurementPlanInfo).then(res => {
+				var that = this
+				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
+						phone: this.deptList.buyerPhone,
+						verifyCode: this.verifyCode
+					}).then(res => {
 						if (res.data.code == 200) {
-							uni.showToast({
-								title: "发布成功",
-								icon: 'none',
-							})
-							// setTimeout(() => {
-							// 	uni.navigateBack({})
-							// }, 1000)
-							this.deptList = {}
-							uni.navigateTo({
-								url: `/pages/release/release`
-							})
-						} else {
+							that.$api.doRequest('post', '/procurementPlanInfo/api/insertProcurementPlanInfo', that
+									.insertProcurementPlanInfo).then(res => {
+									if (res.data.code == 200) {
+										uni.showToast({
+											title: "发布成功",
+											icon: 'none',
+										})
+										// setTimeout(() => {
+										// 	uni.navigateBack({})
+										// }, 1000)
+										that.deptList = {}
+										uni.navigateTo({
+											url: `/pages/release/release`
+										})
+									} else {
+										uni.showToast({
+											title: res.data.message,
+											icon: 'none',
+											duration: 2000
+										})
+									}
+							
+								})
+								.catch(res => {
+									uni.showToast({
+										title: res.errmsg,
+										icon: 'none',
+										duration: 2000
+									})
+								});
+						} 
+						else if(res.data.code=='11003'){
+							uni.showModal({
+								title: '提示',
+								content: '验证码不正确',
+								});
+						}
+						else {
 							uni.showToast({
 								title: res.data.message,
 								icon: 'none',
 								duration: 2000
 							})
 						}
-
 					})
 					.catch(res => {
 						uni.showToast({
-							title: res.errmsg,
+							title: res.data.message,
 							icon: 'none',
 							duration: 2000
 						})
@@ -509,9 +638,9 @@
 				this.deptList.grade = this.pinType[this.pinIndex]
 			},
 			nianChange(e) {
-				this.nianIndex = e.detail.value
+				this.nianType = e.detail.value
 				this.niantypes = this.nianType[this.nianIndex];
-				this.deptList.outputYear = this.baoType[this.baoIndex]
+				this.deptList.outputYear = this.nianType[this.nianType]
 			},
 
 			baoChange(e) {
@@ -520,6 +649,33 @@
 				this.deptList.packingTypeKey = e.detail.value
 				this.deptList.packingType = this.baoType[this.baoIndex];
 			},
+			getdate() {
+			  var date = new Date()
+			  var year = date.getFullYear() //获取完整的年份(4位)
+			  var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+			  var datetime = date.getDate() //获取当前日(1-31)
+			  if (mouth < 10) {
+				mouth = '0' + mouth
+			  }
+			  if (datetime < 10) {
+				datetime = '0' + datetime
+			  }
+			  return year + mouth + datetime
+			},
+			verifyinit() {
+			  var arr = []
+			  for (var i = 48; i < 123; i++) {
+				if (i > 57 && i < 65) continue
+				if (i > 90 && i < 97) continue
+				arr.push(String.fromCharCode(i))
+			  }
+			  arr.sort(function() {
+				return Math.random() - 0.5
+			  })
+			  arr.length = 4
+		
+			  return arr.join('')
+			},
 			chengChange(e) {
 				this.chengIndex = e.detail.value
 				this.chengtypes = this.chengType[this.chengIndex];
@@ -594,4 +750,23 @@
 		text-align: center;
 		line-height: 30px;
 	}
+	.getcode {
+		font-size: 14px;
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		color: #AFB3BF;
+		background: #F5F6F9;
+		height: 30px;
+		line-height: 30px;
+	}
+	
+	.getcode.active {
+		border: none;
+	}
+	
+	.getcode.active {
+		background: #22C572;
+		color: #fff;
+	}
 </style>

pageD/myRelease/sellDetails.vue

@@ -7,7 +7,7 @@
 			<view class="c-row b-b">
 				<text class="tit">名头</text>
 				<view class="con-list">
-					<text @click="navToDetailPage">{{deptList.procurementPlanNo}}</text>
+					{{deptList.seller}}
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -37,7 +37,6 @@
 			<view class="c-row b-b">
 				<text class="tit">类型</text>
 				<view class="con-list">
-
 					{{deptList.salePlanType}}
 				</view>
 			</view>
@@ -50,7 +49,7 @@
 			<view class="c-row b-b" v-if="deptList.salePlanType == '现货'">
 				<text class="tit">单价（元/吨）</text>
 				<view class="con-list">
-					{{deptList.unitPrice}}
+					{{deptList.salePrice}}
 				</view>
 			</view>
 			<view class="c-row b-b" v-if="deptList.salePlanType == '期货'">
@@ -158,7 +157,7 @@
 			<view class="c-row">
 				<text class="tit">运费承担方</text>
 				<view class="con-list">
-					{{deptList.freightPayer == null || procurementPlanInfos.freightPayer == "" ? "暂无信息":deptList.freightPayer }}
+					{{deptList.freightPayer == null || deptList.freightPayer == "" ? "暂无信息":deptList.freightPayer }}
 				</view>
 			</view>
 		</view>

pageD/myRelease/sellEdit.vue

@@ -4,7 +4,7 @@
 			<view class="c-row b-b">
 				<text class="tit">名头</text>
 				<view class="con-list">
-					<text @click="navToDetailPage">{{deptList.procurementPlanNo}}</text>
+					<text @click="navToDetailPage">{{deptList.seller}}</text>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -34,22 +34,20 @@
 			</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.salePlanType">
-						{{typesIndex>-1?typesType[typesIndex]:'请选择类型'}}
-					</view>
-				</picker>
+				<view class="con-list">
+					{{deptList.salePlanType}}
+				</view>
 			</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>
+					<input placeholder="请填写单价" name="input" v-model="deptList.salePrice"></input>
 				</view>
 			</view>
 			<view class="c-row b-b" v-if="this.typesIndex == 1">
@@ -106,8 +104,7 @@
 			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">杂质（%）<= </text>
 						<view class="con-list">
-							<!-- <input placeholder="请填写杂质占比" name="input" v-model="deptList.impurity"></input> -->
-							{{deptList.impurity}}
+							<input placeholder="请填写杂质占比" name="input" v-model="deptList.impurity"></input>
 						</view>
 			</view>
 			<view v-if='!checked' class="c-row b-b">
@@ -402,16 +399,16 @@
 					return
 				}
 				if (this.deptList.salePlanType == '现货') {
-					if (!this.deptList.unitPrice) {
+					if (!this.deptList.salePrice) {
 						this.$api.msg('单价不能为空')
 						return
 					}
-					if (this.deptList.unitPrice > 100000 || this.deptList.unitPrice < 1) {
+					if (this.deptList.salePrice > 100000 || this.deptList.salePrice < 1) {
 						this.$api.msg('单价输入错误')
 						return
 					}
-					if (this.deptList.unitPrice.indexOf('.') != -1) {
-						if (this.deptList.unitPrice.split('.')[1].length > 2) {
+					if (this.deptList.salePrice.indexOf('.') != -1) {
+						if (this.deptList.salePrice.split('.')[1].length > 2) {
 							this.$api.msg('单价输入错误')
 							return
 						}
@@ -512,7 +509,9 @@
 					}
 				}
 				this.insertProcurementPlanInfo = this.deptList
-				this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
+				if (this.deptList.salePlanType == '期货') {
+					this.insertProcurementPlanInfo.basisPrice = this.insertProcurementPlanInfo.basisPrice
+				}
 				this.insertProcurementPlanInfo.commonId = this.userInfo.id
 				this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 				this.$api.doRequest('post', '/salePlanInfo/api/editSalePlanInfo', this

pageD/myRelease/sellGrain.vue

@@ -4,7 +4,7 @@
 			<view class="c-row b-b">
 				<text class="tit">名头</text>
 				<view class="con-list">
-					<text @click="navToDetailPage">{{deptList.procurementPlanNo}}</text>
+					<text @click="navToDetailPage">{{deptList.seller}}<text class='tip_text cuIcon-right'></text></text>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -21,9 +21,9 @@
 				</view>
 			</view>
 			<view class="c-row b-b">
-				<text class="tit">出货量（吨）</text>
+				<text class="tit">出售量（吨）</text>
 				<view class="con-list">
-					<input placeholder="请输入采购重量，如1000" name="input" v-model="deptList.plannedSaleVolume"></input>
+					<input placeholder="请输入出售重量，如1000" name="input" v-model="deptList.plannedSaleVolume"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -50,7 +50,7 @@
 			<view class="c-row b-b" v-if="this.typesIndex == 0">
 				<text class="tit">单价（元/吨）</text>
 				<view class="con-list">
-					<input placeholder="请填写单价" name="input" v-model="deptList.unitPrice"></input>
+					<input placeholder="请填写单价" name="input" v-model="deptList.salePrice"></input>
 				</view>
 			</view>
 			<view class="c-row b-b" v-if="this.typesIndex == 1">
@@ -76,14 +76,24 @@
 			<view class="c-row b-b">
 				<text class="tit">卖方手机号</text>
 				<view class="con-list">
-					<input placeholder="请输入买方手机号" name="input" v-model="deptList.sellerPhone"></input>
+					<input placeholder="请输入卖方手机号" name="input" v-model="deptList.sellerPhone"></input>
 				</view>
 			</view>
-			<view class="c-row ">
+			<!-- <view class="c-row ">
 				<text class="validate">获取验证码</text>
 				<view class="con-list">
 					<input placeholder="请填写6位短信验证码" name="input" v-model="deptList.title1"></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;'>
+					<view class="con-list">
+						<input v-model='verifyCode' placeholder="请输入验证码" type="text">
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="buylow">
@@ -94,49 +104,49 @@
 					style="font-size: 14px; ">完善更多信息<text
 						style="font-size: 10px; color: #AFB3BF;">（选填，可由客服人员代为完善）</text></text>
 			</view>
-			<view v-if='!checked' 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.waterContent"></input>
 						</view>
 			</view>
-			<view v-if='!checked' 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 v-if='!checked' 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 v-if='!checked' 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 v-if='!checked' 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 v-if='!checked' 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 v-if='!checked' 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 v-if='!checked' 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">
@@ -144,7 +154,7 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='!checked' 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">
@@ -153,7 +163,7 @@
 				</picker>
 			</view>
 
-			<view v-if='!checked' 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">
@@ -161,7 +171,7 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='!checked' 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">
@@ -169,13 +179,13 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='!checked&&baoIndex==2||!checked&&baoIndex==3' class="c-row b-b">
+			<view v-if='checked&&baoIndex!=0' class="c-row b-b">
 				<text class="tit">袋装备注</text>
 				<view class="con-list">
 					<input placeholder="请填写袋装备注" name="input" v-model="deptList.baggingNotes"></input>
 				</view>
 			</view>
-			<view v-if='!checked' class="c-row b-b">
+			<view v-if='checked' class="c-row ">
 				<text class="tit">运费承担方</text>
 				<picker @change="chengChange" :value="chengIndex" :range="chengType" class="con-list">
 					<view class="con-list">
@@ -201,13 +211,13 @@
 				typesType: ["现货", "期货"],
 				typesIndex: 0,
 				deptList: {
+					salePlanType:'现货',
 					salePlanTypeKey:0,
 					grainKey:0,
 					gradeKey:0,
 					packingTypeKey:0,
 					freightPayerKey:-1,
-					priceType: "定价采购",
-					procurementPlanType: "现货",
+					priceType: "定价销售",
 					grain: "塔粮",
 					grade: "不限（默认）",
 					outputYear: "2020",
@@ -223,24 +233,31 @@
 					province: true,
 					city: true,
 				},
-				checked: true,
-				insertProcurementPlanInfo: {},
-				liIndex: 0,
+				checked: false,
+				insertSalePlanInfo: {},
+				liIndex: -1,
 				liType: ['塔粮', '筛粮', '中粒', '大粒'],
-				pinIndex: 0,
-				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
-				nianIndex: 3,
+				pinIndex: -1,
+				pinType: ['一等品', '二等品', '三等品', '等外'],
+				nianIndex: -1,
 				nianType: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014', '2013', '2012',
 					'2011'
 				],
 				show: false,
 				show1: false,
-				region: '请选择收货地区',
+				region: '请选择发货地区',
+				regions: "",
 				region1: '请选择产地',
-				baoIndex: 0,
-				baoType: ['不限（默认）', '散装', '大袋', '小袋'],
+				region2 :"",
+				baoIndex: -1,
+				baoType: ['散装', '大袋', '小袋'],
 				chengIndex: -1,
-				chengType: ['可议', '买方承担', '卖方承担']
+				chengType: ['可议', '买方承担', '卖方承担'],
+				codestatus: false,
+				sendDisabled: false,
+				sendText: '获取验证码',
+				verifyCode:"",
+				verification:true,
 			}
 		},
 		computed: {
@@ -248,7 +265,7 @@
 		},
 		onLoad(options) {
 			if (options.customerName) {
-				this.deptList.procurementPlanNo = options.customerName
+				this.deptList.seller = options.customerName
 			}
 		},
 		onShow() {
@@ -258,9 +275,9 @@
 			}).then(res => {
 				if (res.data.code == 200) {
 					if (res.data.data.customerTypeFlag == 1) {
-						that.$set(this.deptList, 'procurementPlanNo', res.data.data.customerName)
+						that.$set(this.deptList, 'seller', res.data.data.customerName)
 					} else {
-						that.$set(this.deptList, 'procurementPlanNo', res.data.data.compName)
+						that.$set(this.deptList, 'seller', res.data.data.compName)
 					}
 					this.goods = res.data.data
 				}
@@ -268,11 +285,82 @@
 			})
 		},
 		methods: {
+			// async amendprice() {
+			// 	var that = this
+			// 	this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
+			// 			phone: this.deptList.buyerPhone,
+			// 			verifyCode: this.verifyCode
+			// 		}).then(res => {
+			// 			if (res.data.code == 200) {	
+			// 			} else {
+			// 				that.verification = false
+			// 				uni.showToast({
+			// 					title: res.data.message,
+			// 					icon: 'none',
+			// 					duration: 2000
+			// 				})
+			// 				return false
+			// 			}
+			// 		})
+			// 		.catch(res => {
+			// 			that.verification = false
+			// 			uni.showToast({
+			// 				title: res.data.message,
+			// 				icon: 'none',
+			// 				duration: 2000
+			// 			})
+			// 			return false
+			// 		});
+			// },
+			getcode() {
+				var that = this
+				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(that.deptList.sellerPhone)) {
+					this.$api.doRequest('get', '/commonUser/sendVerifyCode', {
+							phone: that.deptList.sellerPhone
+						}).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
+								})
+								return
+							}
+						})
+						.catch(res => {
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none',
+								duration: 2000
+							})
+							return
+						});
+				} else {
+					uni.showToast({
+						title: '请输入正确的手机号',
+						icon: 'none',
+						duration: 2000
+					})
+				}
+			},
 			regionpicker(e) {
 				this.deptList.sendPrivate = e.province.label
 				this.deptList.sendCity = e.city.label
 				this.deptList.sendArea = e.area.label
 				this.region = e.province.label + '-' + e.city.label + '-' + e.area.label
+				this.regions = e.province.label + '-' + e.city.label + '-' + e.area.label
 			},
 			regionchange() {
 				this.show = true
@@ -281,6 +369,7 @@
 				this.deptList.outputPrivate = e.province.label
 				this.deptList.outputCity = e.city.label
 				this.region1 = e.province.label + '-' + e.city.label
+				this.region2 = e.province.label + '-' + e.city.label
 			},
 			regionchange1() {
 				this.show1 = true
@@ -294,7 +383,7 @@
 				this.deptList.salePlanTypeKey = e.detail.value+1
 				this.deptList.salePlanType = this.typesType[this.typesIndex];
 				if (this.typesIndex == 0) {
-					this.deptList.priceType = '定价采购'
+					this.deptList.priceType = '定价销售'
 				} else {
 					this.deptList.priceType = '期货盘面价+基差'
 				}
@@ -325,16 +414,16 @@
 					return
 				}
 				if (!this.deptList.plannedSaleVolume) {
-					this.$api.msg('出货量不能为空')
+					this.$api.msg('出售量不能为空')
 					return
 				}
 				if (this.deptList.plannedSaleVolume > 100000 || this.deptList.plannedSaleVolume < 1) {
-					this.$api.msg('出货量输入错误')
+					this.$api.msg('出售量输入错误')
 					return
 				}
 				if (this.deptList.plannedSaleVolume.indexOf('.') != -1) {
 					if (this.deptList.plannedSaleVolume.split('.')[1].length > 2) {
-						this.$api.msg('出货量输入错误')
+						this.$api.msg('出售量输入错误')
 						return
 					}
 				}
@@ -361,16 +450,16 @@
 					return
 				}
 				if (this.deptList.salePlanType == '现货') {
-					if (!this.deptList.unitPrice) {
+					if (!this.deptList.salePrice) {
 						this.$api.msg('单价不能为空')
 						return
 					}
-					if (this.deptList.unitPrice > 100000 || this.deptList.unitPrice < 1) {
+					if (this.deptList.salePrice > 100000 || this.deptList.salePrice < 1) {
 						this.$api.msg('单价输入错误')
 						return
 					}
-					if (this.deptList.unitPrice.indexOf('.') != -1) {
-						if (this.deptList.unitPrice.split('.')[1].length > 2) {
+					if (this.deptList.salePrice.indexOf('.') != -1) {
+						if (this.deptList.salePrice.split('.')[1].length > 2) {
 							this.$api.msg('单价输入错误')
 							return
 						}
@@ -391,12 +480,27 @@
 						}
 					}
 				}
+				if (!this.regions) {
+					this.$api.msg('发货地区不能为空')
+					return
+				}
+				if (!this.region2) {
+					this.$api.msg('产地不能为空')
+					return
+				}
 
 				if (!this.deptList.sellerPhone) {
 					this.$api.msg('卖方手机号不能为空')
 					return
 				}
-
+				if (this.deptList.sellerPhone.length!=11) {
+					this.$api.msg('卖方手机号输入错误')
+					return
+				}
+				if(!this.verifyCode){
+					this.$api.msg('验证码不能为空')
+					return
+				}
 				if (this.checked == false) {
 					if (this.deptList.waterContent && this.deptList.waterContent < 1 ||
 						this.deptList.waterContent && this.deptList.waterContent > 40) {
@@ -470,40 +574,78 @@
 						}
 					}
 				}
-				this.insertProcurementPlanInfo = this.deptList
-				this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
-				this.insertProcurementPlanInfo.commonId = this.userInfo.id
-				this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
-				this.$api.doRequest('post', '/salePlanInfo/api/insertSalePlanInfo', this
-						.insertProcurementPlanInfo).then(res => {
+				// if(this.amendprice() == false){
+				// 	this.$api.msg('验证码输入有误！')
+				// 	return
+				// }
+				var that=this
+				this.insertSalePlanInfo = this.deptList
+				this.insertSalePlanInfo.basisPrice = this.insertSalePlanInfo.basisPrice
+				this.insertSalePlanInfo.commonId = this.userInfo.id
+				this.insertSalePlanInfo.salePlanNo='XSJH'+this.getdate()+this.verifyinit()
+				this.insertSalePlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
+						phone: this.deptList.sellerPhone,
+						verifyCode: this.verifyCode
+					}).then(res => {
 						if (res.data.code == 200) {
-							uni.showToast({
-								title: "发布成功",
-								icon: 'none',
-							})
-							// setTimeout(() => {
-							// 	uni.navigateBack({})
-							// }, 1000)
-							this.deptList = {}
-							uni.navigateTo({
-								url: `/pages/release/release`
-							})
-						} else {
+							that.$api.doRequest('post', '/salePlanInfo/api/insertSalePlanInfo', that.insertSalePlanInfo).then(res => {
+									if (res.data.code == 200) {
+										uni.showToast({
+											title: "发布成功",
+											icon: 'none',
+										})
+										// setTimeout(() => {
+										// 	uni.navigateBack({})
+										// }, 1000)
+										that.deptList = {}
+										uni.navigateTo({
+											url: `/pages/release/release`
+										})
+									} else {
+										uni.showToast({
+											title: res.data.message,
+											icon: 'none',
+											duration: 2000
+										})
+									}
+							
+								})
+								.catch(res => {
+									uni.showToast({
+										title: res.errmsg,
+										icon: 'none',
+										duration: 2000
+									})
+								});
+						}
+						else if(res.data.code=='11003'){
+						 	uni.showModal({
+						 		title: '提示',
+						 		content: '验证码不正确',
+						 		});
+						 }
+						else {
 							uni.showToast({
 								title: res.data.message,
 								icon: 'none',
 								duration: 2000
 							})
+							return
 						}
-
 					})
 					.catch(res => {
 						uni.showToast({
-							title: res.errmsg,
+							title: res.data.message,
 							icon: 'none',
 							duration: 2000
 						})
+						return
 					});
+				// this.insertProcurementPlanInfo = this.deptList
+				// this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
+				// this.insertProcurementPlanInfo.commonId = this.userInfo.id
+				// this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 			},
 			liChange(e) {
 				this.liIndex = e.detail.value
@@ -529,6 +671,33 @@
 				this.deptList.packingTypeKey = e.detail.value
 				this.deptList.packingType = this.baoType[this.baoIndex];
 			},
+			getdate() {
+			  var date = new Date()
+			  var year = date.getFullYear() //获取完整的年份(4位)
+			  var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+			  var datetime = date.getDate() //获取当前日(1-31)
+			  if (mouth < 10) {
+				mouth = '0' + mouth
+			  }
+			  if (datetime < 10) {
+				datetime = '0' + datetime
+			  }
+			  return year + mouth + datetime
+			},
+			verifyinit() {
+			  var arr = []
+			  for (var i = 48; i < 123; i++) {
+				if (i > 57 && i < 65) continue
+				if (i > 90 && i < 97) continue
+				arr.push(String.fromCharCode(i))
+			  }
+			  arr.sort(function() {
+				return Math.random() - 0.5
+			  })
+			  arr.length = 4
+					
+			  return arr.join('')
+			},
 			chengChange(e) {
 				this.chengIndex = e.detail.value
 				this.chengtypes = this.chengType[this.chengIndex];
@@ -573,13 +742,11 @@
 		padding-right: 20rpx;
 		font-size: 14px;
 	}
-
 	.buyup {
 		background-color: #FFFFFF;
 		border-radius: 20px;
 		margin-top: 10px;
 	}
-
 	.buylow {
 		background-color: #FFFFFF;
 		border-radius: 20px;
@@ -592,7 +759,6 @@
 		background-color: #22C572;
 		color: #FFFFFF;
 	}
-
 	.validate {
 		width: 100px;
 		height: 32px;
@@ -603,4 +769,21 @@
 		text-align: center;
 		line-height: 30px;
 	}
+	.getcode {
+		font-size: 14px;
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		color: #AFB3BF;
+		background: #F5F6F9;
+		height: 30px;
+		line-height: 30px;
+	}
+	.getcode.active {
+		border: none;
+	}
+	.getcode.active {
+		background: #22C572;
+		color: #fff;
+	}
 </style>

pageD/warehousings/ex_warehouse.vue

@@ -97,7 +97,7 @@
 					<text class="tit">出库日期</text>
 
 					<view class="con-list" @click="show = true">
-						{{WarehouseInOutInfo.inOutDate!='' || WarehouseInOutInfo.inOutDate != null ? WarehouseInOutInfo.inOutDate : time1}}
+						{{ WarehouseInOutInfo.inOutDate != null ? WarehouseInOutInfo.inOutDate : time1}}
 					</view>
 					<u-picker :params='params' :default-time='time1' @confirm="DateChange" v-model="show" mode="time">
 					</u-picker>
@@ -108,7 +108,11 @@
 				</view>
 				<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
 					:size-type="['compressed']" @on-success="getImgUrl" @on-remove="onRemove"
-					@on-uploaded="isAdd = true" :before-upload="filterFileType"></upload>
+					@on-uploaded="isAdd = true" :before-upload="filterFileType"
+					v-if="WarehouseInOutInfo.addressUrl == null || WarehouseInOutInfo.addressUrl == '' "></upload>
+				<image :src="WarehouseInOutInfo.addressUrl" mode=""
+					v-if="WarehouseInOutInfo.addressUrl != null || WarehouseInOutInfo.addressUrl != '' "
+					class="picture"></image>
 				<!-- <view style="height: 90px; margin-left: 16px;" class="flex">
 							<image v-bind:src="license1" class="picture1" v-if="this.license1 != null || this.license1 !=''"></image>
 						<view  @click="uploadPictures">
@@ -215,6 +219,7 @@
 					pcFlag: 0,
 					contractNo: {},
 					carNo: {},
+					warehouseName:{},
 				},
 				WarehouseInOutInfo1: {
 					contractNo: {},
@@ -243,6 +248,7 @@
 				},
 				show: false,
 				license1: "",
+				ids:"",
 
 			}
 		},
@@ -284,7 +290,19 @@
 				return new Date()
 			}
 		},
-		onShow() {
+		onLoad(option) {
+			this.WarehouseInOutInfo.contractNo = option.contractNo
+			this.WarehouseInOutInfo.goodsName = option.goodsName
+			this.WarehouseInOutInfo.consignee = option.consignee
+			this.WarehouseInOutInfo.boxNo = option.boxNo
+			this.WarehouseInOutInfo.tranCarNo = option.tranCarNo
+			this.WarehouseInOutInfo.titleNo = option.titleNo
+			this.WarehouseInOutInfo.id = option.id
+			this.WarehouseInOutInfo.carNo = option.carNo
+			this.WarehouseInOutInfo.warehouseName = option.warehouseName
+			this.getList(this.WarehouseInOutInfo.id)
+		},
+		onShow() {	
 			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {
 				compId: '2710b21efc1e4393930c5dc800010dc4',
 				warehouseType: 1,
@@ -294,45 +312,66 @@
 					for (var i = 0; i < res.data.data.length; i++) {
 						if (res.data.data[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
 							this.warehouseIndex = i
+							this.ids = res.data.data[i].id
 						}
 						arr.push(res.data.data[i].warehouseName)
 					}
 					this.warehouselist = res.data.data
 					this.warehouse = arr
 				}
-
 			})
-			this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
-				compId: '2710b21efc1e4393930c5dc800010dc4',
-				warehouseType: 1,
-			}).then(res => {})
-		},
-		onLoad(option) {
-			this.WarehouseInOutInfo.contractNo = option.contractNo
-			this.WarehouseInOutInfo.goodsName = option.goodsName
-			this.WarehouseInOutInfo.consignee = option.consignee
-			this.WarehouseInOutInfo.boxNo = option.boxNo
-			this.WarehouseInOutInfo.tranCarNo = option.tranCarNo
-			this.WarehouseInOutInfo.titleNo = option.titleNo
-			this.WarehouseInOutInfo.id = option.id
-			this.WarehouseInOutInfo.carNo = option.carNo
-			// var date = new Date()
-			// var year = date.getFullYear()
-			// var month = date.getMonth()
-			// var date1 = date.getDate()
-			// if (month + 1 < 10) {
-			// 	month = "0" + (month + 1)
-			// }
-			// this.time = year + '-' + month + "-" + date1
-			this.getList(this.WarehouseInOutInfo.id)
+			// this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
+			// 	id: this.ids,
+			// }).then(res => {
+			// 	var arr = []
+			// 	for (var i = 0; i < res.data.data.warehousePositionInfoList.length; i++) {
+			// 		console.log(res.data.data.warehousePositionInfoList[i])
+			// 		arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
+			// 	}
+			// 	this.warehouse1 = arr
+			// 	this.warehouselist11 = res.data.data
+			// })
 		},
+		
 		methods: {
 			getList(id1) {
 				var that = this
 				this.$api.doRequest('get', '/warehouseInOutInfo/getInfo', {
 						id: id1
 					}).then(res => {
-						this.WarehouseInOutInfo = res.data.data
+						
+
+						if(res.data.code == 200){
+							this.WarehouseInOutInfo = res.data.data
+							if (this.WarehouseInOutInfo.warehouseInOutDetail != null ) {
+									this.list = this.WarehouseInOutInfo.warehouseInOutDetail
+								}
+								if(this.WarehouseInOutInfo.inOutTypeKey != null){
+										this.ruIndex = this.WarehouseInOutInfo.inOutTypeKey
+								}
+							    if(this.WarehouseInOutInfo.warehouseNameKey != null){
+									this.warehouseIndex = this.WarehouseInOutInfo.warehouseNameKey
+								}
+								this.warehouseIndex1 = this.WarehouseInOutInfo.binNumberKey
+								
+								if(this.WarehouseInOutInfo.gradeKey != null){
+									this.pinIndex = this.WarehouseInOutInfo.gradeKey
+								}
+								
+								var positionid
+								for (var i = 0; i < this.warehouselist.length; i++) {
+									if (this.warehouselist[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
+										this.warehouseIndex = i
+										positionid = this.warehouselist[i].id
+									}
+								}
+							this.warehouseChange3(positionid)
+								for (var i = 0; i < this.warehouse1.length; i++) {
+									if (this.warehouse1[i] == this.WarehouseInOutInfo.binNumber) {
+										this.warehouseIndex1 = i
+									}
+								}
+						}
 					})
 					.catch(res => {
 						uni.showToast({
@@ -342,6 +381,26 @@
 						})
 					});
 			},
+	 async warehouseChange3(id){
+			var that = this
+			this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
+				id: id,
+			}).then(res => {
+				if(res.data.code == 200 ){
+					var arr = []
+					for (var i = 0; i < res.data.data.warehousePositionInfoList.length; i++) {
+						arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
+					}
+					that.warehouse1 = arr
+					for(var i = 0 ; i < that.warehouse1.length ; i++){
+						if(that.warehouse1[i] == that.WarehouseInOutInfo.binNumber){
+							that.warehouseIndex1 = i
+						}
+					}
+				}			
+			})
+			return 	that.warehouse1
+		},
 			warehouseChange(e) {
 				var id = ''
 				this.warehouseIndex = e.detail.value
@@ -356,16 +415,16 @@
 				}).then(res => {
 					var arr = []
 					for (var i = 0; i < res.data.data.warehousePositionInfoList.length; i++) {
-						console.log(res.data.data.warehousePositionInfoList[i])
+						// console.log(res.data.data.warehousePositionInfoList[i])
 						arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
 					}
 					this.warehouse1 = arr
-					this.warehouselist11 = res.data.data
 				})
 			},
 			warehouseChange1(e) {
 				var id = ''
 				this.warehouseIndex1 = e.detail.value
+				this.WarehouseInOutInfo.binNumberKey = this.warehouseIndex1
 				this.WarehouseInOutInfo.binNumber = this.warehouse1[this.warehouseIndex1]
 			},
 
@@ -385,7 +444,6 @@
 				}
 			},
 			getImgUrl(res) {
-				console.log(res)
 				this.imgUrls.push(res);
 			},
 			onRemove(index) {
@@ -406,8 +464,8 @@
 					this.$api.msg('皮重输入错误')
 					return
 				}
-				if (this.WarehouseInOutInfo.tare.indexOf('.') != -1) {
-					if (this.WarehouseInOutInfo.tare.split('.')[1].length > 2) {
+				if (this.WarehouseInOutInfo.tare.toString().indexOf('.') != -1) {
+					if (this.WarehouseInOutInfo.tare.toString().split('.')[1].length > 2) {
 						this.$api.msg('皮重输入错误')
 						return
 					}
@@ -500,8 +558,6 @@
 				if (this.imgUrls.length > 0) {
 					this.WarehouseInOutInfo.addressUrl = this.imgUrls[0]
 				}
-				console.log(this.WarehouseInOutInfo, "卖粮对象")
-	
 				this.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse', this.WarehouseInOutInfo).then(res => {
 					if (res.data.code == 200) {
 						uni.showToast({
@@ -509,10 +565,13 @@
 							icon: 'none',
 							duration: 2000
 						})
-						// uni.navigateBack({})
-						setTimeout(() => {
-							uni.navigateBack({})
-						}, 200)
+						uni.navigateTo({
+							url: `/pages/task/my_task`,
+						})
+
+						// setTimeout(() => {
+						// 	uni.navigateBack({})
+						// }, 200)
 					} else {
 						uni.showToast({
 							title: res.data.message,
@@ -552,8 +611,8 @@
 					this.$api.msg('毛重输入错误')
 					return
 				}
-				if (this.WarehouseInOutInfo.grossWeight.indexOf('.') != -1) {
-					if (this.WarehouseInOutInfo.grossWeight.split('.')[1].length > 2) {
+				if (this.WarehouseInOutInfo.grossWeight.toString().indexOf('.') != -1) {
+					if (this.WarehouseInOutInfo.grossWeight.toString().split('.')[1].length > 2) {
 						this.$api.msg('毛重输入错误')
 						return
 					}
@@ -562,8 +621,8 @@
 					this.$api.msg('皮重输入错误')
 					return
 				}
-				if (this.WarehouseInOutInfo.tare.indexOf('.') != -1) {
-					if (this.WarehouseInOutInfo.tare.split('.')[1].length > 2) {
+				if (this.WarehouseInOutInfo.tare.toString().indexOf('.') != -1) {
+					if (this.WarehouseInOutInfo.tare.toString().split('.')[1].length > 2) {
 						this.$api.msg('皮重输入错误')
 						return
 					}
@@ -665,9 +724,12 @@
 							title: '提交成功',
 							icon: 'none'
 						})
-						setTimeout(() => {
-							uni.navigateBack({})
-						}, 200)
+						uni.navigateTo({
+							url: `/pages/task/my_task`,
+						})
+						// setTimeout(() => {
+						// 	uni.navigateBack({})
+						// }, 200)
 					} else {
 						uni.showToast({
 							title: res.data.message,
@@ -882,17 +944,22 @@
 		margin-left: -60px;
 	}
 
-	.picture {
+	/* .picture {
 		width: 90px;
 		height: 90px;
 		border-radius: 10px;
-		/* 
-		position: relative; */
-	}
+	} */
 
 	.picture1 {
 		width: 90px;
 		height: 90px;
 		border-radius: 10px;
 	}
+
+	.picture {
+		width: 75px;
+		height: 75px;
+		border-radius: 10px;
+		margin-left: 16px;
+	}
 </style>

pageD/warehousings/warehousings.vue

@@ -295,7 +295,6 @@ import upload from '@/components/upload.vue';
 				month="0"+(month+1)
 			}
 			this.time = year+'-'+month+"-"+date1
-			this.getList(this.WarehouseInOutInfo.id)
 		},
 		methods: {
 			getList(id1){
@@ -303,10 +302,13 @@ import upload from '@/components/upload.vue';
 				this.$api.doRequest('get','/warehouseInOutInfo/getInfo',{id:id1}).then(res => {
 					
 					that.WarehouseInOutInfo = res.data.data
-					 that.list = that.WarehouseInOutInfo.warehouseInOutDetail
+					console.log(that.WarehouseInOutInfo.warehouseInOutDetail != null)
+					if( that.WarehouseInOutInfo.warehouseInOutDetail != null){
+						that.list = that.WarehouseInOutInfo.warehouseInOutDetail
+					} 
 					this.pinIndex = this.WarehouseInOutInfo.gradeKey
+				this.ruIndex = this.WarehouseInOutInfo.inOutTypeKey 
 					this.WarehouseInOutInfo.deductionAmount = Math.abs(res.data.data.deductionAmount) 
-
 				})
 				.catch(res => {
 					uni.showToast({

pages.json

@@ -480,6 +480,56 @@
 						"navigationBarTitleText": "发运任务"
 					}
 				},
+				{
+					"path": "freightTransport/index",
+					"style": {
+						"navigationBarTitleText": "货运收发",
+						"enablePullDownRefresh": false
+					}
+				
+				},
+				{
+					"path": "freightTransport/addsendgoods",
+					"style": {
+						"navigationBarTitleText": "创建",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "freightTransport/sendrecord",
+					"style": {
+						"navigationBarTitleText": "发货记录",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "freightTransport/contract_detail",
+					"style": {
+						"navigationBarTitleText": "添加",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "freightTransport/confirmpaygoods",
+					"style": {
+						"navigationBarTitleText": "确认收货",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "freightTransport/payrecord",
+					"style": {
+						"navigationBarTitleText": "收货记录",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "freightTransport/addpaygoods",
+					"style": {
+						"navigationBarTitleText": "添加收货人",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 					"path": "pages/task_detail_jy",
 					"style": {
@@ -702,6 +752,12 @@
 						"navigationBarTitleText": "添加"
 					}
 				},
+				// {
+				// 	"path": "contract/warehousings",
+				// 	"style": {
+				// 		"navigationBarTitleText": "附件"
+				// 	}
+				// },
 				{
 					"path": "contract/contract",
 					"style": {
@@ -722,6 +778,13 @@
 						"enablePullDownRefresh": true
 					}
 				},
+				{
+					"path": "contract/enclosures",
+					"style": {
+						"navigationBarTitleText": "附件",
+						"enablePullDownRefresh": true
+					}
+				},
 				{
 					"path": "video/look",
 					"style": {

pages/attestation/index.vue

@@ -147,11 +147,13 @@
 				},	
 				
 			liangShang(){
+				console.log(1111)
 				uni.navigateTo({
 					url: `/pages/attestation/indexTwo`
 				})
 			},
 			siJi(){
+				console.log(2222)
 				uni.navigateTo({
 					url: `/pages/attestation/indexThree`
 				})

pages/attestation/indexThree.vue

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

pages/attestation/indexTwo.vue

@@ -7,19 +7,24 @@
 				</view>
 				<view class="company">{{item.compName}}</view>
 				<view class="company" v-if="item.customerTypeFlag == 1">{{item.customerName}}</view>
-				<view class="status" v-if="item.authenticationStatus == '已认证'">
-					<image src="../../static/img/authentication/cert-personal@3x.png"
-						style="width: 16px;height: 16px;top:3px;"></image>
-					{{item.authenticationStatus}}
+				<view class="status" v-if="item.cover == '1'">
+					已覆盖
 				</view>
-				<view class="status1" v-if="item.authenticationStatus == '审核中'">
-					{{item.authenticationStatus}}
-				</view>
-				<view class="status2" v-if="item.authenticationStatus == '未通过'">
-					{{item.authenticationStatus}}
-				</view>
-				<view class="status3" v-if="item.authenticationStatus == '已覆盖'">
-					{{item.authenticationStatus}}
+				<view v-else>
+					<view class="status" v-if="item.authenticationStatus == '已认证'">
+						<image src="../../static/img/authentication/cert-personal@3x.png"
+							style="width: 16px;height: 16px;top:3px;"></image>
+						{{item.authenticationStatus}}
+					</view>
+					<view class="status1" v-if="item.authenticationStatus == '审核中'">
+						{{item.authenticationStatus}}
+					</view>
+					<view class="status2" v-if="item.authenticationStatus == '未通过'">
+						{{item.authenticationStatus}}
+					</view>
+					<view class="status3" v-if="item.authenticationStatus == '已覆盖'">
+						{{item.authenticationStatus}}
+					</view>
 				</view>
 			</view>
 			<view class="geren" v-if="item.customerTypeFlag == 1"> {{item.customerPhone}}</view>
@@ -33,8 +38,9 @@
 					<text style="font-size: 12px;" @click.stop="select(item)">设为默认</text>
 				</view>
 				<view class="options flex">
-					<view class='but' @click="open(item)">更换手机号</view>
-					<view class='but' @click="companyEdit(item)">修改</view>
+					<view class='but' v-if="item.authenticationStatus == '已覆盖'||item.authenticationStatus == '已认证'"
+						@click="open(item)">更换手机号</view>
+					<view class='but' v-if="item.authenticationStatus == '未通过'" @click="companyEdit(item)">修改</view>
 					<view class='but' @click="deleteLS(item)">删除</view>
 				</view>
 			</view>
@@ -45,11 +51,9 @@
 					</view>
 					<view class="cancel" @click='pricestatus=false'>×</view>
 					<view class='shade-content-item'>
-						<input v-model='price' placeholder="请输入手机号" type="number" class="tainput">
+						<input v-model='price' placeholder="请输入手机号" type="number" class="tainput" maxlength="11">
 					</view>
 					<view>
-						<!-- 	<view style='width:50%;display:inline-block;' @click='pricestatus=false'>取消</view>
-						<view style='width:50%;display:inline-block;' @click='amendprice'>确定</view> -->
 						<view class="determine" @click="getcode">
 							获取验证码
 						</view>
@@ -65,7 +69,7 @@
 					<text style="color:#AFB3BF;font-size: 14px;">验证码已发送至+86 {{price}}</text>
 					<view class="cancel" @click='pricestatusTwo=false,pricestatus=false'>×</view>
 					<view class='shade-content-item flex'>
-						<input v-model='verifyCode' placeholder="填写验证码" type="number" class="tainput1">
+						<input v-model='verifyCode' placeholder="填写验证码" type="number" class="tainput1" maxlength="6">
 						<text style="color:#AFB3BF;font-size: 14px;" @click="resend">{{sendText}}</text>
 					</view>
 					<view>
@@ -73,9 +77,6 @@
 							<text class="btns1 btn1" @click='pricestatusTwo=false'>取消</text>
 							<view class="btns1 btn2" @click='amendprice(item)'>确定</view>
 						</view>
-						<!-- <view class="determine">
-							获取验证码
-						</view> -->
 					</view>
 				</view>
 			</view>
@@ -104,6 +105,7 @@
 				id: "",
 				defaults1: "default1",
 				defaults2: "default2",
+				identityAuthenticationInfos:{},
 			}
 		},
 		computed: {
@@ -123,42 +125,46 @@
 				}
 			},
 			select(item) {
-				if (item.basis == "false") {
-					for (var i = 0; i < this.businessman.length; i++) {
-						if (this.businessman[i] == item) {
-							item.basis = "true"
-						} else {
-							this.businessman[i].basis = "false"
-						}
-					}
-
-					// this.defaults1 = "default2"
-				} else if (item.basis == "true") {
-					item.basis = "false"
-					// this.defaults2 = "default1"
-				}
-				this.identityAuthenticationInfo.commonId = this.userInfo.id
-				this.identityAuthenticationInfo.defaultFlag = 1
-				this.identityAuthenticationInfo.id = item.id
-				this.$api.doRequest('post', '/identityAuthenticationInfo/api/setDefault', this.identityAuthenticationInfo,
-						'application/json;charset=UTF-8').then(res => {
+				if (item.authenticationStatus == '已认证') {
+					if (item.basis == "false") {
 						for (var i = 0; i < this.businessman.length; i++) {
-							if (this.businessman.defaultFlag == 1) {
-								this.defaults = "default2"
+							if (this.businessman[i] == item) {
+								item.basis = "true"
 							} else {
-								this.defaults = "default1"
+								this.businessman[i].basis = "false"
 							}
 						}
-						this.getList()
-					})
-					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
-					});
 
+						// this.defaults1 = "default2"
+					} else if (item.basis == "true") {
+						item.basis = "false"
+						// this.defaults2 = "default1"
+					}
+					this.identityAuthenticationInfo.commonId = this.userInfo.id
+					this.identityAuthenticationInfo.defaultFlag = 1
+					this.identityAuthenticationInfo.id = item.id
+					this.$api.doRequest('post', '/identityAuthenticationInfo/api/setDefault', this
+							.identityAuthenticationInfo,
+							'application/json;charset=UTF-8').then(res => {
+							for (var i = 0; i < this.businessman.length; i++) {
+								if (this.businessman.defaultFlag == 1) {
+									this.defaults = "default2"
+								} else {
+									this.defaults = "default1"
+								}
+							}
+							this.getList()
+						})
+						.catch(res => {
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						});
+				} else {
+					this.$api.msg('已认证的身份才能设为默认！')
+				}
 			},
 			open(item) {
 				this.id = item.id
@@ -175,7 +181,8 @@
 				this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {
 						pageSize: 10,
 						currentPage: 1,
-						commonId: this.userInfo.id
+						commonId: this.userInfo.id,
+						flag: 0
 					}, 'application/json;charset=UTF-8').then(res => {
 						for (var i = 0; i < res.data.data.records.length; i++) {
 							res.data.data.records[i].basis = "false"
@@ -195,62 +202,105 @@
 					});
 			},
 			amendprice(item) {
+				this.identityAuthenticationInfo.id = item.id
+				this.identityAuthenticationInfo.customerPhone = this.price
+				var that = this
 				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
 						phone: this.price,
 						verifyCode: this.verifyCode
 					}).then(res => {
 						if (res.data.code == 200) {
-							this.$api.doRequest('post', '/identityAuthenticationInfo/api/modifyIdentityPhone', {
-									customerPhone: this.price,
-									id: this.id,
-									commonId: this.userInfo.id
-								}, 'application/json;charset=UTF-8').then(res => {
-									if (res.data.code == 200) {
-										uni.navigateTo({
-											url: '/pages/attestation/indexTwo'
+							that.identityAuthenticationInfos.customerPhone = that.price
+							that.$api.doRequest('get','/identityAuthenticationInfo/selectPhone', that.identityAuthenticationInfos)
+								.then(res => {
+									if (res.data.code == '11018') {
+										uni.showModal({
+											title: '提示',
+											content: '该手机号已认证过个人粮商，再次认证将覆盖之前的认证信息，是否确定认证？',
+											success: function(res) {										
+												if (res.confirm) {
+													that.$api.doRequest('post',
+														'/identityAuthenticationInfo/api/modifyIdentityPhone',
+														that.identityAuthenticationInfo).then(
+														res => {
+															uni.showToast({
+																title: '提交成功',
+																icon: 'none',
+																duration: 2000
+															})
+															uni.navigateTo({
+																url: `/pages/attestation/indexTwo`,
+															})
+														}).catch(res => {
+														uni.showToast({
+															title: res.data.message,
+															icon: 'none',
+															duration: 2000
+														})
+													})
+												} else if (res.cancel) {
+													uni.showToast({
+														title: '提交失败',
+														icon: 'none',
+														duration: 2000
+													})
+												}
+											}
 										});
-										this.$api.msg('修改成功！')
-									} else {
-										uni.showToast({
-											title: res.errmsg,
-											icon: 'none',
-											duration: 2000
+									} else if (res.data.code == 200) {
+										that.$api.doRequest('post',
+											'/identityAuthenticationInfo/api/modifyIdentityPhone',
+											that.identityAuthenticationInfo).then(
+											res => {
+												uni.showToast({
+													title: '提交成功',
+													icon: 'none',
+													duration: 2000
+												})
+												uni.navigateTo({
+													url: `/pages/attestation/indexTwo`,
+												})
+											}).catch(res => {
+											uni.showToast({
+												title: res.data.message,
+												icon: 'none',
+												duration: 2000
+											})
 										})
-										return
-									}
-									if (res.data.code == "ERROR") {
+									} else {
 										uni.showToast({
-											title: res.message,
+											title: res.data.message,
 											icon: 'none',
 											duration: 2000
 										})
-										return
 									}
-								})
-								.catch(res => {
+					
+								}).catch(res => {
 									uni.showToast({
-										title: res.errmsg,
+										title: res.data.message,
 										icon: 'none',
 										duration: 2000
 									})
-								});
-
-							// uni.hideLoading()
+								})
+					
 						} else {
-							// uni.hideLoading()1
+							that.verification = false
 							uni.showToast({
 								title: res.data.message,
 								icon: 'none',
 								duration: 2000
 							})
+							return false
 						}
 					})
 					.catch(res => {
+						that.verification = false
 						uni.showToast({
 							title: res.data.message,
 							icon: 'none',
 							duration: 2000
 						})
+						return false
 					});
 			},
 			getcode() {
@@ -328,13 +378,12 @@
 								'/identityAuthenticationInfo/api/deleteIdentityAuthenticationInfo', {
 									id: item.id
 								}, 'application/json;charset=UTF-8').then(res => {
-								this.procurementPlanInfos = res.data.data.records
-								if (res.errmsg == "Success") {
+								// this.procurementPlanInfos = res.data.data.records
+								if (res.data.code == 200) {
 									this.$api.msg('删除成功！')
 									this.getList()
 									return
 								}
-
 							})
 							.catch(res => {
 								uni.showToast({

pages/business/business.vue

@@ -26,8 +26,8 @@
 			</view>
 		</view>
 		<view style='background:#fff;padding:0 15px;'>
-			<view @click='tabcarchange(0)' class='line' :class='TabCur==0?"active":""'>我要卖</view>
-			<view @click='tabcarchange(1)' class='line' :class='TabCur==1?"active":""'>我要买</view>
+			<view @click='tabcarchange(0)' class='line' :class='TabCur==0?"active":""'>采购</view>
+			<view @click='tabcarchange(1)' class='line' :class='TabCur==1?"active":""'>销售</view>
 		</view>
 		<view v-if='buyInfo.length>0' class="introduce-section">
 			<view v-for="(item, index) in buyInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
@@ -35,23 +35,35 @@
 					<view class="title">{{item.title}}</view>
 				</view>
 				<view class='flex justify-between'>
-					<view class='address'>
+					<view v-if='TabCur==0' class='address'>
 						{{item.receivePrivate}}{{item.receiveCity}}{{item.receiveArea}}{{item.receiveWarehouse}}
 					</view>
+					<view v-if='TabCur==1' class='address'>
+						{{item.sendPrivate}}{{item.sendCity}}{{item.sendArea}}{{item.sendWarehouse}}
+					</view>
 					<view class='price' v-if='item.procurementPlanType=="期货"'>{{item.basisPrice}}<text
 							style='font-size:13px;color:#333333;'>元/吨</text></view>
-					<view class='price' v-if='item.procurementPlanType=="现货"'>{{item.unitPrice}}<text
+					<view class='price' v-if='item.procurementPlanType=="现货"'>{{item.procurementPrice}}<text
 							style='font-size:13px;color:#333;'>元/吨</text></view>
+					<view class='price' v-if='item.salePlanType=="期货"'>+{{item.basisPrice}}<text
+						style='font-size:13px;color:#333333;'>元/吨</text></view>
+					<view class='price' v-if='item.salePlanType=="现货"'>{{item.salePrice}}<text
+						style='font-size:13px;color:#333;'>元/吨</text></view>
 				</view>
 				<view class='flex justify-between'>
 					<view>
 						<view class='tag1 tag-bule radius line-pink' v-if='item.procurementPlanType=="现货"'>现货</view>
 						<view class='tag1 tag-bule radius line-pink' v-if='item.procurementPlanType=="期货"'>期货</view>
+						<view class='tag1 tag-bule radius line-pink' v-if='item.salePlanType=="现货"'>现货</view>
+						<view class='tag1 tag-bule radius line-pink' v-if='item.salePlanType=="期货"'>期货</view>
 						<view class='tag1 tag-yellow radius line-green'>{{item.goodsName}}</view>
-						<view class='tag1 tag-red radius line-yellow'>{{item.weight}}吨</view>
+						<view class='tag1 tag-red radius line-yellow' v-if="TabCur== 0">{{item.plannedPurchaseVolume}}吨</view>
+						<view class='tag1 tag-red radius line-yellow' v-if="TabCur== 1">{{item.plannedSaleVolume}}吨</view>
 					</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货"'>今日基差</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货"'>采购价格</view>
+					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货" && TabCur== 0'>今日基差</view>
+					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货" && TabCur== 0'>采购价格</view>
+					<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="期货" && TabCur== 1'>今日基差</view>
+					<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="现货" && TabCur== 1'>销售价格</view>
 				</view>
 			</view>
 			<view v-show="isLoadMore">
@@ -260,7 +272,7 @@
 						})
 					} else {
 						uni.navigateTo({
-							url: `/pageA/product/detail_buy?id=${id}&compId=${item.compId}`
+							url: `/pageA/product/sales_detail?id=${id}&compId=${item.compId}`
 						})
 					}
 

pages/public/code.vue

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

pages/public/login.vue

@@ -264,8 +264,7 @@
 							clearInterval(interval)
 						}
 					}, 1000)
-				})
-				
+				})	
 			},
 			verifyCodeInput(e){
 				this.verifyCode = e.detail.value

pages/release/release.vue

@@ -11,20 +11,25 @@
 						<view class="status">
 							<view v-if='item.status=="已驳回"' class='put2'>未通过</view>
 							<view v-if='item.status=="待审核"' class='put1'>审核中</view>
-							<view v-if='item.status=="已认证"' class='put'>已通过</view>
+							<view v-if='item.status=="已通过"' class='put'>已通过</view>
 						</view>
 					</view>
-					<view class="address">{{item.receivePrivate}}{{item.receiveCity}}{{item.receiveArea}}</view>
+					<view class="address">{{item.privates}}{{item.city}}{{item.Area}}</view>
 					<view class="flex ">
-						<view class="weight">{{item.weight > 0 ? item.weight : 0}}吨</view>
-						<text class="unitPrice">{{item.unitPrice}} <text class="amount">元/吨</text></text>
+						<view class="weight">{{item.plannedVolume > 0 ? item.plannedVolume : 0}}吨</view>
+						<view v-if='item.planType=="期货"'>
+							<!-- <text class="unitPrice">{{item.basisPrice}} <text class="amount">元/吨</text></text> -->
+						</view>
+						<view v-if='item.planType=="现货"'>
+							<text class="unitPrice">{{item.unitPrice}} <text class="amount">元/吨</text></text>
+						</view>
 					</view>
 				</view>
 				<hr style="margin: 16px 0; color: #EEEEEE;">
 				<view class="flex" style="right: 10px;">
 					<view @click='edit(item)' v-if='item.status!="待审核"' class='anniu'>编辑</view>
-					<view class='anniu' @click="switch1(item)" v-if="item.showFlag == 0">隐藏</view>
-					<view class='anniu' @click="switch1(item)" v-if="item.showFlag == 1">显示</view>
+					<view class='anniu' @click="switch1(item)" v-if='item.showFlag == 0&&item.status!="待审核"'>显示</view>
+					<view class='anniu' @click="switch1(item)" v-if='item.showFlag == 1&&item.status!="待审核"'>隐藏</view>
 					<view class='anniu' @click="deleteRelease(item)">删除</view>
 				</view>
 			</view>
@@ -71,9 +76,9 @@
 				if (item.type == "买粮") {
 					var that = this
 					var tips
-					if (item.showFlag == 0) {
+					if (item.showFlag == 1) {
 						tips = "隐藏后该信息不再展示给其他用户，是否确定隐藏？"
-					} else if (item.showFlag == 1) {
+					} else if (item.showFlag == 0) {
 						tips = "确定显示该信息？"
 					}
 					uni.showModal({
@@ -81,7 +86,6 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
-
 							if (res.confirm) {
 								that.$api.doRequest('post', '/procurementPlanInfo/api/editStatus', {
 										id: item.id,
@@ -89,9 +93,9 @@
 									}).then(res => {
 										// this.procurementPlanInfos = res.data.data.records
 										if (res.data.message == "Success") {
-											if (item.showFlag == 0) {
+											if (item.showFlag == 1) {
 												that.$api.msg('隐藏成功！')
-											} else if (item.showFlag == 1) {
+											} else if (item.showFlag == 0) {
 												that.$api.msg('显示成功！')
 											}
 											that.getList()
@@ -113,9 +117,9 @@
 				} else if (item.type == "卖粮") {
 					var that = this
 					var tips
-					if (item.showFlag == 0) {
+					if (item.showFlag == 1) {
 						tips = "隐藏后该信息不再展示给其他用户，是否确定隐藏？"
-					} else if (item.showFlag == 1) {
+					} else if (item.showFlag == 0) {
 						tips = "确定显示该信息？"
 					}
 					uni.showModal({
@@ -130,9 +134,9 @@
 									}).then(res => {
 										// this.procurementPlanInfos = res.data.data.records
 										if (res.data.message == "Success") {
-											if (item.showFlag == 0) {
+											if (item.showFlag == 1) {
 												that.$api.msg('隐藏成功！')
-											} else if (item.showFlag == 1) {
+											} else if (item.showFlag == 0) {
 												that.$api.msg('显示成功！')
 											}
 											that.getList()
@@ -147,7 +151,6 @@
 										})
 									});
 							} else if (res.cancel) {
-								// console.log('用户点击取消');
 							}
 						},
 					})
@@ -165,7 +168,9 @@
 				}
 			},
 			deleteRelease(item) {
+				var that = this
 				if (item.type == "买粮") {
+					var that = this
 					uni.showModal({
 						// title: '登录提示',
 						content: '确定删除该信息？',
@@ -173,12 +178,12 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								this.$api.doRequest('post', '/procurementPlanInfo/api/deleteProcurementPlan', {
+								that.$api.doRequest('post', '/procurementPlanInfo/api/deleteProcurementPlan', {
 										id: item.id
 									}).then(res => {
 										if (res.data.message == "Success") {
-											this.$api.msg('删除成功！')
-											this.getList()
+											that.$api.msg('删除成功！')
+											that.getList()
 											return
 										}
 									})
@@ -204,12 +209,12 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								this.$api.doRequest('post', '/salePlanInfo/api/deleteSalePlanInfo', {
+								that.$api.doRequest('post', '/salePlanInfo/api/deleteSalePlanInfo', {
 										id: item.id
 									}).then(res => {
 										if (res.data.message == "Success") {
-											this.$api.msg('删除成功！')
-											this.getList()
+											that.$api.msg('删除成功！')
+											that.getList()
 											return
 										}
 									})
@@ -227,7 +232,6 @@
 						fail: () => {},
 						complete: () => {}
 					})
-
 				}
 			},
 			releaseChange(e) {

pages/user/user.vue

@@ -198,7 +198,7 @@
 						// icon: 'cuIcon-copy',
 						src:'../../static/img/sign/receiveGoods@2x.png',
 						tips: 0,
-						url: `/pages/user/task`,
+						url: `/pageA/freightTransport/index`,
 						show: true
 					},
 					{