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: 简化代码

src/common/utils/navPag.js

@@ -15,29 +15,6 @@ import {
   object
 } from '@dcloudio/vue-cli-plugin-uni/packages/postcss/tags';
 
-export function webViewHref(url, pam = {}, crossPagePam = {}) {
-  var defaultPam = {
-    ...pam,
-    ...crossPagePam,
-    "x-token": store.state.user.token,
-    openId: store.state.user.openId,
-    userId: store.state.user.userId,
-    username: store.state.user.name,
-    useravatar: store.state.user.avatar,
-    // #ifndef H5
-    miniProgram: "jsm_env",
-    // #endif
-  }
-
-  var pamstr = Object.entries(defaultPam).map(item => item.join("=")).join("&");
-
-  if (!!~url.indexOf("?")) {
-    return process.env.VUE_APP_HREF + url + `${pamstr?"&"+pamstr:""}`
-  } else {
-    return process.env.VUE_APP_HREF + url + `${pamstr?"?"+pamstr:""}`
-  }
-}
-
 export const navToPage = (function() {
   var gopageid = null
   return function(p, goToType = "navigateTo") {
@@ -113,6 +90,44 @@ export const navToPage = (function() {
   }
 })()
 
+// var curRouteH5 = {}
+// var curRouteMini = {}
+
+export function webViewHref(url, pam = {}, crossPagePam = {}) {
+
+
+  // if(crossPagePam.crossPageTs){
+  //   var funs = Object.keys(JSON.parse(decodeURIComponent(crossPagePam.crossPageTs)))
+  //   var H5 = Object.keys(curRouteH5).find(_url=>!!~url.indexOf(_url))
+  //   var Mini = Object.keys(curRouteMini).find(_url=>!!~url.indexOf(_url))
+  // }else{
+
+  // }
+
+  var defaultPam = {
+    ...pam,
+    ...crossPagePam,
+    "x-token": store.state.user.token,
+    openId: store.state.user.openId,
+    userId: store.state.user.userId,
+    username: store.state.user.name,
+    useravatar: store.state.user.avatar,
+    // #ifndef H5
+    miniProgram: "jsm_env",
+    // #endif
+  }
+
+  var pamstr = Object.entries(defaultPam).map(item => item.join("=")).join("&");
+
+  if (!!~url.indexOf("?")) {
+    return process.env.VUE_APP_HREF + url + `${pamstr?"&"+pamstr:""}`
+  } else {
+    return process.env.VUE_APP_HREF + url + `${pamstr?"?"+pamstr:""}`
+  }
+}
+
+
+
 export const crossPage = (function() {
   var funs = {}
   var tiemIdIs = {}
@@ -171,13 +186,6 @@ export const crossPage = (function() {
           }
         })
       }
-      if (tiemIdIs[name]) {
-        clearTimeout(tiemIdIs[name])
-      }
-      uni.setStorageSync(name, data);
-      tiemIdIs[name] = setTimeout(function() {
-        uni.removeStorageSync(name)
-      }, 350)
       // #endif
     },
 
@@ -185,11 +193,40 @@ export const crossPage = (function() {
       if (!funs[name]) {
         funs[name] = {}
       }
-      funs[name][md5(fun.toString())] = fun
+      let funcName = md5(fun.toString())
+      funs[name][funcName] = fun;
 
       // #ifdef H5
       delaydepartFun()
       // #endif
+
+      // -----------------------------------
+      // (function getrouter() {
+      //   let routes = getCurrentPages();
+      //   if (routes.length) {
+      //     let curRoute = routes[routes.length - 1].route
+      //     wx.miniProgram.getEnv(res => {
+      //       if (res.miniprogram) {
+      //         if (!curRouteMini[curRoute]) {
+      //           curRouteMini[curRoute] = []
+      //         }
+      //         if (!!~curRouteMini[curRoute].indexOf(name)) {
+      //           curRouteMini[curRoute].push(name)
+      //         }
+      //       } else {
+      //         if (!curRouteH5[curRoute]) {
+      //           curRouteH5[curRoute] = []
+      //         }
+      //         if (!!~curRouteH5[curRoute].indexOf(name)) {
+      //           curRouteH5[curRoute].push(name)
+      //         }
+      //       }
+      //     })
+
+      //   } else {
+      //     setTimeout(getrouter, 300)
+      //   }
+      // })();
     },
 
     $off(name, fun) {
@@ -219,22 +256,5 @@ export const crossPage = (function() {
     },
     // #endif
   };
-
-  // #ifdef H5
-  (function tiemID() {
-    Object.keys(funs).map(name => {
-      if (funs[name]) {
-        var data = uni.getStorageSync(name);
-        if (data) {
-          Object.keys(funs[name]).map(key => {
-            funs[name][key](data)
-          })
-        }
-      }
-    })
-    setTimeout(tiemID, 200)
-  })()
-  // #endif
-
   return funco
-})()
+})()