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

pageA/product/business_sale.vue

@@ -88,7 +88,7 @@
 			</picker>
 			</view>
 		</view>
-		<view v-if='packingIndex==0' class="beizhu align-start">
+		<view v-if='purchaseOrder.packingType =="大袋" || purchaseOrder.packingType =="小袋"' class="beizhu align-start">
 			<view class="title">袋装备注</view>
 			<view >
 			<textarea maxlength="-1" v-model='purchaseOrder.baggingNotes' placeholder="请填写包装规格、质量、包装物要求。例:50kg袋装、大粒、彩包" class="textareas"></textarea>

pageA/product/detail.vue

@@ -198,7 +198,7 @@
 			<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" 
+				<button v-else type="primary" class="action-btn no-border add-cart-btn" 
 				@click="tradeNow">立即发车</button>
 			</view>
 		</view>
@@ -452,7 +452,6 @@
 					that.$api.msg('终止成功')
 					uni.hideLoading()
 					setTimeout(()=>{uni.navigateBack()},1000);
-					
 				})
 			},
 			navBack() {

pageA/product/sales_detail.vue

@@ -8,16 +8,16 @@
 			<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">
+					<view style='flex:1.5;color:#878C9C;'>{{goods.sendPrivate}}{{goods.sendCity}}{{goods.sendArea}}{{goods.sendWarehouse}}</view>
+					<view  v-if='goods.salePlanType=="现货"' 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 style='text-align:right;' v-if='goods.salePlanType=="现货"'>采购价格</view>
+				<view style='text-align:right;' v-if='goods.salePlanType=="期货"'>今日基差</view>
 			</view>
 		</view>
 		<view v-if="goods.storeImg" class="carousel-section">
@@ -104,7 +104,7 @@
 						<text>{{goods.packingType}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.packingType == '大袋' || goods.packingType == '小袋'">
 					<text class="tit">袋装备注</text>
 					<view class="con-list">
 						<text>{{goods.baggingNotes}}</text>
@@ -262,8 +262,6 @@
 				},
 				reason:"",
 				price:undefined,
-				
-
 			};
 		},
 		onShow() {
@@ -467,49 +465,51 @@
 				// 	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}`
-				// 	})
-				// }
-				
+				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/business_sale?id=${that.goods.id}&packing=${that.goods.packing}}&province=${that.goods.province}
+						// &city=${that.goods.city}&area=${that.goods.area}&storeName=${that.goods.storeName}&seller=${that.goods.seller}
+						// &companyId=${that.goods.companyId}&sellerPhone=${that.goods.sellerPhone}&minSale=${that.goods.minSale}
+						// &exsitCount=${that.goods.total}&isFutures=${that.goods.isFutures}
+						// &basis=${that.goods.basis}&basisSmall=${that.goods.basisSmall}&basisBig=${that.goods.basisBig}
+						// &unloadingFee=${that.goods.unloadingFee}`
+						url:`/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}&`
+					})
+				}
 			}
 		},
 

pageB/contract/contract.vue

@@ -9,7 +9,6 @@
 					</view>
 					<text class="status">{{item.status}}</text>
 				</view>
-				
 			</view>
 			<view>
 				<view class="c-row ">
@@ -20,7 +19,7 @@
 				</view>
 			</view>
 			<view class="forList flex">
-				<view class="title">{{item.goodsName}}:<text>{{item.goodsName}}</text></view>
+				<view class="title">{{item.goodsName}}:<text>{{item.weight}}</text></view>
 				<view class="title">单价:￥<text>{{item.unitPrice}}</text></view>
 				<view class="title">基差:￥<text>{{item.basis}}</text></view>
 			</view>
@@ -298,7 +297,6 @@
 			// 				} else if (e.currentTarget.dataset.index == 5) {
 			// 					this.carNoImg1 = "";
 			// 				}
-
 			// 			}
 			// 		}
 			// 	})

pageD/identity/driverIdentity.vue

@@ -145,6 +145,7 @@
 				if(this.verification == false){
 					return
 				}
+				console.log(this.verification)
 				this.DriverViewInfo.cardAddressUrl = this.id.toString()
 				var model = JSON.stringify(this.DriverViewInfo);
 				uni.navigateTo({
@@ -161,6 +162,7 @@
 							
 						} else {
 							that.verification = false
+							console.log(that.verification,"1")
 							uni.showToast({
 								title: res.data.message,
 								icon: 'none',
@@ -171,6 +173,7 @@
 					})
 					.catch(res => {
 						that.verification = false
+						console.log(that.verification,"2")
 						uni.showToast({
 							title: res.data.message,
 							icon: 'none',

pageD/myRelease/sellDetails.vue

@@ -158,7 +158,7 @@
 			<view class="c-row">
 				<text class="tit">运费承担方</text>
 				<view class="con-list">
-					{{deptList.freightPayer == null || procurementPlanInfos.freightPayer == "" ? "暂无信息":deptList.freightPayer }}
+					{{deptList.freightPayer == null || deptList.freightPayer == "" ? "暂无信息":deptList.freightPayer }}
 				</view>
 			</view>
 		</view>

pages/business/business.vue

@@ -260,7 +260,7 @@
 						})
 					} else {
 						uni.navigateTo({
-							url: `/pageA/product/detail_buy?id=${id}&compId=${item.compId}`
+							url: `/pageA/product/sales_detail?id=${id}&compId=${item.compId}`
 						})
 					}
 

pages/public/login.vue

@@ -264,8 +264,7 @@
 							clearInterval(interval)
 						}
 					}, 1000)
-				})
-				
+				})	
 			},
 			verifyCodeInput(e){
 				this.verifyCode = e.detail.value