Browse Source

订单模块 协销余额抵扣提交订单

zhengjinyi 3 years ago
parent
commit
75e2058807

+ 0 - 1
components/cm-module/creatOrder/sellerInvoice.vue

@@ -301,7 +301,6 @@
 		height: auto;
 		background: #FFFFFF;
 		float: left;
-		margin-top: 24rpx;
 		.invoice-title{
 			width: 702rpx;
 			padding: 0 24rpx;

+ 7 - 5
pages/seller/order/create-order.vue

@@ -217,12 +217,11 @@
 				productIds:'',			  //商品ID,
 				confirmType:1,			  
 				submitState:'',  		  // 提交状态
-				balanceDeductionFlag:2,   // 勾选余额的状态(1使用,2不使用)
-				totalCount:0,				  // 订单提交总数量
+				totalCount:0,			  // 订单提交总数量
 				reducedPrice:0,			  // 满减金额
 				couponAmount:0,	  		  // 优惠券金额
 				totalDiscountAmount:0,	  // 共减金额
-				orderShouldPayFee:0.00,		  // 订单提交总金额
+				orderShouldPayFee:0.00,	  // 订单提交总金额
 				allPrice:0.00,			  // 订单总金额
 				surplusMoney:0.00,		  // 显示勾选后的剩余抵扣
 				userMoney:0.00,			  // 显示可使用余额
@@ -408,10 +407,10 @@
 				if(this.userMoney > 0){
 					this.ischecked = !this.ischecked
 					if(this.ischecked){
-						this.balanceDeductionFlag =1
+						this.confirmParam.payInfo.balancePayFlag = 1
 						this.attributePallPrice()
 					}else{
-						this.balanceDeductionFlag = 2
+						this.confirmParam.payInfo.balancePayFlag = 0
 						if( this.freightData.postageFlag == 1 ){
 							this.orderShouldPayFee = this.allPrice + parseInt(this.freightData.postage) - this.couponAmount
 						}else{
@@ -526,6 +525,9 @@
 					}
 				}).catch(error =>{
 					this.isSubLoading = false
+					this.confirmParam.payInfo = JSON.parse(this.confirmParam.payInfo);
+					this.confirmParam.orderInfo = JSON.parse(this.confirmParam.orderInfo);
+					this.confirmParam.orderInvoice = JSON.parse(this.confirmParam.orderInvoice);
 					this.$util.msg(error.msg,2000)
 				})
 			},