fix

src/App.vue

@@ -2,6 +2,7 @@
   <div id="app">
     <cr-nav-bar v-if="header" :title="title" left-text="" @click-left="backFun" />
     <div class="app">
+      <!-- <Weapp v-if="isWeixinBrowser" jump-url="/pages/user/login" /> -->
       <keep-alive>
         <router-view v-if="$route.meta.keepLive" />
       </keep-alive>
@@ -19,6 +20,7 @@ import { mapState } from 'vuex';
 import NetError from '@/components/NetError';
 import { isApp, isWxMp, isWechat } from '@/service/validation.service';
 import store from '@/store';
+// import Weapp from '@/components/weapp';
 import goodsShare from '@/components/groupShare';
 import qs from 'qs';
 export default {

src/api/groupBuy.js

@@ -59,7 +59,9 @@ export default {
     return http.get(`${talosHost}/api/kdsp/playBill/getMakePicData?${qsString}`);
   },
   getGroupShareInfo(orderNo) {
-    return http.get(`${talosHost}/api/kdsp/groupShareInfo?orderNo=${orderNo}`);
+    return http.get(`${talosHost}/api/kdsp/groupShareInfo?orderNo=${orderNo}`, {
+      hideLoading: true
+    });
   },
   getPlayBillUrl(m) {
     return http.get(`http://192.168.25.122/api/kdsp/playBill/getPlayBillUrl?m=${m}`);

src/components/groupShare.vue

@@ -59,6 +59,7 @@ export default {
   },
   mounted() {
     EventBus.$on('goods_share_info', ({ shareInfo, type }) => {
+      this.$store.dispatch('change_loading', true);
       // if (!isApp && !isWxMp) {
       //   this.tipDialogMessage();
       //   return;
@@ -85,6 +86,7 @@ export default {
       if (isWxMp) {
         this.shareOpenWechat();
       }
+      this.$store.dispatch('change_loading', false);
     },
     handleShareInfo(shareInfo) {
       // 处理是否已经有 海报地址，如果有，小程序弹出地步框，App直接弹出分享
@@ -98,6 +100,7 @@ export default {
           // 直接调用app分享方法
           this.appShareEventChange();
         }
+        this.$store.dispatch('change_loading', false);
         return;
         // 如果传递的数据有海报则不处理
       }

src/components/sharePic.vue

@@ -196,6 +196,7 @@ export default {
               const observer = {
                 error(err) {
                   console.log(err);
+                  _this.$store.dispatch('change_loading', false);
                 },
                 complete({ hash }) {
                   const fileLink = config.qiniuHost + hash;

src/service/init.service.js

@@ -10,7 +10,10 @@ export default {
   // token校验，整个流程都是登陆后的
   init: router => {
     router.beforeEach((to, from, next) => {
-      if (to.name == 'groupBuyList' && from.name == 'groupBuySkuInfo') {
+      if (
+        to.name == 'groupBuyList' &&
+        (from.name == 'groupBuySkuInfo' || Object.keys(from.query).length == 0)
+      ) {
         // 这是为了详情页登录，把登录信息带回列表页所做的处理
         to.query.vccToken = '{token}';
       }

src/views/goodsDetail/index.vue

@@ -315,7 +315,7 @@ export default {
         activityPrice: this.detailInfo.activityPrice, // y
         skuNo: this.detailParam.skuNo,
         peoplePhotoList: avatorList,
-        endTime: this.detailInfo.endTime || ''
+        endTime: this.detailInfo?.groupBuyInfo.currentGroupEndTime || this.detailInfo?.endTime || ''
       };
       EventBus.$emit('goods_share_info', {
         shareInfo: sharePicData,

src/views/goodsDetail/smallPic.vue

@@ -190,7 +190,7 @@ export default {
         activityPrice: this.detailInfo.activityPrice, // y
         skuNo: this.detailParam.skuNo,
         peoplePhotoList: avatorList,
-        endTime: this.detailInfo.endTime || ''
+        endTime: this.detailInfo?.groupBuyInfo.currentGroupEndTime || this.detailInfo?.endTime || ''
       };
       EventBus.$emit('goods_share_info', {
         shareInfo: sharePicData,