前端 sdy

pageA/product/business_buy.vue

@@ -108,7 +108,7 @@
 		<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>
+		<input placeholder="请填写包装费" name="input" @input='someprice' v-model="packingFee"></input>
 		</view>
 		</view>
 		<view  v-if="purchaseOrder.procurementPlanType=='期货'"  class=" align-start ">
@@ -202,7 +202,8 @@
 					invoiceMoney:0,
 					unloadingFee:0,
 					packingMoney:0,
-					packing:'散装'
+					packing:'散装',
+					packingFee:0
 				};
 			},
 			onLoad(options) {
@@ -233,10 +234,10 @@
 						this.goods=res.data.data
 						if(this.goods.customerTypeFlag==1){
 							this.purchaseOrder.invoiceFee=-20
-							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.invoiceFee)
+							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.purchaseOrder.invoiceFee)
+							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis)-Number(this.purchaseOrder.invoiceFee)
 						}
 					}
 					uni.hideLoading()
@@ -276,7 +277,9 @@
 							return
 						}
 					}
-					this.purchaseOrder.packingFee=-this.purchaseOrder.packingFee
+					
+					this.purchaseOrder.packingFee=-this.packingFee
+					
 					if(this.purchaseOrder.packingFee>0||this.purchaseOrder.packingFee<-2000){
 						this.$api.msg('包装费输入错误')
 						return
@@ -311,14 +314,18 @@
 									if(res.data.code==200){
 										that.$api.doRequest('post','/purchaseOrder/api/submitPurchaseOrder', {id:res.data.data}).then(res1 => {
 											if(res1.data.code==200){
-												uni.navigateTo({
-													url: `/pages/business/business`
-												})
 												uni.showToast({
 													title: '提交成功，等待买方回复',
 													icon: 'none',
-													duration: 2000
-												})
+													duration: 2000,
+													success() {
+														setTimeout(()=>{
+															uni.navigateBack({
+																delta:1
+															})
+														},2000)
+													}
+												})	
 											}else{
 												uni.showToast({
 													title: res.data.message,
@@ -362,16 +369,17 @@
 					})
 				},
 				someprice(e){
-					if(this.purchaseOrder.pointPrice&&this.purchaseOrder.invoiceFee&&this.purchaseOrder.packingFee){
-						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.pointPrice)+Number(this.purchaseOrder.invoiceFee)+Number(-this.purchaseOrder.packingFee)
+					
+					if(this.purchaseOrder.pointPrice&&this.purchaseOrder.invoiceFee&&this.packingFee){
+						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.pointPrice)+Number(this.purchaseOrder.invoiceFee)+Number(-this.packingFee)
 					}else if(this.purchaseOrder.pointPrice&&this.purchaseOrder.invoiceFee){
 						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.pointPrice)+Number(this.purchaseOrder.invoiceFee)
-					}else if(this.purchaseOrder.pointPrice&&this.purchaseOrder.packingFee){
-						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.pointPrice)+Number(-this.purchaseOrder.packingFee)
+					}else if(this.purchaseOrder.pointPrice&&this.packingFee){
+						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.pointPrice)+Number(-this.packingFee)
 					}else if(this.purchaseOrder.pointPrice){
 						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.pointPrice)
-					}else if(this.purchaseOrder.packingFee){
-						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(-this.purchaseOrder.packingFee)
+					}else if(this.packingFee){
+						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(-this.packingFee)
 					}else if(this.purchaseOrder.invoiceFee){
 						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.invoiceFee)
 					}else{

pageA/product/business_sale.vue

@@ -169,7 +169,7 @@
 					bankNameIndex:0,
 					packingIndex:0,
 					invoiceIndex:0,
-					packingType: ['散袋(默认)','大袋','小袋'],
+					packingType: ['散粮','大袋','小袋'],
 					// invoiceType: ['不开发票', '普通发票', '增值税发票'],
 					invoiceType: ['不开发票','增值税发票'],
 					acceptType: ['第三方检验（国家检验资质）', '交收地库或港出具的检验', '现场看货','其他'],

pages/attestation/index.vue

@@ -310,6 +310,7 @@
 
 <style>
 	.center {
+		overflow-x: hidden;
 		padding: 10px 20px;
 	}
 
@@ -347,7 +348,6 @@
 		width: 100%;
 		height: 350rpx;
 		margin-top: 20rpx;
-
 	}
 
 	.arrows {