From 4064c56b2170598ea923dfb3dc1545deca2baf77 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Sat, 11 Dec 2021 13:48:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E9=87=8D=E6=9E=84=E4=BF=83?=
 =?UTF-8?q?=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/m-buy/goods.vue                    | 110 ++++++---
 pages/cart/coupon/couponCenter.vue            |   2 +-
 pages/product/goods.vue                       | 233 +++++++++++++-----
 pages/product/product/goods/-goods-intro.vue  |  46 ++--
 .../promotion/-promotion-assemble-list.vue    |  14 +-
 .../-promotion-assemble-promotions.vue        |  97 ++++++--
 .../product/promotion/-promotion-coupon.vue   |  36 +--
 .../product/product/promotion/-promotion.vue  |  50 ++--
 pages/promotion/joinGroup.vue                 |   2 +-
 9 files changed, 401 insertions(+), 189 deletions(-)

diff --git a/components/m-buy/goods.vue b/components/m-buy/goods.vue
index cbe310b..06aaaa6 100644
--- a/components/m-buy/goods.vue
+++ b/components/m-buy/goods.vue
@@ -1,35 +1,48 @@
 <template>
   <div class="wrapper">
-    <u-popup class="popup" v-model="buyMask" :height="setup.height" closeable :mode="setup.mode"
-    :border-radius="setup.radius" @close="closeMask()">
+    <u-popup
+      class="popup"
+      v-model="buyMask"
+      :height="setup.height"
+      closeable
+      :mode="setup.mode"
+      :border-radius="setup.radius"
+      @close="closeMask()"
+    >
       <!-- 商品 -->
       <view class="goods-box bottom">
         <view class="goods-header">
           <view class="goods-img">
-            <u-image width="200rpx" border-radius="20" class="uimage" height="200rpx"
-              :src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"></u-image>
+            <u-image
+              width="200rpx"
+              border-radius="20"
+              class="uimage"
+              height="200rpx"
+              :src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"
+            ></u-image>
           </view>
           <view class="goods-skus">
-
             <!-- 有活动商品价格 -->
-            <view class="goods-price " v-if="goodsDetail.promotionPrice">
+            <view class="goods-price" v-if="goodsDetail.promotionPrice">
               <span v-if="goodsDetail.promotionPrice && !pointDetail">
                 ￥
-                <span
-                  class="goods-price-promotionShow goods-price-bigshow">{{ formatPrice(goodsDetail.promotionPrice)[0] }}</span>
+                <span class="goods-price-promotionShow goods-price-bigshow">{{
+                  formatPrice(goodsDetail.promotionPrice)[0]
+                }}</span>
                 .{{ formatPrice(goodsDetail.promotionPrice)[1] }}
               </span>
               <span v-if="pointDetail.points">
-                <span class="goods-price-promotionShow goods-price-bigshow">{{ pointDetail.points }}</span>
+                <span class="goods-price-promotionShow goods-price-bigshow">{{
+                  pointDetail.points
+                }}</span>
                 积分
               </span>
               <div class="promotion-box">
                 ￥
                 <span class="goods-price-bigshow">{{
-                formatPrice(goodsDetail.price)[0]
-              }}</span>
+                  formatPrice(goodsDetail.price)[0]
+                }}</span>
                 .{{ formatPrice(goodsDetail.price)[1] }}
-
               </div>
             </view>
             <!-- 正常商品的价格 -->
@@ -37,10 +50,9 @@
               <span>
                 ￥
                 <span class="goods-price-bigshow">{{
-                formatPrice(goodsDetail.price)[0]
-              }}</span>
+                  formatPrice(goodsDetail.price)[0]
+                }}</span>
                 .{{ formatPrice(goodsDetail.price)[1] }}
-
               </span>
             </view>
             <view class="goods-check-skus">
@@ -55,36 +67,61 @@
         <!-- 商品信息 -->
         <scroll-view class="goods-skus-box" :scroll-y="true">
           <!-- 规格 -->
-          <view class="goods-skus-view" :key="specIndex" v-for="(spec, specIndex) in formatList">
+          <view
+            class="goods-skus-view"
+            :key="specIndex"
+            v-for="(spec, specIndex) in formatList"
+          >
             <view class="skus-view-list">
               <view class="view-class-title">{{ spec.name }}</view>
 
-
               <!-- 正常逻辑 循环出sku -->
-              <view v-if="!parentOrder"  :class="{ active: spec_val.value == currentSelceted[specIndex] }" class="skus-view-item"
-                v-for="(spec_val, spec_index) in spec.values" :key="spec_index"
-                @click="handleClickSpec(spec, specIndex, spec_val)">{{ spec_val.value }} </view>
+              <view
+                v-if="!parentOrder"
+                :class="{ active: spec_val.value == currentSelceted[specIndex] }"
+                class="skus-view-item"
+                v-for="(spec_val, spec_index) in spec.values"
+                :key="spec_index"
+                @click="handleClickSpec(spec, specIndex, spec_val)"
+                >{{ spec_val.value }}
+              </view>
 
               <!-- 拼团购买，仅筛选出当前拼团类型商品 -->
-              <view v-if="parentOrder  && spec_val.skuId == goodsDetail.id"  :class="{ active: spec_val.value == currentSelceted[specIndex] }" class="skus-view-item"
-                v-for="(spec_val, spec_index) in spec.values" :key="spec_index"
-                @click="handleClickSpec(spec, specIndex, spec_val)">{{ spec_val.value }} </view>
+              <view
+                v-if="parentOrder && spec_val.skuId == goodsDetail.id"
+                :class="{ active: spec_val.value == currentSelceted[specIndex] }"
+                class="skus-view-item"
+                v-for="(spec_val, spec_index) in spec.values"
+                :key="spec_index"
+                @click="handleClickSpec(spec, specIndex, spec_val)"
+                >{{ spec_val.value }}
+              </view>
             </view>
           </view>
           <!-- 数量 -->
           <view class="goods-skus-number">
             <view class="view-class-title">数量</view>
