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

src/components/rules.vue

@@ -4,7 +4,7 @@
       <span class="title">拼团玩法</span>
       <span class="desc" @click="showRules">详细规则 <i class="iconfont icon-arrow"/></span>
     </div>
-    <cr-image src="@/assets/images/rules.png" />
+    <cr-image src="https://img.lkbang.net/activity/rules.png" />
   </div>
 </template>
 <style lang="less" scoped>

src/service/httpDecorator.js

 import HttpRequest from '@qg/ui-request';
 import { Toast } from '@qg/cherry-ui';
 import store from '@/store';
-import { appVersion, isWxMp } from '@/service/validation.service';
+import { appVersion, isApp, isWxMp } from '@/service/validation.service';
 import { getVccChannel } from './userInfo.service';
 import localStorage from '@/service/localStorage.service';
-// import sessionStorage from '@/service/sessionStorage.service';
-// import MpBridge from '@/service/mp';
-// import Bridge from '@qg/js-bridge';
+import sessionStorage from '@/service/sessionStorage.service';
+import MpBridge from '@/service/mp';
+import Bridge from '@qg/js-bridge';
 
 function getURLSearchParams(json) {
   if (!json) return '';
@@ -24,11 +24,11 @@ const http = new HttpRequest(
         const { data, config } = res;
         const returnRawData = config.rawData;
         if (returnRawData) return [data, null];
-        if (data.businessCode === '401' || data.businessCode === '0401') {
-          // router.push({ name: 'login' });
-          window.localStorage.removeItem('vccToken');
-          window.sessionStorage.removeItem('vccToken');
-        }
+        // if (data.businessCode === '401' || data.businessCode === '0401') {
+        //   // router.push({ name: 'login' });
+        //   window.localStorage.removeItem('vccToken');
+        //   window.sessionStorage.removeItem('vccToken');
+        // }
         const success =
           (data.code === '0000' && data.businessCode === '0000') || data.business_code === 0;
         if (success) {
@@ -41,35 +41,37 @@ const http = new HttpRequest(
         let error = new Error(msg);
         error.response = data;
 
-        // if (
-        //   error?.response?.businessCode === '6049' ||
-        //   error?.response?.businessCode === '401' ||
-        //   error?.response?.businessCode === '0401'
-        // ) {
-        //   window.localStorage.removeItem('vccToken');
-        //   window.sessionStorage.removeItem('vccToken');
-        //   if (isApp) {
-        //     const nativeBridge = new Bridge();
-        //     window.xyqbNativeEvent = function(res) {
-        //       const json = typeof res === 'string' ? JSON.parse(res) : res;
-        //       if (json.event === 'getTokenSuccess') {
-        //         const appData = json.data || {};
-        //         if (appData && appData.token) {
-        //           localStorage.set('vccToken', appData.token);
-        //           sessionStorage.set('vccToken', appData.token);
-        //           setTimeout(() => {
-        //             window.location.reload();
-        //           }, 300);
-        //         }
-        //       }
-        //     };
-        //     nativeBridge.getToken();
-        //   }
-        //   if (isWxMp) {
-        //     const nativeBridge = new MpBridge();
-        //     nativeBridge.getToken({ from: 'groupbuy' });
-        //   }
-        // }
+        if (
+          error?.response?.businessCode === '6049' ||
+          error?.response?.businessCode === '401' ||
+          error?.response?.businessCode === '0401'
+        ) {
+          localStorage.removeItem('vccToken');
+          sessionStorage.removeItem('vccToken');
+          if (isApp) {
+            const nativeBridge = new Bridge();
+            window.xyqbNativeEvent = function(res) {
+              const json = typeof res === 'string' ? JSON.parse(res) : res;
+              if (json.event === 'getTokenSuccess') {
+                const appData = json.data || {};
+                if (appData && appData.token) {
+                  localStorage.set('vccToken', appData.token);
+                  sessionStorage.set('vccToken', appData.token);
+                  setTimeout(() => {
+                    window.location.reload();
+                  }, 500);
+                }
+              }
+            };
+            nativeBridge.getToken();
+          }
+          if (isWxMp) {
+            const nativeBridge = new MpBridge();
+            nativeBridge.getToken({
+              clear: 1
+            });
+          }
+        }
 
         console.error(error);
         return [null, error];