feat:update处理冲突

src/components/sharePic.vue

@@ -3,14 +3,35 @@
     <div class="groupInfo">
       <!-- 组团头像信息 -->
       <div class="avatorGroup">
-        <div
-          v-for="(item, index) in avatorList"
-          :key="index"
-          class="item"
-          :class="{ leader: index == 0, normal: index != 0 }"
-        >
-          <img class="avator" :src="item" alt="" />
-          <template v-if="index == 0">
+        <template v-if="avatorList.length !== 0">
+          <div
+            v-for="(item, index) in avatorList"
+            :key="index"
+            class="item"
+            :class="{ leader: index == 0, normal: index != 0 }"
+          >
+            <img class="avator" :src="item" alt="" />
+            <template v-if="index == 0">
+              <div class="leaderName">团长</div>
+              <div class="leaderBorder">
+                <img
+                  src="https://img.lkbang.net/activity/share/default/leaderBorder.png?i=1"
+                  alt=""
+                />
+              </div>
+              <div class="crown">
+                <img src="https://img.lkbang.net/activity/share/default/crown.png?i=1" alt="" />
+              </div>
+            </template>
+          </div>
+          <div
+            v-for="num in maxCount - avatorList.length"
+            :key="`placeholder${num}`"
+            class="item placeholder"
+          />
+        </template>
+        <template v-else>
+          <div class="item leader">
             <div class="leaderName">团长</div>
             <div class="leaderBorder">
               <img
@@ -21,19 +42,20 @@
             <div class="crown">
               <img src="https://img.lkbang.net/activity/share/default/crown.png?i=1" alt="" />
             </div>
-          </template>
-        </div>
-        <div
-          v-for="num in maxCount - avatorList.length"
-          :key="`placeholder${num}`"
-          class="item placeholder"
-        />
+          </div>
+          <div
+            v-for="num in maxCount - 1 - avatorList.length"
+            :key="`placeholder${num}`"
+            class="item placeholder"
+          />
+        </template>
         <div v-if="openGroupCnt >= 7" class="item more" />
       </div>
       <div class="groupProcess">
         <div class="desc">
           还差 <span>{{ sharePicData.needGuys }}人</span> 成团，<template v-if="endTime != ''"
-            >参团截止时间 {{ endTime }}</template
+            ><template v-if="avatorList.length == 0">活动</template
+            ><template v-else>参团</template>截止时间 {{ endTime }}</template
           >
         </div>
       </div>
@@ -98,7 +120,10 @@ export default {
     },
     async createAndUploadPic(sharePicData) {
       this.sharePicData = sharePicData;
-      this.endTime = sharePicData.endTime ? sharePicData.endTime.split(' ')[0] : '';
+      let endTime = sharePicData.endTime ? sharePicData.endTime.split(' ')[0] : '';
+      if (endTime) {
+        this.endTime = `${new Date(endTime).getMonth() + 1}月${new Date(endTime).getDate()}日`;
+      }
       this.handleAvator(sharePicData);
       const _this = this;
       const [qrcodeUrl] = await groupBuyApi.getQrcodeUrl(sharePicData);

src/views/goodsDetail/components/bottomNav.vue

@@ -8,7 +8,7 @@
           type="primary"
           shape="circle"
           :disabled="disabled"
-          @click="createOrJoin(1)"
+          @click="createOrJoin(2)"
           >自己做团长</cr-button
         >
         <cr-button
@@ -80,7 +80,7 @@ export default {
     },
     createOrJoin(mark) {
       // 参团
-      // mark 1-> 开团  2-> 参团
+      // mark 1-> 开团  0-> 参团 2->自己做团长
       this.$emit('buy', mark);
     }
   }

src/views/goodsDetail/index.vue

@@ -207,6 +207,7 @@ import Bridge from '@qg/js-bridge';
 import MpBridge from '@/service/mp';
 import { isWxMp, isApp } from '@/service/validation.service';
 import { EventBus } from '@/service/utils.service';
