前端gjy

pageA/freightTransport/addpaygoods.vue

@@ -1,12 +1,14 @@
 <template>
 	<view class="container">
 		<view class="information">
-			<u-form :model="userInfo" ref="uForm" class="uForm">
+			<u-form :model="user" ref="uForm" class="uForm">
 				<u-form-item label="收货人姓名" prop="receiveName" label-width="160" required>
-					<u-input v-model="userInfo.receiveName" :disabled="recipientsNumber?true:false" input-align="right" placeholder="请输入收货人姓名" />
+					<u-input v-model="user.receiveName" :disabled="recipientsNumber?true:false" input-align="right"
+						placeholder="请输入收货人姓名" />
 				</u-form-item>
 				<u-form-item label="收货人手机号" prop="receivePhone" label-width="180" required>
-					<u-input v-model="userInfo.receivePhone" :disabled="recipientsNumber?true:false" input-align="right" placeholder="请输入收货人注册易粮易运的手机号" />
+					<u-input v-model="user.receivePhone" :disabled="recipientsNumber?true:false" input-align="right"
+						placeholder="请输入收货人注册易粮易运的手机号" />
 				</u-form-item>
 
 			</u-form>
@@ -14,13 +16,13 @@
 		<button class="submit-btn" @click="submit" v-if="!recipientsNumber">提交</button>
 		<button class="submit-btn btn-bgccolor" v-if="recipientsNumber">人数已达上限</button>
 		<view class="c-row">
-			<view class="">全部收货人（{{dataList.receivingUsers.length}}）</view>
+			<view class="">全部收货人（{{dataList.receivingUsers.length+1}}）</view>
 		</view>
 		<view class="c-row">
-			<view class="title">我的用户昵称</view>
-				<view class="phone">
-					{{dataList.accountNumber}}
-				</view>
+			<view class="title">{{dataList.consignee}}</view>
+			<view class="phone">
+				{{dataList.accountNumber}}
+			</view>
 		</view>
 		<view class="information" v-for="(item,index) in dataList.receivingUsers">
 			<view class="c-row">