-            <u-number-box :bg-color="numberBox.bgColor" :max="200" :color="numberBox.color"
-              :input-width="numberBox.width" :input-height="numberBox.height" :size="numberBox.size" :min="1"
-              v-model="num">
+            <u-number-box
+              :bg-color="numberBox.bgColor"
+              :max="200"
+              :color="numberBox.color"
+              :input-width="numberBox.width"
+              :input-height="numberBox.height"
+              :size="numberBox.size"
+              :min="1"
+              v-model="num"
+            >
             </u-number-box>
           </view>
         </scroll-view>
         <!-- 按钮 -->
         <view class="btns">
-
-          <view class="box-btn card" v-if="buyType != 'PINTUAN' && goodsDetail.goodsType!='VIRTUAL_GOODS'"
-            @click="addToCartOrBuy('cart')">加入购物车</view>
+          <view
+            class="box-btn card"
+            v-if="buyType != 'PINTUAN' && goodsDetail.goodsType != 'VIRTUAL_GOODS'"
+            @click="addToCartOrBuy('cart')"
+            >加入购物车</view
+          >
           <view class="box-btn buy" @click="addToCartOrBuy('buy')">立即购买</view>
         </view>
       </view>
@@ -140,10 +177,10 @@ export default {
       default: "",
       type: null,
     },
