Sfoglia il codice sorgente

前端小程序 样式sdy

zhongtianhaoyuan 3 anni fa
parent
commit
68cbc56eed

+ 94 - 28
pageA/product/Identity_switching.vue

@@ -1,27 +1,37 @@
 <template>
+	
 	<view class="center">
 		<view v-for="(item , index) in lists" :Key="index">
-			<view>
-				<view class="company">{{item.customerType}}</view>
-				<view class="guess-item" @click="navToDetailPage(item)">
+			<view class="forList">
+				<view class="flex">
+					<view class="company" v-if="item.customerType == '企业'">{{item.customerType}}</view>
+					<view class="company1" v-if="item.customerType == '个人'">{{item.customerType}}</view>
+					<view class="guess-item" @click="navToDetailPage(item)">
+				</view>
+				
 					<view class="infos">
-
-						<view class="info">{{item.customerName}}
-							<view class='cu-tag radius line-pink but'>{{item.authenticationStatus}}</view>
+	
+						<view class="info1">{{item.customerName}}
+							<view class='but but1' v-if="item.authenticationStatus == '已认证'">{{item.authenticationStatus}}</view>
+							<view class='but but2' v-if="item.authenticationStatus == '审核中'">{{item.authenticationStatus}}</view>
+							<view class='but but3' v-if="item.authenticationStatus == '未通过'">{{item.authenticationStatus}}</view>
+							<view class='but but4' v-if="item.authenticationStatus == '已覆盖'">{{item.authenticationStatus}}</view>
 						</view>
-						<view class="info">{{item.customerPhone}}</view>
-						<label>
-							<checkbox style='transform: scale(0.8);' :value='item.id' :checked="item.checked" @click.stop="checkBox($event,item)" ></checkbox>
-							<text>设置默认</text>
-						</label>
+						<view class="info2">{{item.customerPhone}}</view>
+					
 						
 					</view>
-
+	
 				</view>
+					<hr style="margin: 10px 0px;">
+				<label>
+					<checkbox style='transform: scale(0.8);' :value='item.id' :checked="item.checked" @click.stop="checkBox($event,item)" ></checkbox>
+					<text>设置默认</text>
+				</label>
 			</view>
 		</view>
 	</view>
-
+	
 	</view>
 	</view>
 </template>
@@ -176,22 +186,78 @@
 	}
 
 	.company {
+		width: 35px;
+		height: 35px;
+		background-color: #E9F8F0;
 		font-size: 16px;
 		margin-top: 10px;
+		border-radius: 5px;
+		text-align: center;
+		line-height: 35px;
+		color: #22C572;
+		font-size: 12px;
+		
 	}
-
-	.infos {
-		/* margin: 10px 20px; */
-		width: 100%;
-		display: inline-table;
-	}
-
-	.info {
-		line-height: 20px;
-	}
-
-	.but {
-		right: 3px;
-		float: right;
-	}
+	.company1{
+			width: 35px;
+			height: 35px;
+			background-color: #FEECE6;
+			font-size: 16px;
+			margin-top: 10px;
+			border-radius: 5px;
+			text-align: center;
+			line-height: 35px;
+			color:#FE6430;
+			font-size: 12px;
+		}
+	
+		.infos {
+			/* margin: 10px 20px; */
+			width: 100%;
+			display: inline-table;
+		}
+	
+		.info {
+			line-height: 20px;
+		}
+	
+		.but {
+			margin-right: 30px;
+			float: right;
+			font-size: 14px;
+			
+			background-color: #FFFFFF;
+		}
+		.but1{
+			color: #22C572 ;
+		}
+		.but2{
+			color:#FE6430;
+		}
+		.but3{
+			color:#FB1E1E;
+		}
+		.but4{
+			color:#AFB3BF;
+		}
+		.forList{
+			background-color: #FFFFFF;
+			padding: 10px 10px;
+			border-radius: 10px;
+			margin-top: 10px;
+		}
+	/* 	.guess-item{
+			font-size: 18px;
+			margin-left: 20px;
+			font-weight: 700;
+		} */
+		.info1{
+			font-size: 18px;
+			margin-left: 20px;
+			font-weight: 700;
+		}
+		.info2{
+			margin-left: 20px;
+			color: #AFB3BF;
+		}
 </style>

+ 105 - 28
pageA/product/business_buy.vue

@@ -1,91 +1,131 @@
 <template>
-	<view class="container">
-		<view  class="cu-form-group">
+	<view class="center">
+		<view class="transaction">
+			
+		
+		<view  class="c-row b-b">
 			<view class="title">卖方</view>
