Merge branch 'master' of http://git.ycjcjy.com/dianyang/colmo-h5

src/main.js

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

src/router/index.js

@@ -9,8 +9,6 @@ import Result from '@/pages/resultPage'
 Vue.use(Router)
 
 const router = new Router({
-  mode: "history",
-
   routes: [
     {
       path: '/',
@@ -23,7 +21,7 @@ const router = new Router({
       component: AllPages
     },
     {
-      path: '/pages',
+      path: '/detail',
       name: 'Test',
       component: Test
     },

src/utils/initial.js

@@ -73,18 +73,24 @@ export function Login () {
     store.commit('SET_USER_INFO', userInfo)
     let location = window.location.href
 
-    pv({ addr: location })
-
+    try {
+      pv({ addr: location })
+    } catch (error) {
+      console.error(error)
+    }
+    try {
+      share({
+        title: '开启干洗护理新时代',
+        desc: '即刻尊享'
+      })
+    } catch (error) {
+      console.error(error)
+    }
 
     hideLoading()
-    share({
-      title: '开启干洗护理新时代',
-      desc: '即刻尊享'
-    })
 
     return;
   })
-
 }
 
 function hideLoading () {
@@ -110,10 +116,13 @@ export function redirect (force) {
   if (process.env.NODE_ENV === 'development') return;
 
   const originCode = localStorage.getItem('wxcode');
+  const wxfirst = localStorage.getItem('wxfirst') || true;
   const queryCode = getCode();
+ 
   localStorage.setItem('wxcode', queryCode)
+  localStorage.setItem('wxfirst', 'not');
 
-  if (force || !queryCode || queryCode === originCode) {
+  if (force || wxfirst || !queryCode || queryCode === originCode) {
 
     const local = encodeURIComponent(location.origin + location.pathname)
     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`

src/utils/request.js

@@ -39,6 +39,8 @@ export default function (url, options) {
       const { code, data, message } = res.data
       if (code === 1000) {
         resolve(data)
+      } else {
+        reject(res.data)
       }
     }).catch(err => {
       const message = err.message || err.errMsg || err
@@ -49,9 +51,7 @@ export default function (url, options) {
         // 请求超时
         // Message.error('请求超时')
       }
-      reject(message)
-    }).finally(() => {
-      // 请求结束
+      reject(err)
     })
   })
 }