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

src/components/sharePic.vue

@@ -30,7 +30,9 @@
         <div class="item more" />
       </div>
       <div class="groupProcess">
-        <div class="desc">还差 <span>2人</span> 成团，参团截止时间5月3日</div>
+        <div class="desc">
+          还差 <span>{{ sharePicData.needGuys }}人</span> 成团，参团截止时间5月3日
+        </div>
       </div>
     </div>
     <div class="skuImg">
@@ -39,11 +41,13 @@
       <div class="skuInfo">
         <div class="skuPrice">
           <span class="groupPriceContainer">拼团价 ¥</span>
-          <span class="groupPrice">0</span>
-          <span class="salePrice">¥3899</span>
+          <span class="groupPrice">¥{{ sharePicData.activityPrice }}</span>
+          <span class="salePrice">¥{{ sharePicData.salePrice }}</span>
         </div>
         <div class="skuSuccess">
-          <p>已有<span>6999人</span></p>
+          <p>
+            已有<span>{{ sharePicData.groupBuySuccessGuys }}人</span>
+          </p>
           <p>拼团成功</p>
         </div>
       </div>

src/mixins/goodsCheck.mixin.js

@@ -16,7 +16,7 @@ export default {
         if (json.event === 'getTokenSuccess') {
           const appData = json.data || {};
           if (appData && appData.token) {
-            localStorage.get('vccToken', appData.token);
+            localStorage.set('vccToken', appData.token);
             that.$nextTick(() => {
               window.location.reload();
             });

src/service/validation.service.js

@@ -301,7 +301,7 @@ export const isIOS = /iphone|ipad|ipod/.test(ua);
 export const isAndroid = /android/.test(ua);
 
 // 判断
-export const appVersion = ua.match(/xyqb\/([\d|.]+)/);
+export const appVersion = ua.match(/xyqb\/([\d|.]+)/) ? ua.match(/xyqb\/([\d|.]+)/)[1] : "7.7.00";
 
 // 判断羊小咩环境
 export const isXyqb = ua.match(/xyqb/i) == "xyqb";

src/views/pay/payResult.vue

@@ -128,13 +128,15 @@ export default {
   },
   methods: {
     outputPicUrl(res) {
-      console.log(res);
       this.picUrl = res;
       this.$store.dispatch('goods_share_open');
       console.log(this.picUrl);
     },
     async setShareData() {
-      const [res] = await groupBuyApi.getGroupShareInfo(this.orderNo);
+      const [res, error] = await groupBuyApi.getGroupShareInfo(this.orderNo);
+      if (error) {
+        return this.$toast('获取分享数据失败');
+      }
       this.sharePicData = res;
       this.$refs.sharePic.createAndUploadPic();
     },