-			<view v-if='goods.customerTypeFlag==1' class="title" @click="liang">{{purchaseOrder.customer?purchaseOrder.customer:goods.customerName}}></view>
-			<view v-if='goods.customerTypeFlag==2' class="title" @click="liang">{{purchaseOrder.compName?purchaseOrder.compName:goods.compName}}></view>
+			<view class="con-list">
+				<view v-if='goods.customerTypeFlag==1' class="title" @click="liang">{{purchaseOrder.customer?purchaseOrder.customer:goods.customerName}}></view>
+				<view v-if='goods.customerTypeFlag==2' class="title" @click="liang">{{purchaseOrder.compName?purchaseOrder.compName:goods.compName}}></view>
+			</view>
 		</view>
-		<view  class="cu-form-group">
+		<view  class="c-row">
 			<view class="title">买方</view>
+			<view class="con-list">
 			<view class="title">{{purchaseOrder.buyer}}</view>
+			</view>
 		</view>
-		<view   class="cu-form-group margin-top">
+		</view>
+		<view class="transaction">
+		<view   class="c-row b-b margin-top">
 			<view class="title">收货地区</view>
+			<view class="con-list">
 				<view class="title">{{purchaseOrder.receivePrivate}}{{purchaseOrder.receiveCity}}{{purchaseOrder.receiveArea}}</view>
-			</picker>
+			</view>
 		</view>
-		<view   class="cu-form-group ">
+		<view   class="c-row b-b ">
 			<view class="title">收货库</view>
+			<view class="con-list">
 				<view class="title">{{purchaseOrder.receivePrivate}}{{purchaseOrder.receiveCity}}{{purchaseOrder.receiveArea}}{{purchaseOrder.receiveWarehouse}}</view>
-			</picker>
+			</view>
 		</view>
-		<view v-if='companyId!=2' class="cu-form-group">
+		<view v-if='companyId!=2' class="c-row b-b">
 			<view class="title">货名</view>
+			<view class="con-list">
 			<text>{{purchaseOrder.goodsName}}</text>
+			</view>
 		</view>
-		<view class="cu-form-group">
+		<view class="c-row b-b">
 			<view class="title">最小成交量(吨)</view>
+			<view class="con-list">
 			<text>{{purchaseOrder.minimumVolume}}</text>
+			</view>
 		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="cu-form-group">
+		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row">
 			<view  class="title">今日基差(元/吨)</view>
+			<view class="con-list">
 				<view class="picker">
 					<text>{{purchaseOrder.basis}}</text>
 				</view>
+				</view>
 		</view>
-		<view v-else class="cu-form-group">
+	
+		<view v-else class="c-row ">
 			<view   class="title">采购单价(元/吨)</view>
+			<view class="con-list">
 				<view class="picker">
 					<text>{{purchaseOrder.unitPrice}}</text>
 				</view>
+				</view>
 		</view>
-		<view class="cu-form-group margin-top">
+			</view >
+				<view class="transaction">
+		<view class="c-row b-b margin-top">
 			<view class="title">发票类型</view>
+			<view class="con-list">
 			<picker @change="invoiceChange" :value="invoiceIndex" :range="invoiceType">
 				<view class="picker">
 					{{packingIndex>-1?invoiceType[packingIndex]:'请选择'}}
 				</view>
 			</picker>
+			</view>
 		</view>
-		<view  class="cu-form-group">
+		<view  class="c-row b-b">
 			<view class="title">出售数量(吨)</view>
+			<view class="con-list">
 			<input v-model='purchaseOrder.transactionsNumber' placeholder="请填写出售数量" name="input"></input>
+			</view>
 		</view>
-		<view  class="cu-form-group">
+		<view  class="c-row b-b">
 			<view class="title">包装方式</view>
+			<view class="con-list">
 			<picker @change="packingChange" :value="packingIndex" :range="packingType">
 				<view class="picker">
 					{{packingIndex>-1?packingType[packingIndex]:'请选择'}}
 				</view>
 			</picker>
+			</view>
 		</view>
-		<view v-if='packingIndex==0' class="cu-form-group align-start">
+		<view v-if='packingIndex==0' class="beizhu align-start">
 			<view class="title">袋装备注</view>
-			<textarea maxlength="-1" v-model='purchaseOrder.baggingNotes' placeholder="请填写包装规格、质量、包装物要求。例:50kg袋装、大粒、彩包" ></textarea>
+			<view >
+			<textarea maxlength="-1" v-model='purchaseOrder.baggingNotes' placeholder="请填写包装规格、质量、包装物要求。例:50kg袋装、大粒、彩包" class="textareas"></textarea>
+			</view>
 		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="cu-form-group align-start">
+		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
 			<view class="title">点价(元/吨)</view>
