From a8c1440a020892431b50a28df9b2607e0670606c Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 6 Nov 2024 15:39:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E8=AF=BE=E4=B8=8B=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=9B=91=E5=90=AC=E7=94=A8=E6=88=B7=E6=94=B9=E5=8F=98?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=20=E5=87=8F=E5=B0=91=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=202.=E5=BD=93=E4=BC=9A=E5=91=98=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E6=9C=AA0=E6=97=B6=E4=B8=8D=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BC=98=E6=83=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/index.vue | 37 ++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index e10c227..3e31363 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -399,7 +399,10 @@
                     }"
                   >
                     <div slot="content">
-                      <div class="u-flex color-000 u-font-14 u-row-between">
+                      <div
+                        class="u-flex color-000 u-font-14 u-row-between"
+                        v-if="vipDiscountPrice > 0"
+                      >
                         <span class="font-bold">会员优惠 </span>
                         <span class="">{{ vipDiscountPrice }} </span>
                       </div>
@@ -1683,7 +1686,7 @@ export default {
 
       const oldPrice = this.order.old.list.reduce((a, b) => {
         const total = b.info
-          .filter((v) => v.isGift === "true"||v.status === "return")
+          .filter((v) => v.isGift === "true" || v.status === "return")
           .reduce((prve, cur) => {
             return prve + cur.number * cur.salePrice;
           }, 0);
@@ -1715,9 +1718,13 @@ export default {
       return total;
     },
     giftLen() {
-      const nowlen = this.order.list.filter((v) => v.isGift === "true"||v.status === "return").length;
+      const nowlen = this.order.list.filter(
+        (v) => v.isGift === "true" || v.status === "return"
+      ).length;
       const oldlen = this.order.old.list.reduce((prve, cur) => {
-        const arr = cur.info.filter((v) => v.isGift === "true"||v.status === "return");
+        const arr = cur.info.filter(
+          (v) => v.isGift === "true" || v.status === "return"
+        );
         prve.push(...arr);
         return prve;
       }, []).length;
@@ -1787,7 +1794,8 @@ export default {
         const bTotal = b.info
           .filter(
             (v) =>
-              v.isGift !== "true" && v.status !== "return"&& 
+              v.isGift !== "true" &&
+              v.status !== "return" &&
               v.memberPrice &&
               v.memberPrice != v.salePrice
           )
@@ -1799,7 +1807,10 @@ export default {
       const nowMemberprice = this.order.list
         .filter(
           (v) =>
-            v.isGift !== "true" && v.status !== "return" && v.memberPrice && v.memberPrice != v.salePrice
+            v.isGift !== "true" &&
+            v.status !== "return" &&
+            v.memberPrice &&
+            v.memberPrice != v.salePrice
         )
         .reduce((a, b) => {
           return a + b.number * (b.salePrice - b.memberPrice);
@@ -1932,12 +1943,11 @@ export default {
         orderId: this.createOrder.data.id || "",
         type: val === "" ? 1 : 0,
       }).then((res) => {
-        if(this.isCreateOrder){
-          this.getOrderData();
+        if (this.isCreateOrder) {
           this.createOrder.data.memberId = val.id;
-        this.getCalcUsablePoints().then((res) => {
-          this.pointsValueChange(this.points.value);
-        });
+          this.getOrderData().then(()=>{
+            this.pointsValueChange(this.points.value);
+          })
         }
       });
     },
@@ -3737,8 +3747,8 @@ export default {
             totalAmount: res.seatAmount || 0,
             status: "",
           };
-          console.log(' this.order.seatFee')
-          console.log( this.order.seatFee)
+      console.log(" this.order.seatFee");
+      console.log(this.order.seatFee);
       this.order.old.list = Object.entries(goodsMap).map(([key, value]) => ({
         info: value.map((v) => {
           return {
@@ -3799,7 +3809,6 @@ export default {
 </script>
   
   <style scoped lang="scss">
-
 .selQuan {
   border: 1px solid #d9d9d9;
   border-radius: 4px;