张延森 3 年之前
父節點
當前提交
3fed0af876
共有 4 個檔案被更改,包括 25 行新增16 行删除
  1. 4
    2
      src/main.js
  2. 1
    3
      src/router/index.js
  3. 17
    8
      src/utils/initial.js
  4. 3
    3
      src/utils/request.js

+ 4
- 2
src/main.js 查看文件

@@ -22,7 +22,6 @@ Vue.component('swiper-slide', SwiperSlide)
22 22
 /* eslint-disable no-new */
23 23
 redirect()
24 24
 
25
-
26 25
 Login().then(e => {
27 26
   new Vue({
28 27
     router,
@@ -31,6 +30,9 @@ Login().then(e => {
31 30
   }).$mount('#app')
32 31
 }).catch(e => {
33 32
   console.error(e)
34
-  alert('系统错误, 请刷新重试')
33
+  // alert('系统错误, 请刷新重试')
34
+
35
+  // 重试一次
36
+  redirect(true)
35 37
 })
36 38
 

+ 1
- 3
src/router/index.js 查看文件

@@ -9,8 +9,6 @@ import Result from '@/pages/resultPage'
9 9
 Vue.use(Router)
10 10
 
11 11
 const router = new Router({
12
-  mode: "history",
13
-
14 12
   routes: [
15 13
     {
16 14
       path: '/',
@@ -23,7 +21,7 @@ const router = new Router({
23 21
       component: AllPages
24 22
     },
25 23
     {
26
-      path: '/pages',
24
+      path: '/detail',
27 25
       name: 'Test',
28 26
       component: Test
29 27
     },

+ 17
- 8
src/utils/initial.js 查看文件

@@ -73,18 +73,24 @@ export function Login () {
73 73
     store.commit('SET_USER_INFO', userInfo)
74 74
     let location = window.location.href
75 75
 
76
-    pv({ addr: location })
77
-
76
+    try {
77
+      pv({ addr: location })
78
+    } catch (error) {
79
+      console.error(error)
80
+    }
81
+    try {
82
+      share({
83
+        title: '开启干洗护理新时代',
84
+        desc: '即刻尊享'
85
+      })
86
+    } catch (error) {
87
+      console.error(error)
88
+    }
78 89
 
79 90
     hideLoading()
80
-    share({
81
-      title: '开启干洗护理新时代',
82
-      desc: '即刻尊享'
83
-    })
84 91
 
85 92
     return;
86 93
   })
87
-
88 94
 }
89 95
 
90 96
 function hideLoading () {
@@ -110,10 +116,13 @@ export function redirect (force) {
110 116
   if (process.env.NODE_ENV === 'development') return;
111 117
 
112 118
   const originCode = localStorage.getItem('wxcode');
119
+  const wxfirst = localStorage.getItem('wxfirst') || true;
113 120
   const queryCode = getCode();
121
+ 
114 122
   localStorage.setItem('wxcode', queryCode)
123
+  localStorage.setItem('wxfirst', 'not');
115 124
 
116
-  if (force || !queryCode || queryCode === originCode) {
125
+  if (force || wxfirst || !queryCode || queryCode === originCode) {
117 126
 
118 127
     const local = encodeURIComponent(location.origin + location.pathname)
119 128
     const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxd3bab568bc42d1de&redirect_uri=${local}&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect`

+ 3
- 3
src/utils/request.js 查看文件

@@ -39,6 +39,8 @@ export default function (url, options) {
39 39
       const { code, data, message } = res.data
40 40
       if (code === 1000) {
41 41
         resolve(data)
42
+      } else {
43
+        reject(res.data)
42 44
       }
43 45
     }).catch(err => {
44 46
       const message = err.message || err.errMsg || err
@@ -49,9 +51,7 @@ export default function (url, options) {
49 51
         // 请求超时
50 52
         // Message.error('请求超时')
51 53
       }
52
-      reject(message)
53
-    }).finally(() => {
54
-      // 请求结束
54
+      reject(err)
55 55
     })
56 56
   })
57 57
 }