+			<view class="con-list">
 			<input placeholder="请填写点价" name="input" @input='someprice' v-model="purchaseOrder.pointPrice"></input>
+			</view>
 		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="cu-form-group align-start">
+		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
 			<view class="title">发票费用(元/吨)</view>
+			<view class="con-list">
 			<input disabled placeholder="请填写发票费用" name="input" @input='someprice' v-model="purchaseOrder.invoiceFee"></input>
+			</view>
 		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="cu-form-group align-start">
+		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
 			<view class="title">包装费(元/吨)</view>
+			<view class="con-list">
 		<input placeholder="请填写包装费" name="input" @input='someprice' v-model="purchaseOrder.packingFee"></input>
 		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="cu-form-group align-start">
-			<view class="title">结算价格</view>
-			<text>{{purchaseOrder.settlementPrice}}</text>
+		</view>
+		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class=" align-start ">
+			<view class="titles">结算价格</view>
+			<text class="textA">结算价格=点价+基差+发票费用+包装费</text>
+			<view class="con-list">
+			<text >{{purchaseOrder.settlementPrice}}</text>
+			</view>
 			<!-- <input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput' v-model="purchaseOrder.settlementPrice"></input> -->
 		</view>
-		<view style='background:#fff;'>
+		<!-- <view style='background:#fff;'>
 			结算价格=点价+基差+发票费用+包装费
+		</view> -->
 		</view>
-		<view class="padding flex flex-direction">
-			<button class="cu-btn bg-red margin-tb-sm lg" @click="commit()">提交</button>
-		</view>
+	
+			<button class="btn" @click="commit()">提交</button>
+	
 	</view>
 </template>
 
@@ -376,6 +416,10 @@
 </script>
 
 <style scoped>
+	.center {
+		padding: 10px 20px;
+		background-color: #F5F6FA;
+	}
 	.cu-form-group input {
 		text-align: right;
 	}
@@ -411,4 +455,37 @@
 	    text-align: right;
 	    padding-right: 20rpx;
 	}
+	.transaction{
+		background-color: #FFFFFF;
+		margin-top: 10px;
+		border-radius: 20px;
+	}
+	.btn{
+		width: 100%;
+		background-color: #22C572;
+		border-radius: 20px;
+		margin-top: 10px;
+	}
+	.textareas{
+		width: 260px;
+		height: 130px;
+		background-color: #F9F9FA;
+		margin: 10px;
+		padding: 10px 20px;
+		border-radius: 10px;
+	}
+	.beizhu{
+		margin-left: 20px;
+		/* margin: 10px; */
+		margin-top: 10px;
+	}
+	.titles{
+		margin-left: 20px;
+		margin-top: 10px;
+	}
+	.textA{
+		margin-left: 20px;
+		color: #AFB3BF;
+		font-size: 10px;
+	}
 </style>

+ 3 - 1
pageA/product/lookup.vue

@@ -109,6 +109,8 @@
 				forbid: '',
 				isShowKeywordList: false,
 				TabCur:0,
+				isLoadMore:false,
+				loadStatus:'',
 			}
 		},
 		onLoad(options) {
@@ -116,7 +118,7 @@
 			this.TabCur = options.TabCur
 			this.init();
 			if(this.searchKeyWord){
-				this.isShowKeywordList=truetrue
+				this.isShowKeywordList=true
 				this.getData()
 			}
 		},

+ 77 - 11
pageD/myRelease/Identity_switching.vue

@@ -1,23 +1,32 @@
 <template>
 	<view class="center">
 		<view v-for="(item , index) in lists" :Key="index">
-			<view>
-				<view class="company">{{item.customerType}}</view>
-				<view class="guess-item" @click="navToDetailPage(item)">
+			<view class="forList">
+				<view class="flex">
+					<view class="company" v-if="item.customerType == '企业'">{{item.customerType}}</view>
+					<view class="company1" v-if="item.customerType == '个人'">{{item.customerType}}</view>
+					<view class="guess-item" @click="navToDetailPage(item)">
+				</view>
+				
 					<view class="infos">
 
-						<view class="info">{{item.customerName}}
-							<view class='cu-tag radius line-pink but'>{{item.authenticationStatus}}</view>
+						<view class="info1">{{item.customerName}}
+							<view class='but but1' v-if="item.authenticationStatus == '已认证'">{{item.authenticationStatus}}</view>
+							<view class='but but2' v-if="item.authenticationStatus == '审核中'">{{item.authenticationStatus}}</view>
+							<view class='but but3' v-if="item.authenticationStatus == '未通过'">{{item.authenticationStatus}}</view>
+							<view class='but but4' v-if="item.authenticationStatus == '已覆盖'">{{item.authenticationStatus}}</view>
 						</view>