-    pointDetail:{
+    pointDetail: {
       default: "",
       type: null,
-    }
+    },
   },
   watch: {
     buyType: {
@@ -161,8 +198,6 @@ export default {
   },
 
   methods: {
-    
-
     // 格式化金钱  1999 --> [1999,00]
     formatPrice(val) {
       if (typeof val == "undefined") {
@@ -215,7 +250,7 @@ export default {
       }
     },
 
-     /**
+    /**
      * 直接购买
      */
     buy(data) {
@@ -232,7 +267,6 @@ export default {
       });
     },
 
-
     /**
      * 添加到购物车或购买
      */
@@ -276,9 +310,7 @@ export default {
             uni.navigateTo({
               url: `/pages/order/fillorder?way=${data.cartType}&addr=${
                 this.addr.id || ""
-              }&parentOrder=${encodeURIComponent(
-                JSON.stringify(this.parentOrder)
-              )}`,
+              }&parentOrder=${encodeURIComponent(JSON.stringify(this.parentOrder))}`,
             });
           }
         });
@@ -286,7 +318,6 @@ export default {
     },
     formatSku(list) {
       // 格式化数据
-      console.log(list);
       let arr = [{}];
       list.forEach((item, index) => {
         item.specValues.forEach((spec, specIndex) => {
@@ -315,7 +346,6 @@ export default {
               return key.name;
             });
             if (!keys.includes(name)) {
-              console.log(name, values);
               arr.push({
                 name: name,
                 values: [values],
diff --git a/pages/cart/coupon/couponCenter.vue b/pages/cart/coupon/couponCenter.vue
index 96d66c1..0a48d22 100644
--- a/pages/cart/coupon/couponCenter.vue
+++ b/pages/cart/coupon/couponCenter.vue
@@ -28,7 +28,7 @@
                   <span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
                   <view v-else>{{  item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用</view>
                 </view>
-                <view>有效期至：{{  item.endTime.split(" ")[0] }}</view>
+                <view v-if="item.endTime">有效期至：{{  item.endTime.split(" ")[0] }}</view>
               </view>
               <view class="receive" @click="receive(item)">
                 <text>点击</text><br />
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 876e9df..fc9f7d6 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -1,31 +1,60 @@
 <template>
   <div class="main-page">
-
     <!-- #ifdef APP-PLUS -->
     <view class="status_bar"></view>
     <!-- #endif -->
     <!-- 仅h5有效 打开App -->
 
     <!-- 分享 -->
-    <shares v-if="shareFlage && goodsDetail.id" :skuId="this.routerVal.id" :goodsId="this.routerVal.goodsId"
-      :link="'/pages/product/goods?id='+this.routerVal.id+'&goodsId='+this.routerVal.goodsId"
-      :thumbnail="goodsDetail.thumbnail" :goodsName="goodsDetail.goodsName" type="goods" @close="shareFlage = false" />
-    <popups v-model="popupsSwitch" @tapPopup="handleNavbarList" :popData="navbarListData" :x="navbarListX"
-      :y="navbarListY" placement="top-start" />
+    <shares
+      v-if="shareFlage && goodsDetail.id"
+      :skuId="this.routerVal.id"
+      :goodsId="this.routerVal.goodsId"
+      :link="
+        '/pages/product/goods?id=' +
+        this.routerVal.id +
+        '&goodsId=' +
+        this.routerVal.goodsId
+      "
+      :thumbnail="goodsDetail.thumbnail"
+      :goodsName="goodsDetail.goodsName"
+      type="goods"
+      @close="shareFlage = false"
+    />
+    <popups
+      v-model="popupsSwitch"
+      @tapPopup="handleNavbarList"
+      :popData="navbarListData"
+      :x="navbarListX"
+      :y="navbarListY"
+      placement="top-start"
+    />
     <view class="index">
-
       <!-- topBar -->
-      <u-navbar :background="navbar" :is-back="false" :class="headerFlag ? 'header' : 'header bg-none scroll-hide'">
+      <u-navbar
+        :background="navbar"
+        :is-back="false"
+        :class="headerFlag ? 'header' : 'header bg-none scroll-hide'"
+      >
         <div class="headerRow">
           <div class="backs">
             <u-icon @click="back()" name="arrow-left" class="icon-back"></u-icon>
 
-            <u-icon name="list" @click="popupsSwitch = !popupsSwitch" class="icon-list"></u-icon>
+            <u-icon
+              name="list"
+              @click="popupsSwitch = !popupsSwitch"
+              class="icon-list"
+            ></u-icon>
           </div>
           <div class="headerList" :class="headerFlag ? 'tab-bar' : 'tab-bar scroll-hide'">
             <div class="headerRow">
-              <div class="nav-item" v-for="header in headerList" :key="header.id"
-                :class="{ cur: scrollId === header.id }" @click="headerTab(header.id)">
+              <div
+                class="nav-item"
+                v-for="header in headerList"
+                :key="header.id"
+                :class="{ cur: scrollId === header.id }"
+                @click="headerTab(header.id)"
+              >
                 {{ header.text }}
               </div>
             </div>
@@ -33,27 +62,57 @@
         </div>
       </u-navbar>
 
-      <u-navbar :border-bottom="false" v-show="!headerFlag" class="header-only-back" :background="navbarOnlyBack"
-        :is-back="false">
+      <u-navbar
+        :border-bottom="false"
+        v-show="!headerFlag"
+        class="header-only-back"
+        :background="navbarOnlyBack"
+        :is-back="false"
+      >
         <div>
           <div class="bg-back">
-            <u-icon size="40" @click="back()" name="arrow-left" class="icon-back"></u-icon>
-            <u-icon size="40" @click="popupsSwitch = !popupsSwitch" name="list" class="icon-list"></u-icon>
-
+            <u-icon
+              size="40"
+              @click="back()"
+              name="arrow-left"
+              class="icon-back"
+            ></u-icon>
+            <u-icon
+              size="40"
+              @click="popupsSwitch = !popupsSwitch"
+              name="list"
+              class="icon-list"
+            ></u-icon>
           </div>
         </div>
       </u-navbar>
     </view>
 
-    <view class="product-container" :style="{ height: productRefHeight }" ref="productRef" id="productRef">
-      <scroll-view scroll-anchoring enableBackToTop="true" scroll-with-animation scroll-y class="scroll-page"
-        :scroll-top="tabScrollTop" @scroll="pageScroll">
+    <view
+      class="product-container"
+      :style="{ height: productRefHeight }"
+      ref="productRef"
+      id="productRef"
+    >
+      <scroll-view
+        scroll-anchoring
+        enableBackToTop="true"
+        scroll-with-animation
+        scroll-y
+        class="scroll-page"
+        :scroll-top="tabScrollTop"
+        @scroll="pageScroll"
+      >
         <view>
           <!-- 轮播图 -->
           <GoodsSwiper id="main1" :res="imgList" />
 
           <!-- 促销活动条 -->
-          <PromotionAssembleLayout v-if="PromotionList" :detail="goodsDetail" :res="PromotionList" />
+          <PromotionAssembleLayout
+            v-if="PromotionList"
+            :detail="goodsDetail"
+            :res="PromotionList"
+          />
 
           <view class="card-box top-radius-0" id="main2">
             <!-- 活动不显示价钱 -->
@@ -63,14 +122,20 @@
                   {{ goodsDetail.goodsName || "" }}
                 </view>
                 <view class="favorite" @click="clickFavorite(goodsDetail.id)">
-                  <u-icon size="30" :color="favorite ? '#f2270c' : '#262626'" :name="favorite ? 'heart-fill' : 'heart'">
+                  <u-icon
+                    size="30"
+                    :color="favorite ? '#f2270c' : '#262626'"
+                    :name="favorite ? 'heart-fill' : 'heart'"
+                  >
                   </u-icon>
-                  <view :style="{ color: favorite ? '#f2270c' : '#262626' }">{{ favorite ? "已收藏" : "收藏" }}</view>
+                  <view :style="{ color: favorite ? '#f2270c' : '#262626' }">{{
+                    favorite ? "已收藏" : "收藏"
+                  }}</view>
                 </view>
               </view>
               <!-- 商品描述 -->
               <view class="-goods-desc">
-                {{ goodsDetail.sellingPoint || '' }}
+                {{ goodsDetail.sellingPoint || "" }}
               </view>
             </view>
             <view v-else class="-goods-msg">
@@ -79,31 +144,41 @@
                 <view class="-goods-flex">
                   <!-- 如果有积分显示积分 -->
                   <view class="-goods-price" v-if="goodsDetail.price != undefined">
-                    <span v-if="pointDetail.points"> <span class="price">{{pointDetail.points}}</span>
+                    <span v-if="pointDetail.points">
+                      <span class="price">{{ pointDetail.points }}</span>
                       <span>积分</span>
                     </span>
 
-                    <span v-else> <span>¥</span><span class="price">{{ formatPrice(goodsDetail.price)[0] }}</span>.{{
-                      formatPrice(goodsDetail.price)[1]
-                    }} </span>
+                    <span v-else>
+                      <span>¥</span
+                      ><span class="price">{{ formatPrice(goodsDetail.price)[0] }}</span
+                      >.{{ formatPrice(goodsDetail.price)[1] }}
+                    </span>
+                  </view>
+                  <view class="-goods-price" v-else>
+                    ¥<span class="price">0 </span>.00
                   </view>
-                  <view class="-goods-price" v-else> ¥<span class="price">0 </span>.00 </view>
 
                   <view class="icons share" @click="shareChange()">
                     <u-icon size="30" name="share-fill"></u-icon>
                     <view>分享</view>
                   </view>
                   <view class="icons" @click="clickFavorite(goodsDetail.id)">
-                    <u-icon size="30" :color="favorite ? '#f2270c' : '#262626'"
-                      :name="favorite ? 'heart-fill' : 'heart'"></u-icon>
-                    <view :style="{ color: favorite ? '#f2270c' : '#262626' }">{{ favorite ? "已收藏" : "收藏" }}</view>
+                    <u-icon
+                      size="30"
+                      :color="favorite ? '#f2270c' : '#262626'"
+                      :name="favorite ? 'heart-fill' : 'heart'"
+                    ></u-icon>
+                    <view :style="{ color: favorite ? '#f2270c' : '#262626' }">{{
+                      favorite ? "已收藏" : "收藏"
+                    }}</view>
                   </view>
                 </view>
                 <view class="-goods-name desc-bold">
                   {{ goodsDetail.goodsName || "" }}
                 </view>
                 <view class="-goods-desc">
-                  {{ goodsDetail.sellingPoint || ''  }}
+                  {{ goodsDetail.sellingPoint || "" }}
                 </view>
               </view>
             </view>
@@ -123,16 +198,22 @@
           </view>
 
           <!-- 拼团用户列表 -->
-          <PromotionAssembleListLayout v-if="isGroup" @to-assemble-buy-now="toAssembleBuyNow" :res="PromotionList" />
+          <PromotionAssembleListLayout
+            v-if="isGroup"
+            @to-assemble-buy-now="toAssembleBuyNow"
+            :res="PromotionList"
+          />
 
           <!-- 配置地址 如果是虚拟产品的时候不展示 -->
-          <view class="card-box" v-if="goodsDetail.goodsType !='VIRTUAL_GOODS'">
+          <view class="card-box" v-if="goodsDetail.goodsType != 'VIRTUAL_GOODS'">
             <view class="card-flex" @click="shutMask(4)">
               <view class="card-title"> 已选 </view>
               <view class="card-content">
-                <span v-if="selectedGoods.spec">{{ selectedGoods.spec.specName }}-{{
+                <span v-if="selectedGoods.spec"
+                  >{{ selectedGoods.spec.specName }}-{{
                     selectedGoods.spec.specValue
-                  }}</span>
+                  }}</span
+                >
                 <span v-else>默认</span>
               </view>
               <view class="card-bottom">
@@ -157,11 +238,21 @@
           <Evaluation id="main5" :goodsDetail="goodsDetail" />
 
           <!-- 店铺推荐 -->
-          <storeLayout id="main7" :storeDetail="storeDetail" :goodsDetail="goodsDetail" :res="recommendList" />
+          <storeLayout
+            id="main7"
+            :storeDetail="storeDetail"
+            :goodsDetail="goodsDetail"
+            :res="recommendList"
+          />
 
           <!-- 宝贝详情 -->
-          <GoodsIntro id="main9" :res="goodsDetail" :goodsParams="goodsParams" :goodsId="goodsDetail.goodsId"
-            v-if="goodsDetail.id" />
+          <GoodsIntro
+            id="main9"
+            :res="goodsDetail"
+            :goodsParams="goodsParams"
+            :goodsId="goodsDetail.goodsId"
+            v-if="goodsDetail.id"
+          />
 
           <!-- 宝贝推荐 -->
           <GoodsRecommend id="main11" :res="likeGoodsList" />
@@ -186,8 +277,13 @@
         </view>
         <!-- 正常结算页面 -->
         <view class="detail-btn" v-if="!isGroup">
-          <view class="to-store-car to-store-btn" v-if="goodsDetail.goodsType!='VIRTUAL_GOODS'" @click="shutMask(4)">
-            加入购物车</view>
+          <view
+            class="to-store-car to-store-btn"
+            v-if="goodsDetail.goodsType != 'VIRTUAL_GOODS'"
+            @click="shutMask(4)"
+          >
+            加入购物车</view
+          >
           <view class="to-buy to-store-btn" @click="shutMask(4, 'buy')">立即购买</view>
           <view class="to-store-car to-store-btn" v-if="startTimer">暂未开始</view>
         </view>
@@ -206,8 +302,15 @@
       <!-- 规格-模态层弹窗 -->
       <view class="spec">
         <!-- 促销弹窗 -->
-        <u-popup v-model="promotionFlag" :height="setup.height" :mode="setup.mode" :border-radius="setup.radius"
-          @close="promotionFlag=false" :mask-close-able="setup.close" closeable>
+        <u-popup
+          v-model="promotionFlag"
+          :height="setup.height"
+          :mode="setup.mode"
+          :border-radius="setup.radius"
+          @close="promotionFlag = false"
+          :mask-close-able="setup.close"
+          closeable
+        >
           <view class="header-title">优惠</view>
           <view class="cuxiao">
             <scroll-view class="scroll_mask" :scroll-y="true">
@@ -216,7 +319,6 @@
                 <PromotionDetailsLayout :res="PromotionList" />
               </view>
               <view class="con-cuxiao coupons">
-
                 <view class="cuxiao-title">可领优惠券</view>
                 <PromotionCoupon @getCoupon="getCoupon" :res="PromotionList" />
               </view>
@@ -225,13 +327,29 @@
         </u-popup>
 
         <!-- 配送地址弹窗 -->
-        <popupAddress @closeAddress="closePopupAddress" @deliveryData="deliveryFun" v-if="goodsDetail.id"
-          :goodsId="goodsDetail.id" :addressFlag="addressFlag" />
+        <popupAddress
+          @closeAddress="closePopupAddress"
+          @deliveryData="deliveryFun"
+          v-if="goodsDetail.id"
+          :goodsId="goodsDetail.id"
+          :addressFlag="addressFlag"
+        />
 
         <!-- 商品规格  商品详情，以及默认参与活动的id-->
-        <popupGoods :addr="delivery" ref="popupGoods" @changed="changedGoods" @closeBuy="closePopupBuy"
-          @queryCart="cartCount()" :goodsDetail="goodsDetail" :goodsSpec="goodsSpec" :id="productId"
-          v-if="goodsDetail.id " :pointDetail="pointDetail" @handleClickSku="selectSku" :buyMask="buyMask" />
+        <popupGoods
+          :addr="delivery"
+          ref="popupGoods"
+          @changed="changedGoods"
+          @closeBuy="closePopupBuy"
+          @queryCart="cartCount()"
+          :goodsDetail="goodsDetail"
+          :goodsSpec="goodsSpec"
+          :id="productId"
+          v-if="goodsDetail.id"
+          :pointDetail="pointDetail"
+          @handleClickSku="selectSku"
+          :buyMask="buyMask"
+        />
       </view>
     </view>
   </div>
@@ -239,12 +357,7 @@
 
 <script>
 /************接口API***************/
-import {
-  getGoods,
-  getGoodsList,
-  getMpScene,
-  getGoodsDistribution,
-} from "@/api/goods.js";
+import { getGoods, getGoodsList, getMpScene, getGoodsDistribution } from "@/api/goods.js";
 import * as API_trade from "@/api/trade.js";
 import * as API_Members from "@/api/members.js";
 import * as API_store from "@/api/store.js";
@@ -473,16 +586,11 @@ export default {
       getMpScene(this.routerVal.scene).then((res) => {
         if (res.data.success) {
           let data = res.data.result.split(","); // skuId,goodsId,distributionId
-          console.warn(data);
           this.init(data[0], data[1], data[2]);
         }
       });
     } else {
-      this.init(
-        this.routerVal.id,
-        this.routerVal.goodsId,
-        this.routerVal.distributionId
-      );
+      this.init(this.routerVal.id, this.routerVal.goodsId, this.routerVal.distributionId);
     }
   },
   // #ifdef MP-WEIXIN
@@ -530,7 +638,6 @@ export default {
 
       let response = await getGoods(id, goodsId);
 
-      console.log(response);
       if (!response.data.success) {
         setTimeout(() => {
           uni.navigateBack();
@@ -540,7 +647,6 @@ export default {
       if (distributionId || this.$store.state.distributionId) {
         let disResult = await getGoodsDistribution(distributionId);
         if (!disResult.data.success || disResult.statusCode == 403) {
-          console.log("绑定成功!");
           this.$store.state.distributionId = distributionId;
         }
       }
@@ -749,7 +855,6 @@ export default {
         category: this.goodsDetail.categoryId,
         keyword: this.goodsDetail.name,
       }).then((res) => {
-        console.warn(this.likeGoodsList )
         this.likeGoodsList = res.data.result.content;
       });
     },
diff --git a/pages/product/product/goods/-goods-intro.vue b/pages/product/product/goods/-goods-intro.vue
index 32fc5a7..586d979 100644
--- a/pages/product/product/goods/-goods-intro.vue
+++ b/pages/product/product/goods/-goods-intro.vue
@@ -4,12 +4,21 @@
       <view class="goods-detail">
         <view class="detail_padding">
           <div class="goods-detail-box">
-            <div class="goods-detail-item goods-active">商品介绍
-            </div>
+            <div class="goods-detail-item goods-active">商品介绍</div>
           </div>
-          <u-empty class="empty" text="暂无商品介绍" mode="data" v-if="!res.mobileIntro"></u-empty>
-          <u-parse class="vhtml" :lazy-load="true" :use-cache="true" :show-with-animation="true"
-            :html="res.mobileIntro"></u-parse>
+          <u-empty
+            class="empty"
+            text="暂无商品介绍"
+            mode="data"
+            v-if="!res.mobileIntro"
+          ></u-empty>
+          <u-parse
+            class="vhtml"
+            :lazy-load="true"
+            :use-cache="true"
+            :show-with-animation="true"
+            :html="res.mobileIntro"
+          ></u-parse>
         </view>
       </view>
     </view>
@@ -24,12 +33,22 @@
           <div class="param-list" v-if="goodsParams.length == 0">
             <u-empty text="暂无商品参数" mode="list"></u-empty>
           </div>
-          <div class="params-group" v-for="(group,groupIndex) in goodsParams" :key="groupIndex">
-            <view style="font-weight: bold;margin-left: 10px;">{{group.groupName}}</view>
+          <div
+            class="params-group"
+            v-for="(group, groupIndex) in goodsParams"
+            :key="groupIndex"
+          >
+            <view style="font-weight: bold; margin-left: 10px">{{
+              group.groupName
+            }}</view>
             <div class="param-list">
-              <div class="param-item" v-for="(param,index) in group.goodsParamsItemDTOList" :key="index">
-                <div class="param-left">{{param.paramName}}</div>
-                <div class="param-right">{{param.paramValue}}</div>
+              <div
+                class="param-item"
+                v-for="(param, index) in group.goodsParamsItemDTOList"
+                :key="index"
+              >
+                <div class="param-left">{{ param.paramName }}</div>
+                <div class="param-right">{{ param.paramValue }}</div>
               </div>
             </div>
           </div>
@@ -49,7 +68,6 @@ export default {
   },
   props: ["res", "goodsId", "goodsParams"],
   async mounted() {
-    console.log(this.res);
     let res = await getGoodsMessage(this.goodsId);
     if (res.data.success) {
       this.goodsDetail = res.data.result;
@@ -131,11 +149,7 @@ export default {
       width: 52rpx;
       height: 6rpx;
 
-      background-image: linear-gradient(
-        90deg,
-        $price-color,
-        $price-light-color
-      );
+      background-image: linear-gradient(90deg, $price-color, $price-light-color);
     }
   }
   > .goods-detail-item {
diff --git a/pages/product/product/promotion/-promotion-assemble-list.vue b/pages/product/product/promotion/-promotion-assemble-list.vue
index f4b7c46..b32123b 100644
--- a/pages/product/product/promotion/-promotion-assemble-list.vue
+++ b/pages/product/product/promotion/-promotion-assemble-list.vue
@@ -1,23 +1,23 @@
 <template>
   <view class="group-list">
     <view class="group-name">拼购列表</view>
-    <view v-if="assembleOrder.length !=0">
-      <view class="group-item" v-for="(order,index) in assembleOrder" :key="index">
+    <view v-if="assembleOrder.length != 0">
+      <view class="group-item" v-for="(order, index) in assembleOrder" :key="index">
         <view class="group-item-user">
           <u-image shape="circle" width="40px" height="40px" :src="order.face"></u-image>
-          <span class="group-item-name">{{order.nickName | noPassByName}}</span>
+          <span class="group-item-name">{{ order.nickName | noPassByName }}</span>
         </view>
         <view>
-          <span class="group-item-name">还差{{ order.toBeGroupedNum}}人成团</span>
+          <span class="group-item-name">还差{{ order.toBeGroupedNum }}人成团</span>
         </view>
         <view>
-          <u-button size="mini" :custom-style="customStyle" @click="buy(order)">去参团</u-button>
+          <u-button size="mini" :custom-style="customStyle" @click="buy(order)"
+            >去参团</u-button
+          >
         </view>
       </view>
-
     </view>
     <view v-else class="nomore">
-
       <u-empty text="暂无拼团信息" mode="list"></u-empty>
     </view>
   </view>
diff --git a/pages/product/product/promotion/-promotion-assemble-promotions.vue b/pages/product/product/promotion/-promotion-assemble-promotions.vue
index 6b33a94..fb275b2 100644
--- a/pages/product/product/promotion/-promotion-assemble-promotions.vue
+++ b/pages/product/product/promotion/-promotion-assemble-promotions.vue
@@ -1,61 +1,105 @@
 <template>
   <view>
-
     <div v-for="(promotion, promotion_index) in res" :key="promotion_index">
-      <div class="showBox" v-if="promotion.__key == 'SECKILL' || promotion.__key =='GROUPBUY' || promotion.__key == 'PINTUAN'">
+      <div
+        class="showBox"
+        v-if="
+          promotion.__key == 'SECKILL' ||
+          promotion.__key == 'GROUPBUY' ||
+          promotion.__key == 'PINTUAN'
+        "
+      >
         <view class="group-wrapper">
           <div class="u-group-row">
             <view :span="8" class="showBox_L">
               <view class="u-group-flex">
-
                 <!-- 限时抢购 -->
-                <view class="u-group-flex-left" v-if="promotion.__key == 'SECKILL' ">
-
-                  <span class="u-group-flex-left-span" v-if="detail.promotionPrice!=undefined">
-                    ￥ <span class="flex-price"> {{ formatPrice(detail.promotionPrice)[0]}}.{{ formatPrice(detail.promotionPrice)[1]}}</span>
-
+                <view class="u-group-flex-left" v-if="promotion.__key == 'SECKILL'">
+                  <span
+                    class="u-group-flex-left-span"
+                    v-if="detail.promotionPrice != undefined"
+                  >
+                    ￥
+                    <span class="flex-price">
+                      {{ formatPrice(detail.promotionPrice)[0] }}.{{
+                        formatPrice(detail.promotionPrice)[1]
+                      }}</span
+                    >
                   </span>
-                  <view class="u-group-flex" v-if="detail.price!=undefined">
-                    <span class="old-price">￥{{ formatPrice(detail.price)[0]}}.{{ formatPrice(detail.price)[1]}}</span>
+                  <view class="u-group-flex" v-if="detail.price != undefined">
+                    <span class="old-price"
+                      >￥{{ formatPrice(detail.price)[0] }}.{{
+                        formatPrice(detail.price)[1]
+                      }}</span
+                    >
                     <view class="promotion">限时抢购</view>
                   </view>
                 </view>
 
                 <!-- 团购 -->
-                <view class="u-group-flex-left" v-if="promotion.__key == 'GROUPBUY' ">
+                <view class="u-group-flex-left" v-if="promotion.__key == 'GROUPBUY'">
                   <span class="u-group-flex-left-span">
-                    <span class="flex-price"
-                      v-if="promotion.groupbuy_goods_vo.price !=undefined">￥{{ formatPrice(promotion.groupbuy_goods_vo.price )[0]}}.{{ formatPrice(promotion.groupbuy_goods_vo.price )[1]}}</span>
+                    <span
+                      class="flex-price"
+                      v-if="promotion.groupbuy_goods_vo.price != undefined"
+                      >￥{{ formatPrice(promotion.groupbuy_goods_vo.price)[0] }}.{{
+                        formatPrice(promotion.groupbuy_goods_vo.price)[1]
+                      }}</span
+                    >
                     <!-- <span v-if="promotion.point">+{{promotion.point}}积分</span> -->
                   </span>
                   <view class="u-group-flex">
-                    <span class="old-price"
-                      v-if="promotion.groupbuy_goods_vo.original_price!=undefined">￥{{ formatPrice(promotion.groupbuy_goods_vo.original_price)[0]}}.{{ formatPrice(promotion.groupbuy_goods_vo.original_price)[1]}}</span>
+                    <span
+                      class="old-price"
+                      v-if="promotion.groupbuy_goods_vo.original_price != undefined"
+                      >￥{{
+                        formatPrice(promotion.groupbuy_goods_vo.original_price)[0]
+                      }}.{{
+                        formatPrice(promotion.groupbuy_goods_vo.original_price)[1]
+                      }}</span
+                    >
                     <view class="promotion">团购活动</view>
                   </view>
                 </view>
 
-                <view class="u-group-flex-left" v-if="promotion.__key == 'PINTUAN' ">
-
-                  <span class="u-group-flex-left-span" v-if="detail.promotionPrice != undefined">
-                    ￥<span class="flex-price"> {{ formatPrice(detail.promotionPrice)[0]}}.</span>{{ formatPrice(detail.promotionPrice)[1]}}
+                <view class="u-group-flex-left" v-if="promotion.__key == 'PINTUAN'">
+                  <span
+                    class="u-group-flex-left-span"
+                    v-if="detail.promotionPrice != undefined"
+                  >
+                    ￥<span class="flex-price">
+                      {{ formatPrice(detail.promotionPrice)[0] }}.</span
+                    >{{ formatPrice(detail.promotionPrice)[1] }}
                   </span>
                   <view class="u-group-flex" v-if="detail.price != undefined">
-                    <span class="old-price">￥{{ formatPrice(detail.price)[0]}}.{{ formatPrice(detail.price)[1]}}</span>
+                    <span class="old-price"
+                      >￥{{ formatPrice(detail.price)[0] }}.{{
+                        formatPrice(detail.price)[1]
+                      }}</span
+                    >
                     <view class="promotion">拼团活动</view>
                   </view>
                 </view>
                 <!--  拼团右侧 -->
-                <view class="u-group-flex-right" v-if="promotion.__key == 'PINTUAN' ">
-                  <span class="group-bag">{{promotion.requiredNum}}人拼团 </span>
-                  <span class="group-bag">限购{{promotion.limitNum}}件</span>
+                <view class="u-group-flex-right" v-if="promotion.__key == 'PINTUAN'">
+                  <span class="group-bag">{{ promotion.requiredNum }}人拼团 </span>
+                  <span class="group-bag">限购{{ promotion.limitNum }}件</span>
                 </view>
               </view>
             </view>
             <view class="showBox_R" v-if="promotion && promotion.endTime">
               <u-tag :text="getIsTimer(promotion)" size="mini" type="error" />
-              <u-count-down :hide-zero-day="true"  font-size="25" color="#fff" bg-color="#f71471" separator-size="25" separator-color="#f71471"  :show-hours="true" :show-minutes="true"
-                :timestamp="getCountDownTime(promotion.endTime)"></u-count-down>
+              <u-count-down
+                :hide-zero-day="true"
+                font-size="25"
+                color="#fff"
+                bg-color="#f71471"
+                separator-size="25"
+                separator-color="#f71471"
+                :show-hours="true"
+                :show-minutes="true"
+                :timestamp="getCountDownTime(promotion.endTime)"
+              ></u-count-down>
             </view>
           </div>
         </view>
@@ -105,13 +149,12 @@ export default {
       return val.toFixed(2).split(".");
     },
     getCountDownTime(val) {
-      let date = new Date(val.replace(/-/g, "/"))
+      let date = new Date(val.replace(/-/g, "/"));
       let timeSimple = new Date(date).getTime() / 1000;
       return timeSimple - new Date().getTime() / 1000;
     },
     getIsTimer(val) {
       var timestamp = new Date().getTime();
-      
 
       if (timestamp < val.start_time) {
         this.startTimer = true;
diff --git a/pages/product/product/promotion/-promotion-coupon.vue b/pages/product/product/promotion/-promotion-coupon.vue
index 05858dd..4b1efae 100644
--- a/pages/product/product/promotion/-promotion-coupon.vue
+++ b/pages/product/product/promotion/-promotion-coupon.vue
@@ -1,33 +1,37 @@
 <template>
   <view class="wrapper">
-
     <div class="coupon-empty" v-if="!res">暂无优惠券</div>
-    <view class="coupon-List" v-if="res && item.__key=='COUPON'" v-for="(item, index) in res" :key="index">
-      
+    <view class="coupon-List" v-for="(item, index) in couponRes" :key="index">
       <view class="coupon-item">
         <view class="top">
           <div class="price">
-           
             <span v-if="item.couponType == 'DISCOUNT'">{{ item.couponDiscount }}折</span>
             <span v-if="item.couponType == 'PRICE'">￥{{ item.price | unitPrice }}</span>
           </div>
           <view class="text">
-
             <div class="coupon-List-title">
               <view v-if="item.scopeType">
-                <span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
+                <span v-if="item.scopeType == 'ALL' && item.id == 'platform'"
+                  >全平台</span
+                >
                 <span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
-                <view v-else>{{  item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用</view>
+                <view v-else
+                  >{{
+                    item.storeName == "platform" ? "全平台" : item.storeName + "店铺"
+                  }}使用</view
+                >
               </view>
             </div>
             <div>满{{ item.consumeThreshold | unitPrice }}可用</div>
           </view>
-          <view class="lingqu-btn" @click="getCoupon(item)">
-            <div :class="yhqFlag ? 'cur' : ''">{{ yhqFlag ? '已领取或领完' : '立即领取' }}</div>
+          <view class="lingqu-btn" @click="getCoupon(item, index)">
+            <div :class="yhqFlag[index] ? 'cur' : ''">
+              {{ yhqFlag[index] ? "已领取或领完" : "立即领取" }}
+            </div>
           </view>
         </view>
         <view class="line"></view>
-        <view class="time">{{ item.startTime }} - {{item.endTime }}</view>
+        <view class="time">{{ item.startTime }} - {{ item.endTime }}</view>
       </view>
     </view>
   </view>
@@ -37,7 +41,8 @@
 export default {
   data() {
     return {
-      yhqFlag: false, //获取优惠券判断是否点击
+      yhqFlag: [], //获取优惠券判断是否点击
+      couponRes: {},
     };
   },
   props: {
@@ -52,7 +57,9 @@ export default {
         if (this.res && this.res.length != 0) {
           Object.keys(this.res).forEach((item) => {
             let key = item.split("-")[0];
-            this.res[item].__key = key;
+            if (key === "COUPON") {
+              this.couponRes[item] = this?.res[item];
+            }
           });
         }
       },
@@ -61,9 +68,8 @@ export default {
   },
   methods: {
     // 提交优惠券
-    getCoupon(item) {
-      this.yhqFlag = true;
-
+    getCoupon(item, index) {
+      this.yhqFlag[index] = true;
       this.$emit("getCoupon", item);
     },
   },
diff --git a/pages/product/product/promotion/-promotion.vue b/pages/product/product/promotion/-promotion.vue
index 4786672..6444563 100644
--- a/pages/product/product/promotion/-promotion.vue
+++ b/pages/product/product/promotion/-promotion.vue
@@ -1,50 +1,65 @@
 <template>
   <view>
-
-    <view v-for="(promotionItem,promotionIndex) in promotion" :key="promotionIndex" class="promotion_row" @click="shutMask(1)">
-      <view  v-if="res!=null" v-for="(item, index) in Object.keys(res)" :key="index">
-        <div class="promotion_col" v-if="item.split('-')[0] == promotionItem.value && item.split('-')[0] == 'FULL_DISCOUNT'">
+    <view
+      v-for="(promotionItem, promotionIndex) in promotion"
+      :key="promotionIndex"
+      class="promotion_row"
+      @click="shutMask(1)"
+    >
+      <view v-if="res != null" v-for="(item, index) in Object.keys(res)" :key="index">
+        <div
+          class="promotion_col"
+          v-if="
+            item.split('-')[0] == promotionItem.value &&
+            item.split('-')[0] == 'FULL_DISCOUNT'
+          "
+        >
           <!-- 满减，折扣 -->
           <div class="flex">
-            <view class="deg_tag">{{promotionItem.title}}</view>
+            <view class="deg_tag">{{ promotionItem.title }}</view>
             <div class="text proText">满{{ res[item].fullMoney }}元，立享优惠</div>
           </div>
         </div>
-        <div class="promotion_col" v-if="item.split('-')[0] == promotionItem.value && item.split('-')[0] == 'PINTUAN'">
+        <div
+          class="promotion_col"
+          v-if="
+            item.split('-')[0] == promotionItem.value && item.split('-')[0] == 'PINTUAN'
+          "
+        >
           <!-- 拼团 -->
           <div class="flex">
-            <view class="deg_tag">{{promotionItem.title}}</view>
+            <view class="deg_tag">{{ promotionItem.title }}</view>
             <div class="text proText">{{ res[item].promotionName }}</div>
           </div>
         </div>
-        <div class="promotion_col" v-if="item.split('-')[0] == promotionItem.value && item.split('-')[0] == 'SECKILL'">
+        <div
+          class="promotion_col"
+          v-if="
+            item.split('-')[0] == promotionItem.value && item.split('-')[0] == 'SECKILL'
+          "
+        >
           <!-- 限时抢购 -->
           <div class="flex">
-            <view class="deg_tag">{{promotionItem.title}}</view>
+            <view class="deg_tag">{{ promotionItem.title }}</view>
             <div class="text proText">{{ res[item].promotionName }}</div>
           </div>
         </div>
-
       </view>
 
-      <view class="promotion_row" style="display:inline;">
+      <view class="promotion_row" style="display: inline">
         <view>
-          <div class="promotion_col coupon" v-if="couponList && promotionIndex ==1">
+          <div class="promotion_col coupon" v-if="couponList && promotionIndex == 1">
             <!-- 优惠券 -->
 
             <div>
               <view class="deg_tag">优惠券</view>
             </div>
-
           </div>
         </view>
       </view>
     </view>
 
-    <view v-if=" this.res != null && Object.keys(res).length == 0">
-      暂无促销信息
-    </view>
-
+    <view v-if="this.res != null && Object.keys(res).length == 0"> 暂无促销信息 </view>
   </view>
 </template>
 
@@ -69,7 +84,6 @@ export default {
       handler() {
         if (this.res && this.res.length != 0 && this.res != null) {
           Object.keys(this.res).forEach((item) => {
-            
             let key = item.split("-")[0];
             this.res[item].__key = key;
 
diff --git a/pages/promotion/joinGroup.vue b/pages/promotion/joinGroup.vue
index 95bde10..e9c223c 100644
--- a/pages/promotion/joinGroup.vue
+++ b/pages/promotion/joinGroup.vue
@@ -26,7 +26,7 @@
       <div v-if="groupBuy.length !=0">
         <view class="view-item" v-for="(groupItem, groupIndex) in groupBuy" :key="groupIndex">
           <view class="view-left">
-            <u-image border-radius="10" shape="square" :src="groupItem.goodsImage" width="186rpx" height="186rpx">
+            <u-image border-radius="10" shape="square" :src="groupItem.thumbnail" width="186rpx" height="186rpx">
 
               <view slot="error" style="font-size: 24rpx;">加载失败</view>
             </u-image>