@@ -45,7 +47,8 @@
 		name: "trust",
 		data() {
 			return {
-				userInfo: {
+				id:"",
+				user: {
 					compId: "",
 					infoId: "",
 					receiveName: "",
@@ -88,7 +91,7 @@
 
 					]
 				},
-				recipientsNumber:false
+				recipientsNumber: false
 			}
 		},
 		computed: {
@@ -99,8 +102,9 @@
 			this.$refs.uForm.setRules(this.rules);
 		},
 		onLoad(option) {
-			this.userInfo.infoId = option.id;
+			this.user.infoId = option.id;
 			this.getDetail(option.id);
+			this.id = option.id
 
 		},
 		methods: {
@@ -120,7 +124,11 @@
 
 					if (res.data.code == 200) {
 						this.dataList = res.data.data
-						if(this.dataList.length>=20) this.recipientsNumber = true
+						this.dataList.receivingUsers = this.dataList.receivingUsers ? this.dataList
+							.receivingUsers : []
+						if (this.dataList.receivingUsers.length > 20) this.recipientsNumber = true
+
+
 						console.log("this.dataList----------------------")
 						console.log(this.dataList)
 					} else {
@@ -141,14 +149,14 @@
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
 						that.$api.doRequest('post', '/freightReceivingDispatching/api/insertReceivingUser', this
-							.userInfo).then(res => {
+							.user).then(res => {
 							if (res.data.code == 200) {
 								uni.showToast({
 									title: '提交成功',
 									icon: 'none',
 									duration: 2000,
 									success: function() {
-										
+										this.getDetail(that.id);
 									}
 								})
 
@@ -184,7 +192,7 @@
 					confirmText: "删除",
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post','/receivingUser/deleteInfo', {
+							that.$api.doRequest('post', '/receivingUser/deleteInfo', {
 								"id": val.id
 							}).then(res => {
 								if (res.data.code == 200) {
@@ -193,7 +201,7 @@
 										icon: 'none',
 										duration: 2000,
 										success: function() {
-											that.getDetail(that.userInfo.infoId)
+											that.getDetail(that.user.infoId)
 										}
 									})
 
@@ -300,7 +308,8 @@
 		font-weight: 500;
 		color: #FFFFFF;
 	}
-	.btn-bgccolor{
+
+	.btn-bgccolor {
 		background: #D8DAE0;
 	}
 </style>

pageA/freightTransport/addsendgoods.vue

@@ -3,107 +3,39 @@
 		<view class="transaction">
 			<u-form :model="purchaseOrder" ref="uForm" class="uForm">
 				<u-form-item label="业务编号" prop="businessNumber" label-width="140" required>
-					<u-input v-model="purchaseOrder.businessNumber" input-align="right" placeholder="请输入业务编号"/>
+					<u-input v-model="purchaseOrder.businessNumber" input-align="right" placeholder="请输入业务编号" />
 				</u-form-item>
 				<u-form-item label="收货方" prop="consignee" label-width="140" required>
-					<u-input v-model="purchaseOrder.consignee" input-align="right" placeholder="请输入收货方名称"/>
+					<u-input v-model="purchaseOrder.consignee" input-align="right" placeholder="请输入收货方名称" />
 				</u-form-item>
 				<u-form-item label="发货方" prop="shipper" label-width="140" required>
-					<u-input v-model="purchaseOrder.shipper" input-align="right" placeholder="请输入发货方名称"/>
+					<u-input v-model="purchaseOrder.shipper" input-align="right" placeholder="请输入发货方名称" />
 				</u-form-item>
 				<u-form-item label="货名" prop="goodsName" label-width="140" required>
-					<u-input v-model="purchaseOrder.goodsName" input-align="right" placeholder="请输入货名，如玉米"/>
+					<u-input v-model="purchaseOrder.goodsName" input-align="right" placeholder="请输入货名，如玉米" />
 				</u-form-item>
 				<u-form-item label="货物单价（元/吨）" prop="goodsPrice" label-width="250" required>
-					<u-input v-model="purchaseOrder.goodsPrice" input-align="right" placeholder="请输入货物单价"/>
+					<u-input v-model="purchaseOrder.goodsPrice" input-align="right" placeholder="请输入货物单价" />
 				</u-form-item>
 				<u-form-item label="运费单价（元/吨）" prop="freightUnitPrice" label-width="250" required>
-					<u-input v-model="purchaseOrder.freightUnitPrice" input-align="right" placeholder="请输入运费单价"/>
+					<u-input v-model="purchaseOrder.freightUnitPrice" input-align="right" placeholder="请输入运费单价" />
 				</u-form-item>
 				<u-form-item label="运费承担方" prop="freightUnitPrice" label-width="250" required>
-						<!-- <u-select v-model="isFreightUnitPrice" :list="packingType" :default-value="defaultValue" mode="single-column" @confirm="packingChange"></u-select> -->
-						<view class="con-list">
-							<picker @change="packingChange" :value="packingIndex" :range="packingType">
-								<view class="picker">
-									{{packingIndex>-1?packingType[packingIndex]:'请选择'}}
-								</view>
-							</picker>
-						</view>
+					<view class="con-list">
+						<picker @change="packingChange" :value="packingIndex" :range="packingType">
+							<view class="picker">
+								{{packingIndex>-1?packingType[packingIndex]:'请选择'}}
+							</view>
+						</picker>
+					</view>
+				</u-form-item>
+				<u-form-item label="收货地址" prop="receivingAddress" label-width="140" required>
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="请输入收货地址" />
+				</u-form-item>
+				<u-form-item label="收货人账号" prop="accountNumber" label-width="160" required>
+					<u-input v-model="purchaseOrder.accountNumber" input-align="right" placeholder="请输入收货人账号" />
 				</u-form-item>
-			<u-form-item label="收货地址" prop="receivingAddress" label-width="140" required>
-				<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="请输入收货地址"/>
-			</u-form-item>
-			<u-form-item label="收货人账号" prop="accountNumber" label-width="160" required>
-				<u-input v-model="purchaseOrder.accountNumber" input-align="right" placeholder="请输入收货人账号"/>
-			</u-form-item>
 			</u-form>
-			
-			<!-- <view class="c-row b-b margin-top">
-				<view class="title">业务编号</view>
-				<view class="con-list">
-					<input v-model='purchaseOrder.businessNumber' placeholder="请输入业务编号"
-						placeholder-style="font-size: 12px;" name="input"></input>
-				</view>
-			</view> -->
-<!-- 			<view class="c-row b-b">
-				<view class="title">收货方</view>
-				<view class="con-list">
-					<input v-model='purchaseOrder.consignee' placeholder="请输入收货方名称" placeholder-style="font-size: 12px;"
-						name="input"></input>
-				</view>
-			</view> -->
-	<!-- 		<view class="c-row b-b">
-				<view class="title">发货方</view>
-				<view class="con-list">
-					<input v-model='purchaseOrder.shipper' placeholder="请输入发货方名称" placeholder-style="font-size: 12px;"
-						name="input"></input>
-				</view>
-			</view> -->
-			<!-- <view class="c-row b-b">
-				<view class="title">货名</view>
-				<view class="con-list">
-					<input v-model='purchaseOrder.goodsName' placeholder="请输入货名，如玉米"
-						placeholder-style="font-size: 12px;" name="input"></input>
-				</view>
-			</view> -->
-			<!-- <view class="c-row b-b">
-				<view class="title">货物单价（元/吨）</view>
-				<view class="con-list">
-					<input v-model='purchaseOrder.goodsPrice' placeholder="请输入货物单价" placeholder-style="font-size: 12px;"
-						name="input"></input>
-				</view>
-			</view> -->
-			<!-- <view class="c-row b-b">
-				<view class="title">运费单价（元/吨）</view>
-				<view class="con-list">
-					<input v-model='purchaseOrder.freightUnitPrice' placeholder="请输入运费单价"
-						placeholder-style="font-size: 12px;" name="input"></input>
-				</view>
-			</view> -->
-			<!-- <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 class="c-row b-b">
-				<view class="title">收货地址</view>
-				<view class="con-list">
-					<input v-model='purchaseOrder.receivingAddress' placeholder="请输入收货地址"
-						placeholder-style="font-size: 12px;" name="input"></input>
-				</view>
-			</view>
-			<view class="c-row">
-				<view class="title">收货人账号</view>
-				<view class="con-list">
-					<input v-model='purchaseOrder.accountNumber' placeholder="请输入收货人账号"
-						placeholder-style="font-size: 12px;" name="input"></input>
-				</view>
-			</view> -->
 		</view>
 		<view class="account-tip">
 			注：收货人账号为收货人注册易粮易运的手机号码
@@ -117,100 +49,160 @@
 </template>
 
 <script>
+	// import fullPopup from '@/components/common/fullPopup'
 	export default {
 		name: "business",
+		  components: {
+		    // fullPopup
+		  },
 		data() {
 			return {
 				purchaseOrder: {
 					freightPayer: "发货方承担"
 				},
-				packingType: ["发货方承担","收货方承担"],
-				isFreightUnitPrice:true,
-				packingIndex:0,
-				phone:""
+				packingType: ["发货方承担", "收货方承担"],
+				isFreightUnitPrice: true,
+				packingIndex: 0,
+				phone: "",
+				rules: {
+					businessNumber: [{
+						validator: (rule, value, callback) => {
+							return !this.$u.test.isEmpty(value)
+						},
+						message: '业务编号不能为空',
+						trigger: ['change', 'blur']
+					}, ],
+					consignee: [{
+						validator: (rule, value, callback) => {
+							return !this.$u.test.isEmpty(value)
+						},
+						message: '收货方不能为空',
+						trigger: ['change', 'blur']
+					}],
+					shipper: [{
+						validator: (rule, value, callback) => {
+							return !this.$u.test.isEmpty(value)
+						},
+						message: '发货方不能为空',
+						trigger: ['change', 'blur']
+					}],
+
+					goodsName: [{
+						validator: (rule, value, callback) => {
+							return !this.$u.test.isEmpty(value)
+						},
+						message: '货名不能为空',
+						trigger: ['change', 'blur']
+					}],
+					goodsPrice: [{
+							validator: (rule, value, callback) => {
+								return !this.$u.test.isEmpty(value)
+							},
+							message: '货物单价不能为空',
+							trigger: ['change', 'blur']
+						},
+						{
+							validator: (rule, value, callback) => {
+								return this.$u.test.amount(value)
+							},
+							message: '数值类型，最多保留两位小数',
+							trigger: ['change', 'blur'],
+						}
+					],
+					freightUnitPrice: [{
+							validator: (rule, value, callback) => {
+								return !this.$u.test.isEmpty(value)
+							},
+							message: '运费单价不能为空',
+							trigger: ['change', 'blur']
+						},
+						{
+							validator: (rule, value, callback) => {
+								return this.$u.test.amount(value)
+							},
+							message: '数值类型，最多保留两位小数',
+							trigger: ['change', 'blur'],
+						}
+					],
+					receivingAddress: [{
+						validator: (rule, value, callback) => {
+							return !this.$u.test.isEmpty(value)
+						},
+						message: '收获地址不能为空',
+						trigger: ['change', 'blur']
+					}],
+					accountNumber: [{
+							validator: (rule, value, callback) => {
+								return !this.$u.test.isEmpty(value)
+							},
+							message: '手机号码不能为空',
+							trigger: ['change', 'blur']
+						},
+						{
+							validator: (rule, value, callback) => {
+								return this.$u.test.mobile(value);
+							},
+							message: '手机号格式不正确',
+							trigger: ['change', 'blur']
+						}
+					]
+				}
 			}
 		},
-		onShow() {
-
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
 		},
 		onLoad(options) {
 			this.phone = options.phone
 		},
-		onPageScroll(e) {
-
-		},
-		//下拉刷新
-		onPullDownRefresh() {},
-		onReachBottom() { //上拉触底函数
-		},
 		methods: {
 			packingChange(event) {
 				console.log(event)
 				this.packingIndex = event.detail.value;
 			},
 			commit() {
-				this.purchaseOrder.accountNumber= this.phone
-				this.$api.doRequest('post', '/freightReceivingDispatching/api/insertFreightReceivingDispatching',this.purchaseOrder).then(res => {
-					// if(res.data.code=='200'){
-					// 	uni.showModal({
-					// 		title: '提示',
-					// 		content: '该手机号已认证过司机，再次认证将覆盖之前的认证信息，是否确定认证？',
-					// 		success: function (res) {
-					// 			if (res.confirm) {
-					// 				that.DriverViewInfo.cover=1
-					// 					that.$api.doRequest('post', '/driverViewInfo/api/editInfo', that.DriverViewInfo).then(res => {
-					// 					}).catch(res => {
-					// 						uni.showToast({
-					// 							title: '提交成功',
-					// 							icon: 'none',
-					// 							duration: 2000
-					// 						})
-					// 						uni.navigateTo({
-					// 							url: `/pages/attestation/indexThree` 
-					// 						})
-					// 					})
-					// 		        } else if (res.cancel) {
-					// 		          uni.showToast({
-					// 		          	title: '提交失败',
-					// 		          	icon: 'none',
-					// 		          	duration: 2000
-					// 		          })
-					// 		        }
-					// 		    }
-					// 		});
-					
-					
-					// }else if(res.data.code==200){
-					// 	uni.showToast({
-					// 		title: '提交成功',
-					// 		icon: 'none',
-					// 		duration: 2000
-					// 	})
-					// 	uni.navigateTo({
-					// 		url: `/pages/attestation/indexThree` 
-					// 	})
-					// }
-					if(res.data.code==200){
-							uni.showToast({
-								title: '提交成功',
-								icon: 'none',
-								duration: 2000,
-								success:function(){
-									uni.navigateTo({
-											url: `/pageA/freightTransport/index` 
+				this.purchaseOrder.shipperPhone = this.phone
+				this.$refs.uForm.validate(valid => {
+					if (valid) {
+						uni.showLoading({
+							title: '正在加载',
+							mask: true
+						})
+						console.log('验证通过');
+						this.$api.doRequest('post',
+							'/freightReceivingDispatching/api/insertFreightReceivingDispatching',
+							this
+							.purchaseOrder).then(res => {
+							if (res.data.code == 200) {
+								uni.showToast({
+									title: '提交成功',
+									icon: 'none',
+									duration: 2000,
+									success: function() {
+										uni.navigateTo({
+											url: `/pageA/freightTransport/index`
 										})
-								}
-							})
-					
+									}
+								})
+
+							}
+
+						}).catch(res => {
+							// uni.showToast({
+							// 	title: res.data.message,
+							// 	icon: 'none',
+							// 	duration: 2000
+							// })
+						})
+					} else {
+						console.log('验证失败');
 					}
-					
-				}).catch(res => {
-						// uni.showToast({
-						// 	title: res.data.message,
-						// 	icon: 'none',
-						// 	duration: 2000
-						// })
-				})
+				});
+
+
+
+
+
 			}
 		}
 	}
@@ -221,9 +213,11 @@
 	.content {
 		background: #F5F6FA;
 	}
-	.center{
+
+	.center {
 		overflow-y: hidden;
 	}
+
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -657,12 +651,14 @@
 	.btn:after {
 		border: none;
 	}
-	.account-tip{
+
+	.account-tip {
 		font-size: 24rpx;
 		font-weight: 400;
 		color: #AFB3BF;
 		padding-left: 60rpx;
 	}
+
 	.uForm {
 		padding: 0 40rpx;
 	}

pageA/freightTransport/confirmpaygoods.vue

@@ -86,6 +86,14 @@
 							message: '数值类型，1-100之间',
 							trigger: ['change', 'blur'],
 						},
+						// {
+						// 	validator: (rule, value, callback) => {
+						// 		if(parseInt(value)>this.goods.reciveNetWeight) return false
+						// 		return true
+						// 	},
+						// 	message: '收货毛重不能大于发货净重',
+						// 	trigger: ['change', 'blur'],
+						// },
 
 					],
 					reciveTare: [{
@@ -108,9 +116,8 @@
 							},
 							message: '数值类型，1-50之间',
 							trigger: ['change', 'blur'],
-						},
-
-					],
+						}
+					]
 				},
 				id: "",
 				params: {
@@ -134,14 +141,7 @@
 				show: false,
 				goodsName: '',
 				verifyCode: '',
-				sendText0: '获取验证码',
-				sendText1: '获取验证码',
-				sendText2: '获取验证码',
-				sendText3: '获取验证码',
-				sendDisabled0: false,
-				sendDisabled1: false,
-				sendDisabled2: false,
-				sendDisabled3: false,
+			
 				buyer: '',
 				buyerPhone: '',
 				level: '',
@@ -193,11 +193,10 @@
 		onReady() {
 			this.$refs.uForm.setRules(this.rules);
 		},
-		onLoad(option) {
-			this.goods = JSON.parse(option.toINfo)
-			this.id = options.id
-			this.goods.reciveCollectionScreenshot = this.goods.reciveCollectionScreenshot == null ? '' : this.goods
-				.reciveCollectionScreenshot
+		onLoad(options) {
+			this.goods = JSON.parse(options.toINfo)
+			this.id = options.id;
+			this.goods.reciveCollectionScreenshot = this.goods.reciveCollectionScreenshot == null ? '':this.goods.reciveCollectionScreenshot
 		},
 		methods: {
 			DateChange(e) {
@@ -262,6 +261,9 @@
 					content: '确定提交收货信息？',
 					success: function(res) {
 						if (res.confirm) {
+							that.goods.reciveGrossWeight = parseInt(that.goods.reciveGrossWeight)
+							that.goods.reciveTare = parseInt(that.goods.reciveTare)
+							
 							that.$api.doRequest('post',
 									'/freightReceivingDispatching/api/confirmFreightReceivingDispatchingCar',
 									that.goods).then(
@@ -273,10 +275,9 @@
 												success: function(res) {
 													if (res.confirm) {
 														that.$store.commit(
-															'configfreightTransport', true)
+															'configfreightTransport', false)
 														uni.navigateTo({
-															url: `/pageA/freightTransport/record/payrecord?id=` +
-																this.id
+															url: `/pageA/freightTransport/record/payrecord?id=` +that.id
 														})
 														// var result = that.goods.tranCarNo.substr(
 														// 	that.goods.tranCarNo.indexOf("C") +

pageA/freightTransport/contract_detail.vue

@@ -251,14 +251,7 @@
 																tranCarNo: ''
 															}
 														} else if (res.cancel) {
-
-															// uni.navigateBack({
-															// 	delta: 1,
-															// 	success: function() {
-															// 		beforePage.$vm.init(); 
-															// 	}
-															// });
-														}
+													}
 													}
 												});
 											} else if (res.data.code == 11015) {
@@ -291,7 +284,9 @@
 							});
 
 						} else if (res.cancel) {
-
+						uni.navigateTo({
+							url: '/pageA/freightTransport/record/sendrecord?id=' + that.goods.batch
+						})
 						}
 					}
 				});

pageA/freightTransport/index.vue

@@ -14,11 +14,11 @@
 			</view>
 			<view class="" v-if="!isShowNoData">
 				<view v-for="(item,index) in listData" :key="index">
-					<view @click='sendreceiverecord(item)' class="guess-section">
+					<view @click.stop='sendreceiverecord(item)' class="guess-section">
 						<view class="list-item">
 							<view class="list-item-left">
-								<view class='type send' v-if="item.status=='发货'">发</view>
-								<view class='type put' v-if="item.status=='收货'">收</view>
+								<view class='type send' v-if="item.shipperPhone==userInfo.phone">发</view>
+								<view class='type put' v-if="item.shipperPhone!=userInfo.phone">收</view>
 								<view class="number">
 									<view class='businessnumber'>{{item.businessNumber}}</view>
 									<view class='consigner'>{{item.consignee}}</view>
@@ -35,7 +35,7 @@
 							<text>待结算：{{item.toSettled}}</text>
 						</view>
 						<view style='width:100%;' class='flex justify-end'>
-							<view class='del' @click="delRow(item)">删除</view>
+							<view class='del' @click.stop="delRow(item)">删除</view>
 						</view>
 					</view>
 				</view>
@@ -85,7 +85,6 @@
 			this.scrollTop = e.scrollTop;
 		},
 		onReachBottom() { //上拉触底函数
-		debugger
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
 				this.isLoadMore = true
 				this.currentPage += 1
@@ -93,11 +92,10 @@
 			}
 		},
 		onPullDownRefresh() {
-			debugger
 			this.currentPage = 1
 			this.isLoadMore = false
 			this.loadStatus = 'loading'
-			this.listData=[]
+			this.listData = []
 			this.getListData(this.status)
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
@@ -114,7 +112,7 @@
 			},
 			sendreceiverecord(item) {
 
-				if (item.status == '发货') {
+				if (item.shipperPhone == this.userInfo.phone) {
 					uni.navigateTo({
 						url: '/pageA/freightTransport/record/sendrecord?id=' + item.id
 					})
@@ -161,7 +159,13 @@
 									.signedFor
 							}
 							console.log(that.listData)
-							that.isLoadMore = false
+							// if(that.listData.length==0){
+							// 	that.isShowNoData = true
+							// }else{
+							// 	that.isShowNoData = false
+							// }
+							that.isLoadMore = true
+							that.loadStatus = 'nomore'
 						} else {
 							if (that.currentPage > 1) {
 								that.currentPage = 1
@@ -188,7 +192,9 @@
 					})
 			},
 			tabcarchange(val) {
+				this.currentPage = 1
 				this.searchKeyWord = ""
+				this.listData = []
 				console.log(val)
 				this.status = val
 				this.getListData(val)
@@ -201,26 +207,40 @@
 			},
 			//删除
 			delRow(val) {
-				this.$api.doRequest('post', 'freightReceivingDispatching/api/deleteFreightReceivingDispatching', {
-					"id": val.id
-				}).then(res => {
-					if (res.data.code == 200) {
-						// this.listData = res.data.data.records;
-						uni.showToast({
-							title: "删除成功！",
-							icon: 'none',
-							duration: 2000
-						})
-						this.getListData(0)
+				uni.showModal({
+					content: '货运信息（业务编号'+val.businessNumber+'）删除后不可恢复，是否确定删除？',
+					cancelText: "返回",
+					confirmText: "删除",
+					confirmColor:"#22C572",
+					success: function(res) {
+						if (res.confirm) {
+							this.$api.doRequest('post',
+								'freightReceivingDispatching/api/deleteFreightReceivingDispatching', {
+									"id": val.id
+								}).then(res => {
+								if (res.data.code == 200) {
+									// this.listData = res.data.data.records;
+									uni.showToast({
+										title: "删除成功！",
+										icon: 'none',
+										duration: 2000
+									})
+									this.getListData(0)
+								}
+
+							}).catch(res => {
+								// uni.showToast({
+								// 	title: res.data.message,
+								// 	icon: 'none',
+								// 	duration: 2000
+								// })
+							})
+						} else if (res.cancel) {
+
+						}
 					}
+				});
 
-				}).catch(res => {
-					// uni.showToast({
-					// 	title: res.data.message,
-					// 	icon: 'none',
-					// 	duration: 2000
-					// })
-				})
 			}
 
 		}
