Forráskód Böngészése

前端小程序 sdy

zhongtianhaoyuan 3 éve
szülő
commit
261825719d

+ 429 - 0
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>

+ 522 - 0
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>
+

+ 459 - 0
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>

+ 483 - 0
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>

+ 502 - 0
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>

+ 630 - 0
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>
+

+ 621 - 0
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>
+

+ 5 - 0
pageB/contract/contract.vue

@@ -36,6 +36,11 @@
 				<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>

+ 2 - 0
pageD/identity/companyIdentityThree.vue

@@ -338,6 +338,7 @@
 							that.identityAuthenticationInfo.commonId = that.userInfo.id
 							that.identityAuthenticationInfo.payeeAddressUrl = that.bankid.toString()
 							that.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+
 							
 							
 							uni.showModal({
@@ -393,6 +394,7 @@
 													})
 													uni.navigateTo({
 														url: `/pages/attestation/indexTwo`,
+
 													})
 												} else {
 													uni.showToast({

+ 3 - 2
pageD/identity/driverIdentity.vue

@@ -39,7 +39,7 @@
 			<view class="c-row b-b">
 				<text class="tit">手机号</text>
 				<view class="con-list">
-					<input placeholder="请填写手机号" name="input" v-model="DriverViewInfo.driverPhone"></input>
+					<input placeholder="请填写手机号" maxlength = "11"  name="input" v-model="DriverViewInfo.driverPhone"></input>
 				</view>
 			</view>
 			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
@@ -48,7 +48,7 @@
 				<view style='width:70%;position:relative;margin-left: 200px;'>
 					<view class="con-list">
 						<!-- style='width:70%;position:relative;margin-left: 200px;' -->
-						<input v-model='verifyCode' placeholder="请输入验证码" type="text">
+						<input v-model='verifyCode' maxlength = "6"  placeholder="请输入验证码" type="text">
 					</view>
 				</view>
 			</view>
@@ -161,6 +161,7 @@
 					this.$api.msg('手机号不能为空')
 					return
 				}
+				debugger
 				if (this.DriverViewInfo.driverPhone.length != 11) {
 					this.$api.msg('手机号输入错误')
 					return

+ 3 - 3
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 => {

+ 2 - 0
pageD/identity/driverIdentityThree.vue

@@ -93,6 +93,7 @@
 				this.DriverViewInfo.commonId = this.userInfo.id
 				this.DriverViewInfo.pcFlag = 0
 				this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+
 				var that = this
 				uni.showModal({
 					content: "确认提交司机信息?",
@@ -150,6 +151,7 @@
 							// console.log('用户点击取消');
 						}
 					},
+
 				})
 				
 				

+ 21 - 16
pageD/identity/driverIdentityTwo.vue

@@ -176,6 +176,7 @@
 				}],
 				driverPayeeInfoList: [{
 					accountType: "个人账户",
+					accountTypeFlag: "1",
 					accountIndex: '0',
 					binkindex: 0,
 					cardAddressUrl: "",
@@ -244,6 +245,7 @@
 				this.driverPayeeInfoList[index].accountIndex = e.detail.value
 				this.driverPayeeInfoList[index].accountType = this.accountType[this.driverPayeeInfoList[index]
 					.accountIndex];
+				this.driverPayeeInfoList[index].accountTypeFlag= e.detail.value+1;
 				this.accountarr[index] = this.accountType[e.detail.value];
 			},
 			bankimgs(items) {
@@ -362,23 +364,26 @@
 						this.$api.msg('开户支行输入错误')
 						return
 					}
-					if (!this.driverPayeeInfoList[i].payeeName) {
-						this.$api.msg('收款人姓名不能为空')
-						return
-					}
-					if (this.driverPayeeInfoList[i].payeeName.length < 2 || this.driverPayeeInfoList[i].payeeName.length >
-						10) {
-						this.$api.msg('收款人姓名输入错误')
-						return
-					}
-					if (!this.driverPayeeInfoList[i].payeeNumberCard) {
-						this.$api.msg('收款人身份证号不能为空')
-						return
-					}
-					if (this.driverPayeeInfoList[i].payeeNumberCard.length != 18) {
-						this.$api.msg('收款人身份证号输入错误')
-						return
+					if(this.driverPayeeInfoList[i].accountTypeFlag==1){
+						if (!this.driverPayeeInfoList[i].payeeName) {
+							this.$api.msg('收款人姓名不能为空')
+							return
+						}
+						if (this.driverPayeeInfoList[i].payeeName.length < 2 || this.driverPayeeInfoList[i].payeeName.length >
+							10) {
+							this.$api.msg('收款人姓名输入错误')
+							return
+						}
+						if (!this.driverPayeeInfoList[i].payeeNumberCard) {
+							this.$api.msg('收款人身份证号不能为空')
+							return
+						}
+						if (this.driverPayeeInfoList[i].payeeNumberCard.length != 18) {
+							this.$api.msg('收款人身份证号输入错误')
+							return
+						}
 					}
+
 				}
 				this.DriverViewInfo.driverCarInfoList = this.driverCarInfoList
 				this.DriverViewInfo.driverPayeeInfoList = this.driverPayeeInfoList

+ 4 - 4
pageD/myRelease/buyEdit.vue

@@ -446,16 +446,16 @@
 					return
 				}
 				if(this.deptList.procurementPlanType == '现货'){
-					if (!this.deptList.unitPrice) {
+					if (!this.deptList.procurementPrice) {
 						this.$api.msg('单价不能为空')
 						return
 					}
-					if (this.deptList.unitPrice>100000||this.deptList.unitPrice<1) {
+					if (this.deptList.procurementPrice>100000||this.deptList.procurementPrice<1) {
 						this.$api.msg('单价输入错误')
 						return
 					}
-					if (this.deptList.unitPrice.indexOf('.')!=-1) {
-						if(this.deptList.unitPrice.split('.')[1].length>2){
+					if (this.deptList.procurementPrice.indexOf('.')!=-1) {
+						if(this.deptList.procurementPrice.split('.')[1].length>2){
 							this.$api.msg('单价输入错误')
 							return
 						}

+ 50 - 0
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": {

+ 54 - 28
pages/attestation/indexTwo.vue

@@ -207,61 +207,87 @@
 						verifyCode: this.verifyCode
 					}).then(res => {
 						if (res.data.code == 200) {
-							this.$api.doRequest('post', '/identityAuthenticationInfo/api/modifyIdentityPhone', {
-									customerPhone: this.price,
-									id: this.id,
-									commonId: this.userInfo.id
-								}, 'application/json;charset=UTF-8').then(res => {
-									if (res.data.code == 200) {
-										that.$api.msg('修改成功!')
-										that.pricestatusTwo = false
-										that.pricestatus = false
-										that.getList()
-										// uni.navigateTo({
-										// 	url: '/pages/attestation/indexTwo'
-										// });
-
-									} else {
+							that.$api.doRequest('get',
+									'/identityAuthenticationInfo/selectPhone', that
+									.identityAuthenticationInfo)
+								.then(res => {
+									if (res.data.code == '11018') {
+										uni.showModal({
+											title: '提示',
+											content: '该手机号已认证过个人粮商,再次认证将覆盖之前的认证信息,是否确定认证?',
+											success: function(res) {
+												if (res.confirm) {
+													that.$api.doRequest('post',
+														'/identityAuthenticationInfo/api/modifyIdentityPhone',
+														that.identityAuthenticationInfo).then(
+														res => {
+															uni.showToast({
+																title: '提交成功',
+																icon: 'none',
+																duration: 2000
+															})
+															uni.navigateTo({
+																url: `/pages/attestation/indexTwo`,
+															})
+														}).catch(res => {
+														uni.showToast({
+															title: res.data.message,
+															icon: 'none',
+															duration: 2000
+														})
+													})
+												} else if (res.cancel) {
+													uni.showToast({
+														title: '提交失败',
+														icon: 'none',
+														duration: 2000
+													})
+												}
+											}
+										});
+									} else if (res.data.code == 200) {
 										uni.showToast({
-											title: res.errmsg,
+											title: '提交成功',
 											icon: 'none',
 											duration: 2000
 										})
-										return
-									}
-									if (res.data.code == "ERROR") {
+										uni.navigateTo({
+											url: `/pages/attestation/indexTwo`,
+										})
+									} 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() {

+ 1 - 1
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
 					},
 					{