From e4e278c2fa8d2f4074ea02776298e09dc09e9d32 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Tue, 21 Dec 2021 19:12:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BF=83=E9=94=80=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BF=83=E9=94=80=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/product/goods.vue                       |  8 ++---
 .../product/promotion/-promotion-details.vue  | 30 +++++++++++--------
 pages/promotion/joinGroup.vue                 |  2 +-
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 1ec987e..ed80b36 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -116,7 +116,7 @@
 
           <view class="card-box top-radius-0" id="main2">
             <!-- 活动不显示价钱 -->
-            <view v-if="!isPromotion" class="desc-bold -goods-msg">
+            <view v-if="!promotionFlag" class="desc-bold -goods-msg">
               <view class="-goods-flex">
                 <view class="desc-bold">
                   {{ goodsDetail.goodsName || "" }}
@@ -442,7 +442,7 @@ export default {
       popupsSwitch: false, //导航栏列表栏开关
       shareFlage: false,
       selectedGoods: "", //选择的商品规格昵称
-      isPromotion: true, //判断显示拼团活动文字
+      promotionFlag: true, //判断显示拼团活动文字
       isGroup: false, // 是否是拼团活动
       pointDetail: "", // 是否是积分商品
       assemble: "", //拼团的sku
@@ -533,9 +533,9 @@ export default {
           clearInterval(timer);
         }, 100);
 
-        this.isPromotion = false;
+        this.promotionFlag = false;
       } else {
-        this.isPromotion = true;
+        this.promotionFlag = true;
         this.$refs.popupGoods.buyType = "";
       }
     },
diff --git a/pages/product/product/promotion/-promotion-details.vue b/pages/product/product/promotion/-promotion-details.vue
index 6a22ced..4ff0e08 100644
--- a/pages/product/product/promotion/-promotion-details.vue
+++ b/pages/product/product/promotion/-promotion-details.vue
@@ -1,34 +1,38 @@
 <template>
   <view class="wrapper" v-if="res">
-
     <view v-for="(prom, index) in Object.keys(res)" :key="index">
       <view>
-
         <view v-if="prom.split('-')[0] == 'FULL_DISCOUNT'">
           <div class="res_prom_item" v-if="res[prom].fullMinus">
             <u-tag text="满减" type="error"></u-tag>
             <!-- TODO 后续将优化为可点击的商品以及优惠券显示明细 -->
-            <span class="pro-text">满{{ res[prom].fullMoney }}元 立减现金 <span class="price">{{ res[prom].fullMinus}}元</span>
-              <span v-if="res[prom].isCoupon"> 赠送<span>优惠券</span></span>
-              <span v-if="res[prom].isPoint"> 赠送{{res[prom].point}}积分</span>
-              <span v-if="res[prom].isGift"> 赠送商品</span>
-              <span v-if="res[prom].isFreeFreight">赠送包邮服务</span>
-
+            <span class="pro-text"
+              >满{{ res[prom].fullMoney }}元 立减现金
+              <span class="price">{{ res[prom].fullMinus }}元</span>
+              <span v-if="res[prom].couponFlag"> 赠送<span>优惠券</span></span>
+              <span v-if="res[prom].pointFlag"> 赠送{{ res[prom].point }}积分</span>
+              <span v-if="res[prom].giftFlag"> 赠送商品</span>
+              <span v-if="res[prom].freeFreightFlag">赠送包邮服务</span>
             </span>
           </div>
           <div class="res_prom_item" v-if="res[prom].fullRate">
             <u-tag text="打折" type="error"></u-tag>
-            <span class="pro-text">满{{ res[prom].fullMoney }}元，立享<span
-                class="price">{{ res[prom].fullRate }}折</span>优惠</span>
+            <span class="pro-text"
+              >满{{ res[prom].fullMoney }}元，立享<span class="price"
+                >{{ res[prom].fullRate }}折</span
+              >优惠</span
+            >
           </div>
         </view>
 
         <view v-if="prom.split('-')[0] == 'PINTUAN'">
-
           <div class="res_prom_item" v-if="res[prom].requiredNum">
             <u-tag text="拼团" type="error"></u-tag>
-            <span class="pro-text">{{ res[prom].requiredNum }}人拼团 限购<span
-                class="price">{{ res[prom].limitNum}}件</span></span>
+            <span class="pro-text"
+              >{{ res[prom].requiredNum }}人拼团 限购<span class="price"
+                >{{ res[prom].limitNum }}件</span
+              ></span
+            >
           </div>
         </view>
 
diff --git a/pages/promotion/joinGroup.vue b/pages/promotion/joinGroup.vue
index e9c223c..7b953d4 100644
--- a/pages/promotion/joinGroup.vue
+++ b/pages/promotion/joinGroup.vue
@@ -42,7 +42,7 @@
                   ￥{{groupItem.price | unitPrice }}
                 </view>
                 <view class="view-content-original_price">
-                  ￥{{ groupItem.originPrice | unitPrice }}
+                  ￥{{ groupItem.originalPrice | unitPrice }}
                 </view>
               </view>