@@ -231,6 +251,7 @@
 	page,
 	.content {
 		background: #F5F6FA;
+		padding-bottom: 50px;
 	}
 
 	.line {

pageA/freightTransport/record/payrecord.vue

@@ -206,10 +206,10 @@
 						</view>
 					</u-modal>
 				</view>
-				<view style='flex:1;' class='deductfreight' @click="deductPayment()" v-if="!payfreightCli">扣货款</view>
+				<view style='flex:1;' class='deductfreight' @click="deductPayment()" v-if="item.status=='待结算'">扣货款</view>
 				<view class="freightAlert-model">
 					<u-modal v-model="deductPaymentAlert" cancel-color="#AFB3BF" confirm-color="#22C572"
-						:show-title="false" show-cancel-button=true @confirm="confirmeductPayment(item)">
+						:show-title="false" show-cancel-button=true @confirm="confirmeductPayment(item,0)">
 						<view class="freightAlert-warp payAlert">
 							<view class="freightAlert-row">
 								<view class="title">扣货款</view>
@@ -231,10 +231,10 @@
 						</view>
 					</u-modal>
 				</view>
-				<view style='flex:1;' class='payfreight' @click="Payment()" v-if="!payfreightCli">付货款</view>
+				<view style='flex:1;' class='payfreight' @click="Payment()"  v-if="item.status=='待结算'">付货款</view>
 				<view class="freightAlert-model">
 					<u-modal v-model="paymentAlert" cancel-color="#AFB3BF" confirm-color="#22C572" :show-title="false"
-						show-cancel-button=true @confirm="confirmPayPayment(item)">
+						show-cancel-button=true @confirm="confirmeductPayment(item,1)">
 						<view class="freightAlert-warp payAlert">
 							<view class="freightAlert-row">
 								<view class="title">付货款</view>
@@ -286,7 +286,7 @@
 					</u-modal>
 				</view>
 
-				<view @click='confirmpaygoods(item)' style='flex:2;' class='payfreight' v-if="payfreightCli">确认收货</view>
+				<view @click='confirmpaygoods(item)' style='flex:2;' class='payfreight' v-if="item.status!='待结算'">确认收货</view>
 			</view>
 
 		</view>
@@ -330,7 +330,7 @@
 				isShowPayTip: false,
 				isShowPaymenMoneyTip: false,
 				id: "",
-				payfreightCli: false
+				payfreightCli: true
 			}
 		},
 		onShow() {
@@ -351,11 +351,10 @@
 		methods: {
 			confirmpaygoods(item) {
 				uni.navigateTo({
-					url: '/pageA/freightTransport/confirmpaygoods?toINfo=' + JSON.stringify(item)
+					url: '/pageA/freightTransport/confirmpaygoods?toINfo=' + JSON.stringify(item)+'&id='+this.id
 				})
 			},
 			commit() {
-				console.log(1111)
 				uni.navigateTo({
 					url: '/pageA/freightTransport/addpaygoods?id=' + this.id
 				})
@@ -441,10 +440,6 @@
 				console.log("付货款")
 				this.paymentAlert = true
 			},
-			confirmPayPayment() {
-				console.log("付货款提交")
-			},
-
 			//判断输入值
 			checkVal(e, state, item) {
 				console.log(e)
@@ -478,28 +473,47 @@
 			closeModel() {
 				this.freightAlert = false;
 				this.payAlert = false;
-				this.ductPaymentAlert = false;
+				this.deductPaymentAlert = false;
 				this.paymentAlert = false;
 			},
-			confirmeductPayment(val) {
+			confirmPayPayment() {
+				console.log("付货款提交")
+			},
+			confirmeductPayment(val,type) {
 				console.log(val)
-				val.goodsDeductionAmount = parseInt(this.ductPayment);
-				this.$api.doRequest('post', 'freightReceivingDispatching/api/PaymentDeduction', val).then(
+				let _title = ''
+				let _title1 = ''
+				if(type==0){
+					_title = "扣款成功！"
+					_title1 = "扣款失败！"
+				}else{
+					_title = "付款成功！"
+					_title1 = "扣款失败！"
+				}
+				
+				let that = this;
+				val.goodsDeductionAmount = parseInt(that.ductPayment);
+				val.money = 0
+				val.goodsEdPayable = parseInt(that.paymenMoney);
+				that.$api.doRequest('post', 'freightReceivingDispatching/api/PaymentDeduction', val).then(
 					res => {
 						if (res.data.code == 200) {
 							uni.showToast({
-								title: "扣款成功！",
+								title:_title,
 								icon: 'none',
-								duration: 2000
+								duration: 2000,
+								success() {
+									getDetail(that.id, that)
+								}
 							})
-							location.reload()
 						} else {
 							uni.showToast({
-								title: "扣款失败！",
+								title:_title1,
 								icon: 'none',
 								duration: 2000
 							})
-							this.ductPayment = 0
+							that.ductPayment = 0
+							that.goodsEdPayable = 0
 						}
 
 					}).catch(res => {

pageA/freightTransport/record/sendrecord.vue

@@ -197,7 +197,7 @@
 								付款金额
 							</view>
 							<view class="freightAlert-row4">
-								<u-input v-model="item.money" :type="type" :border="border" placeholder="请输入扣款金额"
+								<u-input v-model="item.money" :type="type" :border="border" placeholder="请输入本次支付运费金额"
 									class="uview-border" @input="payInputWatch($event,item)" />
 								<view class="text">
 									元
@@ -388,7 +388,7 @@
 		position: relative;
 
 		.title {
-			color: #9698A2;
+			/* color: #9698A2; */
 		}
 
 		.title-black {

pageA/product/business_buy.vue

@@ -217,6 +217,8 @@
 				packingMoney: 0,
 				packing: '散装',
 				packingFee: null,
+				invoiceFeeCompany:0,
+				invoiceFeePerson:0
 				// choice : false,
 			};
 		},
@@ -238,6 +240,8 @@
 			this.purchaseOrder.procurementPlanType = options.procurementPlanType
 			this.purchaseOrder.procurementPlan = options.procurementPlan
 			this.purchaseOrder.compId = options.compId
+			this.invoiceFeeCompany = options.invoiceFeeCompany
+			this.invoiceFeePerson = options.invoiceFeePerson
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
@@ -257,12 +261,12 @@
 					if (res.data.code == 200) {
 						this.goods = res.data.data
 						if (this.goods.customerTypeFlag == 1) {
-							this.purchaseOrder.invoiceFee = -20
-							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) - Number(this
+							this.purchaseOrder.invoiceFee = this.invoiceFeePerson
+							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) + Number(this
 								.purchaseOrder.invoiceFee)
 						} else {
-							this.purchaseOrder.invoiceFee = 0
-							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) - Number(this
+							this.purchaseOrder.invoiceFee = this.invoiceFeeCompany
+							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) + Number(this
 								.purchaseOrder.invoiceFee)
 						}
 					}

pageA/product/business_sale.vue

@@ -207,7 +207,9 @@
 					invoiceMoney:0,
 					unloadingFee:0,
 					packingMoney:0,
-					packing:'散装'
+					packing:'散装',
+					invoiceFeeCompany:0,
+					invoiceFeePerson:0
 				};
 			},
 			onLoad(options) {
@@ -230,6 +232,8 @@
 				// this.purchaseOrder.baggingNotes=options.baggingNotes
 				this.purchaseOrder.sendWarehouse = options.sendWarehouse
 				this.purchaseOrder.compId=options.compId
+				this.invoiceFeeCompany = options.invoiceFeeCompany
+				this.invoiceFeePerson = options.invoiceFeePerson
 			},
 			computed: {
 				...mapState(['hasLogin','userInfo']),
@@ -246,10 +250,10 @@
 					if(res.data.code==200){
 						this.goods=res.data.data
 						if(this.goods.customerTypeFlag==1){
-							// this.purchaseOrder.invoiceFee=-20
+							this.purchaseOrder.invoiceFee = this.invoiceFeePerson
 							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.invoiceFee)
 						}else{
-							// this.purchaseOrder.invoiceFee=0
+							this.purchaseOrder.invoiceFee = this.invoiceFeeCompany
 							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.invoiceFee)
 						}
 					}

pageA/product/detail.vue

@@ -410,7 +410,8 @@
 								url: `/pageA/product/business_buy?id=${this.goods.id}&receiveArea=${this.goods.receiveArea}&minimumVolume=${this.goods.minimumVolume}
 										&goodsName=${this.goods.goodsName}&receiveCity=${this.goods.receiveCity}&receivePrivate=${this.goods.receivePrivate}&buyer=${this.goods.buyer}
 										&basisPrice=${this.goods.basisPrice}&procurementPrice=${this.goods.procurementPrice}&receiveWarehouse=${this.goods.receiveWarehouse}
-										&procurementPlanType=${this.goods.procurementPlanType}&procurementPlan=${this.goods.procurementPlanNo}&compId=${this.goods.compId}`
+										&procurementPlanType=${this.goods.procurementPlanType}&procurementPlan=${this.goods.procurementPlanNo}&compId=${this.goods.compId}
+										&invoiceFeeCompany=${this.goods.invoiceFeeCompany}&invoiceFeePerson=${this.goods.invoiceFeePerson}`
 							// 	url: `/pageA/product/business_buy?id=${this.goods.id}&packing=${this.goods.packing}}&province=${this.goods.province}
 							// 	&city=${this.goods.city}&area=${this.goods.area}&storeName=${this.goods.storeName}&seller=${this.goods.seller}
 							// 	&companyId=${this.goods.companyId}&sellerPhone=${this.goods.sellerPhone}&minSale=${this.goods.minSale}

pageA/product/sales_detail.vue

@@ -401,7 +401,8 @@
 								url: `/pageA/product/business_sale?id=${this.goods.id}&sendArea=${this.goods.sendArea}&minimumVolume=${this.goods.minimumVolume}
 										&goodsName=${this.goods.goodsName}&sendCity=${this.goods.sendCity}&sendPrivate=${this.goods.sendPrivate}&seller=${this.goods.seller}
 										&basisPrice=${this.goods.basisPrice}&salePrice=${this.goods.salePrice}&sendWarehouse=${this.goods.sendWarehouse}
-										&salePlanType=${this.goods.salePlanType}&salePlan=${this.goods.salePlanNo}&baggingNotes=${this.goods.baggingNotes}&compId=${this.goods.compId}`
+										&salePlanType=${this.goods.salePlanType}&salePlan=${this.goods.salePlanNo}&baggingNotes=${this.goods.baggingNotes}&compId=${this.goods.compId}
+										&invoiceFeeCompany=${this.goods.invoiceFeeCompany}&invoiceFeePerson=${this.goods.invoiceFeePerson}`
 							// 	url: `/pageA/product/business_buy?id=${this.goods.id}&packing=${this.goods.packing}}&province=${this.goods.province}
 							// 	&city=${this.goods.city}&area=${this.goods.area}&storeName=${this.goods.storeName}&seller=${this.goods.seller}
 							// 	&companyId=${this.goods.companyId}&sellerPhone=${this.goods.sellerPhone}&minSale=${this.goods.minSale}

