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

pageA/product/detail.vue

@@ -307,8 +307,7 @@
 					fail: (res) => {
 						console.log('调用失败!')
 					}
-				  });
-				
+				  });		
 			},
 			ViewImage(e) {
 				var img = [];

pageA/product/sales_detail.vue

@@ -507,7 +507,7 @@
 						// &unloadingFee=${that.goods.unloadingFee}`
 						url:`/pageA/product/business_sale?id=${that.goods.id}&buyer=${that.goods.buyer}&seller=${that.goods.seller}&sendPrivate=${that.goods.sendPrivate}
 						&sendCity=${that.goods.sendCity}&sendArea=${that.goods.sendArea}&sendWarehouse=${that.goods.sendWarehouse}&goodsName=${that.goods.goodsName}
-						&minimumVolume=${that.goods.minimumVolume}&unitPrice=${that.goods.unitPrice}&basisPrice=${that.goods.basisPrice}&`
+						&minimumVolume=${that.goods.minimumVolume}&unitPrice=${that.goods.unitPrice}&basisPrice=${that.goods.basisPrice}`
 					})
 				}
 			}

pageB/contract/contract.vue

@@ -3,31 +3,39 @@
 		<view v-for="(item , index) in lists" :Key="index" class="region">
 			<view>
 				<view class="c-row ">
-					<text class="tit">{{item.orderType}}</text>
+					<text class="tit" v-if="item.orderType == '采购'">{{item.orderType}}</text>
+						<text class="tit2" v-if="item.orderType == '销售'">{{item.orderType}}</text>
 					<view class="enterprise">
-						编号{{item.contractNo}}{{item.procurementPlanType}}
+						编号{{item.contractNo}}({{item.procurementPlanType}})
 					</view>
-					<text class="status">{{item.status}}</text>
+					<!-- <text class="status status1" v-if="item.status == '已挂单'">{{item.status}}</text>
+					<text class="status status2" v-if="item.status == '已成交'">{{item.status}}</text>
+					<text class="status status3" v-if="item.status == '已完成'">{{item.status}}</text>
+					<text class="status status1" v-if="item.status == '审核中'">{{item.status}}</text>
+					<text class="status status1" v-if="item.status == '执行中'">{{item.status}}</text> -->
+					<text class="status status1">{{item.status}}</text>
+					
 				</view>
 			</view>
 			<view>
 				<view class="c-row ">
-					<text class="tit1">买方</text>
+					<text class="tit1" v-if="item.orderType == '采购'" >买方</text>
+					<text class="tit1" v-if="item.orderType == '销售'">卖方</text>
 					<view class="enterprise">
-						{{item.customer}}
+						{{item.contracter}}
 					</view>
 				</view>
 			</view>
 			<view class="forList flex">
-				<view class="title">{{item.goodsName}}:<text>{{item.weight}}</text></view>
+				<view class="title">{{item.goodsName}}:<text>{{item.transactionsNumber}}</text></view>
 				<view class="title">单价:￥<text>{{item.unitPrice}}</text></view>
 				<view class="title">基差:￥<text>{{item.basis}}</text></view>
 			</view>
 			<view class="c-row flex annius">
 				<text class="anniu" @click="commit"> 附件</text>
-				<text class="anniu" @click="someprice(item)"> 点价</text>
-				<text class="anniu1" @click="commit1(item)"> 发货</text>
-				<text class="anniu1" @click="commit2(item)"> 收货</text>
+				<text class="anniu" @click="someprice(item)" v-if="item.procurementPlanType == '期货' && (item.status == '已成交' || item.status == '已挂单')"> 点价</text>
+				<text class="anniu1" @click="commit1(item)" v-if="item.orderType == '采购'"> 发货</text>
+				<text class="anniu1" @click="commit2(item)" v-if="item.orderType == '销售'"> 收货</text>
 			</view>
 		</view>
 		<view v-if='pricestatus' class='shade'>
@@ -76,13 +84,13 @@
 				goods: {
 					pageSize: 10,
 					currentPage: 1,
-					id: "41651544",
 					// pcFlag : 0,
 				},
 				procurementPlanInfo: {
 					pageSize: 10,
 					currentPage: 1
 				},
+				price:"",
 				tran: {
 					total: 0,
 					price: 0,
@@ -225,7 +233,7 @@
 			},
 			getList() {
 				this.goods.commonId = this.userInfo.id
-
+                 // this.goods.pcFlag = 0
 				this.$api.doRequest('get', '/purchaseOrder/selectPurchaseOrderApp', this.goods).then(res => {
 						if (res.data.code == 200) {
 							this.lists = res.data.data.records
@@ -770,7 +778,7 @@
 
 	.forList .title {
 		line-height: 30px;
-		margin-left: 15px;
+		margin-left: 25px;
 		color: #9698A2;
 	}
 
@@ -791,6 +799,14 @@
 		padding: 2px 3px;
 		border-radius: 5px;
 	}
+	.tit2 {
+		width: 34px;
+		height: 24px;
+		background-color: #EBEEFA;
+		color: #5C76DF;
+		padding: 2px 3px;
+		border-radius: 5px;
+	}
 
 	.enterprise {
 		font-size: 16px;
@@ -799,7 +815,8 @@
 	}
 	.annius{
 		width: 70%;
-	margin-left: 110px;
+	    margin-left: 110px;
+		justify-content:flex-end;
 	}
 	.anniu{
 		width: 50px;
@@ -876,4 +893,14 @@
 			right: 20px;
 			position: absolute;
 		}
+		.status1{
+			color: #FE6430;
+		}
+		.status2{
+			color: #22C572;
+		}
+		.status3{
+			color: #AFB3BF;
+		}
+	
 </style>

pageB/contract/contract_detail.vue

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

pageD/identity/companyIdentityThree.vue

@@ -254,8 +254,8 @@
 				this.identityAuthenticationInfo.commonId = this.userInfo.id
 				this.identityAuthenticationInfo.payeeAddressUrl = this.bankid.toString()
 				this.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
-				this.amendprice()
-				if(this.verification == false){
+				if(this.amendprice() == false){
+					this.$api.msg('验证码输入有误！')
 					return
 				}
 				this.$api.doRequest('post', '/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', this

pageD/identity/driverIdentity.vue

@@ -50,7 +50,6 @@
 						<!-- style='width:70%;position:relative;margin-left: 200px;' -->
 						<input v-model='verifyCode' placeholder="请输入验证码" type="text">
 					</view>
-
 				</view>
 			</view>
 			<view class="c-row ">
@@ -141,18 +140,18 @@
 					this.$api.msg('常住城市不能为空')
 					return
 				}
-				this.amendprice()
-				if(this.verification == false){
+				
+				if(this.amendprice() == false){
+					this.$api.msg('验证码输入有误！')
 					return
 				}
-				console.log(this.verification)
 				this.DriverViewInfo.cardAddressUrl = this.id.toString()
 				var model = JSON.stringify(this.DriverViewInfo);
 				uni.navigateTo({
 					url: `/pageD/identity/driverIdentityTwo?DriverViewInfo=` + model,
 				})
 			},
-			amendprice() {
+			async amendprice() {
 				var that = this
 				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
 						phone: this.DriverViewInfo.driverPhone,

pageD/myRelease/buyDetails.vue

@@ -1,15 +1,13 @@
 <template>
 	<view class="center">
 		<view class="buyup">
-			
-		
 			<view class="c-row b-b">
 				<text class="title">基本信息</text>
 			</view>
 		<view class="c-row b-b">
 			<text class="tit">名头</text>
 			<view class="con-list">
-				{{procurementPlanInfos.title}}
+				{{procurementPlanInfos.buyer}}
 			</view>
 		</view>
 		<view class="c-row b-b">
@@ -43,13 +41,20 @@
 			</view>
 			
 		</view>
+		
 		<view class="c-row b-b">
 			<text class="tit">价格类型</text>
 			<view class="con-list">
 				{{procurementPlanInfos.priceType}}
 			</view>
 		</view>
-		<view class="c-row b-b">
+		<view class="c-row b-b" v-if="procurementPlanInfos.procurementPlanType == '现货'">
+			<text class="tit">单价（元/吨）</text>
+			<view class="con-list">
+				{{procurementPlanInfos.unitPrice}}
+			</view>
+		</view>
+		<view class="c-row b-b" v-if="procurementPlanInfos.procurementPlanType == '期货'">
 			<text class="tit">基差（元/吨）</text>
 			<view class="con-list">
 				{{procurementPlanInfos.basisPrice}}

pageD/myRelease/buyGrain.vue

@@ -43,7 +43,6 @@
 			<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>
@@ -72,11 +71,21 @@
 					<input placeholder="请输入买方手机号" name="input" v-model="deptList.buyerPhone"></input>
 				</view>
 			</view>
-			<view class="c-row ">
+			<!-- <view class="c-row ">
 				<text class="validate">获取验证码</text>
 				<view class="con-list">
 					<input placeholder="请填写6位短信验证码" name="input" v-model="deptList.title1"></input>
 				</view>
+			</view> -->
+			
+			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
+				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode'
+					class='getcode'>{{sendText}}</button>
+				<view style='width:70%;position:relative;margin-left: 200px;'>
+					<view class="con-list">
+						<input v-model='verifyCode' placeholder="请输入验证码" type="text">
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="buylow">
@@ -235,7 +244,13 @@
 				baoIndex: 0,
 				baoType: ['不限（默认）', '散装', '大袋', '小袋'],
 				chengIndex: -1,
-				chengType: ['可议', '买方承担', '卖方承担']
+				chengType: ['可议', '买方承担', '卖方承担'],
+				codestatus: false,
+				sendDisabled: false,
+				sendText: '获取验证码',
+				verifyCode:"",
+				verification:true,
+				// DriverViewInfo:{},
 			}
 		},
 		computed: {
@@ -263,6 +278,79 @@
 			})
 		},
 		methods: {
+			async amendprice() {
+				var that = this
+				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
+						phone: this.deptList.buyerPhone,
+						verifyCode: this.verifyCode
+					}).then(res => {
+						if (res.data.code == 200) {
+							
+						} else {
+							that.verification = false
+							console.log(that.verification,"1")
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none',
+								duration: 2000
+							})
+							return false
+						}
+					})
+					.catch(res => {
+						that.verification = false
+						console.log(that.verification,"2")
+						uni.showToast({
+							title: res.data.message,
+							icon: 'none',
+							duration: 2000
+						})
+						return false
+					});
+			},
+			getcode() {
+				var that = this
+				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(that.deptList.buyerPhone)) {
+					this.$api.doRequest('get', '/commonUser/sendVerifyCode', {
+							phone: that.deptList.buyerPhone
+						}).then(res => {
+							if (res.data.code == 200) {
+								that.sendDisabled = true
+								let sec = 60
+								let interval = setInterval(() => {
+									sec--;
+									that.sendText = sec + 's后重发'
+									if (sec <= 0) {
+										that.sendDisabled = false
+										that.sendText = "获取验证码"
+										clearInterval(interval)
+									}
+								}, 1000)
+							} else {
+								uni.showToast({
+									title: res.data.message,
+									icon: 'none',
+									duration: 2000
+								})
+								return
+							}
+						})
+						.catch(res => {
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none',
+								duration: 2000
+							})
+							return
+						});
+				} else {
+					uni.showToast({
+						title: '请输入正确的手机号',
+						icon: 'none',
+						duration: 2000
+					})
+				}
+			},
 			regionpicker(e) {
 				this.deptList.receivePrivate = e.province.label
 				this.deptList.receiveCity = e.city.label
@@ -461,6 +549,10 @@
 						}
 					}
 				}
+				if(this.amendprice() == false){
+					this.$api.msg('验证码输入有误！')
+					return
+				}
 				this.insertProcurementPlanInfo = this.deptList
 				this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
 				this.insertProcurementPlanInfo.commonId = this.userInfo.id
@@ -622,4 +714,23 @@
 		text-align: center;
 		line-height: 30px;
 	}
+	.getcode {
+		font-size: 14px;
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		color: #AFB3BF;
+		background: #F5F6F9;
+		height: 30px;
+		line-height: 30px;
+	}
+	
+	.getcode.active {
+		border: none;
+	}
+	
+	.getcode.active {
+		background: #22C572;
+		color: #fff;
+	}
 </style>

pageD/myRelease/sellDetails.vue

@@ -7,7 +7,7 @@
 			<view class="c-row b-b">
 				<text class="tit">名头</text>
 				<view class="con-list">
-					<text @click="navToDetailPage">{{deptList.procurementPlanNo}}</text>
+					<text @click="navToDetailPage">{{deptList.seller}}</text>
 				</view>
 			</view>
 			<view class="c-row b-b">

pageD/myRelease/sellGrain.vue

@@ -79,11 +79,21 @@
 					<input placeholder="请输入买方手机号" name="input" v-model="deptList.sellerPhone"></input>
 				</view>
 			</view>
-			<view class="c-row ">
+			<!-- <view class="c-row ">
 				<text class="validate">获取验证码</text>
 				<view class="con-list">
 					<input placeholder="请填写6位短信验证码" name="input" v-model="deptList.title1"></input>
 				</view>
+			</view> -->
+			
+			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
+				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode'
+					class='getcode'>{{sendText}}</button>
+				<view style='width:70%;position:relative;margin-left: 200px;'>
+					<view class="con-list">
+						<input v-model='verifyCode' placeholder="请输入验证码" type="text">
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="buylow">
@@ -240,7 +250,12 @@
 				baoIndex: 0,
 				baoType: ['不限（默认）', '散装', '大袋', '小袋'],
 				chengIndex: -1,
-				chengType: ['可议', '买方承担', '卖方承担']
+				chengType: ['可议', '买方承担', '卖方承担'],
+				codestatus: false,
+				sendDisabled: false,
+				sendText: '获取验证码',
+				verifyCode:"",
+				verification:true,
 			}
 		},
 		computed: {
@@ -268,6 +283,79 @@
 			})
 		},
 		methods: {
+			async amendprice() {
+				var that = this
+				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
+						phone: this.deptList.sellerPhone,
+						verifyCode: this.verifyCode
+					}).then(res => {
+						if (res.data.code == 200) {
+							
+						} else {
+							that.verification = false
+							console.log(that.verification,"1")
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none',
+								duration: 2000
+							})
+							return false
+						}
+					})
+					.catch(res => {
+						that.verification = false
+						console.log(that.verification,"2")
+						uni.showToast({
+							title: res.data.message,
+							icon: 'none',
+							duration: 2000
+						})
+						return false
+					});
+			},
+			getcode() {
+				var that = this
+				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(that.deptList.sellerPhone)) {
+					this.$api.doRequest('get', '/commonUser/sendVerifyCode', {
+							phone: that.deptList.sellerPhone
+						}).then(res => {
+							if (res.data.code == 200) {
+								that.sendDisabled = true
+								let sec = 60
+								let interval = setInterval(() => {
+									sec--;
+									that.sendText = sec + 's后重发'
+									if (sec <= 0) {
+										that.sendDisabled = false
+										that.sendText = "获取验证码"
+										clearInterval(interval)
+									}
+								}, 1000)
+							} else {
+								uni.showToast({
+									title: res.data.message,
+									icon: 'none',
+									duration: 2000
+								})
+								return
+							}
+						})
+						.catch(res => {
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none',
+								duration: 2000
+							})
+							return
+						});
+				} else {
+					uni.showToast({
+						title: '请输入正确的手机号',
+						icon: 'none',
+						duration: 2000
+					})
+				}
+			},
 			regionpicker(e) {
 				this.deptList.sendPrivate = e.province.label
 				this.deptList.sendCity = e.city.label
@@ -470,11 +558,22 @@
 						}
 					}
 				}
+<<<<<<< HEAD
+				if(this.amendprice() == false){
+					this.$api.msg('验证码输入有误！')
+					return
+				}
+				this.insertProcurementPlanInfo = this.deptList
+				this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
+				this.insertProcurementPlanInfo.commonId = this.userInfo.id
+				this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+=======
 				this.insertSalePlanInfo = this.deptList
 				this.insertSalePlanInfo.basisPrice = -this.insertSalePlanInfo.basisPrice
 				this.insertSalePlanInfo.commonId = this.userInfo.id
 				this.insertSalePlanInfo.salePlanNo='XSJH'+this.getdate()+this.verifyinit()
 				this.insertSalePlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+>>>>>>> cf82327deab7b10c1c2181e90bf088a14545c10f
 				this.$api.doRequest('post', '/salePlanInfo/api/insertSalePlanInfo', this
 						.insertSalePlanInfo).then(res => {
 						if (res.data.code == 200) {
@@ -631,4 +730,23 @@
 		text-align: center;
 		line-height: 30px;
 	}
+	.getcode {
+		font-size: 14px;
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		color: #AFB3BF;
+		background: #F5F6F9;
+		height: 30px;
+		line-height: 30px;
+	}
+	
+	.getcode.active {
+		border: none;
+	}
+	
+	.getcode.active {
+		background: #22C572;
+		color: #fff;
+	}
 </style>

pages/release/release.vue

@@ -14,9 +14,9 @@
 							<view v-if='item.status=="已认证"' class='put'>已通过</view>
 						</view>
 					</view>
-					<view class="address">{{item.receivePrivate}}{{item.receiveCity}}{{item.receiveArea}}</view>
+					<view class="address">{{item.privates}}{{item.city}}{{item.Area}}</view>
 					<view class="flex ">
-						<view class="weight">{{item.weight > 0 ? item.weight : 0}}吨</view>
+						<view class="weight">{{item.plannedVolume > 0 ? item.plannedVolume : 0}}吨</view>
 						<text class="unitPrice">{{item.unitPrice}} <text class="amount">元/吨</text></text>
 					</view>
 				</view>