Merge branch 'feat/group-buy' of git.quantgroup.cn:ui/group-buy-ui into feat/group-buy

src/components/sharePic.vue

@@ -44,8 +44,8 @@
       <div class="skuInfo">
         <div class="skuPrice">
           <span class="groupPriceContainer">拼团价 ¥</span>
-          <span class="groupPrice">¥{{ sharePicData.activityPrice }}</span>
-          <span class="salePrice">¥{{ sharePicData.salePrice }}</span>
+          <span class="groupPrice">¥0</span>
+          <span class="salePrice">¥{{ sharePicData.activityPrice }}</span>
         </div>
         <div class="skuSuccess">
           <p>

src/views/goodsDetail/index.vue

@@ -27,8 +27,9 @@
       <div class="goods-group-buy-info">
         <div class="goods-group-buy-info-price">
           <p class="price">
-            成团价¥<span class="group-price">{{ detailInfo.activityPrice }}</span
-            >售价¥<span class="sale-price">{{ detailInfo.price }}</span>
+            成团价¥<span class="group-price">0</span>售价¥<span class="sale-price">{{
+              detailInfo.activityPrice
+            }}</span>
             <!-- :class="{ scaleFont: parseInt(detailInfo.activityPrice) < 10000 }" -->
           </p>
           <p class="desc">拼团成功/失败，款项原路返回至账户</p>
@@ -146,12 +147,12 @@
           <cr-stepper
             v-model="selectedGoods.skuNum"
             class="Gp-num-step"
-            :min="minCount"
-            :max="detailInfo.limitCount"
+            :min="1"
+            :max="1"
             disable-input
           />
           <div v-if="detailInfo.limitCount" class="goods-popup-num-limit">
-            仅限购买{{ detailInfo.limitCount }}件
+            仅限购买1件
           </div>
         </div>
         <div class="goods-area-button">

src/views/goodsDetail/smallPic.vue

@@ -39,9 +39,11 @@
           </div>
           <div class="goods-product-info-desc-price">
             <div class="goods-product-info-desc-price-group">
-              成团价 ¥<span class="actualPrice">{{ detailInfo.activityPrice }}</span>
+              成团价 ¥<span class="actualPrice">0</span>
+            </div>
+            <div class="goods-product-info-desc-price-market">
+              售价¥{{ detailInfo.activityPrice }}
             </div>
-            <div class="goods-product-info-desc-price-market">售价¥{{ detailInfo.price }}</div>
           </div>
         </div>
       </div>

src/views/goodsList/components/goodsCard.vue

@@ -16,10 +16,8 @@
         :percentage="handleProgressByStatus(goodsItem)"
       />
       <div class="group-item-already">已拼{{ goodsItem.groupBuySuccessCount }}团</div>
-      <div class="group-item-price">
-        成团价 ¥ <sup class="group-item-sup">{{ goodsItem.activityPrice }}</sup>
-      </div>
-      <div class="group-item-delprice">售价 ￥{{ goodsItem.price }}</div>
+      <div class="group-item-price">成团价 ¥ <sup class="group-item-sup">0</sup></div>
+      <div class="group-item-delprice">售价 ￥{{ goodsItem.activityPrice }}</div>
       <!-- 立即开团 -->
       <!-- 已抢光 -->
       <!-- 未开始 -->