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

main.js

@@ -182,17 +182,17 @@ const doRequest = (method, url, data,header)=> {
 	// let baseUrl = config.def().baseUrl
 	let baseUrl = config.def().baseUrlNew
         // 如果data为空
-        if (!data) var data = []
-        var arr = []
-        arr.push(data)
+        // if (!data) var data = []
+        // var arr = []
+        // arr.push(data)
         // 接口需要验证的可以将json转成数组添加值再调用
         // 不需要的可以直接data:data
         return new Promise((resolve, reject) => {
             uni.request({
                 method: method,
                 url: baseUrl +url,
-                data: arr[0],
-                // data:data
+                // data: arr[0],
+                data:data,
                 header: {
                     'content-type': contentheader //'application/x-www-form-urlencoded; charset=UTF-8',
                 },

pageA/product/detail.vue

@@ -376,7 +376,7 @@
 				})
 			},
 			salegrain(){
-				console.log(this.userInfo)
+				var that=this
 				if (!this.hasLogin) {
 					uni.showModal({
 						title: '登录提示',
@@ -386,12 +386,7 @@
 						success: (e) => {
 							if (e.confirm) {
 								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}`
+									url: '/pages/public/login'
 								})
 							}
 						},
@@ -403,8 +398,14 @@
 					this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo',{commonId:this.userInfo.id}).then(res => {
 						if(res.data.code==200){
 							uni.navigateTo({
-								url: '/pages/public/login'
+								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}`
 							})
+							
 						}else if(res.data.code==11016){
 							uni.showModal({
 								    title: '温馨提示',

pageA/product/trade.vue

@@ -3,89 +3,114 @@
 	<view class="container">
 		<view class="detail-desc">
 			<view class="c-list">
-				<view class="c-row">
-					<text class="tit">水分（%）{{'<='}} </text>
+				<view class="c-row b-b">
+					<text class="tit">卖方</text>
 					<view class="con-list">
-						<text>{{goods.waterContent}}</text>
+						<view v-if='goods.customerTypeFlag==1' class="title">{{goods.customerName}}</view>
+						<view v-if='goods.customerTypeFlag==2' class="title">{{goods.compName}}</view>
 					</view>
 				</view>
+				<view class="c-row">
+					<text class="tit">买方</text>
+					<view class="con-list">
+						<view class="title">{{seller}}</view>
+					</view>
 				</view>
-		<view v-if="companyId!=2" class="cu-form-group">
-			<view class="title">卖方</view>
-			<view class="title">{{seller}}</view>
-		</view>
-		<view v-if="companyId!=2" class="cu-form-group">
-			<view class="title">卖方电话</view>
-			<view class="title">{{sellerPhone}}</view>
-		</view>
+			</view>
 		</view>
-		<view class="cu-form-group">
-			<text class="tit">我的信息</text>
-			<view v-if='bankNameList.length>0'>
-				<picker @change="bankNameChange" :value="bankNameIndex" :range="bankNameList">
-					<view class="picker">
-						{{bankNameIndex>-1?bankNameList[bankNameIndex]:'点击选择名头'}}
+		<view class="detail-desc">
+			<view class="c-list">
+				<view class="c-row b-b">
+					<text class="tit">收货地区</text>
+					<view class="con-list">
+						<view  class="title">{{receivePrivate}}{{receiveCity}}{{receiveArea}}</view>
+					</view>
+				</view>
+				<view v-if='pcFlag==1' class="c-row  b-b">
+					<text class="tit">收货库</text>
+					<view class="con-list">
+						<view class="title">{{receiveWarehouse}}</view>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">货名</text>
+					<view class="con-list">
+						<view class="title">{{goodsName}}</view>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">最小成交量（吨）</text>
+					<view class="con-list">
+						<view class="title">{{minimumVolume}}</view>
+					</view>
+				</view>
+				<view class="c-row">
+					<text class="tit">今日基差（元/吨）</text>
+					<view class="con-list">
+						<view class="title">{{basisPrice}}</view>
 					</view>
-				</picker>
+				</view>
 			</view>
-				
-			<button class='cu-btn bg-green shadow' @click="changeZhihang">添加名头</button>
 		</view>
-		<view  v-if="companyId!=2" class="cu-form-group margin-top">
-			<view class="title">价格类型</view>
-			<picker @change="PriceTypeChange" :value="priceTypeIndex" :range="priceType">
-				<view class="picker">
-					{{priceTypeIndex>-1?priceType[priceTypeIndex]:'请选择'}}
+		<view class="detail-desc">
+			<view class="c-list">
+				<view class="c-row  b-b">
+					<text class="tit">发票类型</text>
+					<picker style="text-align:right;" @change="InvoiceTypeChange1" :value="invoiceTypeIndex1" :range="invoiceType1">
+						<view class="picker">
+							{{invoiceTypeIndex1>-1?invoiceType1[invoiceTypeIndex1]:'请选择'}}
+						</view>
+					</picker>
 				</view>
-			</picker>
-		</view>
-		<view v-if='companyId!=2' class="cu-form-group">
-			<view class="title">交接区域</view>
-			<picker mode="region" @change="RegionChange" :value="region">
-				<view class="picker" v-if="region.length>0">
-					{{region[0]}}{{region[1]}}{{region[2]}}
+				<view class="c-row b-b">
+					<text class="tit">出售数量（吨）<text style='color:#FC3535;'>*</text></text>
+					<view class="con-list">
+						<input v-model='list.transactionsNumber' type="digit">
+					</view>
 				</view>
-				<view class="picker" v-else>
-					请选择
+				<view class="c-row b-b">
+					<text class="tit">发票类型</text>
+					<picker style="text-align:right;" @change="packingChange" :value="packingIndex" :range="packingType">
+						<view class="picker">
+							{{packingIndex>-1?packingType[packingIndex]:'请选择'}}
+						</view>
+					</picker>
 				</view>
-			</picker>
-		</view>
-		<view v-if='companyId!=2' class="cu-form-group">
-			<view class="title">详细交收地址</view>
-			<input placeholder="请填写" name="input" @input="addressInput"></input>
-		</view>
-		<view v-if='companyId==2' class="cu-form-group">
-			<view class="title">库点地址</view>
-			<view class="title">{{province+city+area+storeName}}</view>
-		</view>
-		<view class="cu-form-group">
-			<view class="title">最小成交量（吨）</view>
-			<view class="title">{{minSale}}</view>
-		</view>
-		<view v-if='companyId!=2' class="cu-form-group">
-			<view v-if='isFutures==1' class="title">库容</view>
-			<view v-if='isFutures==0' class="title">库存量</view>
-			<view class="title">{{exsitCount}}</view>
-		</view>
-		<view v-if="companyId==2" class="cu-form-group">
-			<view  class="title">发票类型</view>
-			<picker @change="InvoiceTypeChange1" :value="invoiceTypeIndex1" :range="invoiceType1">
-				<view class="picker">
-					{{invoiceTypeIndex1>-1?invoiceType1[invoiceTypeIndex1]:'请选择'}}
+				<view class='b-b' style='padding:10px 15px;'>
+					<text class="tit">袋装备注</text>
+					<view style='position:relative;' class='con-list'>
+						<textarea maxlength='30' v-model='list.baggingNotes' placeholder="请输入袋装备注，如王中王彩袋，49公斤，大粒" class='textarea' name="" id=""  cols="30" rows="3"></textarea>
+					<text style='position:absolute;right:0;bottom:2px;'>{{list.baggingNotes.length}}/30个字</text>
+					</view>
 				</view>
-			</picker>
-		</view>
-		<view v-else class="cu-form-group">
-			<view  class="title">发票类型</view>
-			<picker @change="InvoiceTypeChange" :value="invoiceTypeIndex" :range="invoiceType">
-				<view class="picker">
-					{{invoiceTypeIndex>-1?invoiceType[invoiceTypeIndex]:'请选择'}}
+				<view class="c-row b-b">
+					<text class="tit">点价（元/吨）<text style='color:#FC3535;'>*</text></text>
+					<view class="con-list">
+						<input v-model='list.pointPrice' placeholder="请输入出售数量" type="digit">
+					</view>
 				</view>
-			</picker>
-		</view>
-		<view class="cu-form-group">
-			<view class="title">购买数量（吨）</view>
-			<input placeholder="请填写" name="input" @input="countInput"></input>
+				<view  v-if='invoiceTypeIndex1==0&&goods.customerTypeFlag==1' class="c-row b-b">
+					<text class="tit">发票费用（元/吨）</text>
+					<view class="con-list">
+						<input disabled value='-20' placeholder="请输入出售数量" type="digit">
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">包装费（元/吨）</text>
+					<view class="con-list">
+						<input v-model='list.packingFee' placeholder="请输入包装费" type="digit">
+					</view>
+				</view>
+				<view  style='padding:10px 15px;'>
+					<view class='flex justify-between'>
+						<text class="tit">结算价格（元/吨）</text>
+						<view class="con-list">
+							<input disabled v-model='list.settlementPrice' placeholder="请输入包装费" type="digit">
+						</view>
+					</view>
+					<view style='font-size:11px;color:#AFB3BF;'>结算价格=点价+基差+发票费用+包装费</view>
+				</view>
+			</view>
 		</view>
 		<!-- <view v-if='isFutures==0' class="cu-form-group margin-top margin-bottom">
 			<view class="title">质量验收方式</view>
@@ -95,56 +120,6 @@
 				</view>
 			</picker>
 		</view> -->
-		<view v-if="companyId!=2" class="cu-form-group">
-			<view class="title">包装方式</view>
-			<input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput'></input>
-		</view>
-		<view  v-else class="cu-form-group margin-top">
-			<view class="title">包装方式</view>
-			<picker @change="packingChange" :value="packingIndex" :range="packingType">
-				<view class="picker">
-					{{packingIndex>-1?packingType[packingIndex]:'请选择'}}
-				</view>
-			</picker>
-		</view>
-		<view class="cu-form-group">
-			<view v-if='companyId != 2' class="title">协议单价（元/吨）</view>
-			<view v-else class="title" style='color:red'>点价（元/吨）</view>
-			<input placeholder="请填写" name="input" @input="unitPriceInput"></input>
-		</view>
-		<view v-if="companyId==2" class="cu-form-group">
-			<view class="title">基差（元/吨）</view>
-			<view class="title">{{basis}}</view>
-		</view>
-		<view v-if="companyId==2" class="cu-form-group">
-			<view class="title">发票费用（元/吨）</view>
-			<view class="title">{{invoiceMoney}}</view>
-		</view>
-<!-- 		<view v-if="companyId==2&&unloadingFee" class="cu-form-group">
-			<view class="title">卸车费（元/吨）</view>
-			<view class="title">{{unloadingFee}}</view>
-		</view> -->
-		<view v-if="companyId==2" class="cu-form-group">
-			<view class="title">包装费</view>
-			<view class="title">25KG(含25)以内40元/吨，50KG(含50)以内20元/吨</view>
-		</view>
-		
-		<view v-if="companyId==2" class="cu-form-group">
-			<view class="title">结算价格（自动计算）</view>
-			<view class="title">{{(Number(unitPrice) + Number(basis) + Number(invoiceMoney) +  Number(packingMoney))*count}}元</view>
-		</view>
-		<view v-else class="cu-form-group">
-			<view class="title">总金额（自动计算）</view>
-			<view class="title">{{unitPrice*count}}元</view>
-		</view>
-		<view v-if="companyId==2" class="cu-form-group align-start">
-			<!-- <view class="title">结算价格=点价+基差+发票+包装费</view> -->
-			<view class="title">最终以纸质合同为准</view>
-		</view>
-		<view class="cu-form-group align-start">
-			<view class="title">备注</view>
-			<textarea maxlength="-1" :disabled="modalName!=null" @input="textareaInput" placeholder="请填写包装规格、质量、包装物要求。例:50kg袋装、大粒、彩包"></textarea>
-		</view>
 		<view class="padding flex flex-direction">
 			<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">提交</button>
 		</view>
@@ -155,24 +130,21 @@
 	export default {
 			data() {
 				return {
-					tradeInfo:{
-						salebuyId:0,
-						packing:'',
-						memo:'',
-						buyer:'',
-						buyerPhone:'',
-						unitPrice:0,
-						address:'',
-						count:0,
-						province:'',
-						area:'',
-						priceType:'',
-						invoiceType:'',
-						acceptType:'',
-						seller:'',
-						sellerPhone:'',
-						packingMoney:0,
-						type:0,
+					goodsName:'',
+					goods:{},
+					receiveWarehouse:'',
+					receivePrivate:'',
+					receiveCity:'',
+					receiveArea:'',
+					minimumVolume:0,
+					basisPrice:0,
+					pcFlag:0,
+					list:{
+						transactionsNumber:0,
+						baggingNotes:'',
+						pointPrice:0,
+						packingFee:'',
+						settlementPrice:0
 					},
 					invoiceTypeIndex:0,
 					invoiceTypeIndex1:0,
@@ -180,14 +152,14 @@
 					priceTypeIndex:0,
 					bankNameIndex:0,
 					packingIndex:0,
-					packingType: ['散装', '袋装'],
+					packingType: ['散装', '大装','小袋'],
 					invoiceType: ['不开发票', '普通发票', '增值税发票'],
 					invoiceType1: ['不开发票','增值税发票'],
 					acceptType: ['第三方检验（国家检验资质）', '交收地库或港出具的检验', '现场看货','其他'],
 					priceType: ['库内价', '到库价', '到港价'],
 					priceTypeIndex1:'库内价',
 					region: [],
-					salebuyId:0,
+					id:0,
 					packing:'',
 					memo:'',
 					buyer:'',
@@ -222,9 +194,16 @@
 				};
 			},
 			onLoad(options) {
-				this.salebuyId = options.id
+				this.receiveWarehouse=options.receiveWarehouse
+				this.receivePrivate=options.receivePrivate
+				this.receiveCity=options.receiveCity
+				this.receiveArea=options.receiveArea
+				this.minimumVolume=options.minimumVolume
+				this.basisPrice=options.basisPrice
+				this.id = options.id
+				this.pcFlag = options.pcFlag
+				this.goodsName = options.goodsName
 				this.seller = options.seller
-				this.sellerPhone = options.sellerPhone
 				this.isFutures = options.isFutures
 				this.minSale = options.minSale
 				this.companyId=options.companyId
@@ -239,31 +218,37 @@
 				this.unloadingFee = options.unloadingFee
 			},
 			onShow() {
-				var that=this
-				this.$api.request('company', 'getCompany', failres => {
-					that.$api.msg(failres.errmsg)
-					uni.hideLoading()
-				}).then(res => {
-					if(res.data.code=='SUCCESS'){
-						var data=[]
-						this.Company=res.data.data
-						if(res.data.data){
-							for(let i=0;i<res.data.data.length;i++){
-								data.push(res.data.data[i].companyName+' '+res.data.data[i].companyPhone)
-							}
-						}
-						if(this.Company){
-							this.buyer =this.Company[0].companyName
-							this.buyerPhone=this.Company[0].companyPhone
-							this.tradeCompanyId=this.Company[0].id
-						}
-						that.bankNameList=data
-						uni.hideLoading()
-					}else{
-						that.$api.msg(res.data.code)
-						uni.hideLoading()
+				this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo',{commonId:111111}).then(res => {
+					if(res.data.code==200){
+						this.goods=res.data.data
 					}
+					uni.hideLoading()
 				})
+				// var that=this
+				// this.$api.request('company', 'getCompany', failres => {
+				// 	that.$api.msg(failres.errmsg)
+				// 	uni.hideLoading()
+				// }).then(res => {
+				// 	if(res.data.code=='SUCCESS'){
+				// 		var data=[]
+				// 		this.Company=res.data.data
+				// 		if(res.data.data){
+				// 			for(let i=0;i<res.data.data.length;i++){
+				// 				data.push(res.data.data[i].companyName+' '+res.data.data[i].companyPhone)
+				// 			}
+				// 		}
+				// 		if(this.Company){
+				// 			this.buyer =this.Company[0].companyName
+				// 			this.buyerPhone=this.Company[0].companyPhone
+				// 			this.tradeCompanyId=this.Company[0].id
+				// 		}
+				// 		that.bankNameList=data
+				// 		uni.hideLoading()
+				// 	}else{
+				// 		that.$api.msg(res.data.code)
+				// 		uni.hideLoading()
+				// 	}
+				// })
 				// uni.getLocation({
 				//     type: 'wgs84',
 				// 	geocode:true,
@@ -498,6 +483,23 @@
 			}
 		}
 	}
+	.c-list picker .picker {
+	    line-height: 80rpx;
+	    font-size: 24rpx;
+	    text-overflow: ellipsis;
+	    white-space: nowrap;
+	    overflow: hidden;
+	    width: 100%;
+	    text-align: right;
+	}
+	.c-list picker {
+	    -webkit-box-flex: 1;
+	    -webkit-flex: 1;
+	    flex: 1;
+	    padding-right: 10px;
+	    overflow: hidden;
+	    position: relative;
+	}
 	.c-list {
 		font-size: $font-sm + 2upx;
 		color: $font-color-base;
@@ -548,4 +550,14 @@
 			color: $uni-color-primary;
 		}
 	}
+	.textarea{
+		background:#F9F9FA;
+		font-size:12px;
+		text-align:left;
+		width:100%;
+		height:60px;
+		padding:10px;
+		border-radius:5px;
+		margin-top:10px;
+	}
 </style>

pageB/contract/contract.vue

@@ -1,516 +1,664 @@
 <template>
-	<view v-if='contractInfo'>
-		<view class="content">
-			<scroll-view class="list-scroll-content" scroll-y @scrolltolower="onReachBottomTmp">
-				<view class="guess-section">
-					<view 
-						v-for="(item, index) in contractInfo.tran" :key="index"
-						class="guess-item"
-						@click="navToDetailPage(item)"
-					>
-					<view class="flex justify-between padding-xs ">
-						<view style='background:#4BA831;' class='contractType'>{{item.contractType}}</view>
-						<view style='width:75%;'>
-							<view>合同编号：{{item.contractNo}}</view>
-							<view>运输人员：{{item.driver}}</view>
-							<view>运输车牌：{{item.carNo}}</view>
-						</view>
-					</view>
-					</view>
-					<view
-						v-for="(item, index) in contractInfo.trade" :key="index"
-						class="guess-item"
-					>
-					<view class="flex justify-between padding-xs ">
-						<view style='background:#3C73F2;' v-if="item.contractType == '销售合同'" class='contractType'>
-							<text v-if='item.tips != 0' class='badge'>{{item.tips}}</text>
-							<!-- <text class='badge'>1</text> -->
-							{{item.contractType}}
-						</view>
-						<view style='background:#E3A13E;' v-if="item.contractType == '采购合同'" class='contractType'>
-							<text v-if='item.tips != 0' class='badge'>{{item.tips}}</text>
-							<!-- <text class='badge'>1</text> -->
-							{{item.contractType}}
-						</view>
-						<view style='width:75%;'>
-							
-							<view class='flex justify-between'>
-								<view>合同编号：{{item.contractNo}}</view>
-								<view v-if='item.tradeStatus==2'>已受理</view>
-								<view v-if='item.tradeStatus==3'>已成交</view>
-								<view v-if='item.tradeStatus==4'>已完成</view>
-							</view>
-							<view v-if='item.tradeStatus==2' class='flex justify-between'>
-								<text style='display:inline-block;margin-right:5px;' v-if="item.price">暂定价：{{item.price}}</text>
-								<text style='display:inline-block;margin-right:5px;' v-if="item.basis">基差：{{item.basis}}</text>  
-								<text style='display:inline-block;margin-right:5px;' v-if="item.allCount">吨位：{{item.allCount}}T</text>  
-							</view>
-							<view v-else class='flex justify-between'>
-								<text style='display:inline-block;margin-right:5px;' v-if="item.price">成交价：{{item.price}}</text>
-								<text style='display:inline-block;margin-right:5px;' v-if="item.basis">基差：{{item.basis}}</text>  
-								<text style='display:inline-block;margin-right:5px;' v-if="item.allCount">吨位：{{item.allCount}}T</text>  
-							</view>
-							<view class='flex button-group'><button @click="navToDetailPage2(item)">操作</button><button  @click="examine(item)">查看</button></view>
-							<!-- <view class='flex justify-between' v-if="item.contractType == '采购合同'">
-								<text style='display:inline-block;margin-right:5px;' >总量：{{item.allCount}}</text> 
-								<text style='display:inline-block;margin-right:5px;' >已完成量 {{item.num}}</text>
-							</view>
-							<view class='flex justify-between' v-if="item.contractType == '采购合同'">
-								<text style='display:inline-block;margin-right:5px;' v-if="item.money">应付金额：{{item.money}}</text>
-								<text style='display:inline-block;margin-right:5px;' v-if='item.notMoney'>未付金额：{{item.notMoney}}</text>
-							</view>
-							<view class='flex justify-between' v-if="item.contractType == '销售合同'">
-								<text style='display:inline-block;margin-right:5px;' v-if="item.money">应收金额：{{item.money}}</text> 
-								<text style='display:inline-block;margin-right:5px;' v-if='item.notMoney'>未收金额：{{item.notMoney}}</text>
-							</view>
-							<view class='flex justify-between'>
-								<text style='display:inline-block;margin-right:5px;' v-if="item.basis">基差：{{item.basis}}</text>  
-								<text style='display:inline-block;margin-right:5px;' v-if="item.price">点价金额：{{item.price}}</text>
-							</view>
-							<view class='flex justify-between'>
-								<text v-if="item.invoiceMoney">发票费：{{item.invoiceMoney}}</text>  
-								<text v-if="item.packingMoney">包装费：{{item.packingMoney}}</text>
-								<text v-if="item.unloadingFee">卸车费：{{item.unloadingFee}}</text>
-								<text v-if="item.deductionFee">总扣款(元)：{{item.deductionFee}}</text>
-							</view> -->
-						</view>
-						<!-- <text  class='badge'>11</text> -->
-					</view>
-					<!-- <view class="flex justify-between padding-xs ">
-					  <view class=" padding-xs">
-						  <view  class="cu-capsule radius">
-							<view class="cu-tag bg-green">
-								{{item.contractType}}
-							</view>
-							<view class="cu-tag line-green">
-								{{item.contractNo}}
-							</view>
-						  </view>
-						  <view class="cu-capsule radius">
-							<view v-if="item.allCount" class="cu-tag bg-orange">
-								总量  {{item.allCount}}
-							</view>
-							<view v-if="item.allCount&&item.num" class="cu-tag line-orange">
-								<view v-if="item.allCount-item.num > 0">未完成量  {{item.allCount-item.num}}</view>
-								<view v-else>未完成量  0</view>
-							</view>
-							<view v-if="item.basis" class="cu-tag line-orange">
-								<view>基差 {{basis}}</view>
-							</view>
-							<view v-if="item.price" class="cu-tag bg-orange">
-								点价金额  {{item.price}}
-							</view>
-						  </view>
-						  <view class="cu-capsule radius">
-							<view v-if="item.money && item.contractType == '销售合同'" class="cu-tag bg-orange">
-								应收款  {{item.money}}
-							</view>
-							<view v-if="item.notMoney && item.contractType == '销售合同'" class="cu-tag line-orange">
-								未收款  {{item.notMoney}}
-							</view>
-							<view v-if="item.money && item.contractType == '采购合同'" class="cu-tag bg-orange">
-								应付款  {{item.money}}
-							</view>
-							<view v-if="item.notMoney && item.contractType == '采购合同'" class="cu-tag line-orange">
-								未付款  {{item.notMoney}}
-							</view>
-							<view v-if="item.definitePrice" class="cu-tag bg-orange">
-								我的定金  {{item.definitePrice}}
-							</view>
-						  </view>
-					  </view>
-					  <text v-if='item.tips != 0' class='badge'>{{item.tips}}</text>
-					</view> -->
-					</view>
-					<view v-show="isLoadMore">
-						<uni-load-more :status="loadStatus" ></uni-load-more>
-					</view>
-				</view>
-			</scroll-view>
+	<view class="container">
+		<!-- <block v-if="TabCur==2"> -->
+		<view v-for="(item , index) in lists" :Key="index">
+			
+		
+		<view class="cu-form-group">
+			<view class="title">采购</view>
+	
+			<text style="margin-left: -30%;">编号{{item.contractNo}}{{item.procurementPlanType}}</text>
+			<text>{{item.status}}</text>
 		</view>
-	</view>
-	<view v-else>
-		当前暂无合同信息
+		<view class="cu-form-group">
+			<view class="title">买方</view>
+			<text style="margin-left: -45%;">{{item.customer}}</text>
+			<text></text>
+		</view>
+		<view class="cu-form-group">
+			<view class="title">玉米:<text>{{item.goodsName}}</text></view>
+			<view class="title">单价:<text>{{item.unitPrice}}</text></view>
+			<view class="title">基差:<text>{{item.basis}}</text></view>
+		</view>
+		<view class="c-row b-b">
+			<text><button class="cu-btn commit margin-tb-sm lg" style=" width: 75px;height: 25px; margin-left: 15px;"
+					@click="commit">附件</button></text>
+					
+
+			<text><button class="cu-btn commit margin-tb-sm lg" style=" margin-left: 15px; width: 75px;height: 25px;"
+					@click="commit">点价</button></text>
+					
+					
+			<text><button class="cu-btn commit margin-tb-sm lg" style=" margin-left: 15px; width: 75px;height: 25px;"
+					@click="commit1(item)">发货</button></text>
+					
+		</view>
+		
+		</view>
+		
+		<hr>
+		<!-- <view class="cu-form-group">
+			<view class="title">采购</view>
+			<text style="margin-left: -30%;">编号{{goods.contractNo}}{{goods.procurementPlanType}}</text>
+			<text>{{goods.status}}</text>
+		</view>
+		<view class="cu-form-group">
+			<view class="title">买方</view>
+			<text style="margin-left: -45%;">{{goods.customer}}</text>
+			<text></text>
+		</view>
+		<view class="cu-form-group">
+			<view class="title">玉米:<text>{{goods.goodsName}}</text></view>
+			<view class="title">单价:<text>{{goods.unitPrice}}</text></view>
+			<view class="title">基差:<text>{{goods.basis}}</text></view>
+		</view>
+		<view class="cu-form-group">
+			<view class="title">
+			
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text><button class="cu-btn commit margin-tb-sm lg" style=" width: 75px;height: 25px; margin-left: 15px;"
+					@click="commit">附件</button>
+					
+					</text>
+
+			<text><button class="cu-btn commit margin-tb-sm lg" style=" margin-left: 15px; width: 75px;height: 25px;"
+					@click="commit">点价</button></text>
+		</view> -->
+		<view class="cu-bar bg-white margin-top">
+			<view class="action">
+
+			</view>
+		</view>
+
+		<view class="padding flex flex-direction">
+			<!-- <button class="cu-btn commit margin-tb-sm lg" @click="commit">提交</button> -->
+		</view>
+		<!-- </block> -->
 	</view>
 </template>
 
 <script>
+	
+	import uploadImage from '@/components/ossutil/uploadFile.js';
 	import {
 		mapState
 	} from 'vuex';
 	export default {
-			data() {
-				return {
-					contractInfo: [],
-					pages:1,//页数
-					limit:10 ,//每次取条目数
+		name: "trust",
+		data() {
+			return {
+				lists:[],
+				goods: {
+					pageSize:10,
+					currentPage:1,
+					id:"41651544",
+					// pcFlag : 0,
+				},
+				procurementPlanInfo:{
+				     pageSize:10,
+				     currentPage:1
+				    },
+				tran: {
+					total: 0,
 					price: 0,
-					loadStatus:'loading',  //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
-					isLoadMore:false  //是否加载中
-				};
-			},
-			computed: {
-				...mapState(['hasLogin','userInfo'])
-			},
-			onShow() {
-				this.loadData()
-			},
-			//下拉刷新
-			onPullDownRefresh() {
-				this.pages = 1
-				this.isLoadMore = false
-				this.loadStatus = 'loading'
-				this.loadData()
-			},
-			onLoad(options) {
-			},
-			// onPageScroll(e) {
-			// 	//兼容iOS端下拉时顶部漂移
-			// 	if (e.scrollTop >= 0) {
-			// 		this.headerPosition = "fixed";
-			// 	} else {
-			// 		this.headerPosition = "absolute";
-			// 	}
-			// },
-			onReachBottom(){  //上拉触底函数
-			  if(!this.isLoadMore){  //此处判断，上锁，防止重复请求
-					this.isLoadMore=true
-					this.pages += 1
-					this.getContractData()
-			  }
-			},
-			
-			methods: {
-				async loadData() {
-					const that = this
-					uni.showLoading({
-						title: '正在加载',
-						mask:true
-					})
-					that.$api.request('contract', 'getTranContractList',{
-						page: this.pages,
-						limit:this.limit
-					}, failres => {
-						that.$api.msg(failres.errmsg)
-						this.isLoadMore = false
-						this.loadStatus = 'nomore'
-						if(this.pages>1){this.pages=1}
-						uni.hideLoading()
-						uni.stopPullDownRefresh()
-					}).then(res => {
-						that.contractInfo = res.data
-						uni.hideLoading()
-						uni.stopPullDownRefresh()
-					})
-					if (!this.hasLogin) {
-						uni.showModal({
-							title: '登录提示',
-							content: '您尚未登录，是否立即登录？',
-							showCancel: true,
-							confirmText: '登录',
-							success: (e) => {
-								if (e.confirm) {
-									uni.navigateTo({
-										url: '/pages/public/login'
-									})
-								}
-							},
-							fail: () => {},
-							complete: () => {}
-						})
-					}
+					startPlace: undefined,
+					endPlace: undefined,
+					goodsName: undefined,
+					sender: '',
+					senderPhone: '',
+					status: 0,
+					receiver: '',
+					receiverPhone: '',
+					verifyCode: '',
+					driver: '',
+					driverPhone: '',
+					carNo: '',
+					personNoImg: '',
+					personNoImg1: '',
+					driverNoImg: '',
+					driverNoImg1: '',
+					carNoImg: '',
+					carNoImg1: ''
+
 				},
-				examine(item){
+				PageCur: "trust",
+				TabCur: 0,
+				priceTypeIndex: -1,
+				priceType: ['库内价', '到库价', '到港价'],
+				unitPrice: 0,
+				price: '',
+				seller: '',
+				sellerPhone: '',
+				minSale: '',
+				exsitCount: 0,
+				origin: '',
+				stock: '',
+				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: '',
+				showTran: true
+			};
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		// onShow() {
+		// 	this.loadData()
+		// },
+		onLoad(){
+			this.getList()
+		},
+		methods: {
+				commit1(item){
 					uni.navigateTo({
-						url: `/pageB/contract/look?contractNo=${item.contractNo}`
-					})
-				},
-				//详情
-				navToDetailPage(item) {
-					var that = this
-					uni.showLoading({
-						title: '正在加载',
-						mask:true
-					})
-					uni.downloadFile({
-					  url: item.contractImg,
-					  success: function (res) {
-					    var filePath = res.tempFilePath;
-					    uni.openDocument({
-					      filePath: filePath,
-					      success: function (res) {						
-							uni.hideLoading()
-					        console.log('打开文档成功');
-					      }
-					    });
-					  },
+						url: `/pageB/contract/look?id=${item.id}&contractNo=${item.contractNo}&customer=${item.customer}&goodsName=${item.goodsName}`
 					})
 				},
-				navToDetailPage2(item) {
-					uni.navigateTo({
-						url: `/pageA/pages/deliver_goods?id=${item.id}&contractType=${item.contractType}&tradeStatus=${item.tradeStatus}`
-					})
+			getList(){
+				this.goods.commonId = this.userInfo.id
+	
+			this.$api.doRequest('get','/purchaseOrder/selectPurchaseOrder',this.goods).then(res => {
+			    
+				console.log(res,"fanhuijie")
+				this.lists = res.data.data.records
+				 console.log("调用接口")
+			      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)
+			    })
+			    .catch(res => {
+			     uni.showToast({
+			      title: res.errmsg,
+			      icon:'none',
+			      duration: 2000
+			     })
+			    });
+			   },
+			
 					
-				},
-				onReachBottomTmp(){  //上拉触底函数
-				  if(!this.isLoadMore){  //此处判断，上锁，防止重复请求
-						this.isLoadMore=true
-						this.pages += 1
-						this.getContractData()
-				  }
-				},
-				getContractData(){
-					const that = this
-					var pages=that.pages
-					var limit=that.limit
-				   
-					uni.showLoading({
-						title: '正在加载',
-						mask:true
+			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 = "";
+			// 				}
+
+			// 			}
+			// 		}
+			// 	})
+			// },
+			
+			commit11() {
+				if (this.hasLogin) {
+					uni.showModal({
+						title: '登录提示',
+						content: '您尚未登录，是否立即登录？',
+						showCancel: true,
+						confirmText: '登录',
+						success: (e) => {
+							if (e.confirm) {
+								uni.navigateTo({
+									url: '/pagesB/contract/look'
+								})
+							}
+						},
+						fail: () => {},
+						complete: () => {}
 					})
-					that.$api.request('contract', 'getTranContractList', {
-						page: pages,
-						limit:limit
-					},failres => {
-						that.$api.msg(failes.errmsg)
-						that.isLoadMore=false
-						that.loadStatus = 'nomore'
-						if(that.pages>1){that.pages-=1}
-						uni.hideLoading()
-					}).then(res => {
-						//销售信息
-						if(that.contractInfo.length > 0){
-							that.contractInfo = that.contractInfo.concat(data)
-							that.isLoadMore=false
+				} 
+				else {
+					const that = this
+					if (this.TabCur == 0) {
+						// if (!that.seller) {
+						// 	this.$api.msg('请填写卖方');
+						// 	return;
+						// }
+						// if (!that.sellerPhone) {
+						// 	this.$api.msg('请填写手机号码');
+						// 	return;
+						// }
+						// if (!that.exsitCount) {
+						// 	this.$api.msg('请填写库存量');
+						// 	return;
+						// }
+						// if (!that.minSale) {
+						// 	this.$api.msg('请填写最小成交量');
+						// 	return;
+						// }
+						// if (!that.goodsName) {
+						// 	this.$api.msg('请填写货名');
+						// 	return;
+						// }
+						// if (!that.verifyCode) {
+						// 	this.$api.msg('请填写验证码');
+						// 	return;
+						// }
+
+						// if (!that.price) {
+						// 	that.$api.msg('请选择价格类型')
+						// 	return
+						// }
+						// if (!that.unitPrice) {
+						// 	that.$api.msg('请填写协议价格（元/吨）');
+						// 	return
+						// }
+						// if (!that.origin) {
+						// 	this.$api.msg('请填写产地');
+						// 	return;
+						// }
+						// if (!that.stock) {
+						// 	this.$api.msg('请填写库存地');
+						// 	return;
+						// }
+						// if (!that.level) {
+						// 	this.$api.msg('请填写国标等级');
+						// 	return;
+						// }
+						// that.saleInfo.seller = that.seller
+						// that.saleInfo.sellerPhone = that.sellerPhone
+						// that.saleInfo.priceType = that.price
+						// that.saleInfo.unitPrice = that.unitPrice
+						// that.saleInfo.minSale = that.minSale
+						// that.saleInfo.exsitCount = that.exsitCount
+						// that.saleInfo.origin = that.origin
+						// that.saleInfo.stock = that.stock
+						// that.saleInfo.verifyCode = that.verifyCode
+						// that.saleInfo.goodsName = that.goodsName
+						// that.saleInfo.buyer = that.buyer
+						// that.saleInfo.buyerPhone = that.buyerPhone
+						// that.saleInfo.level = that.level
+					} else if (this.TabCur == 1) {
+						if (!that.buyer) {
+							this.$api.msg('请填写买方');
+							return;
+						}
+						if (!that.buyerPhone) {
+							this.$api.msg('请填写手机号码');
+							return;
 						}
-						else{
-							if(that.pages>1){that.pages-=1}						
-							that.isLoadMore=true
-							that.loadStatus = 'nomore'
+						if (!that.goodsName) {
+							this.$api.msg('请填写货名');
+							return;
+						}
+						if (!that.verifyCode) {
+							this.$api.msg('请填写验证码');
+							return;
+						}
+
+						if (!that.price) {
+							that.$api.msg('请选择价格类型')
+							return
+						}
+						if (!that.unitPrice) {
+							that.$api.msg('请填写协议价格（元/吨）');
+							return
+						}
+						if (!that.origin) {
+							this.$api.msg('请填写产地');
+							return;
+						}
+						if (!that.stock) {
+							this.$api.msg('请填写库存地');
+							return;
+						}
+						if (!that.level) {
+							this.$api.msg('请填写国标等级');
+							return;
+						}
+						that.saleInfo.seller = that.seller
+						that.saleInfo.sellerPhone = that.sellerPhone
+						that.saleInfo.priceType = that.price
+						that.saleInfo.unitPrice = that.unitPrice
+						that.saleInfo.minSale = that.minSale
+						that.saleInfo.exsitCount = that.exsitCount
+						that.saleInfo.origin = that.origin
+						that.saleInfo.stock = that.stock
+						that.saleInfo.verifyCode = that.verifyCode
+						that.saleInfo.goodsName = that.goodsName
+						that.saleInfo.buyer = that.buyer
+						that.saleInfo.buyerPhone = that.buyerPhone
+						that.saleInfo.level = that.level
+					} else if (this.TabCur == 2) {
+						if (!that.sender) {
+							this.$api.msg('请填写发货方');
+							return;
+						}
+						if (!that.senderPhone) {
+							this.$api.msg('请填写发货方手机号码');
+							return;
+						}
+						if (!that.receiver) {
+							this.$api.msg('请填写收货方');
+							return;
+						}
+						if (!that.receiverPhone) {
+							this.$api.msg('请填写收货方手机号码');
+							return;
+						}
+						if (!that.goodsName) {
+							this.$api.msg('请填写货名');
+							return;
+						}
+						if (!that.verifyCode) {
+							this.$api.msg('请填写验证码');
+							return;
+						}
+						that.tran.sender = that.sender
+						that.tran.senderPhone = that.senderPhone
+						that.tran.receiver = that.receiver
+						that.tran.receiverPhone = that.receiverPhone
+						that.tran.verifyCode = that.verifyCode
+						that.tran.goodsName = that.goodsName
+						that.tran.total = that.total
+						that.tran.price = that.price
+						that.tran.startPlace = that.startPlace
+						that.tran.endPlace = that.endPlace
+					} else if (this.TabCur == 3) {
+						if (!that.startPlace) {
+							this.$api.msg('请填写起始地');
+							return;
+						}
+						if (!that.endPlace) {
+							this.$api.msg('请填写目的地');
+							return;
+						}
+						if (!that.driver) {
+							this.$api.msg('请填写承运人');
+							return;
+						}
+						if (!that.driverPhone) {
+							this.$api.msg('请填写承运人手机号码');
+							return;
+						}
+						if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(that.driverPhone)) {
+							that.$api.msg('请输入正确的承运人手机号码');
+							return
+						}
+						if (!that.carNo) {
+							this.$api.msg('请填写车牌号');
+							return;
+						}
+						if (!that.verifyCode) {
+							this.$api.msg('请填写验证码');
+							return;
+						}
+						if (!that.personNoImg || !that.personNoImg1) {
+							that.$api.msg('请上传身份证正、反面照片');
+							return
+						}
+						if (!that.driverNoImg || !that.driverNoImg1) {
+							that.$api.msg('请上传驾驶证主、副页照片');
+							return
+						}
+						if (!that.carNoImg || !that.carNoImg1) {
+							that.$api.msg('请上传行车证主、副页照片');
+							return
+						}
+						that.tran.driver = that.driver
+						that.tran.driverPhone = that.driverPhone
+						that.tran.verifyCode = that.verifyCode
+						that.tran.price = that.price
+						that.tran.startPlace = that.startPlace
+						that.tran.endPlace = that.endPlace
+						that.tran.carNo = that.carNo
+						that.tran.personNoImg = that.personNoImg
+						that.tran.personNoImg1 = that.personNoImg1
+						that.tran.driverNoImg = that.driverNoImg
+						that.tran.driverNoImg1 = that.driverNoImg1
+						that.tran.carNoImg = that.carNoImg
+						that.tran.carNoImg1 = that.carNoImg1
+					}
+					// 获取用户的当前设置，判断是否点击了“总是保持以上，不在询问”
+					wx.getSetting({
+						// withSubscriptions: true,//是否获取用户订阅消息的订阅状态，默认false不返回
+						success(res) {
+							if (res.authSetting['scope.subscribeMessage']) {
+								uni.openSetting({ // 打开设置页
+									success(res) {
+										console.log(res.authSetting)
+									}
+								});
+							} else { // 用户没有点击“总是保持以上，不再询问”则每次都会调起订阅消息
+								uni.requestSubscribeMessage({
+									tmplIds: ['8cVkckXi_8zfHeScXRHhjN6cgZFYYCWIMPDTiPWagXY'], // 
+									success(res) {
+										console.log(res)
+										if (res['8cVkckXi_8zfHeScXRHhjN6cgZFYYCWIMPDTiPWagXY'] ==
+											"accept") { // 字段就是tmplIds模板id
+											uni.showLoading({
+												title: '正在提交',
+												mask: true
+											})
+											if (that.TabCur == 0) {
+												that.$api.request('sale', 'addSale', that.saleInfo,
+													failres => {
+														uni.hideLoading()
+														that.$api.msg(failres.errmsg);
+
+													}).then(res => {
+													uni.hideLoading()
+													uni.showModal({
+														title: '提示',
+														content: "发布提交成功，工作人员会尽快联系该号码：" +
+															that.sellerPhone,
+														showCancel: false,
+														confirmText: '确定',
+														success: () => {
+															uni.navigateBack()
+														}
+													})
+													// that.$api.prePage().refreshList(data, that.manageType);
+												})
+											} else if (that.TabCur == 1) {
+												that.$api.request('sale', 'addBuy', that.saleInfo,
+													failres => {
+														uni.hideLoading()
+														that.$api.msg(failres.errmsg);
+
+													}).then(res => {
+													uni.hideLoading()
+													uni.showModal({
+														title: '提示',
+														showCancel: false,
+														content: "发布提交成功，工作人员会尽快联系该号码：" +
+															that.buyerPhone,
+														confirmText: '确定',
+														success: () => {
+															uni.navigateBack()
+														}
+													})
+													// that.$api.prePage().refreshList(data, that.manageType);
+												})
+											} else if (that.TabCur == 2) {
+												that.$api.request('tran', 'addTran', that.tran,
+													failres => {
+														uni.hideLoading()
+														that.$api.msg(failres.errmsg);
+													}).then(res => {
+													uni.hideLoading()
+													uni.showModal({
+														title: '提示',
+														showCancel: false,
+														content: "发布提交成功，工作人员会尽快联系该号码：" +
+															that.senderPhone,
+														confirmText: '确定',
+														success: () => {
+															uni.navigateBack()
+														}
+													})
+													// that.$api.prePage().refreshList(data, that.manageType);
+												})
+
+											} else if (that.TabCur == 3) {
+												that.$api.request('tran', 'addCarDriver', that.tran,
+													failres => {
+														uni.hideLoading()
+														that.$api.msg(failres.errmsg);
+													}).then(res => {
+													uni.hideLoading()
+													uni.showModal({
+														title: '提示',
+														showCancel: false,
+														content: "发布提交成功，工作人员会尽快联系该号码：" +
+															that.driverPhone,
+														confirmText: '确定',
+														success: () => {
+															uni.navigateBack()
+														}
+													})
+													// that.$api.prePage().refreshList(data, that.manageType);
+												})
+
+											}
+
+										}
+									}
+								})
+							}
 						}
-						uni.hideLoading()
 					})
 				}
-			},
-		}
+			}
+		},
+	}
+	
+	
+	
 </script>
 
-<style lang='scss' scoped>
-	.contractType{
-		padding: 10px 15px;
-		width: 118rpx;
-		border-radius: 9rpx;
-		height: 118rpx;
-		position: relative;
-	}
-	.button-group{
-		margin-top:10px;
-		justify-content: space-between;
-	}
-	.button-group button{
-		height: 30px;
-		font-size: 12px;
-		line-height: 30px;
-		margin:0;
-	}
-	page,
-	.content {
-		background: $page-color-base;
-		height: 100%;
-	}
-	.cu-tag {
-	    font-size: 40rpx;
-	    word-break:break-all;
-	}
-	.container{
-		padding-bottom: 100upx;
-	}
-	.cu-capsule+.cu-capsule {
-	    margin-left: 0rpx;
-	}
-	.cu-capsule {
-	    display: flex;
-		position: relative;
-	    margin: 5px 0;
+<style scoped>
+	.zan-dialog__mask {
+	    position: fixed;
+	    top: 0;
+	    left: 0;
+	    right: 0;
+	    bottom: 0;
+	    z-index: 10;
+	    background: rgba(0, 0, 0, 0);   /*设置阴影半透明背景如： background: rgba(0, 0, 0, 0.4);*/
+	    display: none;
+	  }
+	  
+	  .zan-dialog__container {
+	    position: fixed;
+	    bottom: 400rpx;
+	    width: 650rpx;    /*弹窗布局宽*/
+	    height: 350rpx;   /*弹窗布局高，与下面弹出距离transform有关*/
+	    margin-left: 50rpx;
+	    background: #f8f8f8;
+	    transform: translateY(300%);  /*弹框弹出距离，与弹框布局高度有关，如300%表示弹起距离为3倍弹窗高度 */
+	    transition: all 0.4s ease;
+	    z-index: 12;
+	    border-radius: 20rpx;
+	    box-shadow: 0px 3px 3px 2px gainsboro;  /*弹框的悬浮阴影效果，如不需要可注释该行*/
+	  }
+	  
+	  .zan-dialog--show .zan-dialog__container {
+	    transform: translateY(0);
+	  }
+	  
+	  .zan-dialog--show .zan-dialog__mask {
+	    display: block;
+	  }
+	.container {
+		padding-bottom: 160rpx;
 	}
+
 	.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;
 	}
-	.place{
-		font-size: 40rpx;
-		line-height: 1;
-		padding-right: 10upx;
-	}
-	.place-center{
-		font-size: 28rpx;
-	}
-	.guess-item{
-		/* margin-top: 10rpx; */
-	}
-	.btn-size{
-		font-size: 28rpx;
-	}
-	.place-bottom{
-		margin-top: 20rpx;
-	}
-	.swiper-box {
-		height: calc(100% - 40px);
-	}
-	.list-scroll-content {
-		height: 100%;
-	}
-	.uni-swiper-item {
-		height: auto;
-	}
-	/* 标题简介 */
-	.introduce-section_contract {
-		background: #fff;
-		padding: 20upx 30upx;
-	}
-		.title {
-			font-size: 34upx;
-			color: $font-color-dark;
-			height: 50upx;
-			line-height: 50upx;
-			flex:3;
-		}
-		.title-tip {
-			flex:1;
-			color:#fa436a;
-		}
-		.price-box {
-			display: flex;
-			align-items: baseline;
-			height: 100upx;
-			padding: 10upx 0;
-			font-size: 26upx;
-			color: $uni-color-primary;
-		}
-	
-		.price_contract {
-			font-size: 34rpx;
-		}
-	
-		.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;
-		}
-	.guess-section{
-		padding-bottom: 100upx;
-		display:flex;
-		flex-wrap:wrap;
-		padding: 0 30upx;
-		background: #fff;
-		.guess-item{
-			display:flex;
-			flex-direction: column;
-			width: 98%;
-			border-bottom:1px solid #f8f8f8;
-		}
-		.image-wrapper{
-			width: 100%;
-			height: 330upx;
-			border-radius: 3px;
-			overflow: hidden;
-			image{
-				width: 100%;
-				height: 100%;
-				opacity: 1;
-			}
-		}
-		.title{
-			font-size: $font-lg;
-			color: #121212;
-		}
-		.price-orther{
-			font-size: $font-sm;
-			color:$font-color-base;
-		}
-		.price{
-			font-size: 64rpx;
-			color: #39b54a;
-			line-height: 1;
-			padding-right: 10upx;
-		}
-		
-		.goods1{
-			font-size: $font-sm;
-			color: $font-color-base;
-		}
-		.goods2{
-			font-size: $font-sm;
-			color: $font-color-base;
-			padding-left: 10%;
-		}
-		.goods3{
-			font-size: $font-sm;
-			color: $font-color-base;
-			padding-left: 10%;
-		}
-		.goods4{
-			font-size: $font-sm;
-			color: #ff5500;
-		}
-		.goods5{
-			font-size: $font-sm;
-			color: $font-color-base;
-		}
-		.view-item{
-			width: 100%;
-			// line-height: 40upx;
-			padding-top: 10upx;
-		}
-		.confirm-btn {
-			margin-left: 20%;
-		}
-		.date-time {
-			margin-left: 30%;
-		}
-		.padding-xs-tmp {
-			padding: 15upx 10upx 10upx 10upx;
-		}
-	}
-	.badge{
-		position: absolute;
-		right: -5px;
-		top: -16px;
+
+	.commit {
+		background: linear-gradient(45deg, #DF331C, #DA611A);
 		color: #fff;
-		background-color: #dc3545;
-		display: inline-block;
-		padding: .25em .4em;
-		height: 15px;
-		margin: 20rpx 0;
-		font-size: 75%;
-		font-weight: 700;
-		line-height: 1;
-		text-align: center;
-		white-space: nowrap;
-		vertical-align: top;
-		border-radius: 50%;
-		-webkit-transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;
-		transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;
-		}
+	}
 </style>

pageB/contract/contract_detail.vue

@@ -1,870 +1,606 @@
 <template>
 	<view class="container">
-		<view class="introduce-section">
-			<view class="price-box">
-				<view class="title">{{contract.contractNo}}</view>
-				<view class="title-tip">
-					<text class="price-tip">¥</text>
-					<text class="price">{{contract.price}}</text>
-					<text class="price-tip">元/吨</text>
-				</view>
+		<!-- <block v-if="TabCur==2"> -->
+			<view class="cu-form-group">
+				<view class="title">派车编号</view>
+				<input  name="input" v-model="goods.tranCarNo"></input>
 			</view>
-			<view class="bot-row">
-				<view class='cu-tag radius line-orange'>{{contract.seller}}</view>
-				<view class='cu-tag radius line-orange'>{{contract.buyer}}</view>
+			<view class="cu-form-group">
+				<view class="title">车牌号</view>
+				<input placeholder="请输入车牌号" name="input" v-model="goods.carNo"></input>
 			</view>
-			
-			<view class="bot-row">
-				<view class='cu-tag radius line-orange'>{{contract.goodsName}}</view>
-				<view class='cu-tag radius line-orange'>{{contract.total}}吨</view>
+			<view class="cu-form-group">
+				<view class="title">司机手机号</view>
+				<input placeholder="请输入司机身份认证的手机号" name="input" v-model="goods.driverPhone"></input>
 			</view>
-		</view>
-		
-		<view class="detail-desc">
-			<view class="d-header">
-				<text>基本信息</text>
+			<view class="cu-form-group">
+				<view class="title">毛重(吨)</view>
+				<input placeholder="请输入毛重" type="mobile" name="input"  @input="grossWeightchange" v-model="goods.grossWeight"></input>
 			</view>
-			 <view class="c-list">
-				 <view class="c-row b-b">
-				 	<text class="tit">卖方</text>
-				 	<view class="con-list">
-				 		<text>{{contract.seller}}</text>
-				 	</view>
-				 </view>
-				 <view class="c-row b-b">
-				 	<text class="tit">买方</text>
-				 	<view class="con-list">
-				 		<text>{{contract.buyer}}</text>
-				 	</view>
-				 </view>
-				<view class="c-row b-b">
-					<text class="tit">货名</text>
-					<view class="con-list">
-						<text>{{contract.goodsName}}</text>
-					</view>
-				</view>
-				<view class="c-row b-b">
-					<text class="tit">总量(吨)</text>
-					<view class="con-list">
-						<text>{{contract.total}}</text>
-					</view>
-				</view>
-				<view class="c-row b-b">
-					<text class="tit">起始时间</text>
-					<view class="con-list">
-						<text>{{contract.startTime}}</text>
-					</view>
-				</view>
-				<view class="c-row b-b">
-					<text class="tit">结束时间</text>
-					<view class="con-list">
-						<text>{{contract.endTime}}</text>
-					</view>
-				</view>
-				<view class="c-row b-b">
-					<text class="tit">合同编号</text>
-					<view class="con-list">
-						<text>{{contract.contractNo}}</text>
-					</view>
-				</view>
-				<view class="c-row b-b">
-					<text class="tit">容重(克/升){{'>='}}</text>
-					<view class="con-list">
-						<text>{{contract.bulkDensity}}</text>
-					</view>
-				</view>
-				<view class="c-row b-b">
-					<text class="tit">水分(%){{'<='}}</text>
-					<view class="con-list">
-						<text>{{contract.waterContent}}</text>
-					</view>
-				</view>
-				<view class="c-row b-b">
-					<text class="tit">杂质(%){{'<='}}</text>
-					<view class="con-list">
-						<text>{{contract.impurity}}</text>
-					</view>
-				</view>
-				<view class="c-row b-b">
-					<text class="tit">霉变粒(%){{'<='}}</text>
-					<view class="con-list">
-						<text>{{contract.mildew}}</text>
-					</view>
-				</view>
-				<view class="c-row b-b">
-					<text class="tit">焦糊粒(%){{'<='}}</text>
-					<view class="con-list">
-						<text>{{contract.burnt}}</text>
-					</view>
-				</view>
-				<view class="c-row b-b">
-					<text class="tit">品级</text>
-					<view class="con-list">
-						<text>{{contract.level}}</text>
-					</view>
-				</view>
-				<view class="c-row b-b">
-					<text class="tit">包装方式</text>
-					<view class="con-list">
-						<text>{{contract.packing}}</text>
-					</view>
-				</view>
-				<view class="c-row b-b">
-					<text class="tit">交货地点</text>
-					<view class="con-list">
-						<text>{{contract.place}}</text>
-					</view>
+			<view class="cu-form-group">
+				<view class="title">皮重(吨)</view>
+				<input placeholder="请输入皮重" type="mobile" name="input"  @input="tarechange" v-model="goods.tare"></input>
+			</view>
+			<view class="cu-form-group">
+				<view class="title">净重(吨)</view>
+				<input placeholder="自动计算" type="mobile" name="input" v-model="goods.netWeight"></input>
+			</view>
+			   
+			<view class="cu-bar bg-white margin-top">
+				<view class="action">
+					上传磅单照片
 				</view>
-				<view class="c-row b-b">
-					<text class="tit">价格(元/吨)</text>
-					<view class="con-list">
-						<text>{{contract.price}}</text>
+			</view>
+			<view class="cu-form-group">
+				<view class="grid col-4 grid-square flex-sub">
+					<view class="bg-img" v-if="personNoImg != ''" @tap="ViewImage" :data-url="personNoImg">
+					 <image :src="personNoImg" mode="aspectFit"></image>
+						<view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="0">
+							<text class='cuIcon-close'></text>
+						</view>
 					</view>
-				</view>
-				<view class="c-row b-b">
-					<text class="tit">验收方式</text>
-					<view class="con-list">
-						<text>{{contract.acceptType}}</text>
+					<view class="bg-img" v-if="personNoImg1 != ''" @tap="ViewImage" :data-url="personNoImg1">
+					 <image :src="personNoImg1" mode="aspectFit"></image>
+						<view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="1">
+							<text class='cuIcon-close'></text>
+						</view>
 					</view>
-				</view>
-				<view class="c-row b-b">
-					<text class="tit">备注</text>
-					<view class="con-list">
-						<text>{{contract.memo}}</text>
+					<view class="solids" @tap="ChooseImagePerson" v-if="personNoImg == '' || personNoImg1 == ''">
+						<text class='cuIcon-cameraadd'></text>
 					</view>
 				</view>
 			</view>
-		</view>
-		
+			<view class="padding flex flex-direction">
+				<button class="cu-btn commit margin-tb-sm lg" @click="getList">提交</button>
+			</view>
+		<!-- </block> -->
 	</view>
 </template>
 
 <script>
 	import uploadImage from '@/components/ossutil/uploadFile.js';
-	import uniNumberBox from '@/components/uni-number-box.vue';
-	import {  
-        mapState 
-    } from 'vuex';
+	import {
+		mapState
+	} from 'vuex';
 	export default {
-		components: {
-			uniNumberBox
-		},
-		data() {
-			return {
-				contract: {
+			name: "trust",
+			data() {
+				return {
+					goods: {
+						tranCarNo:'',
+						carNo:'',
+						grossWeight:'',
+						tare:'',
+						netWeight:'',
+						personNoImg:'',
+						personNoImg1:'',
+
+						 contractNo:'',
+						 goodsName:'',
+						
+					},
+					carNo:'',
+					PageCur: "trust",
+					TabCur: 0,
+					priceTypeIndex:-1,
+					priceType: ['库内价', '到库价', '到港价'],
+					unitPrice:0,
+					price:'',
+					seller:'',
+					sellerPhone:'',
+					minSale:'',
+					exsitCount:0,
+					origin:'',
+					stock:'',
+					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:'',
+					showTran:true
+				};
+			},
+			computed: {
+				...mapState(['hasLogin','userInfo'])
+				},	
+			onShow() {
+			},
+			onLoad(option) {
+				this.goods.netWeight =option.netWeight
+				
+				
+			},
+			methods: {
+				 
+				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.netWeight = Number(
+				          this.goods.grossWeight - this.goods.tare
+				        )
+				      }
+				    },
+				tarechange(e) {
+				      if (this.goods.grossWeight && this.goods.tare) {
+				        this.goods.netWeight = Number(
+				          this.goods.grossWeight - this.goods.tare
+				        )
+				      }
+				    },
+				getList(){
+					console.log(this.goods,"duixiang")
+				this.$api.doRequest('post','/tranCarInfo/api/addTranTask',this.goods).then(res => {
+				     console.log("调用接口")
+				      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)
+				    })
+				    .catch(res => {
+				     uni.showToast({
+				      title: res.errmsg,
+				      icon:'none',
+				      duration: 2000
+				     })
+				    });
+				   },
+				ChooseImagePerson() {
+					uni.chooseImage({
+						count: 1, //默认9
+						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+						sourceType: ['album','camera'], //从相册选择
+						success: (res) => {
+							//上传图片
+							//图片路径可自行修改
+							uploadImage(res.tempFilePaths[0], 'personNoImg/',
+								result => {
+								 if (this.personNoImg.length != 0) {
+								 	this.personNoImg1 = result
+								 } else {
+								 	this.personNoImg = 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 = "";
+								}
+								
+							}
+						}
+					})
+				},
+				commit(){
+					if (!this.hasLogin) {
+						uni.showModal({
+							title: '登录提示',
+							content: '您尚未登录，是否立即登录？',
+							showCancel: true,
+							confirmText: '登录',
+							success: (e) => {
+								if (e.confirm) {
+									uni.navigateTo({
+										url: '/pages/public/login'
+									})
+								}
+							},
+							fail: () => {},
+							complete: () => {}
+						})
+					}
+					else{
+						const that = this
+						if(this.TabCur == 0){
+							if(!that.seller){
+								this.$api.msg('请填写车牌号');
+								return;
+							}
+							if(!that.sellerPhone){
+								this.$api.msg('请填写司机手机号码');
+								return;
+							}
+							if(!that.exsitCount){
+								this.$api.msg('请填写毛重');
+								return;
+							}
+							if(!that.minSale){
+								this.$api.msg('请填写皮重');
+								return;
+							}
+							
+							that.saleInfo.seller = that.seller
+							that.saleInfo.sellerPhone = that.sellerPhone
+							that.saleInfo.priceType = that.price
+							that.saleInfo.unitPrice = that.unitPrice
+							that.saleInfo.minSale = that.minSale
+							that.saleInfo.exsitCount = that.exsitCount
+							that.saleInfo.origin = that.origin
+							that.saleInfo.stock = that.stock
+							that.saleInfo.verifyCode = that.verifyCode
+							that.saleInfo.goodsName = that.goodsName
+							that.saleInfo.buyer = that.buyer
+							that.saleInfo.buyerPhone = that.buyerPhone
+							that.saleInfo.level = that.level
+						}else if(this.TabCur == 1){
+							if(!that.buyer){
+								this.$api.msg('请填写买方');
+								return;
+							}
+							if(!that.buyerPhone){
+								this.$api.msg('请填写手机号码');
+								return;
+							}
+							if(!that.goodsName){
+								this.$api.msg('请填写货名');
+								return;
+							}
+							if(!that.verifyCode){
+								this.$api.msg('请填写验证码');
+								return;
+							}
+							
+							if (!that.price) {
+								that.$api.msg('请选择价格类型')
+								return
+							}
+							if(!that.unitPrice){
+								that.$api.msg('请填写协议价格（元/吨）');
+								return
+							}
+							if(!that.origin){
+								this.$api.msg('请填写产地');
+								return;
+							}
+							if(!that.stock){
+								this.$api.msg('请填写库存地');
+								return;
+							}
+							if(!that.level){
+								this.$api.msg('请填写国标等级');
+								return;
+							}
+							that.saleInfo.seller = that.seller
+							that.saleInfo.sellerPhone = that.sellerPhone
+							that.saleInfo.priceType = that.price
+							that.saleInfo.unitPrice = that.unitPrice
+							that.saleInfo.minSale = that.minSale
+							that.saleInfo.exsitCount = that.exsitCount
+							that.saleInfo.origin = that.origin
+							that.saleInfo.stock = that.stock
+							that.saleInfo.verifyCode = that.verifyCode
+							that.saleInfo.goodsName = that.goodsName
+							that.saleInfo.buyer = that.buyer
+							that.saleInfo.buyerPhone = that.buyerPhone
+							that.saleInfo.level = that.level
+						}
+						else if(this.TabCur == 2){
+							if(!that.sender){
+								this.$api.msg('请填写发货方');
+								return;
+							}
+							if(!that.senderPhone){
+								this.$api.msg('请填写发货方手机号码');
+								return;
+							}
+							if(!that.receiver){
+								this.$api.msg('请填写收货方');
+								return;
+							}
+							if(!that.receiverPhone){
+								this.$api.msg('请填写收货方手机号码');
+								return;
+							}
+							if(!that.goodsName){
+								this.$api.msg('请填写货名');
+								return;
+							}
+							if(!that.verifyCode){
+								this.$api.msg('请填写验证码');
+								return;
+							}
+							that.tran.sender = that.sender
+							that.tran.senderPhone = that.senderPhone
+							that.tran.receiver = that.receiver
+							that.tran.receiverPhone = that.receiverPhone
+							that.tran.verifyCode = that.verifyCode
+							that.tran.goodsName = that.goodsName
+							that.tran.total = that.total
+							that.tran.price = that.price
+							that.tran.startPlace = that.startPlace
+							that.tran.endPlace = that.endPlace
+						}
+						else if(this.TabCur == 3){
+							if(!that.startPlace){
+								this.$api.msg('请填写起始地');
+								return;
+							}
+							if(!that.endPlace){
+								this.$api.msg('请填写目的地');
+								return;
+							}
+							if(!that.driver){
+								this.$api.msg('请填写承运人');
+								return;
+							}
+							if(!that.driverPhone){
+								this.$api.msg('请填写承运人手机号码');
+								return;
+							}
+							if(!/(^1[3|4|5|7|8][0-9]{9}$)/.test(that.driverPhone)){
+								that.$api.msg('请输入正确的承运人手机号码');
+								return
+							}
+							if(!that.carNo){
+								this.$api.msg('请填写车牌号');
+								return;
+							}
+							if(!that.verifyCode){
+								this.$api.msg('请填写验证码');
+								return;
+							}
+							if (!that.personNoImg || !that.personNoImg1) {
+								that.$api.msg('请上传磅单');
+								return
+							}
+							if (!that.driverNoImg || !that.driverNoImg1) {
+								that.$api.msg('请上传驾驶证主、副页照片');
+								return
+							}
+							if (!that.carNoImg || !that.carNoImg1) {
+								that.$api.msg('请上传行车证主、副页照片');
+								return
+							}
+							that.tran.driver = that.driver
+							that.tran.driverPhone = that.driverPhone
+							that.tran.verifyCode = that.verifyCode
+							that.tran.price = that.price
+							that.tran.startPlace = that.startPlace
+							that.tran.endPlace = that.endPlace
+							that.tran.carNo = that.carNo
+							that.tran.personNoImg = that.personNoImg
+							that.tran.personNoImg1 = that.personNoImg1
+							that.tran.driverNoImg = that.driverNoImg
+							that.tran.driverNoImg1 = that.driverNoImg1
+							that.tran.carNoImg = that.carNoImg
+							that.tran.carNoImg1 = that.carNoImg1
+						}
+						// 获取用户的当前设置，判断是否点击了“总是保持以上，不在询问”
+						wx.getSetting({
+						 	// withSubscriptions: true,//是否获取用户订阅消息的订阅状态，默认false不返回
+						   success(res){
+						   if(res.authSetting['scope.subscribeMessage']){
+						     uni.openSetting({ // 打开设置页
+						       success(res) {
+									console.log(res.authSetting)
+						       }
+						     });
+						   }else{// 用户没有点击“总是保持以上，不再询问”则每次都会调起订阅消息
+						     uni.requestSubscribeMessage({
+						       tmplIds: ['8cVkckXi_8zfHeScXRHhjN6cgZFYYCWIMPDTiPWagXY'],// 
+						       success (res) {
+						         console.log(res)
+						         if(res['8cVkckXi_8zfHeScXRHhjN6cgZFYYCWIMPDTiPWagXY'] == "accept"){// 字段就是tmplIds模板id
+						            uni.showLoading({
+						            		title: '正在提交',
+											mask:true
+						            	})
+						            	if(that.TabCur == 0){
+						            		that.$api.request('sale', 'addSale',that.saleInfo, failres => {
+						            			uni.hideLoading()
+						            			that.$api.msg(failres.errmsg);
+						            			
+						            		}).then(res => {
+						            			uni.hideLoading()
+						            			uni.showModal({
+						            				title: '提示',
+						            				content: "发布提交成功，工作人员会尽快联系该号码："+that.sellerPhone,
+						            				showCancel: false,
+						            				confirmText: '确定',
+						            				success: () => {
+						            					uni.navigateBack()
+						            				}
+						            			})
+						            			// that.$api.prePage().refreshList(data, that.manageType);
+						            		})
+						            	}
+						            	else if(that.TabCur == 1){
+						            		that.$api.request('sale', 'addBuy',that.saleInfo, failres => {
+						            			uni.hideLoading()
+						            			that.$api.msg(failres.errmsg);
+						            			
+						            		}).then(res => {
+						            			uni.hideLoading()
+						            			uni.showModal({
+						            				title: '提示',
+						            				showCancel: false,
+						            				content: "发布提交成功，工作人员会尽快联系该号码："+that.buyerPhone,
+						            				confirmText: '确定',
+						            				success: () => {
+						            					uni.navigateBack()
+						            				}
+						            			})
+						            			// that.$api.prePage().refreshList(data, that.manageType);
+						            		})
+						            	}
+						            	else if(that.TabCur == 2){
+						            		that.$api.request('tran', 'addTran',that.tran, failres => {
+						            			uni.hideLoading()
+						            			that.$api.msg(failres.errmsg);
+						            		}).then(res => {
+						            			uni.hideLoading()
+						            			uni.showModal({
+						            				title: '提示',
+						            				showCancel: false,
+						            				content: "发布提交成功，工作人员会尽快联系该号码："+that.senderPhone,
+						            				confirmText: '确定',
+						            				success: () => {
+						            					uni.navigateBack()
+						            				}
+						            			})
+						            			// that.$api.prePage().refreshList(data, that.manageType);
+						            		})
+						            		
+						            	}
+						            	else if(that.TabCur == 3){
+						            		that.$api.request('tran', 'addCarDriver',that.tran, failres => {
+						            			uni.hideLoading()
+						            			that.$api.msg(failres.errmsg);
+						            		}).then(res => {
+						            			uni.hideLoading()
+						            			uni.showModal({
+						            				title: '提示',
+						            				showCancel: false,
+						            				content: "发布提交成功，工作人员会尽快联系该号码："+that.driverPhone,
+						            				confirmText: '确定',
+						            				success: () => {
+						            					uni.navigateBack()
+						            				}
+						            			})
+						            			// that.$api.prePage().refreshList(data, that.manageType);
+						            		})
+						            		
+						            	}
+						            
+						         }
+						       }
+						      })
+						     }
+						   }
+						})
+						}
 				}
-			};
-		},
-		onShow() {
-		},
-		onLoad(options) {
-			const that = this
-			uni.showLoading({
-				title: '正在加载',
-				mask:true
-			})
-			that.$api.request('contract', 'getContractDetail', {
-				contractNo: options.contractNo
-			}, failres => {
-				that.$api.msg(failres.errmsg)
-				uni.hideLoading()
-			}).then(res => {
-				that.contract = res.data
-				uni.hideLoading()
-			})
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo'])
-		},
-		methods: {
+			},
 		}
-
-	}
 </script>
 
-
-<style lang='scss' scoped>
-	.container {
-		background: $page-color-base;
-		padding-bottom: 160upx;
-	}
-
-	.icon-you {
-		font-size: $font-base + 2upx;
-		color: #888;
-	}
-
-	.carousel {
-		height: 722upx;
-		position: relative;
-
-		swiper {
-			height: 100%;
-		}
-
-		.image-wrapper {
-			width: 100%;
-			height: 100%;
-		}
-
-		.swiper-item {
-			display: flex;
-			justify-content: center;
-			align-content: center;
-			height: 750upx;
-			overflow: hidden;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-	}
-
-
-	/* 分享 */
-	.share-section {
-		display: flex;
-		align-items: center;
-		color: $font-color-base;
-		background: linear-gradient(left, #fdf5f6, #fbebf6);
-		padding: 12upx 30upx;
-
-		.share-icon {
-			display: flex;
-			align-items: center;
-			width: 70upx;
-			height: 30upx;
-			line-height: 1;
-			border: 1px solid $uni-color-primary;
-			border-radius: 4upx;
-			position: relative;
-			overflow: hidden;
-			font-size: 22upx;
-			color: $uni-color-primary;
-
-			&:after {
-				content: '';
-				width: 50upx;
-				height: 50upx;
-				border-radius: 50%;
-				left: -20upx;
-				top: -12upx;
-				position: absolute;
-				background: $uni-color-primary;
-			}
-		}
-
-		.icon-xingxing {
-			position: relative;
-			z-index: 1;
-			font-size: 24upx;
-			margin-left: 2upx;
-			margin-right: 10upx;
-			color: #fff;
-			line-height: 1;
-		}
-
-		.tit {
-			font-size: $font-base;
-			margin-left: 10upx;
-		}
-
-		.icon-bangzhu1 {
-			padding: 10upx;
-			font-size: 30upx;
-			line-height: 1;
-		}
-
-		.share-btn {
-			flex: 1;
-			text-align: right;
-			font-size: $font-sm;
-			color: $uni-color-primary;
-		}
-
-		.icon-you {
-			font-size: $font-sm;
-			margin-left: 4upx;
-			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;
-		flex-direction: column;
-		padding: 20upx 30upx;
-		background: #fff;
-		margin-top: 16upx;
-
-		.e-header {
-			display: flex;
-			align-items: center;
-			height: 70upx;
-			font-size: $font-sm + 2upx;
-			color: $font-color-light;
-
-			.tit {
-				font-size: $font-base + 2upx;
-				color: $font-color-dark;
-				margin-right: 4upx;
-			}
-
-			.tip {
-				flex: 1;
-				text-align: right;
-			}
-
-			.icon-you {
-				margin-left: 10upx;
-			}
-		}
-	}
-
-	.eva-box {
-		display: flex;
-		padding: 20upx 0;
-
-		.portrait {
-			flex-shrink: 0;
-			width: 80upx;
-			height: 80upx;
-			border-radius: 100px;
-		}
-
-		.right {
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			font-size: $font-base;
-			color: $font-color-base;
-			padding-left: 26upx;
-
-			.con {
-				font-size: $font-base;
-				color: $font-color-dark;
-				padding: 20upx 0;
-			}
-
-			.bot {
-				display: flex;
-				justify-content: space-between;
-				font-size: $font-sm;
-				color: $font-color-light;
-			}
-		}
-	}
-
-	/*  详情 */
-	.detail-desc {
-		background: #fff;
-		margin-top: 16upx;
-		width: 750upx;
-
-		.d-header {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 80upx;
-			font-size: $font-base + 2upx;
-			color: $font-color-dark;
-			position: relative;
-
-			text {
-				padding: 0 20upx;
-				background: #fff;
-				position: relative;
-				z-index: 1;
-			}
-
-			&:after {
-				position: absolute;
-				left: 50%;
-				top: 50%;
-				transform: translateX(-50%);
-				width: 300upx;
-				height: 0;
-				content: '';
-				border-bottom: 1px solid #ccc;
-			}
-		}
-	}
-
-	/* 规格选择弹窗 */
-	.attr-content {
-		padding: 10upx 30upx;
-
-		.a-t {
-			display: flex;
-
-			image {
-				width: 170upx;
-				height: 170upx;
-				flex-shrink: 0;
-				margin-top: -40upx;
-				border-radius: 8upx;
-				;
-			}
-
-			.right {
-				display: flex;
-				flex-direction: column;
-				padding-left: 24upx;
-				font-size: $font-sm + 2upx;
-				color: $font-color-base;
-				line-height: 42upx;
-
-				.price {
-					font-size: $font-lg;
-					color: $uni-color-primary;
-					margin-bottom: 10upx;
-				}
-
-				.selected-text {
-					margin-right: 10upx;
-				}
-			}
-		}
-
-		.attr-list {
-			display: flex;
-			flex-direction: column;
-			font-size: $font-base + 2upx;
-			color: $font-color-base;
-			padding-top: 30upx;
-			padding-left: 10upx;
-		}
-
-		.item-list {
-			padding: 30upx 0 0;
-			display: flex;
-			flex-wrap: wrap;
-
-			text {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				background: #eee;
-				margin-right: 20upx;
-				margin-bottom: 20upx;
-				border-radius: 100upx;
-				min-width: 60upx;
-				height: 60upx;
-				padding: 0 20upx;
-				font-size: $font-base;
-				color: $font-color-dark;
-			}
-
-			.selected {
-				background: #fbebee;
-				color: $uni-color-primary;
-			}
-		}
-	}
-
-	/*  弹出层 */
-	.popup {
-		position: fixed;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 99;
-
-		&.show {
-			display: block;
-
-			.mask {
-				animation: showPopup 0.2s linear both;
-			}
-
-			.layer {
-				animation: showLayer 0.2s linear both;
-			}
-		}
-
-		&.hide {
-			.mask {
-				animation: hidePopup 0.2s linear both;
-			}
-
-			.layer {
-				animation: hideLayer 0.2s linear both;
-			}
-		}
-
-		&.none {
-			display: none;
-		}
-
-		.mask {
-			position: fixed;
-			top: 0;
-			width: 100%;
-			height: 100%;
-			z-index: 1;
-			background-color: rgba(0, 0, 0, 0.4);
-		}
-
-		.layer {
-			position: fixed;
-			z-index: 99;
-			bottom: 0;
-			width: 100%;
-			min-height: 40vh;
-			border-radius: 10upx 10upx 0 0;
-			background-color: #fff;
-
-			.btn {
-				height: 66upx;
-				line-height: 66upx;
-				border-radius: 100upx;
-				background: $uni-color-primary;
-				font-size: $font-base + 2upx;
-				color: #fff;
-				margin: 30upx auto 20upx;
-			}
-		}
-
-		@keyframes showPopup {
-			0% {
-				opacity: 0;
-			}
-
-			100% {
-				opacity: 1;
-			}
-		}
-
-		@keyframes hidePopup {
-			0% {
-				opacity: 1;
-			}
-
-			100% {
-				opacity: 0;
-			}
-		}
-
-		@keyframes showLayer {
-			0% {
-				transform: translateY(120%);
-			}
-
-			100% {
-				transform: translateY(0%);
-			}
-		}
-
-		@keyframes hideLayer {
-			0% {
-				transform: translateY(0);
-			}
-
-			100% {
-				transform: translateY(120%);
-			}
-		}
+<style scoped>
+	.container{
+		padding-bottom: 160rpx;
 	}
-
-	/* 底部操作菜单 */
-	.page-bottom {
-		position: fixed;
-		left: 30upx;
-		bottom: 30upx;
-		z-index: 95;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		width: 690upx;
-		height: 100upx;
-		background: rgba(255, 255, 255, .9);
-		box-shadow: 0 0 20upx 0 rgba(0, 0, 0, .5);
-		border-radius: 16upx;
-
-		.p-b-btn {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-			font-size: $font-sm;
-			color: $font-color-base;
-			width: 96upx;
-			height: 80upx;
-
-			.yticon {
-				font-size: 40upx;
-				line-height: 48upx;
-				color: $font-color-light;
-			}
-
-			&.active,
-			&.active .yticon {
-				color: $uni-color-primary;
-			}
-
-			.icon-fenxiang2 {
-				font-size: 42upx;
-				transform: translateY(-2upx);
-			}
-
-			.icon-shoucang {
-				font-size: 46upx;
-			}
-		}
-	}
-
-	/* 优惠券面板 */
-	.mask {
-		display: flex;
-		align-items: flex-end;
-		position: fixed;
-		left: 0;
-		top: var(--window-top);
-		bottom: 0;
-		width: 100%;
-		background: rgba(0, 0, 0, 0);
-		z-index: 9995;
-		transition: .3s;
-
-		.mask-content {
-			width: 100%;
-			min-height: 30vh;
-			max-height: 70vh;
-			background: #f3f3f3;
-			transform: translateY(100%);
-			transition: .3s;
-			overflow-y: scroll;
-		}
-
-		&.none {
-			display: none;
-		}
-
-		&.show {
-			background: rgba(0, 0, 0, .4);
-
-			.mask-content {
-				transform: translateY(0);
-			}
-		}
-	}
-
-	/* 优惠券列表 */
-	.coupon-item {
-		display: flex;
-		flex-direction: column;
-		margin: 20upx 24upx;
-		background: #fff;
-
-		.con {
-			display: flex;
-			align-items: center;
-			position: relative;
-			height: 120upx;
-			padding: 0 30upx;
-
-			&:after {
-				position: absolute;
-				left: 0;
-				bottom: 0;
-				content: '';
-				width: 100%;
-				height: 0;
-				border-bottom: 1px dashed #f3f3f3;
-				transform: scaleY(50%);
-			}
-		}
-
-		.left {
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			flex: 1;
-			overflow: hidden;
-			height: 100upx;
-		}
-
-		.title {
-			font-size: 32upx;
-			color: $font-color-dark;
-			margin-bottom: 10upx;
-		}
-
-		.time {
-			font-size: 24upx;
-			color: $font-color-light;
-		}
-
-		.right {
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			font-size: 26upx;
-			color: $font-color-base;
-			height: 100upx;
-		}
-
-		.price {
-			font-size: 44upx;
-			color: $base-color;
-
-			&:before {
-				content: '￥';
-				font-size: 34upx;
-			}
-		}
-
-		.tips {
-			font-size: 24upx;
-			color: $font-color-light;
-			line-height: 60upx;
-			padding-left: 30upx;
-		}
-
-		.circle {
-			position: absolute;
-			left: -6upx;
-			bottom: -10upx;
-			z-index: 10;
-			width: 20upx;
-			height: 20upx;
-			background: #f3f3f3;
-			border-radius: 100px;
-
-			&.r {
-				left: auto;
-				right: -6upx;
-			}
-		}
+	.cu-form-group input {
+		text-align: right;
 	}
-
-	.rich-img {
-		width: 100%;
-		height: auto;
-		margin: 0;
-		padding: 0;
-		line-height: 0px;
+	.text-white text{
+		background: linear-gradient(45deg, #3DC146, #B2D612);
+		padding:5px 10px;
+		border-radius: 38rpx;
 	}
-
-
-	button::after {
-		border: none;
+	.cu-form-group textarea {
+		text-align: right;
 	}
-	/* 销售信息 */
-	.introduce-section {
-		background: #fff;
-		padding: 20upx 30upx;
-		padding-bottom: 100upx;
-		.guess-item {
-			padding-bottom: 20upx;
-			border-bottom: 1px solid #ccc;
-		}
-		.title {
-			font-size: 28upx;
-			color: $font-color-dark;
-			font-weight:bold;
-			height: 50upx;
-			line-height: 50upx;
-			flex:2.5;
-		}
-		.title-tip {
-			flex:1;
-		}
-		.price-box {
-			display: flex;
-			align-items: baseline;
-			height: 70upx;
-			padding: 10upx 0;
-			font-size: 26upx;
-			color: $uni-color-primary;
-		}
-	
-		.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;
-			}
-		}
+	.commit{
+		background: linear-gradient(45deg, #DF331C, #DA611A);
+		color:#fff;
 	}
 </style>

pageD/identity/companyIdentity.vue

@@ -1,16 +1,21 @@
 <template>
 	<view class="center">
 		<view>
-			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'"
-			 alt=""></image>
+			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;'
+				:src="consentStatus==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'"
+				alt=""></image>
 			<text>公司</text>
-			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus1==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'"
-			 alt=""></image>
+			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;'
+				:src="consentStatus1==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'"
+				alt=""></image>
 			<text>个人</text>
 		</view>
 		<view v-if="consentStatus == true">
 			<view>
-				<button type="default">上传营业执照</button>
+				<button type="default" @click="license">上传营业执照</button>
+				<view style="width: 100px;margin: 0 auto;" v-if="license1 != ''">
+					<image v-bind:src = "license1" style="width: 100px;height: 100px;"></image>
+				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">公司名称</text>
@@ -21,12 +26,19 @@
 			<view class="c-row b-b">
 				<text class="tit">纳税人识别号</text>
 				<view class="con-list">
-					<input placeholder="请填写纳税人识别号" name="input" v-model="identityAuthenticationInfo.payTaxesCard"></input>
+					<input placeholder="请填写纳税人识别号" name="input"
+						v-model="identityAuthenticationInfo.payTaxesCard"></input>
 				</view>
 			</view>
 			<view>
-				<button type="default">上传身份证正面</button>
-				<button type="default">上传身份证反面</button>
+				<button type="default" @click="idUp">上传身份证正面</button>
+				<view style="width: 100px;margin: 0 auto;" v-if="id1 != ''">
+					<image v-bind:src = "id1" style="width: 100px;height: 100px;"></image>
+				</view>
+				<button type="default" @click="idLow">上传身份证反面</button>
+				<view style="width: 100px;margin: 0 auto;" v-if="id2 != ''">
+					<image v-bind:src = "id2" style="width: 100px;height: 100px;"></image>
+				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">姓名</text>
@@ -37,12 +49,19 @@
 			<view class="c-row b-b">
 				<text class="tit">身份证号</text>
 				<view class="con-list">
-					<input placeholder="请填写身份证号" name="input" v-model="identityAuthenticationInfo.customerNumberCard"></input>
+					<input placeholder="请填写身份证号" name="input"
+						v-model="identityAuthenticationInfo.customerNumberCard"></input>
 				</view>
 			</view>
 			<view>
-				<button type="default">上传银行卡正面</button>
-				<button type="default">上传银行卡反面</button>
+				<button type="default" @click="bankUp()">上传银行卡正面</button>
+				<view style="width: 100px;margin: 0 auto;" v-if="bank1 != ''">
+					<image v-bind:src = "bank1" style="width: 100px;height: 100px;"></image>
+				</view>
+				<button type="default" @click="bankLow()">上传银行卡反面</button>
+				<view style="width: 100px;margin: 0 auto;" v-if="bank2 != ''">
+					<image v-bind:src = "bank2" style="width: 100px;height: 100px;"></image>
+				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">银行卡号</text>
@@ -59,19 +78,20 @@
 			<view class="c-row b-b">
 				<text class="tit">开户支行</text>
 				<view class="con-list">
-					<input placeholder="请填写开户支行" name="input" v-model="identityAuthenticationInfo.bankDepositBranch"></input>
+					<input placeholder="请填写开户支行" name="input"
+						v-model="identityAuthenticationInfo.bankDepositBranch"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">手机号</text>
 				<view class="con-list">
-					<input placeholder="请填写手机号" name="input" v-model="identityAuthenticationInfo.customerPhone"></input>
+					<input placeholder="请填写手机号" @input='phoneinput' v-model="identityAuthenticationInfo.customerPhone"></input>
 				</view>
 			</view>
 			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
-				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode' class='getcode'>{{sendText}}</button>
+				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode'
+					class='getcode'>{{sendText}}</button>
 				<view style='width:70%;position:relative;margin-left: 200px;'>
-
 					<input v-model='verifyCode' placeholder="请输入验证码" type="text">
 				</view>
 			</view>
@@ -84,8 +104,14 @@
 		</view>
 		<view v-else>
 			<view>
-				<button type="default">上传身份证正面</button>
-				<button type="default">上传身份证反面</button>
+				<button type="default" @click="idUp">上传身份证正面</button>
+				<view style="width: 100px;margin: 0 auto;" v-if="id1 != ''">
+					<image v-bind:src = "id1" style="width: 100px;height: 100px;"></image>
+				</view>
+				<button type="default" @click="idLow">上传身份证反面</button>
+				<view style="width: 100px;margin: 0 auto;" v-if="id2 != ''">
+					<image v-bind:src = "id2" style="width: 100px;height: 100px;"></image>
+				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">姓名</text>
@@ -96,12 +122,19 @@
 			<view class="c-row b-b">
 				<text class="tit">身份证号</text>
 				<view class="con-list">
-					<input placeholder="请填写身份证号" name="input" v-model="identityAuthenticationInfo.customerNumberCard"></input>
+					<input placeholder="请填写身份证号" name="input"
+						v-model="identityAuthenticationInfo.customerNumberCard"></input>
 				</view>
 			</view>
 			<view>
-				<button type="default">上传银行卡正面</button>
-				<button type="default">上传银行卡反面</button>
+				<button type="default" @click="bankUp()">上传银行卡正面</button>
+				<view style="width: 100px;margin: 0 auto;" v-if="bank1 != ''">
+					<image v-bind:src = "bank1" style="width: 100px;height: 100px;"></image>
+				</view>
+				<button type="default" @click="bankLow()">上传银行卡反面</button>
+				<view style="width: 100px;margin: 0 auto;" v-if="bank2 != ''">
+					<image v-bind:src = "bank2" style="width: 100px;height: 100px;"></image>
+				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">银行卡号</text>
@@ -118,7 +151,8 @@
 			<view class="c-row b-b">
 				<text class="tit">开户支行</text>
 				<view class="con-list">
-					<input placeholder="请填写开户支行" name="input" v-model="identityAuthenticationInfo.bankDepositBranch"></input>
+					<input placeholder="请填写开户支行" name="input"
+						v-model="identityAuthenticationInfo.bankDepositBranch"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -130,17 +164,19 @@
 			<view class="c-row b-b">
 				<text class="tit">收款人身份证号</text>
 				<view class="con-list">
-					<input placeholder="请填写收款身份证号" name="input" v-model="identityAuthenticationInfo.payeeNumberCard"></input>
+					<input placeholder="请填写收款身份证号" name="input"
+						v-model="identityAuthenticationInfo.payeeNumberCard"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">手机号</text>
 				<view class="con-list">
-					<input placeholder="请填写手机号" name="input" v-model="identityAuthenticationInfo.customerPhone"></input>
+					<input placeholder="请填写手机号" @input='phoneinput' v-model="identityAuthenticationInfo.customerPhone"></input>
 				</view>
 			</view>
 			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
-				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode' class='getcode'>{{sendText}}</button>
+				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode'
+					class='getcode'>{{sendText}}</button>
 				<view style='width:70%;position:relative;margin-left: 200px;'>
 					<input v-model='verifyCode' placeholder="请输入验证码" type="text">
 				</view>
@@ -157,15 +193,18 @@
 			<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">提交</button>
 		</view>
 	</view>
-	
+
 </template>
 
 <script>
+	import {
+	    mapState 
+	} from 'vuex';
 	export default {
 		name: "buy",
 		data() {
 			return {
-				radios: 2,
+				tupian:"",
 				inputContent: null,
 				customerPhone: '',
 				consentStatus: true,
@@ -176,10 +215,30 @@
 				sendText: '获取验证码',
 				platform: '',
 				sendDisabled: false,
+				id:[],
+				id1:"",
+				id2:"",
+				license1:"",
+				bank1:"",
+				bank2:"",
+				bankid:[],
+
 				identityAuthenticationInfo: {
-					customerPhone: ''
+					customerPhone: '',
+			
 				},
+				tempFilePaths: [],
+				businessLicenseAddressUrl:"",
+
+				// userInfo:{
+				// 	phone: ''
+				// },
+				identityAuthenticationInfo: {},
 			};
+
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo'])
 		},
 		methods: {
 			consent() {
@@ -190,14 +249,125 @@
 					this.consentStatus = false
 					this.consentStatus1 = true
 				}
+			},
 
+			license() {
+				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.identityAuthenticationInfo.businessLicenseAddressUrl = strToObj.url
+								that.license1 = strToObj.url
+							}
+						})
+					}
+				})
+			},
+			idUp(){
+				var that = this
+				wx.chooseImage({
+					success: function(res) {
+						wx.uploadFile({
+							url: 'https://www.zthymaoyi.com/upload/admin',
+							filePath: res.tempFilePaths[0],
+							name: 'file',
+							success(res) {
+								var data = res.data
+								var strToObj = JSON.parse(data)			
+								that.id[0] = strToObj.url
+								that.id1 = strToObj.url
+							}
+						})
+					}
+				})
+			},
+			idLow(){
+				var that = this
+				wx.chooseImage({
+					success: function(res) {
+						wx.uploadFile({
+							url: 'https://www.zthymaoyi.com/upload/admin',
+							filePath: res.tempFilePaths[0],
+							name: 'file',
+							success(res) {
+								var data = res.data
+								var strToObj = JSON.parse(data)			
+								that.id[1] = strToObj.url
+								that.id2 = strToObj.url
+							}
+						})
+					}
+				})
+			},
+			bankUp(){
+				var that = this
+				wx.chooseImage({
+					success: function(res) {
+						wx.uploadFile({
+							url: 'https://www.zthymaoyi.com/upload/admin',
+							filePath: res.tempFilePaths[0],
+							name: 'file',
+							success(res) {
+								var data = res.data
+								var strToObj = JSON.parse(data)			
+								that.bankid[0] = strToObj.url
+								that.bank1 = strToObj.url
+							}
+						})
+					}
+				})
+			},
+			bankLow(){
+				var that = this
+				wx.chooseImage({
+					success: function(res) {
+						wx.uploadFile({
+							url: 'https://www.zthymaoyi.com/upload/admin',
+							filePath: res.tempFilePaths[0],
+							name: 'file',
+							success(res) {
+								var data = res.data
+								var strToObj = JSON.parse(data)			
+								that.bankid[1] = strToObj.url
+								that.bank2 = strToObj.url
+							}
+						})
+					}
+				})
+			},
+			commit() {
+				this.identityAuthenticationInfo.commonId = this.userInfo.id
+				this.identityAuthenticationInfo.cardAddressUrl = this.id.toString()
+				this.identityAuthenticationInfo.payeeAddressUrl = this.bankid.toString()
+				if(this.consentStatus1 == true){
+					this.identityAuthenticationInfo.customerTypeFlag = "个人"
+				}else if(this.consentStatus == true){
+					this.identityAuthenticationInfo.customerTypeFlag = "企业"
+				}
+				this.$api.doRequest('post', '/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', this
+						.identityAuthenticationInfo)
+					.then(res => {
+						console.log(12545645)
+					}).catch(res => {
+						uni.showToast({
+							title: res.data.message,
+							icon: 'none',
+							duration: 2000
+						})
+					})
 			},
 
 			getcode() {
 				var that = this
-				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.customerPhone)) {
+				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.identityAuthenticationInfo.customerPhone)) {
 					this.$api.doRequest('get', '/commonUser/sendVerifyCode', {
-							phone: this.customerPhone
+							phone: this.identityAuthenticationInfo.customerPhone
 						}).then(res => {
 							if (res.data.code == 200) {
 								that.sendDisabled = true
@@ -233,37 +403,21 @@
 						duration: 2000
 					})
 				}
-
+			},
+			phoneinput(e){
+				if(e.detail.value.length==11){
+					this.codestatus=true
+				}
 			},
 			verifyCodeInput(e) {
 				this.verifyCode = e.detail.value
 			},
-			phoneinput(e) {
-				if (e.detail.value.length == 11) {
-					this.codestatus = true
-				}
-			},
 			cancel() {
 				this.inputShow = false
 				this.inputStatus = 'none'
 				this.isPhone = false
 			},
-			radioschenge(index) {
-				console.log(index)
-				this.radios = index
-			},
-			commit() {
-				this.$api.doRequest('post', '/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', this.identityAuthenticationInfo)
-					.then(res => {
-						console.log(12545645)
-					}).catch(res => {
-						uni.showToast({
-							title: res.data.message,
-							icon: 'none',
-							duration: 2000
-						})
-					})
-			},
+			
 		},
 	}
 </script>
@@ -272,7 +426,6 @@
 	.center {
 		padding: 10px 20px;
 	}
-
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -283,17 +436,6 @@
 		padding: 20rpx 30rpx;
 		position: relative;
 	}
-
-	.verificationCode {
-		margin-top: 20px;
-		background: #F5F6F9;
-		color: #AFB3BF;
-	}
-
-	.verificationCode:after {
-		border: none;
-	}
-
 	.con-list {
 		-webkit-box-flex: 1;
 		-webkit-flex: 1;
@@ -311,34 +453,23 @@
 		padding-right: 20rpx;
 		font-size: 14px;
 	}
-
-	.verificationCode.active {
-		background: #22C572;
-		color: #fff;
-	}
-
 	.getcode {
 		font-size: 14px;
 		position: absolute;
-		/* 	right:0; */
 		top: 50%;
 		transform: translateY(-50%);
 		color: #AFB3BF;
 		background: #F5F6F9;
 		height: 30px;
 		line-height: 30px;
-
 	}
-
-	.getcode:after {
+	.getcode.active {
 		border: none;
 	}
-
-	.uni-navigator {
-		display: inline-block;
-		color: #22C572;
+	.uni-navigator{
+		display:inline-block;
+		color:#22C572;
 	}
-
 	.getcode.active {
 		background: #22C572;
 		color: #fff;

pageD/identity/companyIdentityLook.vue

@@ -12,7 +12,7 @@
 		</view>
 		<view v-if="consentStatus == true">
 			<view>
-				<button type="default">营业执照</button>
+				<button type="default" @click="license">营业执照</button>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">公司名称</text>
@@ -169,7 +169,7 @@
 		methods: {
 			getList() {
 				
-				this.$api.doRequest('get', '/identityAuthenticationInfo/api/getIdentityAuthenticationInfo', {id:this.id}, 'application/json;').then(res => {
+				this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo', {id:this.id}, 'application/json;charset=UTF-8').then(res => {
 						console.log("成功连接")
 						this.procurementPlanInfos = res.data.data
 					})
@@ -190,7 +190,8 @@
 					this.consentStatus1 = true
 				}
 				
-			}
+			},
+			
 		}
 	}
 </script>

pageD/identity/driverIdentity.vue

@@ -2,40 +2,52 @@
 	<view class="center">
 		<view>
 			<view class="labels">司机信息</view>
-			<button type="default">身份证正面</button>
-			<button type="default">身份证反面</button>
+			<view>
+				<button type="default" @click="idUp">上传身份证正面</button>
+				<view style="width: 100px;margin: 0 auto;" v-if="id1 != ''">
+					<image v-bind:src = "id1" style="width: 100px;height: 100px;"></image>
+				</view>
+				<button type="default" @click="idLow">上传身份证反面</button>
+				<view style="width: 100px;margin: 0 auto;" v-if="id2 != ''">
+					<image v-bind:src = "id2" style="width: 100px;height: 100px;"></image>
+				</view>
+			</view>
 			<view class="c-row b-b">
 				<text class="tit">姓名</text>
 				<view class="con-list">
-					<input placeholder="请填写姓名" name="input" @input="addressInput"></input>
+					<input placeholder="请填写姓名" name="input" v-model="DriverViewInfo.driverName"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">身份证号</text>
 				<view class="con-list">
-					<input placeholder="请填写身份证号" name="input" @input="addressInput"></input>
+					<input placeholder="请填写身份证号" name="input" v-model="DriverViewInfo.numberCard"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">手机号</text>
 				<view class="con-list">
-					<input placeholder="请填写手机号" name="input" @input="addressInput"></input>
+					<input placeholder="请填写手机号" name="input" v-model="DriverViewInfo.driverPhone"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
-				<text class="tit"><button type="default">获取验证码</button></text>
+			<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 placeholder="请填写验证码" name="input" @input="addressInput"></input>
+					<!-- style='width:70%;position:relative;margin-left: 200px;' -->
+					<input v-model='verifyCode' placeholder="请输入验证码" type="text">
 				</view>
+			
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">常驻城市</text>
 				<view class="con-list">
-					<input placeholder="请填写常驻城市" name="input" @input="addressInput"></input>
+					<input placeholder="请填写常驻城市" name="input" v-model="DriverViewInfo.residentCityProvincial"></input>
 				</view>
 			</view>
-		
-		
+
+
 		</view>
 		<view class="margin-top">
 			<view class="labels">货车信息</view>
@@ -43,14 +55,14 @@
 			<view class="c-row b-b">
 				<text class="tit">车牌号</text>
 				<view class="con-list">
-					<input placeholder="请填写车牌号" name="input" @input="addressInput"></input>
+					<input placeholder="请填写车牌号" name="input" v-model="driverCarInfoList.carNumber"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">车型</text>
 				<!-- <view class="con-list"> -->
 				<picker @change="ModelChange" :value="ModelIndex" :range="ModelType" class="con-list">
-					<view class="picker " >
+					<view class="picker ">
 						{{ModelIndex>-1?ModelType[ModelIndex]:'请选择车型'}}
 					</view>
 				</picker>
@@ -58,7 +70,7 @@
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">不含车头车长（米）</text>
-			<!-- 	 <view class="con-list"> -->
+				<!-- 	 <view class="con-list"> -->
 				<picker @change="carLongChange" :value="carLongIndex" :range="carLongType" class="con-list">
 					<view class="picker">
 						{{carLongIndex>-1?carLongType[carLongIndex]:'请选择车长'}}
@@ -69,18 +81,18 @@
 			<view class="c-row b-b">
 				<text class="tit">载重（吨）</text>
 				<view class="con-list">
-					<input placeholder="请填写载重（吨）" name="input" @input="addressInput"></input>
+					<input placeholder="请填写载重（吨）" name="input" v-model="driverCarInfoList.carLoad"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">出厂年份</text>
 				<view class="con-list">
-					<input placeholder="请填写载重（吨）" name="input" @input="addressInput"></input>
+					<input placeholder="请填写出厂年份" name="input" v-model="driverCarInfoList.yearManufacture"></input>
 				</view>
 			</view>
-			
+
 			<button type="default">添加车辆</button>
-			
+
 		</view>
 		<view class="margin-top">
 			<view class="labels">账户信息</view>
@@ -88,60 +100,66 @@
 			<view class="c-row b-b">
 				<text class="tit">账户类型</text>
 				<view class="con-list">
-					<input placeholder="请填写账户类型" name="input" @input="addressInput"></input>
+					<input placeholder="请填写账户类型" name="input" v-model="driverPayeeInfoList.accountType"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">银行卡照片（可选）</text>
 				<view class="con-list">
-					<input placeholder="请上传照片" name="input" @input="addressInput"></input>
+					<input placeholder="请上传照片" name="input" v-model="driverPayeeInfoList.payeeAddressUrl"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">银行卡号</text>
 				<view class="con-list">
-					<input placeholder="请输入银行卡号" name="input" @input="addressInput"></input>
+					<input placeholder="请输入银行卡号" name="input" v-model="driverPayeeInfoList.bankCard"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">开户行</text>
 				<view class="con-list">
-					<input placeholder="请输入开户行" name="input" @input="addressInput"></input>
+					<input placeholder="请输入开户行" name="input" v-model="driverPayeeInfoList.bankDeposit"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">开户支行</text>
 				<view class="con-list">
-					<input placeholder="请输入开户支行" name="input" @input="addressInput"></input>
+					<input placeholder="请输入开户支行" name="input" v-model="driverPayeeInfoList.bankDepositBranch"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">收款人姓名</text>
 				<view class="con-list">
-					<input placeholder="请输入收款人姓名" name="input" @input="addressInput"></input>
+					<input placeholder="请输入收款人姓名" name="input" v-model="driverPayeeInfoList.payeeName"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">收款人身份证号</text>
 				<view class="con-list">
-					<input placeholder="请输入收款人身份证号" name="input" @input="addressInput"></input>
+					<input placeholder="请输入收款人身份证号" name="input" v-model="driverPayeeInfoList.payeeNumberCard"></input>
 				</view>
 			</view>
 			<button type="default">添加账号</button>
 		</view>
 		<view class="margin-top">
-				<view class="labels">上传附件</view>
-			
+			<view class="labels">上传附件</view>
+
 			<button type="default">行驶证</button>
 			<button type="default">驾驶证</button>
 			<button type="default">道路运营证</button>
 			<button type="default">从业资格证</button>
 		</view>
-		
+		<view class="padding flex flex-direction">
+			<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">提交</button>
+		</view>
+	</view>
 	</view>
 </template>
 
 <script>
+	import {
+	    mapState 
+	} from 'vuex';
 	export default {
 		data() {
 			return {
@@ -151,24 +169,224 @@
 				ModelType:["高栏","集装箱","自卸车"],
 				carLong:'',
 				carLongType:['13','9.6','8.2','8.7','11.7','12.5','13.7','15','16','17.5'],
+				id:[],
+				id1:"",
+				id2:"",
+				// bank1:"",
+				// bank2:"",
+				// bankid:[],
+				sendText: '获取验证码',
 
+				sendText: '获取验证码',
+				ModelIndex: '高栏',
+				Model: '',
+				ModelType: ["高栏", "集装箱", "自卸车"],
+				carLong: '',
+				carLongType: ['13', '9.6', '8.2', '8.7', '11.7', '12.5', '13.7', '15', '16', '17.5'],
+				driverCarInfoList: {},
+				driverPayeeInfoList: {},
+				DriverViewInfo: {
+					driverCarInfoList: [],
+					driverPayeeInfoList: [],
+				},
 			}
 		},
+		computed: {
+			...mapState(['hasLogin','userInfo'])
+		},
 		methods: {
-			ModelChange(e){
+			phoneinput(e) {
+				if (e.detail.value.length == 11) {
+					this.codestatus = true
+				}
+			},
+			getcode() {
+				var that = this
+				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.customerPhone)) {
+					this.$api.doRequest('get', '/commonUser/sendVerifyCode', {
+							customerPhone: this.customerPhone
+						}).then(res => {
+							if (res.data.code == 200) {
+								that.sendDisabled = true
+								let sec = 60
+								let interval = setInterval(() => {
+									sec--;
+									that.sendText = sec + 's后重发'
+									if (sec <= 0) {
+										that.sendDisabled = false
+										that.sendText = "获取验证码"
+										clearInterval(interval)
+									}
+								}, 1000)
+							} else {
+								uni.showToast({
+									title: res.data.message,
+									icon: 'none',
+									duration: 2000
+								})
+							}
+						})
+						.catch(res => {
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none',
+								duration: 2000
+							})
+						});
+				} else {
+					uni.showToast({
+						title: '请输入正确的手机号',
+						icon: 'none',
+						duration: 2000
+					})
+				}
+
+			},
+			doGetVerify() {
+				const that = this
+				var phone = this.inputContent;
+				if (!phone || phone.length != 11) {
+					uni.showToast({
+						title: '请输入正确手机号！',
+						icon: 'none'
+					})
+					return
+				}
+
+				that.$api.request('user', 'sendVerifyCode', {
+					phone: phone,
+				}).then(res => {
+					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)
+				})
+
+			},
+			verifyCodeInput(e) {
+				this.verifyCode = e.detail.value
+			},
+			cancel() {
+				this.inputShow = false
+				this.inputStatus = 'none'
+				this.isPhone = false
+			},
+			ModelChange(e) {
 				this.ModelIndex = e.detail.value
 				this.Model = this.ModelType[this.ModelIndex];
+				this.driverCarInfoList.carModel = this.ModelType[this.ModelIndex];
 			},
-			carLongChange(e){
+			carLongChange(e) {
 				this.carLongIndex = e.detail.value
 				this.carLong = this.carLongType[this.carLongIndex];
-			}
+			},
+			idUp(){
+				var that = this
+				wx.chooseImage({
+					success: function(res) {
+						wx.uploadFile({
+							url: 'https://www.zthymaoyi.com/upload/admin',
+							filePath: res.tempFilePaths[0],
+							name: 'file',
+							success(res) {
+								var data = res.data
+								var strToObj = JSON.parse(data)			
+								that.id[0] = strToObj.url
+								that.id1 = strToObj.url
+							}
+						})
+					}
+				})
+			},
+			idLow(){
+				var that = this
+				wx.chooseImage({
+					success: function(res) {
+						wx.uploadFile({
+							url: 'https://www.zthymaoyi.com/upload/admin',
+							filePath: res.tempFilePaths[0],
+							name: 'file',
+							success(res) {
+								var data = res.data
+								var strToObj = JSON.parse(data)			
+								that.id[1] = strToObj.url
+								that.id2 = strToObj.url
+							}
+						})
+					}
+				})
+			},
+			getcode() {
+				var that = this
+				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.identityAuthenticationInfo.customerPhone)) {
+					this.$api.doRequest('get', '/commonUser/sendVerifyCode', {
+							phone: this.identityAuthenticationInfo.customerPhone
+						}).then(res => {
+							if (res.data.code == 200) {
+								that.sendDisabled = true
+								let sec = 60
+								let interval = setInterval(() => {
+									sec--;
+									that.sendText = sec + 's后重发'
+									if (sec <= 0) {
+										that.sendDisabled = false
+										that.sendText = "获取验证码"
+										clearInterval(interval)
+									}
+								}, 1000)
+							} else {
+								uni.showToast({
+									title: res.data.message,
+									icon: 'none',
+									duration: 2000
+								})
+							}
+						})
+						.catch(res => {
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none',
+								duration: 2000
+							})
+						});
+				} else {
+					uni.showToast({
+						title: '请输入正确的手机号',
+						icon: 'none',
+						duration: 2000
+					})
+				}
+				this.driverCarInfoList.carLength = this.carLongType[this.carLongIndex];
+			},
+			commit() {
+				
+				this.DriverViewInfo.driverCarInfoList = [this.driverCarInfoList]
+				this.DriverViewInfo.driverPayeeInfoList = [this.driverPayeeInfoList]
+				this.DriverViewInfo.commonId = this.userInfo.id
+
+		
+				this.$api.doRequest('post', '/driverViewInfo/api/addInfo', this.DriverViewInfo).then(res => {
+				}).catch(res => {
+					uni.showToast({
+						title: res.data.message,
+						icon: 'none',
+						duration: 2000
+					})
+				})
+			},
 		}
 	}
 </script>
 
 <style>
-	.center{
+	.center {
 		padding: 10px 20px;
 		}
 		.labels{
@@ -202,5 +420,99 @@
 		    padding-right: 20rpx;
 			font-size: 14px;
 		}
+		.getcode {
+			font-size: 14px;
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+			color: #AFB3BF;
+			background: #F5F6F9;
+			height: 30px;
+			line-height: 30px;
+		}
+		.getcode.active {
+			border: none;
+		}
+		.uni-navigator{
+			display:inline-block;
+			color:#22C572;
+		}
+		.getcode.active {
+			background: #22C572;
+			color: #fff;
+		}
+
+	
+
+	.labels {
+		font-size: 16px;
+		font-weight: 400;
+	}
+
+	.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;
+	}
+
+
+	.verificationCode {
+		margin-top: 20px;
+		background: #F5F6F9;
+		color: #AFB3BF;
+	}
+
+	.verificationCode:after {
+		border: none;
+	}
+
+	.verificationCode.active {
+		background: #22C572;
+		color: #fff;
+	}
+
+	.getcode {
+		font-size: 14px;
+		position: absolute;
+		/*  right:0; */
+		top: 50%;
+		transform: translateY(-50%);
+		color: #AFB3BF;
+		background: #F5F6F9;
+		height: 30px;
+		line-height: 30px;
+
+	}
+
+	.getcode:after {
+		border: none;
+	}
+
+	.getcode.active {
+		background: #22C572;
+		color: #fff;
+	}
 </style>

pageD/myRelease/buyGrain.vue

@@ -317,6 +317,7 @@
 					return
 				}
 		         this.insertProcurementPlanInfo.commonId = this.userInfo.id
+				 this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 				this.$api.doRequest('post', '/procurementPlanInfo/api/insertProcurementPlanInfo', this
 						.insertProcurementPlanInfo).then(res => {
 						console.log("添加成功")

pageD/warehousings/warehousings.vue

@@ -160,7 +160,10 @@
 				goods: {},
 				list: {},
 				WarehouseInOutInfo: {
-					warehouseInOutDetail: {}
+					warehouseInOutDetail: {},
+					pcFlag: 0,
+					contractNo: {},
+					carNo: {},
 				},
 				pinIndex: 0,
 				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],

pages.json

@@ -552,7 +552,7 @@
 				{
 				    "path" : "contract/contract_detail",
 				    "style" : {
-						"navigationBarTitleText": "合同详情"
+						"navigationBarTitleText": "添加发车信息"
 						}
 				},
 				{
@@ -564,7 +564,7 @@
 				},{
 				    "path" : "contract/look",
 				    "style" : {
-						"navigationBarTitleText": "查看",
+						"navigationBarTitleText": "发货",
 						"enablePullDownRefresh": true
 						}
 				},

pages/release/release.vue

@@ -133,9 +133,8 @@
 				})
 			},
 			getList(){
-				
-				this.$api.doRequest('get','/procurementPlanInfo/selectProcurementPlanInfo',this.procurementPlanInfo).then(res => {
-					
+				// this.procurementPlanInfo.pcFlag = "1"
+				this.$api.doRequest('get','/procurementPlanInfo/selectProcurementPlanInfo',this.procurementPlanInfo).then(res => {		
 					this.procurementPlanInfos = res.data.data.records
 					console.log(this.procurementPlanInfos,"对象")
 					

pages/task/my_task.vue

@@ -103,7 +103,6 @@
 				this.getIndexBuyData()
 			},
 			navToDetailPage(item) {
-				console.log(item)
 				if(item.statusFlag == 3){
 				uni.navigateTo({
 					url: `/pageD/warehousings/warehousingDetails?id=${item.id}`