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

src/views/goodsDetail/components/bottomNav.vue

 <template>
   <div class="goods-bottom">
+    <template v-if="status == 1">
       <template v-if="groupId">
         <cr-button
           class="mutiplie"
@@ -7,7 +8,7 @@
           type="primary"
           shape="circle"
           :disabled="disabled"
-        @click="createGroup"
+          @click="createOrJoin(1)"
           >自己做团长</cr-button
         >
         <cr-button
@@ -16,16 +17,28 @@
           :disabled="disabled"
           type="primary"
           block
-        @click="joinGroup"
+          @click="createOrJoin(0)"
         >
           立即参团
         </cr-button>
       </template>
       <template v-else>
-      <cr-button shape="circle" :disabled="disabled" type="primary" block @click="createGroup">
+        <cr-button
+          shape="circle"
+          :disabled="disabled"
+          type="primary"
+          block
+          @click="createOrJoin(1)"
+        >
           立即开团
         </cr-button>
       </template>
+    </template>
+    <template v-else>
+      <cr-button shape="circle" :disabled="disabled" type="primary" block @click="shareTo">
+        邀请好友
+      </cr-button>
+    </template>
   </div>
 </template>
 <script>
@@ -35,16 +48,8 @@ export default {
   mixins: [goodsCheckMixin],
   props: {
     groupId: {
-      type: String,
-      default: ''
-    },
-    type: {
-      type: String,
-      default: 'shopCar' // shoppingCar 购物车；settlement 结算;submitOrder 确认订单
-    },
-    shopBtnName: {
-      type: String,
-      default: '立即购买' // shoppingCar 购物车；settlement 结算;submitOrder 确认订单
+      type: Number,
+      default: 0
     },
     info: {
       type: Object,
@@ -62,7 +67,7 @@ export default {
     },
     status: {
       type: Number,
-      default: 2
+      default: 1 // 1是大图详情页， 2是小图详情页
     }
   },
   data() {
@@ -71,21 +76,17 @@ export default {
     };
   },
   methods: {
-    joinGroup() {
-      // 参团
-      if (this.checkLogin()) {
-        // todo
-        return;
-      }
-      this.$emit('buy');
+    shareTo() {
+      // 邀请好友
+      this.$emit('share');
     },
-    createGroup() {
-      // 开团
+    createOrJoin(mark) {
+      // 参团
+      // mark 1-> 开团  2-> 参团
       if (this.checkLogin()) {
-        // todo
         return;
       }
-      this.$emit('buy');
+      this.$emit('buy', mark);
     }
   }
 };

src/views/goodsDetail/components/groupDescInfo.vue

@@ -13,9 +13,11 @@
         </p>
       </template>
     </div>
-    <div v-if="groupInfo.groupBuyStatus == 1" class="gourp-rules">
+    <div class="gourp-rules">
+      <template v-if="groupInfo.groupBuyStatus == 1 || groupInfo.groupBuyStatus == 0">
         <p>成团条件：{{ groupInfo.groupBuyCondition || '' }}</p>
         <cr-image src="@/assets/images/flag.png" width="13px" />
+      </template>
       <!-- </template> -->
     </div>
     <div v-if="showButtonGroup" ref="buttonArea" class="button-area">
@@ -54,6 +56,7 @@ export default {
     return {
       observer: null,
       statusTextMap: {
+        0: '发起拼团，邀请好友一起拼团吧！',
         2: '恭喜成团，等待发货！',
         3: '哎呀，拼团时间已过，尚未成团！',
         4: '已发货'
@@ -98,7 +101,7 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  margin-bottom: @padding-unit;
+  margin-bottom: @padding-xs;
   .desc {
     margin-right: @padding-unit;
     span {

src/views/goodsDetail/index.vue

@@ -222,7 +222,7 @@ export default {
       inProgress: false, // 活动是否已经开始
       countDownText: '',
       showPage: false, // 是否显示页面，当查询完团与人的关系后进行处理，如果用户已经参与了此商品此活动的团，navigateto small else showpage = true
-      groupId: '', // 团id
+      groupId: 0, // 团id
       // 以下是原有的data
       detailParam: {
         skuNo: '',
@@ -262,10 +262,14 @@ export default {
   created() {
     this.hasLogin = localStorage.get('vccToken') != 'null' ? true : false;
     this.detailParam = { ...this.$route.query };
+    localStorage.remove('orderData');
     localStorage.set('activityId', this.detailParam.templateId); // 设置活动模板id，用于下单
     if (this.detailParam.groupBuyGroupId) {
-      localStorage.set('groupBuyGroupId', this.detailParam.groupBuyGroupId || ''); // 设置groupBuyGroupId，用于下单
-      this.groupId = this.detailParam.groupBuyGroupId || '';
+      localStorage.set('groupBuyGroupId', this.detailParam.groupBuyGroupId); // 设置groupBuyGroupId，用于下单
+      this.groupId = +this.detailParam.groupBuyGroupId;
+    } else {
+      localStorage.remove('groupBuyGroupId');
+      this.groupId = 0;
     }
     this.name = this.$route.params;
     this.init(this.detailParam);
@@ -284,11 +288,14 @@ export default {
       this.swiperCurrent = index;
     },
     // ka渠道逻辑
-    goVccOrDetail() {
+    goVccOrDetail(res) {
       if (!this.hasLogin) {
         this.checkLogin();
         return;
       }
+      if (res == 1) {
+        localStorage.remove('groupBuyGroupId'); // 开团或者自己做团长的时候需要移除groupBuyGroupId，再去调下单
+      }
       this.toOrder();
     },
     setStartStatus(data) {
@@ -298,7 +305,6 @@ export default {
       this.groupTimestemp = data.groupBuyInfo.currentGroupEndTime
         ? new Date(data.groupBuyInfo.currentGroupEndTime).getTime()
         : -1;
-      console.log(currentTime, activityStartTime, activityEndTime);
       if (currentTime <= activityStartTime) {
         // 当前时间小于活动开始时间
         this.timestemp = activityStartTime;
@@ -323,7 +329,7 @@ export default {
       const [res] = await goods.detailInfo(detailParam);
       if (res.groupBuyInfo.groupId) {
         localStorage.set('groupBuyGroupId', res.groupBuyInfo.groupId || ''); // 设置groupBuyGroupId，用于下单
-        this.groupId = res.groupBuyInfo.groupId || '';
+        this.groupId = +res.groupBuyInfo.groupId || 0;
       }
       if (res.groupBuyInfo?.joinGroup) {
         const query = { ...this.$route.query };
@@ -332,6 +338,7 @@ export default {
       this.imgList = res.imageUrl || [];
       this.detailInfo = res;
       this.setStartStatus(res);
+      this.showPage = true;
       try {
         const detailImages = await goods.getDetailPic(this.detailInfo.contentDetailUrl);
         // const imgReg = new RegExp('(?<=src=").[^"]*', 'g');
@@ -346,7 +353,6 @@ export default {
           srcArr.push(src);
         }
         this.detailImgList = srcArr;
-        this.showPage = true;
       } catch (error) {
         console.error(error);
       }

src/views/goodsDetail/smallPic.vue

@@ -85,7 +85,7 @@
         />
       </div>
     </div>
-    <bottom-nav v-if="showButtonNav" type="shoppingCar" :disabled="false" @buy="goVccOrDetail" />
+    <bottom-nav v-if="showButtonNav" :status="2" :disabled="false" @share="shareTo" />
   </div>
 </template>
 <script>
@@ -135,7 +135,11 @@ export default {
     this.detailParam = { ...this.$route.query };
     localStorage.set('activityId', this.detailParam.templateId); // 设置活动模板id，用于下单
     if (this.detailParam.groupBuyGroupId) {
-      localStorage.set('groupBuyGroupId', this.detailParam.groupBuyGroupId || ''); // 设置groupBuyGroupId，用于下单
+      localStorage.set('groupBuyGroupId', this.detailParam.groupBuyGroupId); // 设置groupBuyGroupId，用于下单
+      this.groupId = +this.detailParam.groupBuyGroupId;
+    } else {
+      localStorage.remove('groupBuyGroupId');
+      this.groupId = 0;
     }
     this.name = this.$route.params;
     this.imgList = [this.name.goodsimg];
@@ -151,6 +155,9 @@ export default {
     }, 5000);
   },
   methods: {
+    shareTo() {
+      // 分享
+    },
     changeButtonVisible(res) {
       this.showButtonNav = res;
     },
@@ -165,6 +172,7 @@ export default {
       const [res] = await goods.detailInfo(detailParam);
       if (res.groupBuyInfo.groupId) {
         localStorage.set('groupBuyGroupId', res.groupBuyInfo.groupId || ''); // 设置groupBuyGroupId，用于下单
+        this.groupId = +res.groupBuyInfo.groupId || '';
       }
       this.showShareButton = res.groupBuyInfo.groupBuyStatus == 1 ? true : false;
       this.imgList = res.imageUrl || [];