Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/order-submit/order-submit.vue

@@ -615,6 +615,7 @@
 							this.payInfo.GoodsName = this.mchs[0].goods_list[0].name.slice(0, 10);
 							this.formdata.DeliveryMethod = this.mchs[0].delivery.send_type;
 							this.ds = res.data;
+							console.log("this.ds ",this.ds )
 							this.expressPrice = 0.0;
 							this.goodPrice = 0.0;
 							this.couponPrice = 0.0;
@@ -644,7 +645,6 @@
 				);
 			},
 			formatPrice() {
-				console.log("this.mchs", this.mchs);
 				if (this.mchs) {
 					this.mchs.forEach(x => {
 						x.delivery.showDelivery = false;
@@ -655,7 +655,21 @@
 								}
 							});
 						}
-						this.goodPrice += parseFloat(x.total_goods_price);
+						//绑定商品价格 HK 2022-10-11新增 判断是否有绑定商品
+						let tempRelevancePrice = 0;
+						if (x.goods_list && x.goods_list.length > 0) {
+							x.goods_list.forEach(rootItem => {
+								if (rootItem.GoodsRelevanceList && rootItem.GoodsRelevanceList.length > 0) {
+									rootItem.GoodsRelevanceList.forEach(qitem => {
+										tempRelevancePrice += parseFloat(qitem.RelevancePrice);
+										console.log("tempRelevancePrice1", tempRelevancePrice)
+									})
+								}
+							})
+						}
+						console.log("tempRelevancePrice2", tempRelevancePrice)
+						//HK 2022-10-11 新增结束
+						this.goodPrice += parseFloat(x.total_goods_price) + parseFloat(tempRelevancePrice);
 						this.expressPrice += parseFloat(x.express_price);
 						this.couponPrice += parseFloat(x.coupon.coupon_discount || 0.0);
 						this.cashPrice += parseFloat(x.deposit.deposit_price || 0.0);
@@ -698,7 +712,6 @@
 	button[disabled] {
 		color: rgba(0, 0, 0, .3) !important;
 		background-color: #f7f7f7 !important;
-
 	}
 
 	.ordersubmit {