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

apiconfig.js

@@ -4,7 +4,7 @@
 import request from 'request.js'
 class apiconfig {
   constructor(config = {}) {
-        this.baseurl= 'http://120.27.95.106:9999/';
+         this.baseurl= 'http://120.27.95.106:9999/';
 		this.pathconfig={
 			checkUpdate: this.baseurl +'/checkVersion'
 		}

config/index.js

@@ -1,6 +1,7 @@
 const dev = {
-	// baseUrl: 'http://127.0.0.1:8080',
+	// baseUrl: 'http://192.168.1.120:8090/',
 	baseUrl: 'https://www.zthymaoyi.com',
+	baseUrlNew: 'http://192.168.1.120:8090/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

main.js

@@ -99,6 +99,7 @@ const request = (_gp, _mt, data = {}, failCallback) => {
 			userInfo = uni.getStorageSync('userInfo')
 		}
 		let accessToken = userInfo ? userInfo.accessToken : ''
+		// let baseUrl = 'http://192.168.1.120:8090/'
 		let baseUrl = config.def().baseUrl
 		uni.request({
 			url: baseUrl + '/m.api',
@@ -173,10 +174,13 @@ const request = (_gp, _mt, data = {}, failCallback) => {
 }
 // 现app调用方式
 
-const doRequest = (method, url, data)=> {
-	console.log(method,url,data)
+const doRequest = (method, url, data,header)=> {
+	var contentheader='application/json'
+	if(header){
+		contentheader=header
+	}
 	// let baseUrl = config.def().baseUrl
-	let baseUrl = 'http://192.168.1.120:8090/'
+	let baseUrl = config.def().baseUrlNew
         // 如果data为空
         if (!data) var data = []
         var arr = []
@@ -190,7 +194,7 @@ const doRequest = (method, url, data)=> {
                 data: arr[0],
                 // data:data
                 header: {
-                    'content-type': 'application/x-www-form-urlencoded'
+                    'content-type': contentheader //'application/x-www-form-urlencoded; charset=UTF-8',
                 },
                 success: function(result) {
                     // resolve调用后，即可传递到调用方使用then或者async+await同步方式进行处理逻辑

pageA/product/detail.vue

@@ -1,34 +1,32 @@
 <template>
 	<view class="container">
+		<view class="back-btn cuIcon-back" @click="navBack"></view>
+		<view class='title1'>采购详情</view>
+		<image style='width:100%;' src='../../static/img/jiaoyi/bg@3x.png'></image>
 		<view class="introduce-section">
-			<view class="price-box">
-				<view class="title">{{goods.title}}</view>
-				<view  v-if='goods.isFutures==0' class="title-tip">
-					<text class="price-tip">¥</text>
-					<text class="price">{{goods.price}}</text>
-					<text class="price-tip">元/吨</text>
-				</view>
-				<view  v-else class="title-tip">
-					<text class="price-tip">今日基差</text>
-					<text class="price-tip">¥</text>
-					<text class="price-tip">{{goods.basis}}</text>
-					<text class="price-tip">元/吨</text>
+			<view style='height:70px;'>
+				<view class="title">{{goods.title}}(元/吨)</view>
+				<view class='flex justify-between'>
+					<view style='flex:1.5;color:#878C9C;'>{{goods.receivePrivate}}{{goods.receiveCity}}{{goods.receiveArea}}{{goods.receiveWarehouse}}</view>
+					<view  v-if='goods.procurementPlanType=="现货"' class="title-tip">
+						<text class="price">{{goods.unitPrice}}</text>
+					</view>
+					<view style='text-align:right;'  v-else class="title-tip">
+						{{goods.basisPrice}}
+					</view>
 				</view>
+				<view style='text-align:right;' v-if='goods.procurementPlanType=="现货"'>采购价格</view>
+				<view style='text-align:right;' v-if='goods.procurementPlanType=="期货"'>今日基差</view>
 			</view>
-			<view class="bot-row">
+			<!-- <view class="bot-row">
 				<view v-if='goods.companyId==2' class='cu-tag radius line-orange'>佳屹农</view>
 				<view v-else class='cu-tag radius line-orange'>易粮易运</view>
 				<view v-if='goods.sellerPhone && goods.companyId!=2' class='cu-tag radius line-orange' >{{goods.sellerPhone}}</view>
-				<!-- <view class='cu-tag radius line-orange'>{{goods.basis}}元/吨</view> -->
 			</view>
-			<!-- <view v-if='goods.companyId==2' class="bot-row">
-				<view class='cu-tag radius line-orange'>大袋{{goods.basisBig}}</view>
-				<view class='cu-tag radius line-orange'>小袋装{{goods.basisSmall}}</view>
-			</view> -->
 			<view v-if='goods.companyId!=2' class="bot-row">
 				<view class='cu-tag radius line-orange'>剩余量: {{goods.total - goods.soldCount}}吨</view>
 				<view class='cu-tag radius line-orange'>总量: {{goods.total}}吨</view>
-			</view>
+			</view> -->
 		</view>
 		<view v-if="goods.storeImg" class="carousel-section">
 			<swiper autoplay="true" interval="3000" duration="500" class="carousel" circular @change="swiperChange">
@@ -53,140 +51,163 @@
 			<view class="d-header">
 				<text>基本信息</text>
 			</view>
-			 <view class="c-list">
-				<view class="c-row b-b">
-					<text class="tit">品种</text>
+			<view class="c-list">
+				<view class="c-row">
+					<text class="tit">货名</text>
 					<view class="con-list">
 						<text>{{goods.goodsName}}</text>
 					</view>
 				</view>
-				<view  v-if='goods.companyId!=2' class="c-row b-b">
-					<text class="tit">产地</text>
+				<view class="c-row">
+					<text class="tit">采购量（吨）</text>
 					<view class="con-list">
-						<text>{{goods.origin}}</text>
+						<text>{{goods.plannedPurchaseVolume}}</text>
 					</view>
 				</view>
-				<view  v-if='goods.companyId!=2' class="c-row b-b">
-					<text class="tit">国标等级</text>
+				<view class="c-row">
+					<text class="tit">最小成交量（吨）</text>
 					<view class="con-list">
-						<text>{{goods.level}}</text>
+						<text>{{goods.minimumVolume}}</text>
 					</view>
 				</view>
-				<view  v-if='goods.companyId!=2' class="c-row b-b">
-					<text class="tit">年份</text>
+				<view class="c-row">
+					<text class="tit">类型</text>
 					<view class="con-list">
-						<text>{{goods.year}}</text>
+						<text>{{goods.procurementPlanType}}</text>
 					</view>
 				</view>
-				<view v-if='goods.companyId!=2' class="c-row b-b">
-					<text class="tit">包装方式</text>
+				<view class="c-row">
+					<text class="tit">价格类型</text>
 					<view class="con-list">
-						<text>{{goods.packing}}</text>
+						<text>{{goods.priceType}}</text>
 					</view>
 				</view>
-				<view class="c-row b-b">
-					<text class="tit">最小成交量</text>
+				<view class="c-row">
+					<text class="tit">收货地区</text>
 					<view class="con-list">
-						<text>{{goods.minSale}}(吨)</text>
+						<text>{{goods.receivePrivate}}{{goods.receiveCity}}{{goods.receiveArea}}</text>
 					</view>
 				</view>
-				<view v-if='goods.isFutures==0' class="c-row b-b">
-					<text class="tit">剩余量</text>
+				<view class="c-row">
+					<text class="tit">运费承担方</text>
 					<view class="con-list">
-						<text>{{numFilter(goods.total-goods.soldCount)}}</text>
+						<text>{{goods.freightPayer}}</text>
 					</view>
 				</view>
-				<view class="c-row b-b">
-					<text class="tit">价格类型</text>
+				<view class="c-row">
+					<text class="tit">包装方式</text>
 					<view class="con-list">
-						<text>{{goods.priceType}}</text>
+						<text>{{goods.packingType}}</text>
 					</view>
 				</view>
-				<view class="c-row b-b">
-					<text class="tit">库存地</text>
+				<view class="c-row">
+					<text class="tit">袋装备注</text>
 					<view class="con-list">
-						<text>{{goods.stock}}</text>
+						<text>{{goods.baggingNotes}}</text>
+					</view>
+				</view>
+				<view class="c-row">
+					<text class="tit">买方</text>
+					<view class="con-list">
+						<text>{{goods.buyer}}</text>
+					</view>
+				</view>
+				<view class="c-row">
+					<text class="tit">买方电话</text>
+					<view class="con-list">
+						<view>{{goods.buyerPhone}} <a :href="'tel:'+goods.buyerPhone"><image style='width:11px;height:11px;' src='../../static/img/jiaoyi/gengduo1@3x.png'></image></a></view>
 					</view>
 				</view>
 			</view>
+		</view>
+		<view class="detail-desc">
 			<view class="d-header">
-				<text>粮食指标</text>
+				<text>货物要求</text>
 			</view>
 			<view class="c-list">
-				<view v-if='goods.goodsName=="玉米"' class="c-row b-b">
-					<text class="tit">杂质（%）{{'<='}}</text>
+				<view class="c-row">
+					<text class="tit">水分（%）{{'<='}} </text>
 					<view class="con-list">
-						<text>{{goods.impurity}}</text>
+						<text>{{goods.waterContent}}</text>
 					</view>
 				</view>
-				<view v-if='goods.goodsName=="玉米"' class="c-row b-b">
-					<text class="tit">生霉粒（%）{{'<='}}</text>
+				<view class="c-row">
+					<text class="tit">容重（g/L）{{'<='}}</text>
 					<view class="con-list">
-						<text>{{goods.moldy}}</text>
+						<text>{{goods.bulkDensity}}</text>
 					</view>
 				</view>
-				<view v-if='goods.goodsName=="玉米"' class="c-row b-b">
-					<text class="tit">容重（g/L）{{'<='}}</text>
+				<view class="c-row">
+					<text class="tit">热损伤（%）{{'<='}}</text>
 					<view class="con-list">
-						<text>{{goods.bulkDensity}}</text>
+						<text>{{goods.jiaorenli}}</text>
 					</view>
 				</view>
-				<view v-if='goods.goodsName=="玉米"' class="c-row b-b">
-					<text class="tit">气味、色泽</text>
+				<view class="c-row">
+					<text class="tit">杂质（%）{{'<='}}</text>
 					<view class="con-list">
-						<text>{{goods.smell}}</text>
+						<text>{{goods.impurity}}</text>
 					</view>
 				</view>
-				<!-- <view v-if='goods.goodsName=="玉米"' class="c-row b-b">
-					<text class="tit">热损（%）{{'<='}}</text>
+				<view class="c-row">
+					<text class="tit">霉变粒（%）{{'<='}}</text>
 					<view class="con-list">
-						<text>{{goods.heatLoss}}</text>
+						<text>{{goods.mildewGrain}}</text>
 					</view>
-				</view> -->
-				<view class="c-row b-b">
-					<text class="tit">水分（%）{{'<='}} </text>
+				</view>
+				<view class="c-row">
+					<text class="tit">不完善粒（%）{{'<='}}</text>
 					<view class="con-list">
-						<text>{{goods.waterContent}}</text>
+						<text>{{goods.imperfectGrain}}</text>
 					</view>
 				</view>
-				<view v-if='goods.goodsName=="大豆"' class="c-row b-b">
+				<view class="c-row">
 					<text class="tit">蛋白（%）{{'>='}} </text>
 					<view class="con-list">
 						<text>{{goods.protein}}</text>
 					</view>
 				</view>
-				<view v-if='goods.goodsName=="大豆"' class="c-row b-b">
+				<view class="c-row">
 					<text class="tit">粒型</text>
 					<view class="con-list">
-						<text>{{goods.grainType}}</text>
+						<text>{{goods.grain}}</text>
 					</view>
 				</view>
-				<view v-if="goods.userName1" class="c-row b-b">
-					<text class="tit">价格</text>
+				<view class="c-row">
+					<text class="tit">品级</text>
 					<view class="con-list">
-						<input placeholder="请填写" name="input" v-model="price" @input="priceInput"></input>
+						<text>{{goods.grade}}</text>
 					</view>
-					<button class='cu-btn bg-green shadow' @click="changePrice">修改价格</button>
 				</view>
-				<view v-if="goods.userName1" class="c-row b-b">
-					<text class="tit">备注</text>
+				<view class="c-row">
+					<text class="tit">产地</text>
+					<view class="con-list">
+						<text>{{goods.outputPrivate}}{{goods.outputCity}}</text>
+					</view>
+				</view>
+				<view class="c-row">
+					<text class="tit">产出年份</text>
 					<view class="con-list">
-						<input placeholder="请填写" name="input" v-model="reason" @input="reasonInput"></input>
+						<text>{{goods.outputYear}}</text>
 					</view>
-					<button class='cu-btn bg-red shadow' @click="endSale">终止销售</button>
 				</view>
+				</view>
+			</view>
+		<view v-if='status' class='shade'>
+			<view class='shade-content'>
+				<view class='shade-content-item'>
+					您的粮商身份正在审核中，请耐心等待认证状态可在<text>我的-身份认证</text>中查看
+				</view>
+				<image @click='status==false' style='width:30px;height:30px;margin-top:10px;' src='../../static/img/jiaoyi/guanbi-2@3x.png'></image>
 			</view>
-			 <view v-if="goods.userName" class="padding-xl" @click="navToDetailPage()">
-			 		<button class="cu-btn block line-orange lg">
-			 	     <text  class="cuIcon-upload"></text> 上传图片</button>
-			 </view>
 		</view>
 		<!-- 底部操作菜单 -->
-		<view class="page-bottom">
-			<view class="action-btn-group">
-				<button type="primary" class=" action-btn no-border buy-now-btn" @click="contactUs">联系我们</button>
-				<button v-if="goods.status == 1" type="primary" class=" action-btn no-border add-cart-btn" >交易结束</button>
-				<button v-else type="primary" class=" action-btn no-border add-cart-btn" @click="tradeNow">我要买粮</button>
+		<view class="page-bottom1">
+			<view>
+				<button type="primary" @click="contactUs">在线客服</button>
+				<button  @click="salegrain" v-if="goods.pcFlag == 1" type="primary" class=" action-btn no-border add-cart-btn" >立即卖粮</button>
+				<button v-else type="primary" class=" action-btn no-border add-cart-btn" 
+				@click="tradeNow">立即发车</button>
 			</view>
 		</view>
 	</view>
@@ -230,6 +251,7 @@
 					minSale: 0,
 					status:0
 				},
+				status:false,
 				share:{
 				   title: '',
 				   imageUrl:'https://taohaoliang.oss-cn-beijing.aliyuncs.com/shareLogo.png',
@@ -247,21 +269,21 @@
 				title: '正在加载',
 				mask:true
 			})
-			that.$api.request('goods', 'getSaleDetailInfo', {
-				id: options.id
-			}, failres => {
-				that.$api.msg(failres.errmsg)
-				uni.hideLoading()
-			}).then(res => {
-				console.log(res.data)
-				that.goods = res.data
-				that.swiperLength = 3
-				if(that.goods.soldCount >= that.goods.total){
-					that.goods.status = 1
-				}
-				that.share.title = that.goods.title
+			this.$api.doRequest('get', '/procurementPlanInfo/getProcurementPlan',{id:options.id}).then(res => {
 				uni.hideLoading()
+				this.goods=res.data.data
 			})
+			
+			// .then(res => {
+			// 	console.log(res.data)
+			// 	that.goods = res.data
+			// 	that.swiperLength = 3
+			// 	if(that.goods.soldCount >= that.goods.total){
+			// 		that.goods.status = 1
+			// 	}
+			// 	that.share.title = that.goods.title
+			// 	uni.hideLoading()
+			// })
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo'])
@@ -295,9 +317,8 @@
 				}
 				else{
 					uni.makePhoneCall({
-					 	
 					 	// 手机号
-					    phoneNumber: that.goods.sellerPhone, 
+					    phoneNumber: that.goods.buyerPhone, 
 					
 						// 成功回调
 						success: (res) => {
@@ -354,6 +375,80 @@
 					setTimeout(()=>{uni.navigateBack()},1000);
 				})
 			},
+			salegrain(){
+				console.log(this.userInfo)
+				if (!this.hasLogin) {
+					uni.showModal({
+						title: '登录提示',
+						content: '您尚未登录，是否立即登录？',
+						showCancel: true,
+						confirmText: '登录',
+						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}`
+								})
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					})
+				}
+				else{
+					this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo',{commonId:this.userInfo.id}).then(res => {
+						if(res.data.code==200){
+							uni.navigateTo({
+								url: '/pages/public/login'
+							})
+						}else if(res.data.code==11016){
+							uni.showModal({
+								    title: '温馨提示',
+								    content: '您还未认证粮商身份， 下单前请先完善您的身份信息',
+								    confirmText: "去认证",
+									confirmColor: '#22C572',
+									success: function (res) {
+								        if (res.confirm) {
+											uni.navigateTo({//跳转页面
+												url:"../index/index"
+											})
+								        } else if (res.cancel) {
+								        }
+								    }
+								});
+						}else if(res.data.code==11017){
+							this.status=true
+						}
+					})
+					// uni.showModal({
+					// 	    title: '温馨提示',
+					// 	    content: '请在发车前认真核实买方身份，并在签订正规的交易合同后发起发车操作，是否继续发车？',
+					// 	    confirmText: "发车",
+					// 		confirmColor: '#22C572',
+					// 		success: function (res) {
+					// 	        if (res.confirm) {
+					// 				uni.navigateTo({//跳转页面
+					// 					url:"../index/index"
+					// 				})
+					// 	        } else if (res.cancel) {
+					// 	        }
+					// 	    }
+					// 	});
+					// const that = this
+					// uni.navigateTo({
+					// 	url: `/pageA/product/trade?id=${that.goods.id}&packing=${that.goods.packing}}&province=${that.goods.province}
+					// 	&city=${that.goods.city}&area=${that.goods.area}&storeName=${that.goods.storeName}&seller=${that.goods.seller}
+					// 	&companyId=${that.goods.companyId}&sellerPhone=${that.goods.sellerPhone}&minSale=${that.goods.minSale}
+					// 	&exsitCount=${that.goods.total}&isFutures=${that.goods.isFutures}
+					// 	&basis=${that.goods.basis}&basisSmall=${that.goods.basisSmall}&basisBig=${that.goods.basisBig}
+					// 	&unloadingFee=${that.goods.unloadingFee}`
+					// })
+				}
+			},
 			endSale(){
 				const that = this
 				uni.showLoading({
@@ -373,35 +468,56 @@
 					
 				})
 			},
+			navBack() {
+				uni.navigateBack();
+			},
 			tradeNow(){
-				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
-					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}`
-					})
-				}
+				// this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo',{commonId:options.id}).then(res => {
+				// 	uni.hideLoading()
+				// 	this.goods=res.data.data
+				// })
+				// if (!this.hasLogin) {
+				// 	uni.showModal({
+				// 		title: '登录提示',
+				// 		content: '您尚未登录，是否立即登录？',
+				// 		showCancel: true,
+				// 		confirmText: '登录',
+				// 		success: (e) => {
+				// 			if (e.confirm) {
+				// 				uni.navigateTo({
+				// 					url: '/pages/public/login'
+				// 				})
+				// 			}
+				// 		},
+				// 		fail: () => {},
+				// 		complete: () => {}
+				// 	})
+				// }
+				// else{
+				// 	uni.showModal({
+				// 		    title: '温馨提示',
+				// 		    content: '请在发车前认真核实买方身份，并在签订正规的交易合同后发起发车操作，是否继续发车？',
+				// 		    confirmText: "发车",
+				// 			confirmColor: '#22C572',
+				// 			success: function (res) {
+				// 		        if (res.confirm) {
+				// 					uni.navigateTo({//跳转页面
+				// 						url:"../index/index"
+				// 					})
+				// 		        } else if (res.cancel) {
+				// 		        }
+				// 		    }
+				// 		});
+				// 	const that = this
+				// 	uni.navigateTo({
+				// 		url: `/pageA/product/trade?id=${that.goods.id}&packing=${that.goods.packing}}&province=${that.goods.province}
+				// 		&city=${that.goods.city}&area=${that.goods.area}&storeName=${that.goods.storeName}&seller=${that.goods.seller}
+				// 		&companyId=${that.goods.companyId}&sellerPhone=${that.goods.sellerPhone}&minSale=${that.goods.minSale}
+				// 		&exsitCount=${that.goods.total}&isFutures=${that.goods.isFutures}
+				// 		&basis=${that.goods.basis}&basisSmall=${that.goods.basisSmall}&basisBig=${that.goods.basisBig}
+				// 		&unloadingFee=${that.goods.unloadingFee}`
+				// 	})
+				// }
 				
 			}
 		},
@@ -411,8 +527,16 @@
 
 
 <style lang='scss'>
+	.title1{
+		position:absolute;
+		left:50%;
+		transform: translateX(-50%);
+		top: 40upx;
+		z-index:9999;
+		color:#fff;
+	}
 	page {
-		background: $page-color-base;
+		background: #F5F6FA;
 		/* padding-bottom: 160upx; */
 	}
 	.container{
@@ -647,34 +771,22 @@
 	.detail-desc {
 		background: #fff;
 		margin-top: 16upx;
-		width: 750upx;
-
+		margin:10px;
+		position:relative;
+		z-index:4;
+		border-radius:5px;
 		.d-header {
 			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 80upx;
+			padding:10px;
 			font-size: $font-base + 2upx;
 			color: $font-color-dark;
 			position: relative;
-
+			border-bottom:1px solid #EEEEEE;
 			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;
-			}
 		}
 	}
 
@@ -886,20 +998,30 @@
 	}
 
 	/* 底部操作菜单 */
-	.page-bottom {
+	.page-bottom1 {
 		position: fixed;
-		left: 30upx;
-		bottom: 30upx;
+		left: 0;
+		bottom: 0;
 		z-index: 95;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		width: 690upx;
-		height: 100upx;
+		width:100%;
+		height: 70px;
 		background: rgba(255, 255, 255, .9);
-		box-shadow: 0 0 20upx 0 rgba(0, 0, 0, .5);
-		border-radius: 16upx;
-
+		padding:15px;
+		border-radius: 0;
+		text-align:right;
+		button{
+			display:inline-block;
+			border-radius:18px;
+			margin:0 10px;
+			font-size:14px;background:#fff;
+			color:#333;
+			border:1px solid #333;
+		}
+		.action-btn{
+			background:#22C572;
+			color:#fff;
+			border:1px solid #22C572;
+		}
 		.p-b-btn {
 			display: flex;
 			flex-direction: column;
@@ -950,14 +1072,19 @@
 	/* 销售信息 */
 	.introduce-section {
 		background: #fff;
-		padding: 20upx 30upx;
-		padding-bottom: 100upx;
+		padding: 30upx 30upx;
+		position:relative;
+		margin:10px;
+		padding-bottom:25px;
+		margin-top:-148px;
+		border-radius:5px;
+		z-index:4;
 		.guess-item {
 			padding-bottom: 20upx;
 			border-bottom: 1px solid #ccc;
 		}
 		.title {
-			font-size: 28upx;
+			font-size: 16px;
 			color: $font-color-dark;
 			font-weight:bold;
 			height: 50upx;
@@ -966,6 +1093,7 @@
 		}
 		.title-tip {
 			flex:1.5;
+			color:#FD714F;font-size:30px;
 		}
 		.price-box {
 			display: flex;
@@ -1009,4 +1137,37 @@
 			}
 		}
 	}
+	.back-btn {
+		position: absolute;
+		left: 40upx;
+		z-index: 9999;
+		padding-top: var(--status-bar-height);
+		top: 40upx;
+		font-size: 40upx;
+		color: #fff;
+	}
+	.shade{
+		position:fixed;
+		top:0;
+		left:0;
+		width:100%;background:rgba(0,0,0,0.5);
+		height:100%;
+		z-index:999999;
+	}
+	.shade-content{
+		position:absolute;
+		top:50%;
+		left:50%;
+		transform: translateX(-50%) translateY(-50%);
+		z-index:999999;
+		text-align:center;
+	}
+	.shade-content-item{
+		background:#fff;
+		width: 277px;
+		text-align:center;
+		height:121px;
+		padding:35px 10px;
+		border-radius:15px;
+	}
 </style>

pageA/product/lookup.vue

@@ -1,8 +1,15 @@
 <template>
 	<view class="content">
-		<view class="search-box">
+		
+			<view style='background:#fff;display:flex;' class="cu-bar search">
+			<view style='flex:6;' class="search-form round" >
+				<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
+				<input type="text" v-model="searchKeyWord" @input="doSearch" placeholder="请输入货名或标题" confirm-type="search"></input>
+			</view>
+			<view style="width:4%;flex:1;">取消</view>
+			</view>
 			<!-- mSearch组件 如果使用原样式，删除组件元素-->
-			<mSearch class="mSearch-input-box" :mode="2" button="inside" :placeholder="defaultKeyword" @search="doSearch(false)" @input="inputChange" @confirm="doSearch(false)" v-model="keyword"></mSearch>
+			<!-- <mSearch class="mSearch-input-box" :mode="2" button="inside" :placeholder="defaultKeyword" @search="doSearch(false)" @input="inputChange" @confirm="doSearch(false)" v-model="keyword"></mSearch> -->
 			<!-- 原样式 如果使用原样式，恢复下方注销代码 -->
 			<!-- 			
 			<view class="input-box">
@@ -12,25 +19,57 @@
 			<view class="search-btn" @tap="doSearch(false)">搜索</view> 
 			-->
 			<!-- 原样式 end -->
-		</view>
 		<view class="search-keyword" @touchstart="blur">
-			<scroll-view class="keyword-list-box" v-show="isShowKeywordList" scroll-y>
-				<view class="keyword-entry" hover-class="keyword-entry-tap" v-for="row in keywordList" :key="row.keyword">
-					<view class="keyword-text" @tap="doSearch(row.keyword)">
-						<rich-text :nodes="row.htmlStr"></rich-text>
+			<scroll-view style='background:#F5F6FA;' class="keyword-list-box" v-show="isShowKeywordList&&keywordList.length>0" scroll-y>
+				<view style='background:#fff;padding:0 15px;'>
+					<view @click='tabcarchange(0)' class='line' :class='TabCur==0?"active":""'>采购</view>
+					<view @click='tabcarchange(1)' class='line'  :class='TabCur==1?"active":""'>销售</view>
+				</view>
+				<view class="introduce-section">
+					<view v-for="(item, index) in keywordList" :key="index" class="guess-item" @click="navToDetailPage(item)">
+						<view class="price-box">
+							<view class="title">{{item.title}}</view>
+							<view style='dsiplay:flex;' class='flex justify-between'>
+								<view class='address'>
+									{{item.receivePrivate}}{{item.receiveCity}}{{item.receiveArea}}{{item.receiveWarehouse}}
+								</view>
+								<view class='price' v-if='item.procurementPlanType=="期货"'>{{item.basisPrice}}<text style='font-size:13px;color:#333333;'>元/吨</text></view>
+								<view class='price' v-if='item.procurementPlanType=="现货"'>{{item.unitPrice}}<text style='font-size:13px;color:#333;'>元/吨</text></view>
+							</view>
+						</view>
+						<view class='flex justify-between'>
+							<view>
+								<view class='tag1 tag-bule radius line-pink' v-if='item.procurementPlanType=="现货"'>现货</view>
+								<view class='tag1 tag-bule radius line-pink' v-if='item.procurementPlanType=="期货"'>期货</view>
+								<view class='tag1 tag-yellow radius line-green'>{{item.goodsName}}</view>
+								<view class='tag1 tag-red radius line-yellow'>{{item.weight}}吨</view>
+							</view>
+							<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货"'>今日基差</view>
+							<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货"'>采购价格</view>
+						</view>
 					</view>
-					<view class="keyword-img" @tap="setkeyword(row)">
-						<image src="/static/HM-search/back.png"></image>
+					<view v-show="isLoadMore">
+						<uni-load-more :status="loadStatus"></uni-load-more>
 					</view>
 				</view>
 			</scroll-view>
+			<view style='height:80vh;' v-show="isShowKeywordList&&keywordList.length==0">
+				<view style='background:#fff;padding:0 15px;'>
+					<view @click='tabcarchange(0)' class='line' :class='TabCur==0?"active":""'>采购</view>
+					<view @click='tabcarchange(1)' class='line'  :class='TabCur==1?"active":""'>销售</view>
+				</view>
+				<view style='background:#F5F6FA;height:100%;line-height:80vh;text-align:center;'>
+					暂无相关结果
+				</view>
+			</view>
 			<scroll-view class="keyword-box" v-show="!isShowKeywordList" scroll-y>
 				<view class="keyword-block" v-if="oldKeywordList.length>0">
 					<view class="keyword-list-header">
-						<view>历史搜索</view>
+						<view style='font-size:16px;font-weight:600;'>最近搜索</view>
 						<view>
+							<image @tap="oldDelete" style='width:16px;height:16px;' src="../../static/img/jiaoyi/shanchu@3x.png"></image>
 							<!-- <image @tap="oldDelete" src="./static/delete.png"></image> -->
-							<text class="cuIcon-delete text-gray " @tap="oldDelete" ></text>
+						<!-- 	<text class="cuIcon-delete text-gray "  ></text> -->
 							
 						</view>
 					</view>
@@ -40,7 +79,7 @@
 				</view>
 				 <view class="keyword-block">
 					<view class="keyword-list-header">
-						<view>推荐搜索</view>
+						<view style='font-size:16px;font-weight:600;'>推荐搜索</view>
 						<view>
 							 <image @tap="hotToggle" :src="'/static/HM-search/attention'+forbid+'.png'"></image> 
 						</view>
@@ -61,7 +100,9 @@
 		data() {
 			return {
 				defaultKeyword: "",
-				keyword: "",
+				searchKeyWord: "",
+				pageSize:10,
+				currentPage:1,
 				oldKeywordList: [],
 				hotKeywordList: ["玉米","大豆","小麦","水稻","高粱","玉米淀粉","豆粕"],
 				keywordList: [],
@@ -71,8 +112,13 @@
 			}
 		},
 		onLoad(options) {
+			this.searchKeyWord=options.searchKeyWord
 			this.TabCur = options.TabCur
 			this.init();
+			if(this.searchKeyWord){
+				this.isShowKeywordList=truetrue
+				this.getData()
+			}
 		},
 		components: {
 			//引用mSearch组件，如不需要删除即可
@@ -100,6 +146,26 @@
 				this.isLoadMore = false
 				this.loadData()
 			},
+			getData(){
+				var param1=''
+				if (this.TabCur == 0) {
+					param1 = '/procurementPlanInfo/selectProcurementPlanInfo'
+				} else {
+					param1 = 'buy'
+				}
+				this.$api.doRequest('get', param1,{pageSize:this.pageSize,
+				currentPage:this.currentPage,searchKeyWord:this.searchKeyWord}).then(res => {
+					uni.hideLoading()
+					this.keywordList=res.data.data.records
+				})
+				.catch(res => {
+					uni.showToast({
+						title: res.errmsg,
+						icon:'none',
+						duration: 2000
+					})
+				});
+			},
 			//加载默认搜索关键字
 			loadDefaultKeyword() {
 				//定义默认搜索关键字，可以自己实现ajax请求数据再赋值,用户未输入时，以水印方式显示在输入框，直接不输入内容搜索会搜索默认关键字
@@ -176,16 +242,72 @@
 				this.forbid = this.forbid ? '' : '_forbid';
 			},
 			//执行搜索
-			doSearch(key) {
-				console.log(key)
-				console.log(this.keyword)
-				key = key ? key : this.keyword ? this.keyword : this.defaultKeyword;
-				this.keyword = key;
-				this.saveKeyword(key); //保存为历史 
-				var TabCur = this.TabCur
-				uni.navigateTo({
-					url: `/pageA/product/querylist?keywords=${key}&TabCur=${TabCur}`
+			doSearch(e) {
+				if(e.detail.value.length>0){
+					this.isShowKeywordList=true
+				}else{
+					this.isShowKeywordList=false
+				}
+				uni.showLoading({
+					title: '正在加载',
+					mask:true
 				})
+				var param1=''
+				if (this.TabCur == 0) {
+									param1 = '/procurementPlanInfo/selectProcurementPlanInfo'
+								} else {
+									param1 = 'buy'
+								}
+								this.$api.doRequest('get', param1,{pageSize:this.pageSize,
+				currentPage:this.currentPage,searchKeyWord:this.searchKeyWord}).then(res => {
+									uni.hideLoading()
+									this.keywordList=res.data.data.records
+								})
+								.catch(res => {
+									uni.showToast({
+										title: res.errmsg,
+										icon:'none',
+										duration: 2000
+									})
+								});
+				// console.log(key)
+				// console.log(this.keyword)
+				// key = key ? key : this.keyword ? this.keyword : this.defaultKeyword;
+				// this.keyword = key;
+				// this.saveKeyword(key); //保存为历史 
+				// var TabCur = this.TabCur
+				// uni.navigateTo({
+				// 	url: `/pageA/product/querylist?keywords=${key}&TabCur=${TabCur}`
+				// })
+			},
+			tabcarchange(status){
+				this.TabCur=status
+				if (this.TabCur == 0) {
+									param1 = '/procurementPlanInfo/selectProcurementPlanInfo'
+								} else {
+									param1 = 'buy'
+								}
+								this.$api.doRequest('get', param1,{pageSize:this.pageSize,
+				currentPage:this.currentPage,searchKeyWord:this.searchKeyWord}).then(res => {
+					if(res.data.code==200){
+						uni.hideLoading()
+						this.keywordList=res.data.data.records
+					}else{
+						uni.showToast({
+							title: res.data.message,
+							icon:'none',
+							duration: 2000
+						})
+					}
+									
+								})
+								.catch(res => {
+									uni.showToast({
+										title: res.errmsg,
+										icon:'none',
+										duration: 2000
+									})
+								});
 			},
 			//保存关键字到历史记录
 			saveKeyword(keyword) {
@@ -223,7 +345,29 @@
 	}
 </script>
 <style>
-	view{display:block;}
+	.search-form{
+		    background: #F5F6F9;
+	}
+	.line{
+		display:inline-block;
+		padding:5px;
+		position:relative;
+		font-size:17px;
+	}
+	.line.active{
+		font-size:19px;
+		font-weight: 900;
+	}
+	.line.active:after{
+		content:'';
+		display:block;
+		position:absolute;
+		width:18px;
+		left:50%;
+		transform: translateX(-50%);
+		bottom:0;
+		border-bottom:1px solid #22C572;
+	}
 	.search-box {width:100%;background-color:rgb(242,242,242);padding:15upx 2.5%;display:flex;justify-content:space-between;}
 	.search-box .mSearch-input-box{width: 100%;}
 	.search-box .input-box {width:85%;flex-shrink:1;display:flex;justify-content:center;align-items:center;}
@@ -231,7 +375,7 @@
 	.search-box .input-box>input {width:100%;height:60upx;font-size:32upx;border:0;border-radius:60upx;-webkit-appearance:none;-moz-appearance:none;appearance:none;padding:0 3%;margin:0;background-color:#ffffff;}
 	.placeholder-class {color:#9e9e9e;}
 	.search-keyword {width:100%;background-color:rgb(242,242,242);}
-	.keyword-list-box {height:calc(100vh - 110upx);padding-top:10upx;border-radius:20upx 20upx 0 0;background-color:#fff;}
+	.keyword-list-box {background:#F5F6FA;height:calc(100vh - 110upx);padding-top:10upx;border-radius:20upx 20upx 0 0;}
 	.keyword-entry-tap {background-color:#eee;}
 	.keyword-entry {width:94%;height:80upx;margin:0 3%;font-size:30upx;color:#333;display:flex;justify-content:space-between;align-items:center;border-bottom:solid 1upx #e7e7e7;}
 	.keyword-entry image {width:60upx;height:60upx;}
@@ -245,4 +389,139 @@
 	.keyword-box .keyword-block .keyword {width:94%;padding:3px 3%;display:flex;flex-flow:wrap;justify-content:flex-start;}
 	.keyword-box .keyword-block .hide-hot-tis {display:flex;justify-content:center;font-size:28upx;color:#6b6b6b;}
 	.keyword-box .keyword-block .keyword>view {display:flex;justify-content:center;align-items:center;border-radius:60upx;padding:0 20upx;margin:10upx 20upx 10upx 0;height:60upx;font-size:28upx;background-color:rgb(242,242,242);color:#6b6b6b;}
+
+	.tag1 {
+		background:#F5F6F9;
+		padding: 5px;
+		color:#333333;
+		display: inline-flex;
+		font-size: 22rpx;
+		border-radius: 3px;
+		margin: 3px;
+	}
+	.tag {
+		background:#F5F6F9;
+		padding: 7px 12px;
+		color:#333333;
+		display: inline-flex;
+		font-size: 22rpx;
+		border-radius: 15px;
+		margin: 3px;
+	}
+	.tag-bule {
+		background: #EBEEFA;
+		color: #5C76DF;
+	}
+	.tag-green {
+		background: #C6F7BC;
+		color: #065112;
+	}
+	.tag-yellow {
+		background: #F9F2EA;
+		color: #BE9C69;
+	}
+	.tag-red {
+		background: #FEECE6;
+		color: #FE6430;
+	}
+.introduce-section .title{
+	font-size: 17px;
+	font-weight: bold;
+	height:40px;
+	line-height: 40px;
+	flex: 2.5;
+	border-bottom:1px solid #EEEEEE;
+}
+.introduce-section .address{
+	color:#878C9C;
+	font-size:12px;
+	padding:15px 0 10px;
+}
+.introduce-section .price{
+	padding:10px 0 10px;
+	color:#FD714F;
+	font-size:19px;
+	font-weight:700;
+}
+	/* 销售信息 */
+	.introduce-section {
+		background: #fff;
+		padding: 0upx 30upx 20upx;
+		margin:10px;
+		border-radius:4px;
+
+		.guess-item {
+			padding-bottom: 20upx;
+			border-bottom: 1px solid #ccc;
+		}
+
+		.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;
+			}
+		}
+	}
+	.side-bg{
+		position:absolute;
+		width: 64px;
+		height: 64px;
+		z-index: 1;
+	}
+	.drag {
+		position:relative;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: $uni-text-color-inverse;
+		width: 64px;
+		height: 64px;
+		background:transparent;
+		font-size: $uni-font-size-sm;
+		position: fixed;
+		z-index: 9;
+		
+		&.transition {
+			transition: left .3s ease,top .3s ease;
+		}
+	}
 </style>

pageA/product/querylist.vue

@@ -84,137 +84,6 @@
 				</block>
 				</scroll-view>
 			</swiper-item>
-			<!-- <swiper-item class="tab-content" data-id="3">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="onReachBottomTmp">
-					<block v-if="TabCur==2">
-					<view class="guess-section">
-						<view 
-							v-for="(item, index) in tranInfo" :key="index"
-							class="guess-item"
-							@click="navToDetailPage(item)"
-						>
-						<view class="flex justify-between padding-xs ">
-						  <view class="flex-sub padding-xs">
-							  <view class="cu-capsule radius">
-							  	<view class="cu-tag bg-blue">
-							  		{{item.startPlace }}
-							  	</view>
-							  	<view class="cu-tag line-blue">
-							  		{{item.endPlace }}
-							  	</view>
-							  </view>
-						  </view>
-						 
-						  <view class=" padding-xs">
-							  <view v-if="item.status == 0" class="cu-capsule radius">
-								<view  class="cu-tag bg-green">
-									可承运
-								</view>
-								<view class="cu-tag line-green">
-									 <text class="text-price">{{item.price }}</text>
-								</view>
-							  </view>
-							  <view v-else class="cu-capsule radius">
-							  	<view  class="cu-tag bg-red">
-							  		已结束
-							  	</view>
-							  	<view class="cu-tag line-red">
-							  		 <text class="text-price">{{item.price }}</text>
-							  	</view>
-							  </view>
-						  </view>
-						</view>
-						<view class="flex justify-between padding-xs">
-							<view class="flex-sub padding-xs">
-							  <view class="cu-capsule radius">
-								<view class="cu-tag bg-orange">
-									{{item.goodsName}}
-								</view>
-								<view class="cu-tag line-orange">
-									{{numFilter(item.total - item.tranCount) }}吨
-								</view>
-							  </view>
-							</view>
-							<view class=" text-sm padding-xs">
-								<view class=" text-sm padding-xs">
-									<text class="text-gray  text-sm text-right padding-xs-tmp ">{{item.gmtUpdate}}</text>
-								</view>
-							</view>
-						</view>
-						</view>
-						<view v-show="isLoadMore">
-						    <uni-load-more :status="loadStatus" ></uni-load-more>
-						</view>
-					</view>
-				</block>
-				</scroll-view>
-			</swiper-item> -->
-			<!-- <swiper-item class="tab-content" data-id="0">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="onReachBottomTmp">
-					<block v-if="TabCur==3">
-					<view class="guess-section">
-						<view 
-							v-for="(item, index) in carInfo" :key="index"
-							class="guess-item"
-							@click="navToDetailPage(item)"
-						>
-						<view class="flex justify-between padding-xs ">
-						  <view class="flex-sub padding-xs">
-							  <view class="cu-capsule radius">
-							  	<view class="cu-tag bg-blue">
-							  		{{item.startPlace }}
-							  	</view>
-							  	<view class="cu-tag line-blue">
-							  		{{item.endPlace }}
-							  	</view>
-							  </view>
-						  </view>
-						 
-						  <view class=" padding-xs">
-							  <view v-if="item.status == 2" class="cu-capsule radius">
-								<view  class="cu-tag bg-green">
-									可委托
-								</view>
-								<view class="cu-tag line-green">
-									 <text class="text-price">{{item.price }}</text>
-								</view>
-							  </view>
-							  <view v-else class="cu-capsule radius">
-							  	<view  class="cu-tag bg-red">
-							  		已承运
-							  	</view>
-							  	<view class="cu-tag line-red">
-							  		 <text class="text-price">{{item.price }}</text>
-							  	</view>
-							  </view>
-						  </view>
-						</view>
-						<view class="flex justify-between padding-xs">
-							<view class="flex-sub padding-xs">
-							  <view class="cu-capsule radius">
-								<view class="cu-tag bg-orange">
-									{{item.driver}}
-								</view>
-								<view class="cu-tag line-orange">
-									{{item.carNo}}
-								</view>
-							  </view>
-							</view>
-							<view class=" text-sm padding-xs">
-								<view class=" text-sm padding-xs">
-									<text class="text-gray  text-sm text-right padding-xs-tmp ">{{item.gmtUpdate}}</text>
-								</view>
-							</view>
-						</view>
-						</view>
-						<view v-show="isLoadMore">
-						    <uni-load-more :status="loadStatus" ></uni-load-more>
-						</view>
-					</view>
-				</block>
-				
-				</scroll-view>
-			</swiper-item> -->
 		</swiper>
 	</view>
 </template>
@@ -229,6 +98,7 @@
 				swiperLength: 0,
 				carouselList: [],
 				windowSpuList: [],
+				keywords:'',
 				categoryPickList: [],
 				categoryButtomList: [],
 				salesTop: [],
@@ -238,8 +108,8 @@
 				carInfo:[],
 				banner: undefined,
 				isVip: false,
-				pages:1,//页数
-				limit:10 ,//每次取条目数
+				pageSize:10,
+				currentPage:1,
 				loadStatus:'loading',  //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 				isLoadMore:false  ,//是否加载中
 				TabCur: 0,
@@ -479,30 +349,16 @@
 					})
 				}
 				else if(this.TabCur == 1){
-					that.$api.request('buy', 'getBuyListInfo', {
-						keywords: this.keywords,
-						page: pages,
-						limit:limit
-					},failres => {
-						that.$api.msg(failres.errmsg)
-						that.isLoadMore=false
-						that.loadStatus = 'nomore'
-						if(that.pages>1){that.pages-=1}
-						uni.hideLoading()
-					}).then(res => {
-						let data = res.data
-						//销售信息
-						if(data.length > 0){
-							that.buyInfo = that.buyInfo.concat(data)
-							that.isLoadMore=false
-						}
-						else{
-							if(that.pages>1){that.pages-=1}						
-							that.isLoadMore=true
-							that.loadStatus = 'nomore'
-						}
-						uni.hideLoading()
-					})
+				this.$api.doRequest('get', '/procurementPlanInfo/selectProcurementPlanInfo',{pageSize:this.pageSize,
+					currentPage:this.currentPage,keywords:this.keywords}).then(res => {
+									})
+									.catch(res => {
+										uni.showToast({
+											title: res.errmsg,
+											icon:'none',
+											duration: 2000
+										})
+									});
 				}
 				else if(this.TabCur == 2){
 					that.$api.request('tran', 'getTranListInfo', {

pageA/product/trade.vue

@@ -1,6 +1,15 @@
 <template>
 	
 	<view class="container">
+		<view class="detail-desc">
+			<view class="c-list">
+				<view class="c-row">
+					<text class="tit">水分（%）{{'<='}} </text>
+					<view class="con-list">
+						<text>{{goods.waterContent}}</text>
+					</view>
+				</view>
+				</view>
 		<view v-if="companyId!=2" class="cu-form-group">
 			<view class="title">卖方</view>
 			<view class="title">{{seller}}</view>
@@ -9,6 +18,7 @@
 			<view class="title">卖方电话</view>
 			<view class="title">{{sellerPhone}}</view>
 		</view>
+		</view>
 		<view class="cu-form-group">
 			<text class="tit">我的信息</text>
 			<view v-if='bankNameList.length>0'>
@@ -466,4 +476,76 @@
 	    text-align: right;
 	    padding-right: 20rpx;
 	}
+	/*  详情 */
+	.detail-desc {
+		background: #fff;
+		margin-top: 16upx;
+		margin:10px;
+		position:relative;
+		z-index:4;
+		border-radius:5px;
+		.d-header {
+			display: flex;
+			padding:10px;
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			position: relative;
+			border-bottom:1px solid #EEEEEE;
+			text {
+				padding: 0 20upx;
+				position: relative;
+				z-index: 1;
+			}
+		}
+	}
+	.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;
+		}
+	}
 </style>

pageD/identity/companyIdentity.vue

@@ -0,0 +1,346 @@
+<template>
+	<view class="center">
+		<view>
+			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'"
+			 alt=""></image>
+			<text>公司</text>
+			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus1==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'"
+			 alt=""></image>
+			<text>个人</text>
+		</view>
+		<view v-if="consentStatus == true">
+			<view>
+				<button type="default">上传营业执照</button>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">公司名称</text>
+				<view class="con-list">
+					<input placeholder="请填写公司名称" name="input" v-model="identityAuthenticationInfo.compName"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">纳税人识别号</text>
+				<view class="con-list">
+					<input placeholder="请填写纳税人识别号" name="input" v-model="identityAuthenticationInfo.payTaxesCard"></input>
+				</view>
+			</view>
+			<view>
+				<button type="default">上传身份证正面</button>
+				<button type="default">上传身份证反面</button>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">姓名</text>
+				<view class="con-list">
+					<input placeholder="请填写姓名" name="input" v-model="identityAuthenticationInfo.customerName"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">身份证号</text>
+				<view class="con-list">
+					<input placeholder="请填写身份证号" name="input" v-model="identityAuthenticationInfo.customerNumberCard"></input>
+				</view>
+			</view>
+			<view>
+				<button type="default">上传银行卡正面</button>
+				<button type="default">上传银行卡反面</button>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">银行卡号</text>
+				<view class="con-list">
+					<input placeholder="请填写银行卡号" name="input" v-model="identityAuthenticationInfo.bankCard"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">开户行</text>
+				<view class="con-list">
+					<input placeholder="请填写开户行" name="input" v-model="identityAuthenticationInfo.bankDeposit"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">开户支行</text>
+				<view class="con-list">
+					<input placeholder="请填写开户支行" name="input" v-model="identityAuthenticationInfo.bankDepositBranch"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">手机号</text>
+				<view class="con-list">
+					<input placeholder="请填写手机号" name="input" v-model="identityAuthenticationInfo.customerPhone"></input>
+				</view>
+			</view>
+			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
+				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode' class='getcode'>{{sendText}}</button>
+				<view style='width:70%;position:relative;margin-left: 200px;'>
+
+					<input v-model='verifyCode' placeholder="请输入验证码" type="text">
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">公司地址</text>
+				<view class="con-list">
+					<input placeholder="请填写公司地址" name="input" v-model="identityAuthenticationInfo.compAddress"></input>
+				</view>
+			</view>
+		</view>
+		<view v-else>
+			<view>
+				<button type="default">上传身份证正面</button>
+				<button type="default">上传身份证反面</button>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">姓名</text>
+				<view class="con-list">
+					<input placeholder="请填写姓名" name="input" v-model="identityAuthenticationInfo.customerName"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">身份证号</text>
+				<view class="con-list">
+					<input placeholder="请填写身份证号" name="input" v-model="identityAuthenticationInfo.customerNumberCard"></input>
+				</view>
+			</view>
+			<view>
+				<button type="default">上传银行卡正面</button>
+				<button type="default">上传银行卡反面</button>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">银行卡号</text>
+				<view class="con-list">
+					<input placeholder="请填写银行卡号" name="input" v-model="identityAuthenticationInfo.bankCard"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">开户行</text>
+				<view class="con-list">
+					<input placeholder="请填写开户行" name="input" v-model="identityAuthenticationInfo.bankDeposit"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">开户支行</text>
+				<view class="con-list">
+					<input placeholder="请填写开户支行" name="input" v-model="identityAuthenticationInfo.bankDepositBranch"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">收款人姓名</text>
+				<view class="con-list">
+					<input placeholder="请填写收款人姓名" name="input" v-model="identityAuthenticationInfo.payeeName"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">收款人身份证号</text>
+				<view class="con-list">
+					<input placeholder="请填写收款身份证号" name="input" v-model="identityAuthenticationInfo.payeeNumberCard"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">手机号</text>
+				<view class="con-list">
+					<input placeholder="请填写手机号" name="input" v-model="identityAuthenticationInfo.customerPhone"></input>
+				</view>
+			</view>
+			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
+				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode' class='getcode'>{{sendText}}</button>
+				<view style='width:70%;position:relative;margin-left: 200px;'>
+					<input v-model='verifyCode' placeholder="请输入验证码" type="text">
+				</view>
+
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">联系地址</text>
+				<view class="con-list">
+					<input placeholder="请填写联系地址" name="input" v-model="identityAuthenticationInfo.compAddress"></input>
+				</view>
+			</view>
+		</view>
+		<view class="padding flex flex-direction">
+			<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">提交</button>
+		</view>
+	</view>
+	
+</template>
+
+<script>
+	export default {
+		name: "buy",
+		data() {
+			return {
+				radios: 2,
+				inputContent: null,
+				customerPhone: '',
+				consentStatus: true,
+				consentStatus1: false,
+				codestatus: false,
+				verifyCode: null,
+				inputStatus: 'none',
+				sendText: '获取验证码',
+				platform: '',
+				sendDisabled: false,
+				identityAuthenticationInfo: {
+					customerPhone: ''
+				},
+			};
+		},
+		methods: {
+			consent() {
+				if (this.consentStatus == false && this.consentStatus1 == true) {
+					this.consentStatus = true
+					this.consentStatus1 = false
+				} else if (this.consentStatus == true && this.consentStatus1 == false) {
+					this.consentStatus = false
+					this.consentStatus1 = 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', {
+							phone: 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
+					})
+				}
+
+			},
+			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>
+
+<style>
+	.center {
+		padding: 10px 20px;
+	}
+
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+
+	.verificationCode {
+		margin-top: 20px;
+		background: #F5F6F9;
+		color: #AFB3BF;
+	}
+
+	.verificationCode:after {
+		border: none;
+	}
+
+	.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.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;
+	}
+
+	.uni-navigator {
+		display: inline-block;
+		color: #22C572;
+	}
+
+	.getcode.active {
+		background: #22C572;
+		color: #fff;
+	}
+</style>

pageD/identity/companyIdentityLook.vue

@@ -0,0 +1,231 @@
+<template>
+	<view class="center">
+		<view>
+			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'" alt=""></image>
+			<text>公司</text>
+			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus1==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'" alt=""></image>
+			<text>个人</text>
+			<!-- <label class="radio" v-model="radios">
+				<radio value="1" name="radios" /><text>公司</text>
+				<radio value="2" name="radios" /><text>个人</text>
+			</label> -->
+		</view>
+		<view v-if="consentStatus == true">
+			<view>
+				<button type="default">营业执照</button>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">公司名称</text>
+				<view class="con-list">
+					{{deptList.compName}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">纳税人识别号</text>
+				<view class="con-list">
+				{{deptList.payTaxesCard}}
+				</view>
+			</view>
+			<view>
+				<button type="default">身份证正面</button>
+				<button type="default">身份证反面</button>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">姓名</text>
+				<view class="con-list">
+					{{deptList.customerName}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">身份证号</text>
+				<view class="con-list">
+					{{deptList.customerNumberCard}}
+				</view>
+			</view>
+			<view>
+				<button type="default">银行卡正面</button>
+				<button type="default">银行卡反面</button>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">银行卡号</text>
+				<view class="con-list">
+					{{deptList.bankCard}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">开户行</text>
+				<view class="con-list">
+					{{deptList.bankDeposit}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">开户支行</text>
+				<view class="con-list">
+					{{deptList.bankDepositBranch}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">手机号</text>
+				<view class="con-list">
+					{{deptList.customerPhone}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">公司地址</text>
+				<view class="con-list">
+					{{deptList.compAddress}}
+				</view>
+			</view>
+		</view>
+		<view v-else>
+			<view>
+				<button type="default">上传身份证正面</button>
+				<button type="default">上传身份证反面</button>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">姓名</text>
+				<view class="con-list">
+					{{deptList.customerName}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">身份证号</text>
+				<view class="con-list">
+					{{deptList.customerNumberCard}}
+				</view>
+			</view>
+			<view>
+				<button type="default">上传银行卡正面</button>
+				<button type="default">上传银行卡反面</button>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">银行卡号</text>
+				<view class="con-list">
+					{{deptList.bankCard}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">开户行</text>
+				<view class="con-list">
+					{{deptList.bankDeposit}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">开户支行</text>
+				<view class="con-list">
+					{{deptList.bankDepositBranch}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">收款人姓名</text>
+				<view class="con-list">
+					{{ deptList.payeeName}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">收款人身份证号</text>
+				<view class="con-list">
+					{{deptList.payeeNumberCard}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">手机号</text>
+				<view class="con-list">
+					{{deptList.customerPhone}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">联系地址</text>
+				<view class="con-list">
+					{{deptList.compAddress}}
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+	    mapState 
+	} from 'vuex';
+	export default {
+		name: "buy",
+		data() {
+			return {
+				radios: 2,
+				deptList:{},
+				id:"2c4b2845e9dc47ca95c05ad471881be0",
+				consentStatus:true,
+				consentStatus1:false,
+
+			};
+		},
+		onLoad() {
+			this.getList()
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo'])
+		},
+		methods: {
+			getList() {
+				
+				this.$api.doRequest('get', '/identityAuthenticationInfo/api/getIdentityAuthenticationInfo', {id:this.id}, 'application/json;').then(res => {
+						console.log("成功连接")
+						this.procurementPlanInfos = res.data.data
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			consent(){
+				if(this.consentStatus == false && this.consentStatus1 == true){
+					this.consentStatus = true
+					this.consentStatus1 = false
+				}else if(this.consentStatus == true && this.consentStatus1 == false){
+					this.consentStatus = false
+					this.consentStatus1 = true
+				}
+				
+			}
+		}
+	}
+</script>
+
+<style>
+	.center {
+		padding: 10px 20px;
+	}
+
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+
+	.con-list {
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
+		font-size: 14px;
+	}
+</style>

pageD/identity/driverIdentity.vue

@@ -0,0 +1,206 @@
+<template>
+	<view class="center">
+		<view>
+			<view class="labels">司机信息</view>
+			<button type="default">身份证正面</button>
+			<button type="default">身份证反面</button>
+			<view class="c-row b-b">
+				<text class="tit">姓名</text>
+				<view class="con-list">
+					<input placeholder="请填写姓名" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">身份证号</text>
+				<view class="con-list">
+					<input placeholder="请填写身份证号" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">手机号</text>
+				<view class="con-list">
+					<input placeholder="请填写手机号" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit"><button type="default">获取验证码</button></text>
+				<view class="con-list">
+					<input placeholder="请填写验证码" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">常驻城市</text>
+				<view class="con-list">
+					<input placeholder="请填写常驻城市" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+		
+		
+		</view>
+		<view class="margin-top">
+			<view class="labels">货车信息</view>
+			<view class="labels"> 车辆 -？</view>
+			<view class="c-row b-b">
+				<text class="tit">车牌号</text>
+				<view class="con-list">
+					<input placeholder="请填写车牌号" name="input" @input="addressInput"></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 " >
+						{{ModelIndex>-1?ModelType[ModelIndex]:'请选择车型'}}
+					</view>
+				</picker>
+				<!-- </view> -->
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">不含车头车长（米）</text>
+			<!-- 	 <view class="con-list"> -->
+				<picker @change="carLongChange" :value="carLongIndex" :range="carLongType" class="con-list">
+					<view class="picker">
+						{{carLongIndex>-1?carLongType[carLongIndex]:'请选择车长'}}
+					</view>
+				</picker>
+				<!-- </view> -->
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">载重（吨）</text>
+				<view class="con-list">
+					<input placeholder="请填写载重（吨）" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">出厂年份</text>
+				<view class="con-list">
+					<input placeholder="请填写载重（吨）" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			
+			<button type="default">添加车辆</button>
+			
+		</view>
+		<view class="margin-top">
+			<view class="labels">账户信息</view>
+			<view class="labels"> 账户 -？</view>
+			<view class="c-row b-b">
+				<text class="tit">账户类型</text>
+				<view class="con-list">
+					<input placeholder="请填写账户类型" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">银行卡照片（可选）</text>
+				<view class="con-list">
+					<input placeholder="请上传照片" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">银行卡号</text>
+				<view class="con-list">
+					<input placeholder="请输入银行卡号" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">开户行</text>
+				<view class="con-list">
+					<input placeholder="请输入开户行" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">开户支行</text>
+				<view class="con-list">
+					<input placeholder="请输入开户支行" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">收款人姓名</text>
+				<view class="con-list">
+					<input placeholder="请输入收款人姓名" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">收款人身份证号</text>
+				<view class="con-list">
+					<input placeholder="请输入收款人身份证号" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<button type="default">添加账号</button>
+		</view>
+		<view class="margin-top">
+				<view class="labels">上传附件</view>
+			
+			<button type="default">行驶证</button>
+			<button type="default">驾驶证</button>
+			<button type="default">道路运营证</button>
+			<button type="default">从业资格证</button>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				goods:{},
+				ModelIndex:'高栏',
+				Model:'',
+				ModelType:["高栏","集装箱","自卸车"],
+				carLong:'',
+				carLongType:['13','9.6','8.2','8.7','11.7','12.5','13.7','15','16','17.5'],
+
+			}
+		},
+		methods: {
+			ModelChange(e){
+				this.ModelIndex = e.detail.value
+				this.Model = this.ModelType[this.ModelIndex];
+			},
+			carLongChange(e){
+				this.carLongIndex = e.detail.value
+				this.carLong = this.carLongType[this.carLongIndex];
+			}
+		}
+	}
+</script>
+
+<style>
+	.center{
+		padding: 10px 20px;
+		}
+		.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;
+		}
+
+</style>

pageD/identity/driverIdentityLook.vue

@@ -0,0 +1,176 @@
+<template>
+	<view class="center">
+		<view>
+			<view class="labels">司机信息</view>
+			<button type="default">身份证正面</button>
+			<button type="default">身份证反面</button>
+			<view class="c-row b-b">
+				<text class="tit">姓名</text>
+				<view class="con-list">
+					<input placeholder="请填写姓名" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">身份证号</text>
+				<view class="con-list">
+					<input placeholder="请填写身份证号" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">手机号</text>
+				<view class="con-list">
+					<input placeholder="请填写手机号" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">常驻城市</text>
+				<view class="con-list">
+					<input placeholder="请填写常驻城市" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+		
+		
+		</view>
+		<view class="margin-top">
+			<view class="labels">货车信息</view>
+			<view class="labels"> 车辆 -？</view>
+			<view class="c-row b-b">
+				<text class="tit">车牌号</text>
+				<view class="con-list">
+					<input placeholder="请填写车牌号" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">车型</text>
+				<view class="con-list">
+					<input placeholder="请填写车型" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">不含车头车长（米）</text>
+		         <view class="con-list">
+		         	<input placeholder="请填写车长" name="input" @input="addressInput"></input>
+		         </view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">载重（吨）</text>
+				<view class="con-list">
+					<input placeholder="请填写载重（吨）" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">出厂年份</text>
+				<view class="con-list">
+					<input placeholder="请填写载重（吨）" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			
+			
+		</view>
+		<view class="margin-top">
+			<view class="labels">账户信息</view>
+			<view class="labels"> 账户 -？</view>
+			<view class="c-row b-b">
+				<text class="tit">账户类型</text>
+				<view class="con-list">
+					<input placeholder="请填写账户类型" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">银行卡照片（可选）</text>
+				<view class="con-list">
+					<input placeholder="请上传照片" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">银行卡号</text>
+				<view class="con-list">
+					<input placeholder="请输入银行卡号" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">开户行</text>
+				<view class="con-list">
+					<input placeholder="请输入开户行" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">开户支行</text>
+				<view class="con-list">
+					<input placeholder="请输入开户支行" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">收款人姓名</text>
+				<view class="con-list">
+					<input placeholder="请输入收款人姓名" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">收款人身份证号</text>
+				<view class="con-list">
+					<input placeholder="请输入收款人身份证号" name="input" @input="addressInput"></input>
+				</view>
+			</view>
+		</view>
+		<view class="margin-top">
+				<view class="labels">上传附件</view>
+			
+			<button type="default">行驶证</button>
+			<button type="default">驾驶证</button>
+			<button type="default">道路运营证</button>
+			<button type="default">从业资格证</button>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+	
+			}
+		},
+		methods: {
+		
+		}
+	}
+</script>
+
+<style>
+	.center{
+		padding: 10px 20px;
+	}
+	.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;
+	}
+</style>

pageD/myRelease/buyDetails.vue

@@ -0,0 +1,268 @@
+<template>
+	<view class="center">
+			<text class="title">基本信息</text>
+		<view class="c-row b-b">
+			<text class="tit">名头</text>
+			<view class="con-list">
+				{{procurementPlanInfos.title}}
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">标题</text>
+			<view class="con-list">
+				{{procurementPlanInfos.title}}
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">货名</text>
+			<view class="con-list">
+				{{procurementPlanInfos.goodsName}}
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">采购量（吨）</text>
+			<view class="con-list">
+				{{procurementPlanInfos.plannedPurchaseVolume}}
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">最小成交量（吨）</text>
+			<view class="con-list">
+				{{procurementPlanInfos.minimumVolume}}
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">类型</text>
+			
+				<view class="picker">
+				{{procurementPlanInfos.procurementPlanType}}
+				</view>
+			
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">价格类型</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					{{procurementPlanInfos.priceType}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">基差（元/吨）</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					{{procurementPlanInfos.basisPrice}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">产地</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					{{procurementPlanInfos.outputPrivate}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">发货地区</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写发货地区" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">卖方手机号</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写卖方手机号" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<text class="title">附加要求</text>
+		<view class="c-row b-b">
+			<text class="tit">水分（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					{{procurementPlanInfos.waterContent}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">容重（g/L）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					{{procurementPlanInfos.bulkDensity}}
+				</view>
+			</picker>
+		</view>
+
+		<view class="c-row b-b">
+			<text class="tit">热损伤（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					{{procurementPlanInfos.jiaorenli}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">杂质（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					{{procurementPlanInfos.impurity}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">霉变粒（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					{{procurementPlanInfos.mildewGrain}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">不完整粒（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					{{procurementPlanInfos.imperfectGrain}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">蛋白（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					{{procurementPlanInfos.protein}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">粒型 </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					{{procurementPlanInfos.grain}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">品级 </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					{{procurementPlanInfos.procurementPlanInfos}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">产出年份</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+				{{procurementPlanInfos.outputYear}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">包装方式</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					{{procurementPlanInfos.packingType}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">袋装备注</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					{{procurementPlanInfos.baggingNotes}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">运费承担方</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					{{procurementPlanInfos.freightPayer}}
+				</view>
+			</picker>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				types:'',
+				typesType:["现货","期货"],
+				procurementPlanInfos:{},
+				typesIndex:'',
+		
+			}
+		},
+		onLoad(options){
+				
+			this.getList(options.id)
+			console.log(options.id,"idwei1")
+		},
+		methods: {
+			typeChange(e){
+				this.typesIndex = e.detail.value
+				this.types = this.typesType[this.typesIndex];
+			},
+			getList(id1){
+				this.$api.doRequest('get','/procurementPlanInfo/getProcurementPlan',{id:id1}).then(res => {
+					console.log(res)
+					this.procurementPlanInfos = res.data.data
+					console.log(this.procurementPlanInfos,"对象")
+					
+				})
+				.catch(res => {
+					uni.showToast({
+						title: res.errmsg,
+						icon:'none',
+						duration: 2000
+					})
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	.center{
+		padding: 10px 20px;
+	}
+	.c-row {
+	    display: -webkit-box;
+	    display: -webkit-flex;
+	    display: flex;
+	    -webkit-box-align: center;
+	    -webkit-align-items: center;
+	    align-items: center;
+	    padding: 20rpx 30rpx;
+	    position: relative;
+	}
+	.con-list {
+	    -webkit-box-flex: 1;
+	    -webkit-flex: 1;
+	    flex: 1;
+	    display: -webkit-box;
+	    display: -webkit-flex;
+	    display: flex;
+	    -webkit-box-orient: vertical;
+	    -webkit-box-direction: normal;
+	    -webkit-flex-direction: column;
+	    flex-direction: column;
+	    color: #303133;
+	    line-height: 40rpx;
+	    text-align: right;
+	    padding-right: 20rpx;
+		font-size: 14px;
+	}
+	.title{
+		font-size: 18px;
+		font-weight: 600;
+	}
+
+
+</style>

pageD/myRelease/buyGrain.vue

@@ -0,0 +1,396 @@
+<template>
+	<view class="center">
+		<view class="c-row b-b">
+			<text class="tit">名头</text>
+			<view class="con-list">
+				<input placeholder="请填写名头" name="input" v-model="deptList.procurementPlanNo"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">标题</text>
+			<view class="con-list">
+				<input placeholder="请填写标题,2-16个字" name="input" v-model="deptList.title"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">货名</text>
+			<view class="con-list">
+				<input placeholder="请填写货名" name="input" v-model="deptList.goodsName"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">采购量（吨）</text>
+			<view class="con-list">
+				<input placeholder="请填写采购重量" name="input" v-model="deptList.plannedPurchaseVolume"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">最小成交量（吨）</text>
+			<view class="con-list">
+				<input placeholder="请填写最小成交量" name="input" v-model="deptList.minimumVolume"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">类型</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list"
+				>
+				<view class="picker" v-model="deptList.procurementPlanType">
+					{{typesIndex>-1?typesType[typesIndex]:'请选择类型'}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">价格类型</text>
+				<view class="con-list">
+					<!-- <input placeholder="请填写价格类型" name="input"  v-model="deptList.priceType"></input> -->
+					{{deptList.priceType}}
+				</view>
+		</view>
+		<view class="c-row b-b" v-if="this.typesIndex != 1">
+			<text class="tit">单价（元/吨）</text>
+			<view class="con-list">
+				<input placeholder="请填写单价（元/吨）" name="input" v-model="deptList.unitPrice"></input>
+			</view>
+		</view>
+		<view class="c-row b-b" v-if="this.typesIndex == 1">
+			<text class="tit">基差（元/吨）</text>
+			<view class="con-list">
+				<input placeholder="请填写单价（元/吨）" name="input" v-model="deptList.basisPrice"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">收货地区</text>
+			<view class="con-list">
+				<input placeholder="请填写收货地区" name="input" v-model="deptList.receiveArea"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">买方手机号</text>
+			<view class="con-list">
+				<input placeholder="请填写卖方手机号" name="input" v-model="deptList.buyerPhone"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<button type="default">获取验证码</button>
+			<view class="con-list">
+				<input placeholder="请填写6位短信验证码" name="input" v-model="deptList.title1"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">水分（%）<= </text>
+					<view class="con-list">
+						<input placeholder="请填写水分占比" name="input" v-model="deptList.waterContent"></input>
+					</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">容重（g/L）<= </text>
+					<view class="con-list">
+						<input placeholder="请填写容重" name="input" v-model="deptList.bulkDensity"></input>
+					</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">热损伤（%）<= </text>
+					<view class="con-list">
+						<input placeholder="请填写热损伤占比" name="input" v-model="deptList.jiaorenli"></input>
+					</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">杂质（%）<= </text>
+					<view class="con-list">
+						<input placeholder="请填写杂质占比" name="input" v-model="deptList.impurity"></input>
+					</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">霉变粒（%）<= </text>
+					<view class="con-list">
+						<input placeholder="请填写霉变粒占比" name="input" v-model="deptList.mildewGrain"></input>
+					</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">不完整粒（%）<= </text>
+					<view class="con-list">
+						<input placeholder="请填写不完整粒占比" name="input" v-model="deptList.imperfectGrain"></input>
+					</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">蛋白（%）<= </text>
+					<view class="con-list">
+						<input placeholder="请填写蛋白占比" name="input" v-model="deptList.protein"></input>
+					</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">粒型 </text>
+			<picker @change="liChange" :value="liIndex" :range="liType" class="con-list" v-model="deptList.grain">
+				<view class="con-list">
+					{{liIndex>-1?liType[liIndex]:'请选择粒型'}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">品级 </text>
+			<picker @change="pinChange" :value="pinIndex" :range="pinType" class="con-list">
+				<view class="con-list">
+					{{pinIndex>-1?pinType[pinIndex]:'请选择品级'}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">产出年份</text>
+			<picker @change="nianChange" :value="nianIndex" :range="nianType" class="con-list">
+				<view class="con-list">
+					{{nianIndex>-1?nianType[nianIndex]:'请选择产出年份'}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">包装方式</text>
+			<picker @change="baoChange" :value="baoIndex" :range="baoType" class="con-list">
+				<view class="con-list">
+					{{baoIndex>-1?baoType[baoIndex]:'请选择包装方式'}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">袋装备注</text>
+				<view class="con-list">
+					<input placeholder="请填写袋装备注" name="input" v-model="deptList.baggingNotes"></input>
+				</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">运费承担方</text>
+			<picker @change="chengChange" :value="chengIndex" :range="chengType" class="con-list">
+				<view class="con-list">
+					{{chengIndex>-1?chengType[chengIndex]:'请选择运费承担方'}}
+				</view>
+			</picker>
+		</view>
+
+		<button @click="commit()">发布</button>
+	</view>
+</template>
+
+<script>
+	import {
+	    mapState 
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				types: '',
+				typesType: ["现货", "期货"],
+				typesIndex: 0,
+				deptList: {
+					priceType: "定价采购",
+					procurementPlanType:"现货",
+					grain:"塔粮",
+					grade:"不限（默认）",
+					outputYear:"2020",
+					packingType:"不限（默认）",
+					freightPayer:"",
+				},
+				insertProcurementPlanInfo: {},
+				liIndex: 0,
+				liType: ['塔粮', '筛粮', '中粒', '大粒'],
+				pinIndex: 0,
+				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
+				nianIndex: 3,
+				nianType: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014', '2013', '2012',
+					'2011'
+				],
+				baoIndex: 0,
+				baoType: ['不限（默认）', '散装', '大袋', '小袋'],
+				chengIndex: -1,
+				chengType: ['可议', '买方承担', '卖方承担']
+			}
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo'])
+		},
+		methods: {
+			typeChange(e) {
+				this.typesIndex = e.detail.value
+				this.types = this.typesType[this.typesIndex];
+				this.deptList.procurementPlanType = this.typesType[this.typesIndex];
+				if (this.typesIndex == 0) {
+					this.deptList.priceType = '定价采购'
+				} else {
+					this.deptList.priceType = '期货盘面价+基差'
+				}
+
+			},
+			commit() {
+				this.insertProcurementPlanInfo = this.deptList
+				// if (!this.deptList.goodsName) {
+				// 	this.$api.msg('货名1不能为空')
+				// 	return
+				// }
+			// 	if (!this.deptList.title) {
+			// 		this.$api.msg('标题不能为空')
+			// 		return
+			// 	}
+				if (!this.deptList.goodsName) {
+					this.$api.msg('货名不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.plannedPurchaseVolume) {
+					this.$api.msg('采购量不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.minimumVolume) {
+					this.$api.msg('最小成交量不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.procurementPlanType) {
+					this.$api.msg('类型不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.priceType) {
+					this.$api.msg('价格类型不能为空')
+					return
+				}
+				if(this.insertProcurementPlanInfo.procurementPlanType == '现货'){
+					if (!this.insertProcurementPlanInfo.unitPrice) {
+						this.$api.msg('单价不能为空')
+						return
+					}
+				}else if(this.insertProcurementPlanInfo.procurementPlanType == '期货'){
+					if (!this.insertProcurementPlanInfo.basisPrice) {
+						this.$api.msg('基差（元/吨）不能为空')
+						return
+					}
+				}
+			
+				if (!this.insertProcurementPlanInfo.buyerPhone) {
+					this.$api.msg('买方手机号不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.waterContent) {
+					this.$api.msg('水分不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.bulkDensity) {
+					this.$api.msg('容重不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.jiaorenli) {
+					this.$api.msg('热损伤不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.impurity) {
+					this.$api.msg('杂质不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.mildewGrain) {
+					this.$api.msg('霉变粒不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.imperfectGrain) {
+					this.$api.msg('不完整粒不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.bulkDensity) {
+					this.$api.msg('蛋白不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.grain) {
+					this.$api.msg('粒型不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.grade) {
+					this.$api.msg('品级不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.outputYear) {
+					this.$api.msg('产出年份不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.packingType) {
+					this.$api.msg('包装方式不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.baggingNotes) {
+					this.$api.msg('装袋备注不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.freightPayer) {
+					this.$api.msg('运费承担方不能为空')
+					return
+				}
+		         this.insertProcurementPlanInfo.commonId = this.userInfo.id
+				this.$api.doRequest('post', '/procurementPlanInfo/api/insertProcurementPlanInfo', this
+						.insertProcurementPlanInfo).then(res => {
+						console.log("添加成功")
+						this.procurementPlanInfos = res.data.data
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			liChange(e) {
+				this.liIndex = e.detail.value
+				this.litypes = this.liType[this.liIndex];
+				this.deptList.grain = this.liType[this.liIndex]
+			},
+			pinChange(e) {
+				this.pinIndex = e.detail.value
+				this.pintypes = this.pinType[this.pinIndex];
+				this.deptList.grade = this.pinType[this.pinIndex]
+			},
+			nianChange(e) {
+				this.nianIndex = e.detail.value
+				this.niantypes = this.nianType[this.nianIndex];
+				this.deptList.outputYear = this.baoType[this.baoIndex]
+			},
+
+			baoChange(e) {
+				this.baoIndex = e.detail.value
+				this.baotypes = this.baoType[this.baoIndex];
+				this.deptList.packingType = this.chengType[this.chengIndex];
+			},
+			chengChange(e) {
+				this.chengIndex = e.detail.value
+				this.chengtypes = this.chengType[this.chengIndex];
+					this.deptList.freightPayer = this.chengType[this.chengIndex];
+			}
+		}
+	}
+</script>
+
+<style>
+	.center {
+		padding: 10px 20px;
+	}
+
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+
+	.con-list {
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
+		font-size: 14px;
+	}
+</style>

pageD/myRelease/sellDetails.vue

@@ -0,0 +1,246 @@
+<template>
+	<view class="center">
+			<text class="title">基本信息</text>
+		<view class="c-row b-b">
+			<text class="tit">名头</text>
+			<view class="con-list">
+				<input placeholder="请填写名头" name="input" @input="addressInput"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">标题</text>
+			<view class="con-list">
+				<input placeholder="请填写标题,2-16个子" name="input" @input="addressInput"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">货名</text>
+			<view class="con-list">
+				<input placeholder="请填写货名" name="input" @input="addressInput"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">出售量（吨）</text>
+			<view class="con-list">
+				<input placeholder="请填写出售重量" name="input" @input="addressInput"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">最小成交量（吨）</text>
+			<view class="con-list">
+				<input placeholder="请填写最小成交量" name="input" @input="addressInput"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">类型</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="picker">
+					{{typesIndex>-1?typesType[typesIndex]:'请选择类型'}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">价格类型</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写价格类型" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">单价（元/吨）</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写单价（元/吨）" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">产地</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写产地" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">发货地区</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写发货地区" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">卖方手机号</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写卖方手机号" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<text class="title">附加要求</text>
+		<view class="c-row b-b">
+			<text class="tit">水分（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写水分占比" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">容重（g/L）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写容重" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+
+		<view class="c-row b-b">
+			<text class="tit">热损伤（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写热损伤占比" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">杂质（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写杂质占比" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">霉变粒（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写霉变粒占比" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">不完整粒（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写不完整粒占比" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">蛋白（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写蛋白占比" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">粒型 </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写粒型" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">品级 </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写品级" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">产出年份</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写产出年份" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">包装方式</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写包装方式" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">袋装备注</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写包装方式" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">运费承担方</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写包装方式" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				types:'',
+				typesType:["现货","期货"],
+		
+			}
+		},
+		methods: {
+			typeChange(e){
+				this.typesIndex = e.detail.value
+				this.types = this.typesType[this.typesIndex];
+			}
+		}
+	}
+</script>
+
+<style>
+	.center{
+		padding: 10px 20px;
+	}
+	.c-row {
+	    display: -webkit-box;
+	    display: -webkit-flex;
+	    display: flex;
+	    -webkit-box-align: center;
+	    -webkit-align-items: center;
+	    align-items: center;
+	    padding: 20rpx 30rpx;
+	    position: relative;
+	}
+	.con-list {
+	    -webkit-box-flex: 1;
+	    -webkit-flex: 1;
+	    flex: 1;
+	    display: -webkit-box;
+	    display: -webkit-flex;
+	    display: flex;
+	    -webkit-box-orient: vertical;
+	    -webkit-box-direction: normal;
+	    -webkit-flex-direction: column;
+	    flex-direction: column;
+	    color: #303133;
+	    line-height: 40rpx;
+	    text-align: right;
+	    padding-right: 20rpx;
+		font-size: 14px;
+	}
+	.title{
+		font-size: 18px;
+		font-weight: 600;
+	}
+
+
+</style>

pageD/myRelease/sellGrain.vue

@@ -0,0 +1,250 @@
+<template>
+	<view class="center">
+		<view class="c-row b-b">
+			<text class="tit">名头</text>
+			<view class="con-list">
+				<input placeholder="请填写名头" name="input" @input="addressInput"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">标题</text>
+			<view class="con-list">
+				<input placeholder="请填写标题,2-16个子" name="input" @input="addressInput"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">货名</text>
+			<view class="con-list">
+				<input placeholder="请填写货名" name="input" @input="addressInput"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">出售量（吨）</text>
+			<view class="con-list">
+				<input placeholder="请填写出售重量" name="input" @input="addressInput"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">最小成交量（吨）</text>
+			<view class="con-list">
+				<input placeholder="请填写最小成交量" name="input" @input="addressInput"></input>
+			</view>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">类型</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="picker">
+					{{typesIndex>-1?typesType[typesIndex]:'请选择类型'}}
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">价格类型</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写价格类型" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">单价（元/吨）</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写单价（元/吨）" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">产地</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写产地" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">发货地区</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写发货地区" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">卖方手机号</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写卖方手机号" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<button type="default">获取验证码</button>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写6位短信验证码" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">水分（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写水分占比" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">容重（g/L）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写容重" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+
+		<view class="c-row b-b">
+			<text class="tit">热损伤（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写热损伤占比" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">杂质（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写杂质占比" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">霉变粒（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写霉变粒占比" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">不完整粒（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写不完整粒占比" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">蛋白（%）<= </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写蛋白占比" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">粒型 </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写粒型" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">品级 </text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写品级" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">产出年份</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写产出年份" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">包装方式</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写包装方式" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">袋装备注</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写包装方式" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		<view class="c-row b-b">
+			<text class="tit">运费承担方</text>
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+				<view class="con-list">
+					<input placeholder="请填写包装方式" name="input" @input="addressInput"></input>
+				</view>
+			</picker>
+		</view>
+		
+		<button type="default">发布</button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				types:'',
+				typesType:["现货","期货"],
+		
+			}
+		},
+		methods: {
+			typeChange(e){
+				this.typesIndex = e.detail.value
+				this.types = this.typesType[this.typesIndex];
+			}
+		}
+	}
+</script>
+
+<style>
+	.center{
+		padding: 10px 20px;
+	}
+	.c-row {
+	    display: -webkit-box;
+	    display: -webkit-flex;
+	    display: flex;
+	    -webkit-box-align: center;
+	    -webkit-align-items: center;
+	    align-items: center;
+	    padding: 20rpx 30rpx;
+	    position: relative;
+	}
+	.con-list {
+	    -webkit-box-flex: 1;
+	    -webkit-flex: 1;
+	    flex: 1;
+	    display: -webkit-box;
+	    display: -webkit-flex;
+	    display: flex;
+	    -webkit-box-orient: vertical;
+	    -webkit-box-direction: normal;
+	    -webkit-flex-direction: column;
+	    flex-direction: column;
+	    color: #303133;
+	    line-height: 40rpx;
+	    text-align: right;
+	    padding-right: 20rpx;
+		font-size: 14px;
+	}
+
+
+</style>

pageD/warehousings/warehousings.vue

@@ -0,0 +1,273 @@
+<template>
+	<view class="container">
+		<view class="detail-desc">
+			<view class="d-header">
+				<text>发运信息</text>
+			</view>
+
+			<view class="c-list">
+				<view class="c-row b-b">
+					<text class="tit">合同编号</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.contractNo}}</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">货名</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.goodsName}}</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">发车净重(吨)</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.startWeight}}</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">车牌号</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.carNo}}</text>
+					</view>
+				</view>
+			</view>
+
+			<view class="d-header">
+				<text>入库信息</text>
+			</view>
+			<view class="c-list">
+				<view class="cu-form-group align-start">
+					<view class="title">毛重(吨)</view>
+					<input placeholder="请输入毛重" name="input" v-model="WarehouseInOutInfo.grossWeight"></input>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">皮重(吨)</view>
+					<input placeholder="请输入皮重" name="input" v-model="WarehouseInOutInfo.tare"></input>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">净重（吨）</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.grossWeight - WarehouseInOutInfo.tare > 0 ? WarehouseInOutInfo.grossWeight - WarehouseInOutInfo.tare : 0}}</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">仓库</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.warehouseName}}</text>
+					</view>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">仓位号</view>
+					<view class="con-list">
+					<input placeholder="请输入仓位号" name="input" v-model="WarehouseInOutInfo.binNumber"></input>
+				</view>
+				</view>
+				
+				<view class="c-row b-b">
+					<text class="tit">入库类型 </text>
+					<picker @change="ruChange" :value="ruIndex" :range="ruType" class="con-list">
+						<view class="con-list">
+							{{ruIndex>-1?ruType[ruIndex]:'请选择入库类型'}}
+						</view>
+					</picker>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">扣款金额</view>
+					<input placeholder="请输入扣款金额" name="input" v-model="WarehouseInOutInfo.deductionAmount"></input>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">扣款项</view>
+					<input placeholder="请输入扣款项" name="input" v-model="WarehouseInOutInfo.deductionItems"></input>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">入库日期</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.inOutDate}}</text>
+					</view>
+				</view>
+				<view class="padding flex flex-direction">
+					<button class="cu-btn bg-red margin-tb-sm lg">上传磅单照片</button>
+				</view>
+			</view>
+
+			<view class="d-header">
+				<text>化验信息</text>
+			</view>
+			<view class="c-list">
+				<view class="cu-form-group align-start">
+					<view class="title">质检员</view>
+					<input placeholder="请输入质检员姓名" name="input" v-model="list.qualityInspector"></input>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">蛋白(%)>=</view>
+					<input placeholder="请输入蛋白占比" name="input" v-model="list.protein"></input>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">水分(%)<= </view>
+							<input placeholder="请输入水分占比" name="input" v-model="list.waterContent"></input>
+					</view>
+					<view class="cu-form-group align-start">
+						<view class="title">容重(克/升)>= </view>
+						<input placeholder="请输入容重" name="input" v-model="list.bulkDensity"></input>
+					</view>
+					<view class="cu-form-group align-start">
+						<view class="title">热损伤(%)<= </view>
+								<input placeholder="请输入热损伤占比" name="input" v-model="list.jiaorenli"></input>
+						</view>
+						<view class="cu-form-group align-start">
+							<view class="title">杂质(%)<= </view>
+									<input placeholder="请输入杂质占比" name="input" v-model="list.impurity"></input>
+							</view>
+							<view class="cu-form-group align-start">
+								<view class="title">霉变粒(%)<= </view>
+										<input placeholder="请输入霉变粒占比" name="input" v-model="list.mildewGrain"></input>
+								</view>
+								<view class="cu-form-group align-start">
+									<view class="title">不完整粒(%)<= </view>
+											<input placeholder="请输入不完整粒占比" name="input"
+												v-model="list.imperfectGrain"></input>
+									</view>
+									<view class="c-row b-b">
+										<text class="tit">品级 </text>
+										<picker @change="pinChange" :value="pinIndex" :range="pinType" class="con-list">
+											<view class="con-list">
+												{{pinIndex>-1?pinType[pinIndex]:'请选择品级'}}
+											</view>
+										</picker>
+									</view>
+								</view>
+
+							</view>
+							<!-- 底部操作菜单 -->
+							<view class="padding flex flex-direction">
+								<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">暂存</button>
+								<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">提交</button>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				packingType: [],
+				packingIndex: "",
+				goods: {},
+				list: {},
+				WarehouseInOutInfo: {
+					warehouseInOutDetail: {}
+				},
+				pinIndex: 0,
+				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
+				ruIndex: 0,
+				ruType: ['采购入库', '移库入库', '暂存入库', '贸易服务入库', '退库'],
+			}
+		},
+		onLoad(option){
+			this.WarehouseInOutInfo.contractNo = option.contractNo
+			this.WarehouseInOutInfo.goodsName = option.goodsName
+			this.WarehouseInOutInfo.startNetWeight = option.startNetWeight
+			this.WarehouseInOutInfo.carNo = option.carNo+'('+ option.tranCarNo+ ')'
+			this.WarehouseInOutInfo.warehouseName = option.warehouseName
+		},
+		methods: {
+
+			commit() {
+				console.log(this.list)
+				this.WarehouseInOutInfo.warehouseInOutDetail = this.list
+				this.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse', this.WarehouseInOutInfo).then(res => {
+
+				}).catch(res => {
+					uni.showToast({
+						title: res.data.message,
+						icon: 'none',
+						duration: 2000
+					})
+				})
+			},
+			ruChange(e){
+				this.ruIndex = e.detail.value
+				this.rutypes = this.ruType[this.ruIndex];
+			},
+			pinChange(e) {
+				this.pinIndex = e.detail.value
+				this.pintypes = this.pinType[this.pinIndex];
+			},
+		}
+
+	}
+</script>
+<style scoped>
+	.cu-form-group input {
+		text-align: right;
+	}
+
+	.cu-form-group textarea {
+		text-align: right;
+	}
+
+	.margin-bottom {
+		margin-bottom: 30px;
+	}
+
+	.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;
+	}
+
+	.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;
+		}
+	}
+</style>

pages.json

@@ -304,8 +304,6 @@
 		        "navigationBarTitleText": "到站下线"
 		    }
 		}
-		
-        
         ,{
             "path" : "pages/buy/purchase/purchase",
             "style" :                                                                                    
@@ -316,24 +314,55 @@
             
         }
         ,{
-            "path" : "pages/buy/purchase/purchase",
+            "path" : "pages/business/business",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText": "交易",
                 "enablePullDownRefresh": false
             }
             
         }
         ,{
-            "path" : "pages/business/business",
+            "path" : "pageD/identity/driverIdentity",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "交易",
+                "navigationBarTitleText": "司机认证",
                 "enablePullDownRefresh": false
             }
             
-        }
+        },
+		{
+		    "path" : "pageD/identity/driverIdentityLook",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "认证信息",
+		        "enablePullDownRefresh": false
+		    }   
+		},
+		{
+		    "path" : "pageD/identity/companyIdentity",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "粮商认证",
+		        "enablePullDownRefresh": false
+		    }   
+		},
+		{
+		    "path" : "pageD/identity/companyIdentityLook",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "认证信息",
+		        "enablePullDownRefresh": false
+		    }   
+		}
         ,{
+            "path" : "pages/release/release",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "我的发布"
+				}
+		},
+		{
             "path" : "pages/task/my_task",
             "style" :                                                                                    
             {
@@ -341,8 +370,61 @@
                 "enablePullDownRefresh": false
             }
             
+        }
+        ,{
+            "path" : "pageD/myRelease/sellGrain",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "卖粮",
+                "enablePullDownRefresh": false
+            }
+            
+        },
+		{
+		    "path" : "pageD/myRelease/buyGrain",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "买粮",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pageD/myRelease/sellDetails",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "卖粮详情",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pageD/myRelease/buyDetails",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "买粮详情",
+				"enablePullDownRefresh": false
+		    }
+		}
+        ,{
+            "path" : "pageD/warehousings/warehousings",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "入库",
+                "enablePullDownRefresh": false
+            }
+            
         }
 		
+		,{
+		    "path" : "pageD/warehousings/warehousingDetails",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "入库详情",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
     ],
 	"subpackages": [
 			{
@@ -399,7 +481,7 @@
 				{
 					"path": "product/detail",
 					"style": {
-						"navigationBarTitleText": "销售详情"
+						"navigationStyle":"custom"
 					}
 				}, 
 				{

pages/attestation/index.vue

@@ -1,8 +1,152 @@
 <template>
+	<view class="center">
+		<view>
+			<view class="title">粮商身份</view>
+			<view class='cu-tag radius line-pink' @click="adddriver(1)">新增</view>
+			<view class="company">****公司</view>
+			<view class="guess-item" @click="navToDetailPage(1)">
+				<view class="infos">
+
+					<view class="info">张三
+						<view class='cu-tag radius line-pink but'>审核中</view>
+					</view>
+					<view class="info">13333333333</view>
+					<label>
+						<checkbox :value="1" /><text>设置默认</text>
+					</label>
+					<view class='cu-tag radius line-pink '>删除</view>
+					<view class='cu-tag radius line-pink but'>更换手机号</view>
+				</view>
+
+			</view>
+		</view>
+
+		<view class="margin-top">
+			<view class="title">司机身份</view>
+			<view class='cu-tag radius line-pink' @click="adddriver(2)">新增</view>
+			<view class="guess-item" @click="navToDetailPage(2)">
+				<view class="infos">
+					<view class="info">张三
+						<view class='cu-tag radius line-pink but'>审核中</view>
+					</view>
+					<view class="info">13333333333</view>
+
+					<view class='cu-tag radius line-pink '>删除</view>
+					<view class='cu-tag radius line-pink '>修改</view>
+					<view class='cu-tag radius line-pink but'>更换手机号</view>
+				</view>
+			</view>
+		</view>
+	</view>
+
+	</view>
+	</view>
 </template>
 
 <script>
+	import {
+	    mapState 
+	} from 'vuex';
+	export default {
+		name: "buy",
+		data() {
+			return {
+				PageCur: "buy",
+				buyInfo: [],
+				pages: 1, //页数
+				limit: 10, //每次取条目数
+				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
+				isLoadMore: false, //是否加载中
+				showTran: true,
+				scrollTop: 0,
+				TabCur: 0,
+				current: 1,
+				identityAuthenticationInfo:{
+					pageSize:10,
+					currentPage:1,
+					commonId:"",
+				},
+			};
+		},
+		onLoad(){
+			this.getList()
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo'])
+		},
+		methods: {
+			getList(){
+				
+				this.identityAuthenticationInfo.commonId = this.userInfo.id
+				console.log(12313)
+			this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {pageSize:10,
+					currentPage:1,
+					commonId:this.userInfo.id},'application/json;charset=UTF-8').then(res => {
+				console.log("成功连接")
+					this.procurementPlanInfos = res.data.data
+				})
+				.catch(res => {
+					uni.showToast({
+						title: res.errmsg,
+						icon: 'none',
+						duration: 2000
+					})
+				});
+				},
+			adddriver(index) {
+				if (index == 1) {
+					uni.navigateTo({
+						url: `/pageD/identity/companyIdentity`
+					})
+				} else {
+					uni.navigateTo({
+						url: `/pageD/identity/driverIdentity`
+					})
+				}
+			},
+			navToDetailPage(index) {
+				if (index == 1) {
+					uni.navigateTo({
+						url: `/pageD/identity/companyIdentityLook`
+					})
+				} else {
+					uni.navigateTo({
+						url: `/pageD/identity/driverIdentityLook`
+					})
+				}
+
+			}
+		}
+	}
 </script>
 
 <style>
+	.center {
+		padding: 10px 20px;
+	}
+
+	.title {
+		font-size: 18px;
+		font-weight: 900;
+		margin-right: 20px;
+		display: initial;
+	}
+
+	.company {
+		font-size: 16px;
+		margin-top: 10px;
+	}
+
+	.infos {
+		/* margin: 10px 20px; */
+		width: 100%;
+		display: inline-table;
+	}
+	.info {
+		line-height: 20px;
+	}
+	.but {
+		right: 3px;
+		float: right;
+	}
 </style>

pages/business/business.vue

@@ -1,62 +1,78 @@
 <template>
 	<view>
-		<view>	
-			<picker @change="locationChange" :value="location" :range="locationType">
+		<view style='background:#fff;border-bottom:1px solid #EEE;padding-bottom:10px;'>
+			<view class="cu-bar search">
+			<view style='position:absolute;left:30px;top:50%;transform: translateY(-50%);'>	
+			<picker style='display:inline-block;' @change="locationChange" :value="location" :range="locationType">
 				<view class="picker">
 					{{location>-1?locationType[location]:'请选择'}}
 				</view>
 			</picker>
+			<image style='width:10px;height:6px;margin-left:4px;position:relative;top:-2px;' src='../../static/img/jiaoyi/down.png'></image>
 		</view>
-		<view class='tag tag-bule radius line-pink'>采购</view>
-		<view class='tag tag-bule radius line-pink'>销售</view>
-		<view class="cu-bar search bg-white">
 			<view class="search-form round" @click="naviageToPage('/pageA/product/lookup?TabCur=')">
-				<text style='color: #ccc;' class="cuIcon-search"></text>
+				<text style='color: #ccc;text-indent:56px;' class="cuIcon-search"></text>
 				<input type="text" placeholder="请输入货名或标题" confirm-type="search"></input>
 			</view>
 		</view>
-		<view class='tag tag-bule radius line-pink' @click="sousuo">玉米</view>
-		<view class='tag tag-bule radius line-pink' @click="sousuo">大豆</view>
-		<view class='tag tag-bule radius line-pink' @click="sousuo">小麦</view>
-		<view class='tag tag-bule radius line-pink' @click="sousuo">水稻</view>
-		<view class='tag tag-bule radius line-pink' @click="sousuo">高粱</view>
-		<view class="introduce-section">
+		<view style='margin:0 15px;'>
+			<view class='tag radius line-pink' @click="sousuo('玉米')">玉米</view>
+			<view class='tag radius line-pink' @click="sousuo('大豆')">大豆</view>
+			<view class='tag radius line-pink' @click="sousuo('小麦')">小麦</view>
+			<view class='tag radius line-pink' @click="sousuo('水稻')">水稻</view>
+			<view class='tag radius line-pink' @click="sousuo('高粱')">高粱</view>
+		</view>
+		</view>
+		<view style='background:#fff;padding:0 15px;'>
+			<view @click='tabcarchange(0)' class='line' :class='TabCur==0?"active":""'>采购</view>
+			<view  @click='tabcarchange(1)' class='line'  :class='TabCur==1?"active":""'>销售</view>
+		</view>
+		<view v-if='buyInfo.length>0' class="introduce-section">
 			<view v-for="(item, index) in buyInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
 				<view class="price-box">
 					<view class="title">{{item.title}}</view>
-					<template v-if='item.isFutures==0'>
-
-						<view v-if="item.price !== 0" class="title-tip">
-							<text class="price-tip">¥</text>
-							<text class="price">{{item.price}}</text>
-							<text class="price-tip">元/吨</text>
-						</view>
-						<view v-else class="title-tip">
-							<text>市场价</text>
-						</view>
-					</template>
-					<view class="title-tip" v-if='item.isFutures==1'>
-						<text style='color:#828282;margin-bottom:10rpx;display:inline-block;'
-							class="price-tip">今日基差</text>&nbsp;
-						<view>
-							<text class="price-tip">¥</text>
-							<text class="price">{{item.basis}}</text>
-							<text class="price-tip">元/吨</text>
+					<view class='flex justify-between'>
+						<view class='address'>
+							{{item.receivePrivate}}{{item.receiveCity}}{{item.receiveArea}}{{item.receiveWarehouse}}
 						</view>
+						<view class='price' v-if='item.procurementPlanType=="期货"'>{{item.basisPrice}}<text style='font-size:13px;color:#333333;'>元/吨</text></view>
+						<view class='price' v-if='item.procurementPlanType=="现货"'>{{item.unitPrice}}<text style='font-size:13px;color:#333;'>元/吨</text></view>
+					</view>
+				</view>
+				<view class='flex justify-between'>
+					<view>
+						<view class='tag1 tag-bule radius line-pink' v-if='item.procurementPlanType=="现货"'>现货</view>
+						<view class='tag1 tag-bule radius line-pink' v-if='item.procurementPlanType=="期货"'>期货</view>
+						<view class='tag1 tag-yellow radius line-green'>{{item.goodsName}}</view>
+						<view class='tag1 tag-red radius line-yellow'>{{item.weight}}吨</view>
 					</view>
+					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货"'>今日基差</view>
+					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货"'>采购价格</view>
 				</view>
-				<view class='tag tag-bule radius line-pink' v-if='item.isFutures==0'>现货</view>
-				<view class='tag tag-bule radius line-pink' v-if='item.isFutures==1'>期货</view>
-				<view class='tag tag-green radius line-green'>{{item.goodsName}}</view>
-				<view class='tag tag-yellow radius line-yellow'>易粮易运</view>
 			</view>
 			<view v-show="isLoadMore">
 				<uni-load-more :status="loadStatus"></uni-load-more>
 			</view>
 		</view>
+		<view style='height:65vh;background:#F5F6FA;line-height:65vh;text-align:center;'  v-if='buyInfo.length==0'>
+			当前暂无结果
+		</view>
 		<u-back-top :scroll-top="scrollTop" tips="顶部" :custom-style="{backgroundColor: '#a0cfff',color: '#2979ff'}"
 			:iconStyle="{color: '#2979ff',fontSize: '34rpx'}" mode="square" icon="arrow-up"></u-back-top>
-		<drag-button :isDock="true" :existTabBar="true" :isIcon="true" text="发布" location="20" @btnClick="fabu" />
+			<view>
+				<view
+					id="_drag_button"
+					class="drag"
+					style="right:0;bottom:60px;"
+					@touchstart="touchstart"
+					@touchmove.stop.prevent="touchmove"
+					@touchend="touchend"
+					@click.stop.prevent="fabu"
+				>
+				<image class='side-bg' src='../../static/img/jiaoyi/ic_fabu@3x.png'></image>
+				</view>
+			</view>
+		<!-- <drag-button :isDock="true" :existTabBar="true" :isIcon="true" text="发布" location="20" @btnClick="fabu" /> -->
 	</view>
 </template>
 
@@ -67,15 +83,15 @@
 			return {
 				PageCur: "buy",
 				buyInfo: [],
-				pages: 1, //页数
 				limit: 10, //每次取条目数
 				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 				isLoadMore: false, //是否加载中
 				showTran: true,
 				scrollTop: 0,
-				pageSize:1,
+				pageSize:10,
 				searchKeyWord:'',
-				currentPage:10,
+				receivePrivate:'',
+				currentPage:1,
 				categoryList: [{
 					title: '我要买粮',
 					id: '0'
@@ -86,9 +102,9 @@
 				TabCur: 0,
 				current: 1,
 				location: 0,
-				locationType: ['黑龙江省', '河南省', '山东省', '安徽省', '吉林省', '河北省', '江苏省', '内蒙古自治区', '四川省', '湖南省', '湖北省', '辽宁省',
-					'江西省', '云南省', '新疆维吾尔自治区', '山西省', '广西壮族自治区', '陕西省', '广东省', '甘肃省', '重庆市', '贵州省', '浙江省', '福建省',
-					'宁夏回族自治区', '天津市', '海南省', '青海省', '西藏自治区', '上海市', '北京市'
+				locationType: ['全国','黑龙江', '河南', '山东', '安徽', '吉林', '河北', '江苏', '内蒙古', '四川', '湖南', '湖北', '辽宁',
+					'江西', '云南', '新疆', '山西', '广西', '陕西', '广东', '甘肃', '重庆', '贵州', '浙江', '福建',
+					'宁夏', '天津', '海南', '青海', '西藏', '上海', '北京'
 				]
 			}
 		},
@@ -96,31 +112,20 @@
 			uni.showTabBar()
 		},
 		onLoad(options) {
-			// console.log("buy onload")
-			// // #ifdef H5
-			// this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
-			// // #endif
-			// this.cateId = options.tid ? options.tid : 0;
-			// this.keywords = options.keywords ? options.keywords : ''
-			// this.loadData();
-			this.$api.doRequest('get', '/procurementPlanInfo/selectProcurementPlanInfo',{pageSize:this.pageSize,
-			currentPage:this.currentPage,searchKeyWord:this.searchKeyWord}).then(res => {
-				console.log(res)
-							})
-							.catch(res => {
-								uni.showToast({
-									title: res.errmsg,
-									icon:'none',
-									duration: 2000
-								})
-							});
+			console.log("buy onload")
+			// #ifdef H5
+			this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+			// #endif
+			this.cateId = options.tid ? options.tid : 0;
+			this.keywords = options.keywords ? options.keywords : ''
+			this.loadData();
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
 		//下拉刷新
 		onPullDownRefresh() {
-			this.pages = 1
+			this.pageSize = 1
 			this.isLoadMore = false
 			this.loadStatus = 'loading'
 			this.loadData()
@@ -133,6 +138,22 @@
 			}
 		},
 		methods: {
+			sousuo(name){
+				var page = '/pageA/product/lookup?TabCur=' + this.TabCur+'&searchKeyWord='+name
+				uni.navigateTo({
+					url: page,
+					fail() {
+						uni.switchTab({
+							url: page
+						})
+					}
+				})
+			},
+			tabcarchange(status){
+				this.TabCur=status
+				this.pageSize = 1
+				this.loadData()
+			},
 			naviageToPage(page) {
 				page = page + this.TabCur
 				uni.navigateTo({
@@ -145,18 +166,30 @@
 				})
 			},
 			locationChange(e) {
-				this.location = e.detail.value
+				
+				this.receivePrivate = e.detail.value
+				this.pageSize = 1
+				this.loadData()
 			},
 			tabSelect(e) {
 				this.TabCur = e.currentTarget.dataset.id;
 				this.category = this.TabCur
-				this.pages = 1
+				this.pageSize = 1
 				this.loadData()
 			},
 			fabu() {
-				uni.navigateTo({
-					url: `/pageB/trust/trust`
+				uni.showActionSheet({
+					itemList: ['我要买粮', '我要卖粮'],
+					success (res) {
+						console.log(res.tapIndex)
+					},
+					fail (res) {
+						console.log(res.errMsg)
+					}
 				})
+				// uni.navigateTo({
+				// 	url: `/pageB/trust/trust`
+				// })
 			},
 			//加载商品 ，带下拉刷新和上滑加载
 			async loadData(type = 'add', loading) {
@@ -171,11 +204,11 @@
 				} else {
 					param1 = 'buy'
 				}
-				
-				console.log(11111)
-				this.$api.doRequest('get', '/procurementPlanInfo/selectProcurementPlanInfo',{pageSize:this.pageSize,
-currentPage:this.currentPage,searchKeyWord:this.searchKeyWord}).then(res => {
-	console.log(res)
+				this.$api.doRequest('get', param1,{pageSize:this.pageSize,
+				showFlag:1,
+currentPage:this.currentPage,searchKeyWord:this.searchKeyWord,receivePrivate:this.receivePrivate}).then(res => {
+					uni.hideLoading()
+					this.buyInfo=res.data.data.records
 				})
 				.catch(res => {
 					uni.showToast({
@@ -221,7 +254,7 @@ currentPage:this.currentPage,searchKeyWord:this.searchKeyWord}).then(res => {
 			//详情
 			navToDetailPage(item) {
 				let id = item.id;
-				if (item.price === 0) {
+				if (item.unitPrice === 0) {
 					this.contactUs();
 				} else {
 					if (this.TabCur == 0) {
@@ -295,55 +328,81 @@ currentPage:this.currentPage,searchKeyWord:this.searchKeyWord}).then(res => {
 <style>
 	page,
 	.content {
-		// background: $page-color-base;
+		background: #F5F6FA;
+	}
+	.line{
+		display:inline-block;
+		padding:5px;
+		position:relative;
+		font-size:17px;
+	}
+	.line.active{
+		font-size:19px;
+		font-weight: 900;
+	}
+	.line.active:after{
+		content:'';
+		display:block;
+		position:absolute;
+		width:18px;
+		left:50%;
+		transform: translateX(-50%);
+		bottom:0;
+		border-bottom:1px solid #22C572;
 	}
-
 	.cu-tag.badge {
 		right: 26rpx;
 	}
-
 	.cu-item {
 		height: 80rpx;
 		display: inline-block;
 		line-height: 80rpx;
 	}
-
 	.search-form {
-		background: #fff;
-		box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+		background: #F5F6F9;
 	}
-
 	.title-tip {
 		color: #E63113;
 		text-align: right;
 	}
-
+	
+	.tag1 {
+		background:#F5F6F9;
+		padding: 5px;
+		color:#333333;
+		display: inline-flex;
+		font-size: 22rpx;
+		border-radius: 3px;
+		margin: 3px;
+	}
+	.tag {
+		background:#F5F6F9;
+		padding: 7px 12px;
+		color:#333333;
+		display: inline-flex;
+		font-size: 22rpx;
+		border-radius: 15px;
+		margin: 3px;
+	}
 	.tag-bule {
-		background: #CDE7FB;
-		color: #0B4572;
+		background: #EBEEFA;
+		color: #5C76DF;
 	}
-
 	.tag-green {
 		background: #C6F7BC;
 		color: #065112;
 	}
-
 	.tag-yellow {
-		background: #FBF4B1;
-		color: #5C4409;
+		background: #F9F2EA;
+		color: #BE9C69;
 	}
-
-	.tag {
-		padding: 5px;
-		display: inline-flex;
-		font-size: 22rpx;
-		margin: 3px;
+	.tag-red {
+		background: #FEECE6;
+		color: #FE6430;
 	}
-
 	.text-white {
 		color: #fff;
 	}
-
 	.text-white text {
 		position: relative;
 		z-index: 2;
@@ -586,26 +645,35 @@ currentPage:this.currentPage,searchKeyWord:this.searchKeyWord}).then(res => {
 		}
 	}
 
-	/* 销售信息 */
-	.introduce-section {
-		background: #fff;
-		padding: 20upx 30upx;
-		padding-bottom: 100upx;
-
-		.guess-item {
+.introduce-section .title{
+	font-size: 17px;
+	font-weight: bold;
+	height:40px;
+	line-height: 40px;
+	flex: 2.5;
+	border-bottom:1px solid #EEEEEE;
+}
+.introduce-section .address{
+	color:#878C9C;
+	font-size:12px;
+	padding:15px 0 10px;
+}
+.introduce-section .price{
+	padding:10px 0 10px;
+	color:#FD714F;
+	font-size:19px;
+	font-weight:700;
+}
+.introduce-section .guess-item{
+			border-radius:4px;
+			background: #fff;
+			padding: 0upx 30upx 20upx;
+			margin:10px;
 			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;
-		}
-
+	/* 销售信息 */
+	.introduce-section{
 		.title-tip {
 			flex: 1;
 		}
@@ -652,4 +720,27 @@ currentPage:this.currentPage,searchKeyWord:this.searchKeyWord}).then(res => {
 			}
 		}
 	}
+	.side-bg{
+		position:absolute;
+		width: 64px;
+		height: 64px;
+		z-index: 1;
+	}
+	.drag {
+		position:relative;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: $uni-text-color-inverse;
+		width: 64px;
+		height: 64px;
+		background:transparent;
+		font-size: $uni-font-size-sm;
+		position: fixed;
+		z-index: 9;
+		
+		&.transition {
+			transition: left .3s ease,top .3s ease;
+		}
+	}
 </style>

pages/public/login_account_number.vue

@@ -99,8 +99,14 @@
 				this.$api.doRequest('get','/commonUser/login',{phone:this.phone,password:this.password}).then(res => {
 					if(res.data.code==200){
 						uni.setStorageSync('userInfo', res.data.data)
+						this.$api.doRequest('post','/auth/api/loginEnhanced',{companyName: "易粮易运",
+password: "y123456",
+username: "13333333333"}).then(res => {
+							
+						})
 						that.$store.commit('login', res.data.data)
 						that.liangxinLogin()
+						
 						uni.switchTab({
 							url: '/pages/sale/information'
 						});

pages/release/release.vue

@@ -0,0 +1,178 @@
+<template>
+	<view class="center">
+		<view class="introduce-section">
+			<view class="informations"  v-for="(item , index) in procurementPlanInfos" :Key="index">
+				<view @click="details(item)">
+				<view class="labels">{{item.goodsName}}</view>
+				<view class="labels">{{item.weight}}</view>
+				<view class="labels">{{item.unitPrice}}</view>
+				<view class="title">{{item.receivePrivate}}{{item.receiveCity}}{{item.receiveArea}}</view>
+				</view>
+				<view class='cu-tag radius line-pink'>编辑</view>
+				<view class='cu-tag radius line-pink' @click="switch1(item)">显示/隐藏</view>
+			    <view class='cu-tag radius line-pink' @click="deleteRelease(item)">删除</view>
+				<view class='cu-tag radius line-pink put'>{{item.status}}</view>
+			</view>
+		</view>
+		<view class="page-bottom">
+			<view class="action-btn-group">
+				<picker style='display:inline-block;' @change="releaseChange" :value="releases" :range="releaseType">
+					<button  type="primary" class=" action-btn no-border add-cart-btn" >发布</button>
+					<view class="picker">
+						{{releases>-1?releaseType[releases]:''}}
+					</view>
+				</picker>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				releaseType:["我要卖粮","我要买粮"],
+				release:'',
+				releases:'',
+				receivePrivate:'',
+				procurementPlanInfo:{
+					pageSize:10,
+					currentPage:1
+				},
+				releaseIndex:"",
+				pageSize:10,
+				currentPage:1,
+				procurementPlanInfos:[],
+			}
+		},
+		onLoad(){
+			this.getList()
+		},
+		methods: {
+			switch1(item){
+				console.log(125489)
+				// if (!this.hasLogin) {
+					uni.showModal({
+						// title: '登录提示',
+						content: '隐藏后该信息不再展示给其他用户，是否确定隐藏？',
+						showCancel: true,
+						confirmText: '确定',
+						success: (e) => {
+							this.$api.doRequest('post','/procurementPlanInfo/api/editStatus',{id:item.id,flag:0}).then(res => {		
+								this.procurementPlanInfos = res.data.data.records
+								if (res.errmsg == "Success") {
+									this.$api.msg('隐藏成功！')
+									return
+								}
+								
+							})
+							.catch(res => {
+								uni.showToast({
+									title: res.errmsg,
+									icon:'none',
+									duration: 2000
+								})
+							});
+						},
+						fail: () => {},
+						complete: () => {}
+					})
+				// }
+			},
+			
+			
+			deleteRelease(item){
+				// if (!this.hasLogin) {
+					uni.showModal({
+						// title: '登录提示',
+						content: '确定删除该信息？',
+						showCancel: true,
+						confirmText: '确定',
+						success: (e) => {
+							this.$api.doRequest('post','/procurementPlanInfo/api/deleteProcurementPlan',{id:item.id}).then(res => {
+								this.procurementPlanInfos = res.data.data.records
+								if (res.errmsg == "Success") {
+									this.$api.msg('删除成功！')
+									this.getList()
+									return
+								}
+								
+							})
+							.catch(res => {
+								uni.showToast({
+									title: res.errmsg,
+									icon:'none',
+									duration: 2000
+								})
+							});
+						},
+						fail: () => {},
+						complete: () => {}
+					})
+					// }
+			},
+			releaseChange(e){
+				this.receivePrivate = e.detail.value
+				this.release = this.releaseType[this.receivePrivate];
+				this.pageSize = 1
+
+				if(this.release == "我要卖粮"){
+					uni.navigateTo({
+						url: `/pageD/myRelease/sellGrain`
+					})
+				}else if(this.release == "我要买粮"){
+					uni.navigateTo({
+						url: `/pageD/myRelease/buyGrain`
+					})
+				}
+			
+			},
+			details(item){
+				uni.navigateTo({
+					url: `/pageD/myRelease/buyDetails?id=${item.id}`
+				})
+			},
+			getList(){
+				
+				this.$api.doRequest('get','/procurementPlanInfo/selectProcurementPlanInfo',this.procurementPlanInfo).then(res => {
+					
+					this.procurementPlanInfos = res.data.data.records
+					console.log(this.procurementPlanInfos,"对象")
+					
+				})
+				.catch(res => {
+					uni.showToast({
+						title: res.errmsg,
+						icon:'none',
+						duration: 2000
+					})
+				});
+			}
+
+		}
+	}
+</script>
+
+<style>
+	.center {
+		padding: 10px 20px;
+	}
+
+	.informations {
+		/* display: inline-flex; */
+	}
+
+	.labels {
+		display: inline-flex;
+		line-height: 20px;
+		margin-right: 40px;
+	}
+	.put{
+		float: right;
+	}
+	.fabuBut{
+		margin-bottom: 0px;
+	}
+
+
+</style>

pages/sale/information.vue

@@ -48,7 +48,7 @@
 						<view style='flex:1;'>
 							<view class='factory'>{{item.factory}}</view>
 							<view class='wrap'>{{item.city}} {{item.factoryType}}</view>
-							</view>
+						</view>
 						<view style='flex:1;' class='price'>{{item.price}}</view>
 						<view style='flex:1;' class='positive' v-if='item.comparePrice>0'>{{item.comparePrice}}<image class='up' src='https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/up.png'></image></view>
 						<view style='flex:1;' class='negative' v-if='item.comparePrice<0'>{{-item.comparePrice}}<image class='down' src='https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/decline.png'></image></view>

pages/task/my_task.vue

@@ -1,22 +1,484 @@
-<template>
-	<view>
-		
+<template name="task">
+	<view class="content">
+		<view class="cu-bar search bg-white">
+			<view class="search-form round" @click="naviageToPage('/pageA/product/search?TabCur=')">
+				<text style='color: #ccc;' class="cuIcon-search"></text>
+				<input type="text" placeholder="请输入合同编号、车牌号或派车编号" confirm-type="search"></input>
+			</view>
+
+		</view>
+		<view style='background:#fff;padding:0 145px;display:table-footer-group ;'>
+			<view @click='tabcarchange(1)' class='line' :class='statusFlag==1?"active":""'>未完成</view>
+			<view @click='tabcarchange(3)' class='line' :class='statusFlag==3?"active":""'>已完成</view>
+		</view>
+		<view class="introduce-section">
+			<view v-for="(item, index) in taskInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
+				<view class="price-box">
+					<view class='tag tag-bule radius line-pink'>入库任务</view>
+					<view class="title">{{item.carNo}}({{item.tranCarNo}})</view>
+					<view  class="title-tip" v-if="item.statusFlag==3">已完成</view>
+					<view  class="title-tip" v-if="item.statusFlag==1">未完成</view>
+				</view>
+				<view class="titles ">{{item.contractNo}}</view>
+				<view class="titles titleds_aa">{{item.inOutDate}}</view>
+			</view>
+			<view v-show="isLoadMore">
+				<uni-load-more :status="loadStatus"></uni-load-more>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
 	export default {
+		name: "task",
 		data() {
 			return {
-				
-			}
+				PageCur: "task",
+				taskInfo: [],
+				pages: 1, //页数
+				limit: 10, //每次取条目数
+				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
+				isLoadMore: false, //是否加载中
+				showTran: true,
+				scrollTop: 0,
+				statusFlag: 1,
+				current: 1,
+				warehouseInOutInfo: {
+					pageSize: 10,
+					currentPage: 1
+				}
+			};
+		},
+		onLoad(options) {
+
+			this.getIndexBuyData();
+			this.getIndexBuyData()
 		},
 		methods: {
-			
+			getIndexBuyData() {
+				console.log(11111)
+				const that = this
+				var pages = that.pages
+				var limit = that.limit
+				console.log(2112454)
+				this.warehouseInOutInfo.statusFlag = this.statusFlag
+				//this.warehouseInOutInfo.status = this.status
+				this.$api.doRequest('get', '/warehouseInOutInfo/selectInfo', this.warehouseInOutInfo).then(res => {
+					console.log(res, "对象")
+					if (res.data.code == 200) {
+						let data = res.data.data.records
+						console.log(data, "13246")
+						//采购信息
+						if (data.length > 0) {
+							that.taskInfo = that.taskInfo.concat(data)
+							that.isLoadMore = false
+						} else {
+							if (that.pages > 1) {
+								that.pages -= 1
+							}
+							that.isLoadMore = true
+							that.loadStatus = 'nomore'
+						}
+						uni.hideLoading()
+						this.taskInfo = res.data.data.records
+					} else {
+						uni.showToast({
+							title: res.data.message,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				}).catch(res => {
+					uni.showToast({
+						title: res.data.message,
+						icon: 'none',
+						duration: 2000
+					})
+				})
+			},
+			tabcarchange(statusFlag) {
+				this.statusFlag = statusFlag
+				this.pageSize = 1
+				this.getIndexBuyData()
+			},
+			navToDetailPage(item) {
+				console.log(item)
+				if(item.statusFlag == 3){
+				uni.navigateTo({
+					url: `/pageD/warehousings/warehousingDetails?id=${item.id}`
+				})
+				}else{
+					uni.navigateTo({
+						url: `/pageD/warehousings/warehousings?id=${item.id}&contractNo=${item.contractNo}
+						&goodsName=${item.goodsName}&startNetWeight=${item.startNetWeight}
+						&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}`
+					})
+				}
+			}
+
 		}
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	page,
+	.content {
+		background: #F5F6FA;
+	}
+
+	.line {
+		display: inline-block;
+		padding: 5px;
+		position: relative;
+		font-size: 17px;
+		width: 187px;
+		padding-left: 68px;
+	}
+
+	.line.active {
+		font-size: 19px;
+		font-weight: 900;
+	}
+
+	.line.active:after {
+		content: '';
+		display: block;
+		position: absolute;
+		width: 18px;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 0;
+		border-bottom: 1px solid #22C572;
+	}
+
+	.cu-tag.badge {
+		right: 26rpx;
+	}
+
+	.cu-item {
+		height: 80rpx;
+		display: inline-block;
+		line-height: 80rpx;
+	}
+
+	.search-form {
+		background: #fff;
+		box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+	}
+
+	.title-tip {
+		color: #00aa00;
+		text-align: center;
+		font-size: 7px;
+	}
+
+	.tag-bule {
+		background: #a8e4a5;
+		color: #000000;
+	}
+	.tag {
+		padding: 5px;
+		display: inline-flex;
+		font-size: 22rpx;
+		margin: 3px;
+	}
+
+	.text-white {
+		color: #fff;
+	}
+
+	.text-white text {
+		position: relative;
+		z-index: 2;
+		background: linear-gradient(45deg, #3DC146, #B2D612);
+		padding: 5px 10px;
+		border-radius: 38rpx;
+	}
+
+	.guess-section {
+		padding-bottom: 100upx;
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 30upx;
+		background: #fff;
+
+		.guess-item {
+			display: flex;
+			flex-direction: column;
+			width: 98%;
+			border-bottom: 1px solid #ccc;
+		}
+
+		.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;
+		}
+		.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;
+		}
+	}
+
+	.navbar {
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		display: flex;
+		width: 100%;
+		height: 80upx;
+		background: #fff;
+		box-shadow: 0 2upx 10upx rgba(0, 0, 0, .06);
+		z-index: 10;
+
+		.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 30upx;
+			color: $font-color-dark;
+			position: relative;
+
+			&.current {
+				color: $base-color;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 120upx;
+					height: 0;
+					border-bottom: 4upx solid $base-color;
+				}
+			}
+		}
+
+		.p-box {
+			display: flex;
+			flex-direction: column;
+
+			.yticon {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 30upx;
+				height: 14upx;
+				line-height: 1;
+				margin-left: 4upx;
+				font-size: 26upx;
+				color: #888;
+
+				&.active {
+					color: $base-color;
+				}
+			}
+
+			.xia {
+				transform: scaleY(-1);
+			}
+		}
+
+		.cate-item {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			width: 80upx;
+			position: relative;
+			font-size: 44upx;
+
+			&:after {
+				content: '';
+				position: absolute;
+				left: 0;
+				top: 50%;
+				transform: translateY(-50%);
+				border-left: 1px solid #ddd;
+				width: 0;
+				height: 36upx;
+			}
+		}
+	}
+
+	/* 分类 */
+	.cate-mask {
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		bottom: 0;
+		width: 100%;
+		background: rgba(0, 0, 0, 0);
+		z-index: 95;
+		transition: .3s;
+
+		.cate-content {
+			width: 630upx;
+			height: 100%;
+			background: #fff;
+			float: right;
+			transform: translateX(100%);
+			transition: .3s;
+		}
+
+		&.none {
+			display: none;
+		}
+
+		&.show {
+			background: rgba(0, 0, 0, .4);
+
+			.cate-content {
+				transform: translateX(0);
+			}
+		}
+	}
+
+	.cate-list {
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+
+		.cate-item {
+			display: flex;
+			align-items: center;
+			height: 90upx;
+			padding-left: 30upx;
+			font-size: 28upx;
+			color: #555;
+			position: relative;
+		}
 
+		.two {
+			height: 64upx;
+			color: #303133;
+			font-size: 30upx;
+			background: #f8f8f8;
+		}
+
+		.active {
+			color: $base-color;
+		}
+	}
+
+	/* 销售信息 */
+	.introduce-section {
+		background: #fff;
+		padding: 20upx 30upx;
+		padding-bottom: 100upx;
+
+		.guess-item {
+			padding-bottom: 20upx;
+			border-bottom: 1px solid #ccc;
+		}
+
+		.title {
+			font-size: 13upx;
+			color: $font-color-dark;
+			font-weight: bold;
+			height: 100upx;
+			line-height: 50upx;
+			flex: 2.5;
+			margin-left: -4px;
+			padding: 0px 24px;
+
+		}
+
+		.title-tip {
+			flex: 1;
+			-webkit-tap-highlight-color:transparent;
+		}
+
+		.price-box {
+			display: flex;
+			align-items: baseline;
+			height: 57px;
+			padding: 5px 0;
+			font-size: 13px;
+			color: #fa436a;
+		}
+
+		.price {
+			font-size: 15px;
+		}
+
+		.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;
+			}
+		}
+	}
+
+	.titles {
+		display: -webkit-inline-box;
+
+	}
+
+	.titleds_aa {
+		float: right;
+	}
 </style>

pages/user/user.vue

@@ -194,7 +194,7 @@
 							name: '我的任务',
 							icon:'cuIcon-copy',
 							tips: 0,
-							url:'/pages/user/task',
+							url:'/pages/task/my_task',
 							show:true
 						},
 						{
@@ -202,7 +202,7 @@
 							name: '我的发布',
 							icon:'cuIcon-news',
 							tips: 0,
-							url:'/pages/user/message',
+							url:`pages/release/release`,
 							show:true
 						},
 						{