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

src/components/avatorSwiper.vue

@@ -119,7 +119,7 @@ export default {
     },
     getAvatorItem(ele) {
       return {
-        src: ele.data('src') || '',
+        avatar: ele.data('src') || '',
         name: ele.data('name') || ''
       };
     },

src/views/goodsList/components/goodsCard.vue

@@ -124,7 +124,7 @@ export default {
         }
         if (s === 3) {
           message = '您选的商品太火爆了,已经卖完了呢,您可以选择其他的团品重新开团哦～';
-          confirmButtonText = '选择更多';
+          confirmButtonText = '知道了';
         }
 
         this.$dialog({

src/views/orderList/components/List.vue

@@ -204,11 +204,15 @@ export default {
       }
     },
     async openShareEvent(item) {
-      saTrackEvent('H5_MyPuzzlePageInviteFriendsBtnClick', {
-        sku_no: item.skuList[0].skuNo,
-        group_id: item.activityHundredGroupId
-      });
-      this.$emit('option-click', { ...item.skuList[0], eventType: 'share' });
+      try {
+        saTrackEvent('H5_MyPuzzlePageInviteFriendsBtnClick', {
+          sku_no: item.skuList[0].skuNo,
+          group_id: item.activityHundredGroupId
+        });
+        this.$emit('option-click', { ...item.skuList[0], eventType: 'share' });
+      } catch (err) {
+        console.log(err);
+      }
     },
 
     toDetail(goodsItem) {
@@ -218,21 +222,21 @@ export default {
           sku_no: skuList[0].skuNo,
           group_id: activityHundredGroupId
         });
+        this.$router.push({
+          path: '/groupBuy/skuInfoSmallPic',
+          query: {
+            skuNo: skuList[0].skuNo,
+            groupBuyGroupId: activityHundredGroupId,
+            goodsSpecialId: skuList[0].goodsSpecialId,
+            activityId: activityInfoId,
+            templateId: skuList[0].activityTemplateInfoId,
+            templateDetailId: skuList[0].activityTemplateDetailId,
+            vccToken: localStorage.get('vccToken') || ''
+          }
+        });
       } catch (e) {
         console.log(e);
       }
-      this.$router.push({
-        path: '/groupBuy/skuInfoSmallPic',
-        query: {
-          skuNo: skuList[0].skuNo,
-          groupBuyGroupId: activityHundredGroupId,
-          goodsSpecialId: skuList[0].goodsSpecialId,
-          activityId: activityInfoId,
-          templateId: skuList[0].activityTemplateInfoId,
-          templateDetailId: skuList[0].activityTemplateDetailId,
-          vccToken: localStorage.get('vccToken') || ''
-        }
-      });
     },
     onLoad() {
       this.$emit(EVENT_LOADING);