-						<view class="info">{{item.customerPhone}}</view>
-						<label>
-							<checkbox style='transform: scale(0.8);' :value='item.id' :checked="item.checked" @click.stop="checkBox($event,item)" ></checkbox>
-							<text>设置默认</text>
-						</label>
+						<view class="info2">{{item.customerPhone}}</view>
+					
 						
 					</view>
 
 				</view>
+					<hr style="margin: 10px 0px;">
+				<label>
+					<checkbox style='transform: scale(0.8);' :value='item.id' :checked="item.checked" @click.stop="checkBox($event,item)" ></checkbox>
+					<text>设置默认</text>
+				</label>
 			</view>
 		</view>
 	</view>
@@ -162,6 +171,7 @@
 <style>
 	.center {
 		padding: 10px 20px;
+		background-color: #F5F6FA;
 	}
 
 	.title {
@@ -172,8 +182,29 @@
 	}
 
 	.company {
+		width: 35px;
+		height: 35px;
+		background-color: #E9F8F0;
+		font-size: 16px;
+		margin-top: 10px;
+		border-radius: 5px;
+		text-align: center;
+		line-height: 35px;
+		color: #22C572;
+		font-size: 12px;
+		
+	}
+	.company1{
+		width: 35px;
+		height: 35px;
+		background-color: #FEECE6;
 		font-size: 16px;
 		margin-top: 10px;
+		border-radius: 5px;
+		text-align: center;
+		line-height: 35px;
+		color:#FE6430;
+		font-size: 12px;
 	}
 
 	.infos {
@@ -187,7 +218,42 @@
 	}
 
 	.but {
-		right: 3px;
+		margin-right: 30px;
 		float: right;
+		font-size: 14px;
+		
+		background-color: #FFFFFF;
+	}
+	.but1{
+		color: #22C572 ;
+	}
+	.but2{
+		color:#FE6430;
+	}
+	.but3{
+		color:#FB1E1E;
+	}
+	.but4{
+		color:#AFB3BF;
+	}
+	.forList{
+		background-color: #FFFFFF;
+		padding: 10px 10px;
+		border-radius: 10px;
+		margin-top: 10px;
+	}
+/* 	.guess-item{
+		font-size: 18px;
+		margin-left: 20px;
+		font-weight: 700;
+	} */
+	.info1{
+		font-size: 18px;
+		margin-left: 20px;
+		font-weight: 700;
+	}
+	.info2{
+		margin-left: 20px;
+		color: #AFB3BF;
 	}
 </style>

+ 79 - 116
pageD/myRelease/buyGrain.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="center">
+		<view class="buyup">
+			
+		
 		<view class="c-row b-b">
 			<text class="tit">名头</text>
 			<view class="con-list">
@@ -58,13 +61,6 @@
 				<input placeholder="请输入基差" name="input" v-model="deptList.basisPrice"></input>
 			</view>
 		</view>
-		<view class="c-row b-b">
-			<text class="tit">产地</text>
-			<view class="con-list">
-				<view @click='regionchange1'>{{region1}}</view>
-				<u-picker :params='params1' @confirm='regionpicker1' mode="region" v-model="show1" ></u-picker>
-			</view>
-		</view>
 		<view class="c-row b-b">
 			<text class="tit">收货地区</text>
 			<view class="con-list">
@@ -78,58 +74,62 @@
 				<input placeholder="请输入买方手机号" name="input" v-model="deptList.buyerPhone"></input>
 			</view>
 		</view>
-		<view class="c-row b-b">
-			<button @click='getcode' type="default">{{sendText}}</button>
+		<view class="c-row ">
+			<text class="validate">获取验证码</text>
 			<view class="con-list">
 				<input placeholder="请填写6位短信验证码" name="input" v-model="deptList.title1"></input>
 			</view>
 		</view>
-		<view class="c-row b-b">
-			<checkbox style='transform: scale(0.8);'  :checked="checked" @click='checkedbox'></checkbox>完善更多信息(选填,可由客服人员代为完善)
 		</view>
-		<view v-if='checked' class="c-row b-b">
+		<view class="buylow">
+			
+		
+		<view class="c-row ">
+			<checkbox style='transform: scale(0.8);'  :checked="checked" @click='checkedbox'></checkbox><text style="font-size: 14px; ">完善更多信息<text style="font-size: 10px; color: #AFB3BF;">(选填,可由客服人员代为完善)</text></text>
+		</view>
+		<view v-if='!checked' class="c-row b-b">
 			<text class="tit">水分(%)<= </text>
 					<view class="con-list">
 						<input placeholder="请填写水分占比" name="input" v-model="deptList.waterContent"></input>
 					</view>
 		</view>
