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

src/api/groupBuy.js

@@ -8,6 +8,9 @@ export default {
   detailInfo: params => {
     return http.post(`${talosHost}/api/kdsp/activity/activity-goods-special/detail`, { ...params });
   },
+  checkGroupBuyCreateOrder: params => {
+    return http.post(`${talosHost}/api/kdsp/checkCanOpenJoinGroup?${qs.stringify(params)}`);
+  },
   // 详情图片
   getDetailPic: url => {
     return http.get(url, { strategy: 'default', hideLoading: 1, skip: 1, hideToast: 1 });

src/views/goodsDetail/components/groupDescInfo.vue

@@ -8,9 +8,19 @@
         <countDown v-if="!!timestemp" :block-no-bg="true" :end-time="timestemp" />
       </template>
       <template v-else>
-        <p class="desc">
-          {{ statusTextMap[groupInfo.groupBuyStatus] }}
-        </p>
+        <template v-if="groupInfo.groupBuyStatus != 2">
+          <p class="desc">
+            {{ statusTextMap[groupInfo.groupBuyStatus] }}
+          </p>
+        </template>
+        <template v-else>
+          <p v-if="groupInfo.joinGroup" class="desc">
+            {{ statusTextMap[groupInfo.groupBuyStatus] }}
+          </p>
+          <p v-else class="desc">
+            {{ statusTextMap[groupInfo.groupBuyStatus] }}
+          </p>
+        </template>
       </template>
     </div>
     <div class="gourp-rules">

src/views/goodsDetail/index.vue

@@ -317,7 +317,7 @@ export default {
       this.swiperCurrent = index;
     },
     // ka渠道逻辑
-    goVccOrDetail(res) {
+    async goVccOrDetail(res) {
       if (!res) {
         this.currentPopupType = '';
         this.currentPopupName = '';
@@ -332,8 +332,31 @@ export default {
         this.checkLogin();
         return;
       }
+      const checkParams = {
+        activityHundredGroupId: this.groupId || '',
+        skuNo: this.detailParam.skuNo
+      };
       if (res == 1 || res == 2) {
-        localStorage.remove('groupBuyGroupId'); // 开团或者自己做团长的时候需要移除groupBuyGroupId，再去调下单
+        delete checkParams.activityHundredGroupId;
+      }
+      const [checkStatus] = await goods.checkGroupBuyCreateOrder(checkParams);
+      if (!checkStatus.verifyResult) {
+        // 校验是否允许开团或者参团
+        this.$dialog({
+          message: checkStatus.failedReason || '',
+          showCancelButton: false,
+          confirmButtonText: '查看其他商品',
+          onConfirm: () => {
+            this.$router.replace({
+              path: '/groupBuy/list',
+              query: {
+                activityId: this.detailParam.activityId
+              }
+            });
+          }
+        });
+        this.$toast(checkStatus.failedReason);
+        return;
       }
       saTrackEvent('H5_GroupZeroYuanPurchaseActivityDetailPageBtnClick', {
         sku_no: this.detailInfo.skuNo,

src/views/pay/index.vue

@@ -103,7 +103,7 @@ import localStorage from '@/service/localStorage.service';
 import { throttle } from '@/service/utils.service';
 import { goUrlExtends } from './extends';
 import cookies from '@/service/cookieStorage.service';
-import saTrackEvent from '@/service/sa.service';
+import { saTrackEvent } from '@/service/sa.service';
 import {
   codeArr,
   CREDIT_PAY,

src/views/pay/payResult.vue

@@ -47,9 +47,9 @@
       >
     </div>
 
-    <div class="activity">
+    <!-- <div class="activity">
       <cr-image src="@/assets/images/groupBuy/activity.png" />
-    </div>
+    </div> -->
 
     <!-- <div v-if="isSuccess && couponList.length" class="coupon-box">
       <p class="coupon-tip">本单已享以下权益</p>