+import { saTrackEvent } from '@/service/sa.service';
 export default {
   // eslint-disable-next-line vue/name-property-casing
   name: 'goodDetail',
@@ -370,13 +371,22 @@ export default {
     },
     // ka渠道逻辑
     goVccOrDetail(res) {
+      const buttonNameMap = {
+        0: '立即参团',
+        1: '立即开团',
+        2: '自己做团长'
+      };
       if (!this.hasLogin) {
         this.checkLogin();
         return;
       }
-      if (res == 1) {
+      if (res == 1 || res == 2) {
         localStorage.remove('groupBuyGroupId'); // 开团或者自己做团长的时候需要移除groupBuyGroupId，再去调下单
       }
+      saTrackEvent('H5_GroupZeroYuanPurchaseActivityDetailPageBtnClick', {
+        sku_no: this.detailInfo.skuNo,
+        buttons_name: buttonNameMap[res]
+      });
       this.toOrder();
     },
     setStartStatus(data) {
@@ -401,7 +411,7 @@ export default {
       }
       if (currentTime > activityStartTime && currentTime < activityEndTime) {
         this.timestemp = activityEndTime;
-        this.countDownText = '距成团结束';
+        this.countDownText = '距活动结束';
         this.inProgress = 1;
         return;
       }
@@ -588,6 +598,14 @@ export default {
     },
     handleParamsClick(eventType, name) {
       if (this.isPrimordialBrowser) return;
+      if (eventType == 'sku') {
+        saTrackEvent(
+          'H5_GroupZeroYuanPurchaseActivityDetailPageSpecificationSelectionPopupConfirmBtnClick',
+          {
+            sku_no: this.detailInfo.skuNo
+          }
+        );
+      }
       this.currentPopupType = eventType;
       this.currentPopupName = name;
       switch (eventType) {

src/views/goodsDetail/smallPic.vue

@@ -248,7 +248,7 @@ export default {
         return;
       }
       if (currentTime > activityStartTime && currentTime < activityEndTime) {
-        this.countDownText = '距成团结束';
+        this.countDownText = '距活动结束';
         return;
       }
     }

src/views/goodsList/index.vue

@@ -83,7 +83,7 @@ import { handleRemainTime, handleDateFormat } from './components/utils';
 import localStorage from '@/service/localStorage.service';
 import goodsCheckMixin from '@/mixins/goodsCheck.mixin';
 import { setAppTitleColor, EventBus } from '@/service/utils.service';
-// import { registeredEvents } from '@/service/sa.service';
+import { saTrackEvent } from '@/service/sa.service';
 import { isNull } from '@/service/validation.service';
 let topicIndex;
 export default {
@@ -187,6 +187,9 @@ export default {
         shareInfo,
         type: 0
       });
+      saTrackEvent('H5_GroupZeroYuanPurchaseActivityPageSharePopupBtnClick', {
+        activity_id: this.activityId
+      });
     },
     async getShareData() {
       const {

src/views/order/createOrder.vue

@@ -58,6 +58,7 @@ import { HAS_DISCOUNT } from '@/constants/order';
 import cookies from '@/service/cookieStorage.service';
 import { isApp, isWxMp } from '@/service/validation.service';
 import { mapState } from 'vuex';
+import { saTrackEvent } from '@/service/sa.service';
 export default {
   name: 'CreateOrder',
   components: {
@@ -178,6 +179,9 @@ export default {
         });
         return;
       }
+      saTrackEvent('H5_UserClickOrderConfirmPageSubmitOrderBtnClick', {
+        order_type: '0元购'
+      });
       const {
         addrReceiverInfo: { addrReceiverId: receiverId },
         calcFeeInfo: { totalFreightFee, totalPayFee: totalFee },

src/views/pay/index.vue

@@ -130,6 +130,7 @@ import {
   kaGetNextUrl,
   reissueContract
 } from '@/api/pay.api.js';
+import { saTrackEvent } from '@/service/sa.service';
 const VCC_CHANNEL = localStorage.get('vccChannel');
 let Current_Url = null;
 export default {
@@ -409,6 +410,9 @@ export default {
         }
         this.reissueContract();
       }
+      saTrackEvent('H5_CheckOutCounterConfirmPayBtnClick', {
+        order_type: '0元购'
+      });
       this.accountS.fn();
     }, 1000),
     /* 预支付 */