-		<view  v-if='checked'  class="c-row b-b">
+		<view  v-if='!checked'  class="c-row b-b">
 			<text class="tit">容重(g/L)<= </text>
 					<view class="con-list">
 						<input placeholder="请填写容重" name="input" v-model="deptList.bulkDensity"></input>
 					</view>
 		</view>
-		<view  v-if='checked'  class="c-row b-b">
+		<view  v-if='!checked'  class="c-row b-b">
 			<text class="tit">热损伤(%)<= </text>
 					<view class="con-list">
 						<input placeholder="请填写热损伤占比" name="input" v-model="deptList.jiaorenli"></input>
 					</view>
 		</view>
-		<view  v-if='checked'  class="c-row b-b">
+		<view  v-if='!checked'  class="c-row b-b">
 			<text class="tit">杂质(%)<= </text>
 					<view class="con-list">
 						<input placeholder="请填写杂质占比" name="input" v-model="deptList.impurity"></input>
 					</view>
 		</view>
-		<view  v-if='checked'  class="c-row b-b">
+		<view  v-if='!checked'  class="c-row b-b">
 			<text class="tit">霉变粒(%)<= </text>
 					<view class="con-list">
 						<input placeholder="请填写霉变粒占比" name="input" v-model="deptList.mildewGrain"></input>
 					</view>
 		</view>
-		<view  v-if='checked'  class="c-row b-b">
+		<view  v-if='!checked'  class="c-row b-b">
 			<text class="tit">不完整粒(%)<= </text>
 					<view class="con-list">
 						<input placeholder="请填写不完整粒占比" name="input" v-model="deptList.imperfectGrain"></input>
 					</view>
 		</view>
-		<view  v-if='checked'  class="c-row b-b">
+		<view  v-if='!checked'  class="c-row b-b">
 			<text class="tit">蛋白(%)<= </text>
 					<view class="con-list">
 						<input placeholder="请填写蛋白占比" name="input" v-model="deptList.protein"></input>
 					</view>
 		</view>
-		<view  v-if='checked'  class="c-row b-b">
+		<view  v-if='!checked'  class="c-row b-b">
 			<text class="tit">粒型 </text>
 			<picker @change="liChange" :value="liIndex" :range="liType" class="con-list" v-model="deptList.grain">
 				<view class="con-list">
@@ -137,7 +137,7 @@
 				</view>
 			</picker>
 		</view>
-		<view  v-if='checked'  class="c-row b-b">
+		<view  v-if='!checked'  class="c-row b-b">
 			<text class="tit">品级 </text>
 			<picker @change="pinChange" :value="pinIndex" :range="pinType" class="con-list">
 				<view class="con-list">
@@ -145,7 +145,14 @@
 				</view>
 			</picker>
 		</view>
-		<view  v-if='checked'  class="c-row b-b">
+		<view  v-if='!checked'  class="c-row b-b">
+			<text class="tit">产地</text>
+			<view class="con-list">
+				<view @click='regionchange1'>{{region1}}</view>
+				<u-picker :params='params1' @confirm='regionpicker1' mode="region" v-model="show1" ></u-picker>
+			</view>
+		</view>
+		<view  v-if='!checked'  class="c-row b-b">
 			<text class="tit">产出年份</text>
 			<picker @change="nianChange" :value="nianIndex" :range="nianType" class="con-list">
 				<view class="con-list">
@@ -153,7 +160,7 @@
 				</view>
 			</picker>
 		</view>
-		<view  v-if='checked'  class="c-row b-b">
+		<view  v-if='!checked'  class="c-row b-b">
 			<text class="tit">包装方式</text>
 			<picker @change="baoChange" :value="baoIndex" :range="baoType" class="con-list">
 				<view class="con-list">
@@ -161,13 +168,13 @@
 				</view>
 			</picker>
 		</view>
-		<view  v-if='checked&&baoIndex==2||!checked&&baoIndex==3'  class="c-row b-b">
+		<view  v-if='!checked&&baoIndex==2||!checked&&baoIndex==3'  class="c-row b-b">
 			<text class="tit">袋装备注</text>
 				<view class="con-list">
 					<input placeholder="请填写袋装备注" name="input" v-model="deptList.baggingNotes"></input>
 				</view>
 		</view>
-		<view  v-if='checked'  class="c-row b-b">
+		<view  v-if='!checked'  class="c-row b-b">
 			<text class="tit">运费承担方</text>
 			<picker @change="chengChange" :value="chengIndex" :range="chengType" class="con-list">
 				<view class="con-list">
@@ -175,8 +182,9 @@
 				</view>
 			</picker>
 		</view>
+		</view>
 
