From 3f0e34b7159d50cba34843a604cb9fec62fdc6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Wed, 1 Jun 2022 11:30:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=B8=AD=E5=8F=91=E7=8E=B0=E7=9A=84=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 |  2 +-
 pages/product/goods.vue                       | 20 +++++++++----------
 .../product/goods/-goods-recommend.vue        |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/manifest.json b/manifest.json
index 119a102..4cc39c1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "lili商城",
-    "appid" : "__UNI__83F0C3D",
+    "appid" : "__UNI__EC9FD60",
     "description" : "",
     "versionName" : "4.2.5",
     "versionCode" : 4000250,
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 8e1af3c..1cf8b5c 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -7,7 +7,7 @@
 
     <!-- 分享 -->
     <shares
-      v-if="shareFlage && goodsDetail.id"
+      v-if="enableShare && goodsDetail.id"
       :skuId="this.routerVal.id"
       :goodsId="this.routerVal.goodsId"
       :link="
@@ -19,7 +19,7 @@
       :thumbnail="goodsDetail.thumbnail"
       :goodsName="goodsDetail.goodsName"
       type="goods"
-      @close="shareFlage = false"
+      @close="enableShare = false"
     />
     <popups
       v-model="popupsSwitch"
@@ -116,7 +116,7 @@
 
           <view class="card-box top-radius-0" id="main2">
             <!-- 活动不显示价钱 -->
-            <view v-if="!promotionFlag" class="desc-bold -goods-msg">
+            <view v-if="isSeckill || isGroup" class="desc-bold -goods-msg">
               <view class="-goods-flex">
                 <view class="desc-bold">
                   {{ goodsDetail.goodsName || "" }}
@@ -410,7 +410,6 @@ export default {
     return {
       setup,
       promotionShow: false, //弹窗开关
-      promotionFlag: true, //活动开关
       // #ifdef H5
       navbarListX: 110, //导航栏列表栏x轴
       navbarListY: 80, //导航栏列表栏y轴
@@ -447,9 +446,10 @@ export default {
         },
       ],
       popupsSwitch: false, //导航栏列表栏开关
-      shareFlage: false,
+      enableShare: false,
       selectedGoods: "", //选择的商品规格昵称
       isGroup: false, // 是否是拼团活动
+      isSeckill:false, // 是否秒杀活动
       pointDetail: "", // 是否是积分商品
       assemble: "", //拼团的sku
       navbarOnlyBack: {
@@ -485,7 +485,6 @@ export default {
           id: "4",
         },
       ],
-      oldtabScrollTop: 0,
       tabScrollTop: null,
       scrollArr: [],
       scrollId: "1",
@@ -547,10 +546,7 @@ export default {
           this.$refs.popupGoods.buyType = "PINTUAN";
           clearInterval(timer);
         }, 100);
-
-        this.promotionFlag = false;
       } else {
-        this.promotionFlag = true;
         this.$refs.popupGoods.buyType = "";
       }
     },
@@ -684,6 +680,10 @@ export default {
           if (item.indexOf("POINTS_GOODS") == 0) {
             this.pointDetail = this.PromotionList[item];
           }
+          // 秒杀
+          if (item.indexOf("SECKILL") == 0) {
+            this.isSeckill = true
+          }
         });
       // 轮播图
       this.imgList = this.goodsDetail.goodsGalleryList;
@@ -1074,7 +1074,7 @@ export default {
      * 点击分享
      */
     async shareChange() {
-      this.shareFlage = true;
+      this.enableShare = true;
     },
   },
 };
diff --git a/pages/product/product/goods/-goods-recommend.vue b/pages/product/product/goods/-goods-recommend.vue
index 3e3dadc..e2f9655 100644
--- a/pages/product/product/goods/-goods-recommend.vue
+++ b/pages/product/product/goods/-goods-recommend.vue
@@ -1,14 +1,14 @@
 <template>
   <view class="recommend-box" >
     <h4 class="goods-recommend-title">宝贝推荐</h4>
-		<goodsList :res='res' :storeName="false" />
+		<goodsList :res='res' v-if="res" :storeName="false" />
 	 </view>
 </template>
 
-<script>
+<script>
 import goodsList from '@/components/m-goods-list/list.vue'
 export default {
-  props: ["res"],
+  props: ["res"],
 	components:{goodsList},
   methods: {
     }