Merge branch 'master' of ssh://gogs.zfire.top:2222/zfire-front/recycle-mobile

* 'master' of ssh://gogs.zfire.top:2222/zfire-front/recycle-mobile:
  feat: 优化报错提示
  feat: 修改传参判空
  feat: 修改数据

src/common/http/index.js

@@ -3,6 +3,11 @@ import {
   platform
 } from '../utils/index';
 import store from '@/store/index.js'
+
+import {
+  goLoginPage
+} from "@/mixins/index.js"
+
 const program = {
   H5: "wap",
   APP: "app",
@@ -33,25 +38,17 @@ export const $http = (url, method, data, json) => {
     uni.hideLoading()
     const res = response.data;
     if (whiteCodes.indexOf(res.code) < 0) {
+      if (res.code === 1001) {
+        goLoginPage()
+        return {}
+      }
+
       uni.showToast({
         title: res.message || 'Error',
         icon: 'none',
         duration: 1500
       })
 
-      if (res.code === 1001 || res.code === 7777 || res.code === 8888) {
-
-        // return response.data = await doRequest(response, url)//动态刷新token,并重新完成request请求
-        // store.dispatch('user/resetToken').then(() => {
-        //   uni.navigateTo({
-        //     url: '/pages/login/indexs'
-        //   })
-        // })
-
-        // uni.navigateTo({
-        //   url: '/pages/login/indexs'
-        // })
-      }
       return Promise.reject(new Error(res.message || 'Error'))
     } else {
       return res
@@ -129,4 +126,4 @@ export default {
   post,
   put,
   del
-}
+}

src/common/utils/navPag.js

@@ -64,9 +64,9 @@ export const navToPage = (function() {
 export function webViewHref(url) {
   if (!!~url.indexOf("?")) {
     return process.env.VUE_APP_HREF + url +
-      `&x-token=${store.state.user.token}&openId=${store.state.user.openId}&username=${store.state.user.name}&useravatar=${store.state.user.avatar}`
+      `&x-token=${store.state.user.token||''}&openId=${store.state.user.openId||''}&username=${store.state.user.name||''}&useravatar=${store.state.user.avatar||''}`
   } else {
     return process.env.VUE_APP_HREF + url +
-      `?x-token=${store.state.user.token}&openId=${store.state.user.openId}&username=${store.state.user.name}&useravatar=${store.state.user.avatar}`
+      `?x-token=${store.state.user.token||''}&openId=${store.state.user.openId||''}&username=${store.state.user.name||''}&useravatar=${store.state.user.avatar||''}`
   }
 }

src/mixins/index.js

@@ -14,14 +14,14 @@ import store from '@/store/index.js'
 import wx from 'weixin-js-sdk'
 // #endif
 
-// #ifdef MP-WEIXIN
 // 微信小程序页面劫持
-var goLoginPage = (new firstPerform(1000)).refactor(function() {
+export const goLoginPage = (new firstPerform(1000)).refactor(function() {
   navToPage({
     url: "/pages/login/indexs"
   }, "redirectTo")
 });
-var routerBeforeEach = (new firstPerform(200)).refactor(function() {
+// #ifdef MP-WEIXIN
+export const routerBeforeEach = (new firstPerform(200)).refactor(function() {
   function getrouter() {
     let routes = getCurrentPages();
     if (routes.length) {
@@ -42,7 +42,7 @@ var routerBeforeEach = (new firstPerform(200)).refactor(function() {
 });
 // #endif
 
-var updatePageLay = (new firstPerform(1000)).refactor(function() {
+const updatePageLay = (new firstPerform(1000)).refactor(function() {
   // 去除顶部
   var uni_page_head = document.querySelector("uni-page-head[uni-page-head-type='default']")
   if (uni_page_head) {
@@ -76,15 +76,15 @@ function loadStyleString(css) {
 
 // 存放页面公用数据、方法...
 export default {
-  onShow() {
+  onLoad() {
     // #ifdef MP-WEIXIN
     routerBeforeEach()
     // #endif
   },
   mounted() {
-    // #ifdef MP-WEIXIN
-    routerBeforeEach()
-    // #endif
+    // // #ifdef MP-WEIXIN
+    // routerBeforeEach()
+    // // #endif
     if (isWeixin()) {
       updatePageLay()
     }