-		<button @click="commit()">发布</button>
+		<button @click="commit()" class="btn">发布</button>
 	</view>
 </template>
 
@@ -194,13 +202,10 @@
 				deptList: {
 					priceType: "定价采购",
 					procurementPlanType:"现货",
-					grain:"不限",
-					grainKey:1,
-					grade:"不限",
-					gradeKey:1,
+					grain:"塔粮",
+					grade:"不限(默认)",
 					outputYear:"2020",
-					packingType:"不限",
-					packingTypeKey:0,
+					packingType:"不限(默认)",
 					freightPayer:"",
 				},
 				params:{
@@ -215,20 +220,19 @@
 				checked:true,
 				insertProcurementPlanInfo: {},
 				liIndex: 0,
-				liType: ['不限','塔粮', '筛粮', '中粒', '大粒'],
+				liType: ['塔粮', '筛粮', '中粒', '大粒'],
 				pinIndex: 0,
-				pinType: ['不限', '一等品', '二等品', '三等品', '等外'],
+				pinType: ['不限(默认)', '一等品', '二等品', '三等品', '等外'],
 				nianIndex: 3,
 				nianType: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014', '2013', '2012',
 					'2011'
 				],
-				sendText:'获取验证码',
 				show:false,
 				show1:false,
 				region:'请选择收货地区',
 				region1:'请选择产地',
 				baoIndex: 0,
-				baoType: ['不限', '散装', '大袋', '小袋'],
+				baoType: ['不限(默认)', '散装', '大袋', '小袋'],
 				chengIndex: -1,
 				chengType: ['可议', '买方承担', '卖方承担']
 			}
