Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb

src/views/tool/Instead/components/discount.vue

@@ -168,6 +168,7 @@ export default {
     },
 
     confirm() {
+      console.log(this.form.discount / 100)
       this.$emit("confirm", (this.form.discount / 100));
       this.close();
     },

src/views/tool/Instead/components/quans.vue

@@ -229,6 +229,7 @@ export default {
   },
   data() {
     return {
+      discount:1,
       orderPrice: 0,
       fullReductionCouponSel: {
         id: "",
@@ -286,11 +287,12 @@ export default {
       const arr = this.quans.productCoupon.filter((v) => v.proId == row.proId);
       const index = arr.findIndex((v) => v.id == row.id);
       if (index != -1) {
-        return returnProductCoupAllPrice(
+        const n=returnProductCoupAllPrice(
           $goodsPayPriceMap[row.proId],
           index,
           row.num
-        ).toFixed(2);
+        )
+        return (n*this.discount).toFixed(2);
       } else {
         return 0;
       }
@@ -439,6 +441,7 @@ export default {
     async open(data, propSelCoup) {
       console.log(data);
       this.orderPrice = data.orderPrice;
+      this.discount=data.discount||1
       this.quansSelArr = [...propSelCoup];
       $goodsPayPriceMap = returnGoodsPayPriceMap(this.goodsArr || []);
       if (data.memberId) {

src/views/tool/Instead/index.vue

@@ -1725,11 +1725,11 @@ export default {
       return this.vipUser.isVip ? true : false;
     },
     coupdiscount() {
-      return returnCouponAllPrice(
+      return (this.createOrder.discount*returnCouponAllPrice(
         this.quansSelArr,
         this.createOrder.data.detailList || [],
         this.vipUser
-      );
+      )).toFixed(2)
     },
     goodsDisCount() {
       const goodsQuanArr = this.quansSelArr.filter((v) => v.type == 2);
@@ -2195,11 +2195,12 @@ export default {
       const arr = this.quansSelArr.filter((v) => v.proId == row.proId);
       const index = arr.findIndex((v) => v.id == row.id);
       if (index != -1) {
-        return returnProductCoupAllPrice(
+        const n=returnProductCoupAllPrice(
           $goodsPayPriceMap[row.proId],
           index,
           row.num
-        ).toFixed(2);
+        )
+        return (n*this.createOrder.discount).toFixed(2);
       } else {
         return 0;
       }
@@ -2265,6 +2266,7 @@ export default {
           id: this.createOrder.data.id,
           memberId: this.createOrder.data.memberId || this.vipUser.id,
           orderPrice: (this.yinFuJinE * 1 + this.coupdiscount * 1).toFixed(2),
+          discount:this.createOrder.discount
         },
         [...this.quansSelArr]
       );