pageB/news/news_detail.vue

@@ -26,6 +26,9 @@
 	 		uni.hideLoading()
 	 	}).then(res => {
 	 		that.content = res.data.content
+			uni.setNavigationBarTitle({
+				title:res.data.title
+			})
 	 		uni.hideLoading()
 	 	})
 	 },

pageD/myRelease/buyEdit.vue

@@ -525,7 +525,7 @@
 					return
 				}
 				if(this.checked == false){
-				if (this.deptList.waterContent&&this.deptList.waterContent<1||
+				if (this.deptList.waterContent&&this.deptList.waterContent<0||
 				this.deptList.waterContent&&this.deptList.waterContent>40) {
 					this.$api.msg('水分输入错误')
 					return
@@ -536,12 +536,12 @@
 						return
 					}
 				}
-				if (this.deptList.bulkDensity&&this.deptList.bulkDensity<500||
+				if (this.deptList.bulkDensity&&this.deptList.bulkDensity<0||
 				this.deptList.bulkDensity&&this.deptList.bulkDensity>1000) {
 					this.$api.msg('容重输入错误')
 					return
 				}
-				if (this.deptList.jiaorenli&&this.deptList.jiaorenli<1||
+				if (this.deptList.jiaorenli&&this.deptList.jiaorenli<0||
 				this.deptList.jiaorenli&&this.deptList.jiaorenli>40) {
 					this.$api.msg('热损伤输入错误')
 					return
@@ -552,7 +552,7 @@
 						return
 					}
 				}
-				if (this.deptList.impurity&&this.deptList.impurity<1||
+				if (this.deptList.impurity&&this.deptList.impurity<0||
 				this.deptList.impurity&&this.deptList.impurity>40) {
 					this.$api.msg('杂质输入错误')
 					return
@@ -563,7 +563,7 @@
 						return
 					}
 				}
-				if (this.deptList.mildewGrain&&this.deptList.mildewGrain<1||
+				if (this.deptList.mildewGrain&&this.deptList.mildewGrain<0||
 				this.deptList.mildewGrain&&this.deptList.mildewGrain>40) {
 					this.$api.msg('霉变粒输入错误')
 					return
@@ -574,7 +574,7 @@
 						return
 					}
 				}
-				if (this.deptList.imperfectGrain&&this.deptList.imperfectGrain<1||
+				if (this.deptList.imperfectGrain&&this.deptList.imperfectGrain<0||
 				this.deptList.imperfectGrain&&this.deptList.imperfectGrain>40) {
 					this.$api.msg('不完整粒输入错误')
 					return
@@ -585,7 +585,7 @@
 						return
 					}
 				}
-				if (this.deptList.protein && this.deptList.protein < 1 ||
+				if (this.deptList.protein && this.deptList.protein < 0 ||
 				this.deptList.protein && this.deptList.protein > 80) {
 					this.$api.msg('蛋白输入错误')
 					return

pageD/myRelease/buyGrain.vue

@@ -497,7 +497,7 @@
 					return
 				}
 				if (this.checked == false) {
-					if (this.deptList.waterContent && this.deptList.waterContent < 1 ||
+					if (this.deptList.waterContent && this.deptList.waterContent < 0 ||
 						this.deptList.waterContent && this.deptList.waterContent > 40) {
 						this.$api.msg('水分输入错误')
 						return
@@ -508,12 +508,12 @@
 							return
 						}
 					}
-					if (this.deptList.bulkDensity && this.deptList.bulkDensity < 500 ||
+					if (this.deptList.bulkDensity && this.deptList.bulkDensity < 0 ||
 						this.deptList.bulkDensity && this.deptList.bulkDensity > 1000) {
 						this.$api.msg('容重输入错误')
 						return
 					}
-					if (this.deptList.jiaorenli && this.deptList.jiaorenli < 1 ||
+					if (this.deptList.jiaorenli && this.deptList.jiaorenli < 0 ||
 						this.deptList.jiaorenli && this.deptList.jiaorenli > 40) {
 						this.$api.msg('热损伤输入错误')
 						return
@@ -524,7 +524,7 @@
 							return
 						}
 					}
-					if (this.deptList.impurity && this.deptList.impurity < 1 ||
+					if (this.deptList.impurity && this.deptList.impurity < 0 ||
 						this.deptList.impurity && this.deptList.impurity > 40) {
 						this.$api.msg('杂质输入错误')
 						return
@@ -535,7 +535,7 @@
 							return
 						}
 					}
-					if (this.deptList.mildewGrain && this.deptList.mildewGrain < 1 ||
+					if (this.deptList.mildewGrain && this.deptList.mildewGrain < 0 ||
 						this.deptList.mildewGrain && this.deptList.mildewGrain > 40) {
 						this.$api.msg('霉变粒输入错误')
 						return
@@ -546,7 +546,7 @@
 							return
 						}
 					}
-					if (this.deptList.imperfectGrain && this.deptList.imperfectGrain < 1 ||
+					if (this.deptList.imperfectGrain && this.deptList.imperfectGrain < 0 ||
 						this.deptList.imperfectGrain && this.deptList.imperfectGrain > 40) {
 						this.$api.msg('不完整粒输入错误')
 						return
@@ -557,7 +557,7 @@
 							return
 						}
 					}
-					if (this.deptList.protein && this.deptList.protein < 1 ||
+					if (this.deptList.protein && this.deptList.protein < 0 ||
 						this.deptList.protein && this.deptList.protein > 80) {
 						this.$api.msg('蛋白输入错误')
 						return

pageD/myRelease/sellEdit.vue

@@ -523,7 +523,7 @@
 				}
 
 				if (this.checked == false) {
-					if (this.deptList.waterContent && this.deptList.waterContent < 1 ||
+					if (this.deptList.waterContent && this.deptList.waterContent < 0 ||
 						this.deptList.waterContent && this.deptList.waterContent > 40) {
 						this.$api.msg('水分输入错误')
 						return
@@ -534,12 +534,12 @@
 							return
 						}
 					}
-					if (this.deptList.bulkDensity && this.deptList.bulkDensity < 500 ||
+					if (this.deptList.bulkDensity && this.deptList.bulkDensity < 0 ||
 						this.deptList.bulkDensity && this.deptList.bulkDensity > 1000) {
 						this.$api.msg('容重输入错误')
 						return
 					}
-					if (this.deptList.jiaorenli && this.deptList.jiaorenli < 1 ||
+					if (this.deptList.jiaorenli && this.deptList.jiaorenli < 0 ||
 						this.deptList.jiaorenli && this.deptList.jiaorenli > 40) {
 						this.$api.msg('热损伤输入错误')
 						return
@@ -550,7 +550,7 @@
 							return
 						}
 					}
-					if (this.deptList.impurity && this.deptList.impurity < 1 ||
+					if (this.deptList.impurity && this.deptList.impurity < 0 ||
 						this.deptList.impurity && this.deptList.impurity > 40) {
 						this.$api.msg('杂质输入错误')
 						return
@@ -561,7 +561,7 @@
 							return
 						}
 					}
-					if (this.deptList.mildewGrain && this.deptList.mildewGrain < 1 ||
+					if (this.deptList.mildewGrain && this.deptList.mildewGrain < 0 ||
 						this.deptList.mildewGrain && this.deptList.mildewGrain > 40) {
 						this.$api.msg('霉变粒输入错误')
 						return
@@ -572,7 +572,7 @@
 							return
 						}
 					}
-					if (this.deptList.imperfectGrain && this.deptList.imperfectGrain < 1 ||
+					if (this.deptList.imperfectGrain && this.deptList.imperfectGrain < 0 ||
 						this.deptList.imperfectGrain && this.deptList.imperfectGrain > 40) {
 						this.$api.msg('不完整粒输入错误')
 						return
@@ -583,7 +583,7 @@
 							return
 						}
 					}
-					if (this.deptList.protein && this.deptList.protein < 1 ||
+					if (this.deptList.protein && this.deptList.protein < 0 ||
 						this.deptList.protein && this.deptList.protein > 80) {
 						this.$api.msg('蛋白输入错误')
 						return

pageD/myRelease/sellGrain.vue

@@ -534,7 +534,7 @@
 					return
 				}
 				if (this.checked == false) {
-					if (this.deptList.waterContent && this.deptList.waterContent < 1 ||
+					if (this.deptList.waterContent && this.deptList.waterContent < 0 ||
 						this.deptList.waterContent && this.deptList.waterContent > 40) {
 						this.$api.msg('水分输入错误')
 						return
@@ -545,12 +545,12 @@
 							return
 						}
 					}
-					if (this.deptList.bulkDensity && this.deptList.bulkDensity < 500 ||
+					if (this.deptList.bulkDensity && this.deptList.bulkDensity < 0 ||
 						this.deptList.bulkDensity && this.deptList.bulkDensity > 1000) {
 						this.$api.msg('容重输入错误')
 						return
 					}
-					if (this.deptList.jiaorenli && this.deptList.jiaorenli < 1 ||
+					if (this.deptList.jiaorenli && this.deptList.jiaorenli < 0 ||
 						this.deptList.jiaorenli && this.deptList.jiaorenli > 40) {
 						this.$api.msg('热损伤输入错误')
 						return
@@ -561,7 +561,7 @@
 							return
 						}
 					}
-					if (this.deptList.impurity && this.deptList.impurity < 1 ||
+					if (this.deptList.impurity && this.deptList.impurity < 0 ||
 						this.deptList.impurity && this.deptList.impurity > 40) {
 						this.$api.msg('杂质输入错误')
 						return
@@ -572,7 +572,7 @@
 							return
 						}
 					}
-					if (this.deptList.mildewGrain && this.deptList.mildewGrain < 1 ||
+					if (this.deptList.mildewGrain && this.deptList.mildewGrain < 0 ||
 						this.deptList.mildewGrain && this.deptList.mildewGrain > 40) {
 						this.$api.msg('霉变粒输入错误')
 						return
@@ -583,7 +583,7 @@
 							return
 						}
 					}
-					if (this.deptList.imperfectGrain && this.deptList.imperfectGrain < 1 ||
+					if (this.deptList.imperfectGrain && this.deptList.imperfectGrain < 0 ||
 						this.deptList.imperfectGrain && this.deptList.imperfectGrain > 40) {
 						this.$api.msg('不完整粒输入错误')
 						return
@@ -594,7 +594,7 @@
 							return
 						}
 					}
-					if (this.deptList.protein && this.deptList.protein < 1 ||
+					if (this.deptList.protein && this.deptList.protein < 0 ||
 						this.deptList.protein && this.deptList.protein > 80) {
 						this.$api.msg('蛋白输入错误')
 						return

pageD/warehousings/ex_warehouse.vue

@@ -490,7 +490,7 @@
 					this.$api.msg('质检员姓名输入错误')
 					return
 				}
-				if (this.list.protein && this.list.protein < 1 || this.list.protein && this.list.protein > 80) {
+				if (this.list.protein && this.list.protein < 0 || this.list.protein && this.list.protein > 80) {
 					this.$api.msg('蛋白占比输入错误')
 					return
 				}
@@ -500,7 +500,7 @@
 						return
 					}
 				}
-				if (this.list.waterContent && this.list.waterContent < 1 || this.list.waterContent && this.list
+				if (this.list.waterContent && this.list.waterContent < 0 || this.list.waterContent && this.list
 					.waterContent > 40) {
 					this.$api.msg('水分输入错误')
 					return
@@ -511,7 +511,7 @@
 						return
 					}
 				}
-				if (this.list.bulkDensity && this.list.bulkDensity < 500 || this.list.bulkDensity && this.list
+				if (this.list.bulkDensity && this.list.bulkDensity < 0 || this.list.bulkDensity && this.list
 					.bulkDensity > 1000) {
 					this.$api.msg('容重输入错误')
 					return
@@ -522,7 +522,7 @@
 						return
 					}
 				}
-				if (this.list.jiaorenli && this.list.jiaorenli < 1 || this.list.jiaorenli && this.list.jiaorenli > 40) {
+				if (this.list.jiaorenli && this.list.jiaorenli < 0 || this.list.jiaorenli && this.list.jiaorenli > 40) {
 					this.$api.msg('热损伤输入错误')
 					return
 				}
@@ -532,7 +532,7 @@
 						return
 					}
 				}
-				if (this.list.impurity && this.list.impurity < 1 || this.list.impurity && this.list.impurity > 40) {
+				if (this.list.impurity && this.list.impurity < 0 || this.list.impurity && this.list.impurity > 40) {
 					this.$api.msg('杂质输入错误')
 					return
 				}
@@ -542,7 +542,7 @@
 						return
 					}
 				}
-				if (this.list.mildewGrain && this.list.mildewGrain < 1 || this.list.mildewGrain && this.list.mildewGrain >
+				if (this.list.mildewGrain && this.list.mildewGrain < 0 || this.list.mildewGrain && this.list.mildewGrain >
 					40) {
 					this.$api.msg('霉变粒输入错误')
 					return
@@ -553,7 +553,7 @@
 						return
 					}
 				}
-				if (this.list.imperfectGrain && this.list.imperfectGrain < 1 || this.list.imperfectGrain && this.list
+				if (this.list.imperfectGrain && this.list.imperfectGrain < 0 || this.list.imperfectGrain && this.list
 					.imperfectGrain > 40) {
 					this.$api.msg('不完整粒输入错误')
 					return

pageD/warehousings/warehousings.vue

@@ -604,7 +604,7 @@ import upload from '@/components/upload.vue';
 					this.$api.msg('质检员姓名输入错误')
 					return
 				}
-				if(this.list.protein&&this.list.protein<1||this.list.protein&&this.list.protein>80){
+				if(this.list.protein&&this.list.protein<0||this.list.protein&&this.list.protein>80){
 					this.$api.msg('蛋白占比输入错误')
 					return
 				}
@@ -614,7 +614,7 @@ import upload from '@/components/upload.vue';
 						return
 					}
 				}
-				if(this.list.waterContent&&this.list.waterContent<1||this.list.waterContent&&this.list.waterContent>40){
+				if(this.list.waterContent&&this.list.waterContent<0||this.list.waterContent&&this.list.waterContent>40){
 					this.$api.msg('水分输入错误')
 					return
 				}
@@ -624,7 +624,7 @@ import upload from '@/components/upload.vue';
 						return
 					}
 				}
-				if(this.list.bulkDensity&&this.list.bulkDensity<500||this.list.bulkDensity&&this.list.bulkDensity>1000){
+				if(this.list.bulkDensity&&this.list.bulkDensity<0||this.list.bulkDensity&&this.list.bulkDensity>1000){
 					this.$api.msg('容重输入错误')
 					return
 				}
@@ -634,7 +634,7 @@ import upload from '@/components/upload.vue';
 						return
 					}
 				}
-				if(this.list.jiaorenli&&this.list.jiaorenli<1||this.list.jiaorenli&&this.list.jiaorenli>40){
+				if(this.list.jiaorenli&&this.list.jiaorenli<0||this.list.jiaorenli&&this.list.jiaorenli>40){
 					this.$api.msg('热损伤输入错误')
 					return
 				}
@@ -644,7 +644,7 @@ import upload from '@/components/upload.vue';
 						return
 					}
 				}
-				if(this.list.impurity&&this.list.impurity<1||this.list.impurity&&this.list.impurity>40){
+				if(this.list.impurity&&this.list.impurity<0||this.list.impurity&&this.list.impurity>40){
 					this.$api.msg('杂质输入错误')
 					return
 				}
@@ -654,7 +654,7 @@ import upload from '@/components/upload.vue';
 						return
 					}
 				}
-				if(this.list.mildewGrain&&this.list.mildewGrain<1||this.list.mildewGrain&&this.list.mildewGrain>40){
+				if(this.list.mildewGrain&&this.list.mildewGrain<0||this.list.mildewGrain&&this.list.mildewGrain>40){
 					this.$api.msg('霉变粒输入错误')
 					return
 				}
@@ -664,7 +664,7 @@ import upload from '@/components/upload.vue';
 						return
 					}
 				}
-				if(this.list.imperfectGrain&&this.list.imperfectGrain<1||this.list.imperfectGrain&&this.list.imperfectGrain>40){
+				if(this.list.imperfectGrain&&this.list.imperfectGrain<0||this.list.imperfectGrain&&this.list.imperfectGrain>40){
 					this.$api.msg('不完整粒输入错误')
 					return
 				}

pages/business/business.vue

@@ -23,7 +23,7 @@
 					
 					<view class="search-form round" @click="naviageToPage('/pageA/product/lookup?TabCur=')">
 						<text style='color: #ccc;text-indent:56px;' class="cuIcon-search"></text>
-						<input type="text" placeholder="请输入货名或标题" confirm-type="search"></input>
+						<view > 请输入货名或标题</view>
 					</view>
 				</view>
 				<view style='margin:0 15px;'>

pages/public/login_account_number.vue

@@ -7,7 +7,7 @@
 			<h2>欢迎使用易粮易运</h2>
 			<view style='position:relative;width:100%;margin-top:50px;border-bottom:1px solid #E8E9ED;padding:10px;' class="flex">
 				<view style='width:15%;border-right:1px solid #E8E9ED;'>+86</view>
-				<view style='width:85%;'><input style='padding-left:10px;' maxlength='11' v-model='phone' placeholder="请输入手机号码" type="text"></view>
+				<view style='width:85%;'><input style='padding-left:10px;' maxlength='11' v-model='phone' placeholder="请输入手机号码" type="number"></view>
 			<image v-if='phone!=""' @click='phone=""' class='close' src='../../static/img/login/guanbi@2x.png'></image>
 			</view>
 			<view style='margin-top:20px;border-bottom:1px solid #E8E9ED;position:relative;'>

pages/sale/information.vue

@@ -31,7 +31,7 @@
 				<view class='title'>工厂价格</view>
 				<view style='color:#B2B3BB;' @click='more("/pages/sale/plant")'>更多</view>
 			</view>
-			<swiper class="screen-swiper header-swiper" :autoplay="true" interval="3000" duration="500" :circular="true"
+			<swiper class="screen-swiper header-swiper" :autoplay="true" interval="6000" duration="500" :circular="true"
 				:acceleration="true" style="min-height: 380px;">
 				<swiper-item class="" v-for="(item1,index) in factoryPriceData.list" :key="index">
 					<view class='guess-section-wrap-item clearfix' v-for='(item,index1) in item1' :key="index1">
@@ -60,8 +60,9 @@
 			<!-- <uni-notice-bar scrollable="true" single="true" background-color="white" :portList="portList" ></uni-notice-bar> -->
 			<swiper class="screen-swiper header-swiper-port" :autoplay="true" interval="0" duration="60000"
 				:circular="true" :acceleration="true">
-				<swiper-item class="" v-for="(item1,index) in portPriceData.list" :key="index">
-					<view class='guess-section-wrap-item clearfix' v-for='(item,index1) in item1' :key="index1">
+				<swiper-item class="" v-for="(item,index) in portList" :key="index">
+					<view class='guess-section-wrap-item clearfix'>
+						<!-- <view class='guess-section-wrap-item clearfix' v-for='(item,index1) in item1' :key="index1"> -->
 						<view class='factory'>{{item.port}}</view>
 						<view class='wrap'>{{item.goodsName}}</view>
 						<view class='price'>
@@ -890,7 +891,7 @@
 		width: 38vw;
 		background: #F9F9FA;
 		padding: 10px;
-		
+
 		margin: 20rpx;
 		border-radius: 3px;
 		// width:50%;
@@ -1157,8 +1158,13 @@
 	.header-swiper-port {
 		height: 120px;
 		min-height: 120px;
+
+		/deep/.uni-swiper-slide-frame {
+			width: 50% !important;
+		}
 	}
-	.port-number-style{
+
+	.port-number-style {
 		display: flex;
 		align-items: center;
 		margin-right: 14rpx;

pages/user/user.vue

@@ -28,7 +28,7 @@
 		</view>
 		<view class="cover-container">
 
-			<view class="cu-list menu text-left solid-top indexlow">
+			<view class="cu-list menu text-left  ">
 
 				<view class="cu-item" v-for="(item, index) in gridList" v-if="item.show" :key="index"
 					@click="gridClick(item, index)" hover-class="common-hover" :hover-stay-time="50">
@@ -484,6 +484,8 @@
 	}
 	.container {
 		padding-top: 85px;
+		padding-top: 35px;
+		background-color: #F5F6FA;
 		position: relative;
 		width: 100vw;
 		height: 100vh;
@@ -522,6 +524,7 @@
 		overflow-y: scroll; */
 		margin-top: 16rpx;
 		background:#fff;
+		margin-top: 22rpx;
 		margin-bottom: 80rpx;
 	}
 	.badge_user {

store/index.js

@@ -86,7 +86,7 @@ const store = new Vuex.Store({
 		],
 		clientId: lifeData.clientId?lifeData.clientId: "",
 		// 确定收货
-		isConfigfreightTransport:false,
+		isConfigfreightTransport:true,
 		choice:""
 	},
 	mutations: {