@@ -256,46 +260,6 @@
 			})
 		},
 		methods: {
-			getcode(){
-				var that = this
-				if(/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.deptList.buyerPhone)){
-					this.$api.doRequest('get','/commonUser/sendVerifyCode',{phone:this.deptList.buyerPhone}).then(res => {
-						if(res.data.code==200){
-							that.sendDisabled = true
-							let sec = 60
-							let interval = setInterval(() => {
-								sec--;
-								that.sendText = sec + 's后重发'
-								if (sec <= 0) {
-									that.sendDisabled = false
-									that.sendText = "获取验证码"
-									clearInterval(interval)
-								}
-							}, 1000)
-						}else{
-							uni.showToast({
-								title: res.data.message,
-								icon:'none',
-								duration: 2000
-							})
-						}
-					})
-					.catch(res => {
-						uni.showToast({
-							title: res.data.message,
-							icon:'none',
-							duration: 2000
-						})
-					});
-				}else{
-					uni.showToast({
-						title: '请输入正确的手机号',
-						icon:'none',
-						duration: 2000
-					})
-				}
-				
-			},
 			regionpicker(e){
 				this.deptList.receivePrivate=e.province.label
 				this.deptList.receiveCity=e.city.label
@@ -318,14 +282,14 @@
 			},
 			typeChange(e) {
 				this.typesIndex = e.detail.value
-				if(e.detail.value==0){
+				this.types = this.typesType[this.typesIndex];
+				this.deptList.procurementPlanType = this.typesType[this.typesIndex];
+				if (this.typesIndex == 0) {
 					this.deptList.priceType = '定价采购'
-					this.deptList.procurementPlanTypeKey =2
-				}else{
+				} else {
 					this.deptList.priceType = '期货盘面价+基差'
-					this.deptList.procurementPlanTypeKey =1
 				}
-				this.deptList.procurementPlanType = this.typesType[this.typesIndex];
+
 			},
 			navToDetailPage() {
 				// if (index == 1) {
@@ -335,10 +299,6 @@
 					},
 			commit() {
 				this.insertProcurementPlanInfo = this.deptList
-				// if (!this.deptList.goodsName) {
-				// 	this.$api.msg('货名1不能为空')
-				// 	return
-				// }
 				if (!this.deptList.title) {
 					this.$api.msg('标题不能为空')
 					return
@@ -408,7 +368,7 @@
 					}
 				}else if(this.insertProcurementPlanInfo.procurementPlanType == '期货'){
 					if (!this.insertProcurementPlanInfo.basisPrice) {
-						this.$api.msg('基差不能为空')
+						this.$api.msg('基差(元/吨)不能为空')
 						return
 					}
 					if (this.insertProcurementPlanInfo.basisPrice>10000||this.insertProcurementPlanInfo.basisPrice<1) {
@@ -487,13 +447,13 @@
 						return
 					}
 				}
-				if (this.deptList.protein&&this.deptList.protein<1||
-				this.deptList.protein&&this.deptList.protein>80) {
+				if (this.insertProcurementPlanInfo.bulkDensity&&this.insertProcurementPlanInfo.bulkDensity<1||
+				this.insertProcurementPlanInfo.bulkDensity&&this.insertProcurementPlanInfo.bulkDensity>80) {
 					this.$api.msg('蛋白输入错误')
 					return
 				}
-				if (this.deptList.protein&&this.deptList.protein.indexOf('.')!=-1) {
-					if(this.deptList.protein.split('.')[1].length>2){
+				if (this.insertProcurementPlanInfo.bulkDensity&&this.insertProcurementPlanInfo.bulkDensity.indexOf('.')!=-1) {
+					if(this.insertProcurementPlanInfo.bulkDensity.split('.')[1].length>2){
 						this.$api.msg('蛋白输入错误')
 						return
 					}
@@ -501,27 +461,10 @@
 				this.insertProcurementPlanInfo.basisPrice=-this.insertProcurementPlanInfo.basisPrice
 		         this.insertProcurementPlanInfo.commonId = this.userInfo.id
 				 this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
-				 uni.showModal({
-				 	content: '确定发布交易信息?',
-				 	success: (res) => {
-						if(res.confirm) {  
 				this.$api.doRequest('post', '/procurementPlanInfo/api/insertProcurementPlanInfo', this
 						.insertProcurementPlanInfo).then(res => {
-							if(res.data.code==200){
-								uni.showToast({
-									title: "发布成功",
-									icon: 'none',
-								})
-								setTimeout(() => {
-									uni.navigateBack({})
-								}, 2000)
-							}else{
-								uni.showToast({
-									title: res.data.message,
-									icon: 'none',
-									duration: 2000
-								})
-							}
+						console.log("添加成功")
+						this.procurementPlanInfos = res.data.data
 					})
 					.catch(res => {
 						uni.showToast({
@@ -530,20 +473,15 @@
 							duration: 2000
 						})
 					});
-					}
-					}
-				})
 			},
 			liChange(e) {
 				this.liIndex = e.detail.value
 				this.litypes = this.liType[this.liIndex];
-				this.deptList.grainKey = e.detail.value+1
 				this.deptList.grain = this.liType[this.liIndex]
 			},
 			pinChange(e) {
 				this.pinIndex = e.detail.value
 				this.pintypes = this.pinType[this.pinIndex];
-				this.deptList.gradeKey = e.detail.value+1
 				this.deptList.grade = this.pinType[this.pinIndex]
 			},
 			nianChange(e) {
@@ -555,13 +493,11 @@
 			baoChange(e) {
 				this.baoIndex = e.detail.value
 				this.baotypes = this.baoType[this.baoIndex];
-				this.deptList.packingTypeKey = e.detail.value
 				this.deptList.packingType = this.chengType[this.chengIndex];
 			},
 			chengChange(e) {
 				this.chengIndex = e.detail.value
 				this.chengtypes = this.chengType[this.chengIndex];
-				this.deptList.freightPayerKey = e.detail.value+1
 					this.deptList.freightPayer = this.chengType[this.chengIndex];
 			}
 		}
@@ -571,6 +507,7 @@
 <style>
 	.center {
 		padding: 10px 20px;
+		background-color: #F5F6FA;
 	}
 
 	.c-row {
@@ -595,10 +532,36 @@
 		-webkit-box-direction: normal;
 		-webkit-flex-direction: column;
 		flex-direction: column;
-		color: #303133;
+		color: #AFB3BF;
 		line-height: 40rpx;
 		text-align: right;
 		padding-right: 20rpx;
 		font-size: 14px;
 	}
+	.buyup{
+		background-color: #FFFFFF;
+		border-radius: 20px;
+		margin-top: 10px;
+	}
+	.buylow{
+		background-color: #FFFFFF;
+		border-radius: 20px;
+		margin-top: 10px;
+	}
+	.btn{
+		border-radius: 20px;
+		margin-top: 10px;
+		background-color: #22C572;
+		color: #FFFFFF;
+	}
+	.validate{
+		width: 100px;
+		height: 32px;
+		background-color: #F5F6F9;
+		color: #AFB3BF;
+		border-radius: 10px;
+		border: none;
+		text-align: center;
+		line-height: 30px;
+	}
 </style>

+ 115 - 18
pages/release/release.vue

@@ -1,23 +1,40 @@
 <template>
 	<view class="center">
 		<view class="introduce-section">
-			<view class="informations"  v-for="(item , index) in procurementPlanInfos" :Key="index">
+			<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 class="flex">
+					<view class="logo flex">
+						买粮
+					</view>
+				<text class="grain">{{item.goodsName}}</text>
+				<view class="status">
+					<view v-if='item.status=="已驳回"' class='put2'>未通过</view>
+					<view v-if='item.status=="待审核"' class='put1'>审核中</view>
+					<view v-if='item.status=="已认证"' class='put'>已通过</view>
+				</view>	
+				</view>
+				<view class="address">{{item.receivePrivate}}{{item.receiveCity}}{{item.receiveArea}}</view>
+				<view class="flex ">
+					<view class="weight" >{{item.weight > 0 ? item.weight : 0}}吨</view>
+					<text class="unitPrice">{{item.unitPrice}} <text class="amount">元/吨</text></text>
+					
 				</view>
-				<view @click='edit(item)' v-if='item.status!="待审核"' class='cu-tag radius line-pink'>编辑</view>
-				<view class='cu-tag radius line-pink' @click="switch1(item)">隐藏</view>
-				<view class='cu-tag radius line-pink' @click="switch1(item)">显示</view>
-			    <view class='cu-tag radius line-pink' @click="deleteRelease(item)">删除</view>
-				<view v-if='item.status=="已驳回"' class='cu-tag radius line-pink put'>未通过</view>
+				</view>
+				<hr style="margin: 16px 0; color: #EEEEEE;">
+				<view class="flex" style="right: 10px;">
+					<view @click='edit(item)' v-if='item.status!="待审核"' class='anniu'>编辑</view>
+					<view class='anniu' @click="switch1(item)">隐藏</view>
+					<view class='anniu' @click="switch1(item)">显示</view>
+					<view class='anniu' @click="deleteRelease(item)">删除</view>
+				</view>
+				
+				<!-- <view v-if='item.status=="已驳回"' class='cu-tag radius line-pink put'>未通过</view>
 				<view v-if='item.status=="待审核"' class='cu-tag radius line-pink put'>审核中</view>
-				<view v-if='item.status=="已认证"' class='cu-tag radius line-pink put'>已通过</view>
+				<view v-if='item.status=="已认证"' class='cu-tag radius line-pink put'>已通过</view> -->
 			</view>
 		</view>
-		<view class="page-bottom">
+		<!-- <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>
@@ -26,7 +43,13 @@
 					</view>
 				</picker>
 			</view>
-		</view>
+		</view> -->
+		<picker style='display:inline-block;width: 100%;' @change="releaseChange" :value="releases" :range="releaseType">
+			<button  type="primary" class="btn" >发布</button>
+			<view class="picker">
+				{{releases>-1?releaseType[releases]:''}}
+			</view>
+		</picker>
 	</view>
 </template>
 
@@ -162,10 +185,14 @@
 <style>
 	.center {
 		padding: 10px 20px;
+			background-color: #F5F6FA;
 	}
 
 	.informations {
-		/* display: inline-flex; */
+      background-color: #FFFFFF;
+	  margin-top: 20px;
+	  border-radius: 16px;
+	  padding: 10px;
 	}
 
 	.labels {
@@ -173,12 +200,82 @@
 		line-height: 20px;
 		margin-right: 40px;
 	}
-	.put{
-		float: right;
-	}
+
 	.fabuBut{
 		margin-bottom: 0px;
 	}
+	.logo{
+		width: 36px;
+		height: 24px;
+		background-color: #FEECE6;
+		color: #FE6430;
+		border-radius: 8px;
+		padding: 3px;
+		margin-top: 2px;
+	}
+    .grain{
+		font-size: 18px;
+		color: #333333;
+		font-weight: 600;
+		margin-left: 20px;
+	}
+	.address{
+		margin-left: 56px;
+		font-size: 14px;
+		color: #333333;	
+	}
+	.weight{
+		margin-left: 56px;
+		font-size: 14px;
+		color: #878C9C;
+	}
+	.unitPrice{
+		
+		font-size: 22px;
+		font-weight: 600;
+/* 	margin-left: 200px; */
+position: absolute;
+	/* text-align: right; */
+	right: 40px;
 
-
+	}
+	/* .amount{
+		width: 100%;
+	} */
+	.amount{
+		margin-left: 10px;
+		font-size: 12px;
+		
+		}
+		.status{
+			position: absolute;
+			right: 40px;
+		}
+		.put{
+			color: #22C572;
+			font-size: 14px;
+		}
+		.put1{
+			color: #FE6430;
+			font-size: 14px;
+		}
+		.put2{
+			color: #FB1E1E;
+			font-size: 14px;
+		}
+		.anniu{
+			width: 60px;
+			height: 30px;
+			border: 1px solid #CDCDCD;
+			border-radius: 16px;
+			text-align: center;
+			line-height: 30px;
+			margin-left: 10px;
+		}
+		.btn{
+			width: 100%;
+			border-radius: 20px;
+			background-color: #22C572;
+			margin-top: 10px;
+		}
 </style>