修改

pageA/product/business_buy.vue

@@ -392,6 +392,9 @@
 							this.purchaseOrder.invoiceFee=0
 						}
 					}
+					else{
+						this.purchaseOrder.invoiceFee=0
+					}
 				},
 				changeZhihang(){
 					uni.navigateTo({

pageA/product/business_sale.vue

@@ -115,7 +115,7 @@
 			<view class="titles">结算价格</view>
 			<text class="textA">结算价格=点价+基差+发票费用+包装费</text>
 			<view class="con-list">
-			<text >{{purchaseOrder.settlementPrice}}</text>
+			<text style="font-size: 18px;color: #FD714F;margin-left: 120rpx;">￥{{purchaseOrder.settlementPrice}}</text>
 			</view>
 			<!-- <input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput' v-model="purchaseOrder.settlementPrice"></input> -->
 		</view>
@@ -229,7 +229,7 @@
 				this.purchaseOrder.settlementPrice = options.basisPrice
 				this.purchaseOrder.salePlanType = options.salePlanType
 				this.purchaseOrder.salePlan=options.salePlan
-				this.purchaseOrder.baggingNotes=options.baggingNotes
+				// this.purchaseOrder.baggingNotes=options.baggingNotes
 				this.purchaseOrder.sendWarehouse = options.sendWarehouse
 				this.purchaseOrder.compId=options.compId
 			},
@@ -241,10 +241,10 @@
 					if(res.data.code==200){
 						this.goods=res.data.data
 						if(this.goods.customerTypeFlag==1){
-							this.purchaseOrder.invoiceFee=-20
+							// this.purchaseOrder.invoiceFee=-20
 							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.invoiceFee)
 						}else{
-							this.purchaseOrder.invoiceFee=0
+							// this.purchaseOrder.invoiceFee=0
 							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.invoiceFee)
 						}
 					}
@@ -380,11 +380,11 @@
 					this.invoiceIndex = e.detail.value
 					this.purchaseOrder.typeKey=e.detail.value+1
 					this.purchaseOrder.type = this.invoiceType[this.invoiceIndex];
-					if(this.invoiceIndex == 0){
-						if(this.goods.customerTypeFlag==1){
-							this.purchaseOrder.invoiceFee=-20
-						}else{
-							this.purchaseOrder.invoiceFee=0
+					if(this.invoiceIndex == 1){
+						if(this.purchaseOrder.goodsName=='玉米'){
+							this.purchaseOrder.invoiceFee=10
+						}else if(this.purchaseOrder.goodsName=='大豆'){
+							this.purchaseOrder.invoiceFee=20
 						}
 					}
 				},

pageA/product/sales_detail.vue

@@ -13,7 +13,7 @@
 						{{goods.salePrice}}
 					</view>
 					<view style='text-align:right;'  v-else class="title-tip">
-						{{goods.basisPrice}}
+						+{{goods.basisPrice}}
 					</view>
 				</view>
 				<view style='text-align:right;' v-if='goods.salePlanType=="现货"'>销售价格</view>

pageD/myRelease/buyGrain.vue

@@ -278,33 +278,33 @@
 			})
 		},
 		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
-							uni.showToast({
-								title: res.data.message,
-								icon: 'none',
-								duration: 2000
-							})
-							return false
-						}
-					})
-					.catch(res => {
-						that.verification = false
-						uni.showToast({
-							title: res.data.message,
-							icon: 'none',
-							duration: 2000
-						})
-						return false
-					});
-			},
+			// 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
+			// 				uni.showToast({
+			// 					title: res.data.message,
+			// 					icon: 'none',
+			// 					duration: 2000
+			// 				})
+			// 				return false
+			// 			}
+			// 		})
+			// 		.catch(res => {
+			// 			that.verification = false
+			// 			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)) {
@@ -554,10 +554,10 @@
 						}
 					}
 				}
-				if(this.amendprice() == false){
-					this.$api.msg('验证码输入有误！')
-					return
-				}
+				// if(this.amendprice() == false){
+				// 	this.$api.msg('验证码输入有误！')
+				// 	return
+				// }
 				this.insertProcurementPlanInfo = this.deptList
 				this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
 				this.insertProcurementPlanInfo.commonId = this.userInfo.id
@@ -599,7 +599,14 @@
 										duration: 2000
 									})
 								});
-						} else {
+						} 
+						else if(res.data.code=='11003'){
+							uni.showModal({
+								title: '提示',
+								content: '验证码不正确',
+								});
+						}
+						else {
 							uni.showToast({
 								title: res.data.message,
 								icon: 'none',

pageD/myRelease/sellGrain.vue

@@ -283,6 +283,33 @@
 			})
 		},
 		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
+			// 				uni.showToast({
+			// 					title: res.data.message,
+			// 					icon: 'none',
+			// 					duration: 2000
+			// 				})
+			// 				return false
+			// 			}
+			// 		})
+			// 		.catch(res => {
+			// 			that.verification = false
+			// 			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)) {
@@ -535,6 +562,10 @@
 						}
 					}
 				}
+				// if(this.amendprice() == false){
+				// 	this.$api.msg('验证码输入有误！')
+				// 	return
+				// }
 				var that=this
 				this.insertSalePlanInfo = this.deptList
 				this.insertSalePlanInfo.basisPrice = this.insertSalePlanInfo.basisPrice
@@ -575,7 +606,14 @@
 										duration: 2000
 									})
 								});
-						} else {
+						}
+						else if(res.data.code=='11003'){
+						 	uni.showModal({
+						 		title: '提示',
+						 		content: '验证码不正确',
+						 		});
+						 }
+						else {
 							uni.showToast({
 								title: res.data.message,
 								icon: 'none',

pageD/warehousings/ex_warehouse.vue

@@ -616,7 +616,7 @@
 					this.$api.msg('毛重输入错误')
 					return
 				}
-				if (this.WarehouseInOutInfo.grossWeight.indexOf('.') != -1) {
+				if (this.WarehouseInOutInfo.grossWeight.toString().indexOf('.') != -1) {
 					if (this.WarehouseInOutInfo.grossWeight.split('.')[1].length > 2) {
 						this.$api.msg('毛重输入错误')
 						return

pages/business/business.vue

@@ -45,7 +45,7 @@
 							style='font-size:13px;color:#333333;'>元/吨</text></view>
 					<view class='price' v-if='item.procurementPlanType=="现货"'>{{item.procurementPrice}}<text
 							style='font-size:13px;color:#333;'>元/吨</text></view>
-					<view class='price' v-if='item.salePlanType=="期货"'>{{item.basisPrice}}<text
+					<view class='price' v-if='item.salePlanType=="期货"'>+{{item.basisPrice}}<text
 						style='font-size:13px;color:#333333;'>元/吨</text></view>
 					<view class='price' v-if='item.salePlanType=="现货"'>{{item.salePrice}}<text
 						style='font-size:13px;color:#333;'>元/吨</text></view>