diff --git a/apis/index.js b/apis/index.js index 5ba0625..bb53e59 100644 --- a/apis/index.js +++ b/apis/index.js @@ -10,8 +10,8 @@ import router from '../router' // 基础配置 const config = { - apiUrl : 'https://api.gongli.vip/api/', // 正式环境 - // apiUrl : 'http://api.gl.shangkelian.cn/api/', // 测试 + // apiUrl : 'https://api.gongli.vip/api/', // 正式环境 + apiUrl : 'http://api.gl.shangkelian.cn/api/', // 测试 timeout : 60000 } diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index 1c360ed..d7f03bd 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -1,6 +1,6 @@ { - "name": "支付密码输入安全模拟键盘", - "version": "1.1.0", + "name": "dtx_store", + "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { @@ -11,9 +11,9 @@ "hasInstallScript": true }, "node_modules/uni-simple-router": { - "version": "2.0.8-beta.4", - "resolved": "https://registry.npmjs.org/uni-simple-router/-/uni-simple-router-2.0.8-beta.4.tgz", - "integrity": "sha512-ipTHhOaRvjV8qrt3HosX5pNMhwFYBnFOuKyV5joH0evfXubjrGI5tjdwpmwzfW5h3VBth3iAqScv+pW/QmIJXw==" + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/uni-simple-router/-/uni-simple-router-2.0.7.tgz", + "integrity": "sha512-8FKv5dw7Eoonm0gkO8udprrxzin0fNUI0+AvIphFkFRH5ZmP5ZWJ2pvnWzb2NiiqQSECTSU5VSB7HhvOSwD5eA==" }, "node_modules/uview-ui": { "version": "2.0.31", diff --git a/node_modules/uni-simple-router/.eslintignore b/node_modules/uni-simple-router/.eslintignore index db3bbf6..3661113 100644 --- a/node_modules/uni-simple-router/.eslintignore +++ b/node_modules/uni-simple-router/.eslintignore @@ -3,5 +3,4 @@ dist /webpack /src/global.d.ts /test -/jest.config.js -/plugins \ No newline at end of file +/jest.config.js \ No newline at end of file diff --git a/node_modules/uni-simple-router/.eslintrc.js b/node_modules/uni-simple-router/.eslintrc.js index bab0821..e792a31 100644 --- a/node_modules/uni-simple-router/.eslintrc.js +++ b/node_modules/uni-simple-router/.eslintrc.js @@ -12,9 +12,7 @@ module.exports = { getApp: true, __uniConfig: true, __uniRoutes: true, - $npm_package_name: true, - $npm_package_version: true, - $npm_package_last_version: true + $npm_package_name: true }, parser: '@typescript-eslint/parser', extends: ['eslint:recommended'], diff --git a/node_modules/uni-simple-router/dist/link.vue b/node_modules/uni-simple-router/dist/link.vue index 7f2b755..873f412 100644 --- a/node_modules/uni-simple-router/dist/link.vue +++ b/node_modules/uni-simple-router/dist/link.vue @@ -36,23 +36,17 @@ export default { methods: { formatNav(text) { if (text != null && text.constructor === String) { - const keyArray = []; - text = text.replace(/((\w+)|('\s*(\w+)\s*')|("\s*(\w+)\s*"))\s*(?=:)/g, function (val) { - const key = `"${val.trim().replace(/"|'/g, '')}"`; - keyArray.push(key); - return key + text = text.replace(/\'/g, ''); + text = text.replace(/(\w+)(?=:)/g, function (val) { + return `"${val}"`; + }); + text = text.replace(/:\s*([^,{}\s"]+)/g, function (val) { + const arr = val.split(':'); + return `:"${arr[1].trim()}"`; }); - const removeReg=/('|")/g; - for (let i = 0; i < keyArray.length; i++) { - const key = keyArray[i]; - text=text.replace(new RegExp(`${key}\\s*:\\s*('[^']+')`, 'g'),(...args)=>{ - const $1=args[1]; - return `${key}:"${$1.replace(removeReg,'')}"` - }) - } try { - text=JSON.parse(text); - } catch (error) {} + text = JSON.parse(text); + } catch (e) {} } if (this.append) { let pathArr = this.$Route.path.split('/'); diff --git a/node_modules/uni-simple-router/dist/uni-simple-router.d.ts b/node_modules/uni-simple-router/dist/uni-simple-router.d.ts index 7153281..a5769eb 100644 --- a/node_modules/uni-simple-router/dist/uni-simple-router.d.ts +++ b/node_modules/uni-simple-router/dist/uni-simple-router.d.ts @@ -11,20 +11,8 @@ export declare interface appletConfig { animationDuration?: number; } -export declare function assertDeepObject(object: objectAny): boolean; - -export declare function assertNewOptions(options: T): T | never; - -export declare function assertParentChild(parentPath: string, vueVim: any): boolean; - export declare type backTypeRule = 'backbutton' | 'navigateBack'; -export declare function baseClone(source: T, target: Array | objectAny): Array | objectAny | null; - -export declare function copyData(object: T): T; - export declare function createRouter(params: InstantiateConfig): Router; export declare interface debuggerArrayConfig { @@ -35,12 +23,6 @@ export declare interface debuggerArrayConfig { export declare type debuggerConfig = boolean | debuggerArrayConfig; -export declare function deepClone(source: T): T; - -export declare function deepDecodeQuery(query: objectAny): objectAny; - -export declare function def(defObject: objectAny, key: string, getValue: Function): void; - export declare interface endAnimationRule { animationType?: endAnimationType; animationDuration?: number; @@ -48,24 +30,6 @@ export declare interface endAnimationRule { export declare type endAnimationType = 'slide-out-right' | 'slide-out-left' | 'slide-out-top' | 'slide-out-bottom' | 'pop-out' | 'fade-out' | 'zoom-in' | 'zoom-fade-in' | 'none'; -export declare function forMatNextToFrom(router: Router, to: T, from: T): { - matTo: T; - matFrom: T; -}; - -export declare function getDataType(data: T): string; - -export declare function getRoutePath(route: RoutesRule, router: Router): { - finallyPath: string | string[]; - aliasPath: string; - path: string; - alias: string | string[] | undefined; -}; - -export declare function getUniCachePage(pageIndex?: number): T | []; - -export declare function getWildcardRule(router: Router, msg?: navErrorRule): RoutesRule | never; - export declare type guardHookRule = (to: totalNextRoute, from: totalNextRoute, next: (rule?: navtoRule | false) => void) => void; export declare interface H5Config { @@ -96,8 +60,6 @@ export declare interface hookObjectRule { hook: Function; } -declare type hookRule = (args: Array, next: (args: Array) => void, router: Router) => void; - export declare enum hookToggle { 'beforeHooks' = "beforeEach", 'afterHooks' = "afterEach", @@ -111,7 +73,6 @@ export declare interface InstantiateConfig { h5?: H5Config; APP?: AppConfig; applet?: appletConfig; - beforeProxyHooks?: proxyHooksConfig; debugger?: debuggerConfig; routerBeforeEach?: (to: navtoRule, from: navtoRule, next: (rule?: navtoRule | false) => void) => void; routerAfterEach?: (to: navtoRule, from: navtoRule, next?: Function) => void; @@ -130,10 +91,6 @@ export declare interface LifeCycleConfig { routerErrorHooks: Array<(error: navErrorRule, router: Router) => void>; } -export declare function lockDetectWarn(router: Router, to: string | number | totalNextRoute | navRoute, navType: NAVTYPE, next: Function, uniActualData?: uniBackApiRule | uniBackRule | undefined, passiveType?: 'beforeHooks' | 'afterHooks'): void; - -export declare function mergeConfig(baseConfig: T, userConfig: T): T; - export declare interface navErrorRule { type: navRuleStatus; msg: string; @@ -174,13 +131,6 @@ export declare enum navtypeToggle { 'back' = "navigateBack" } -export declare function notDeepClearNull(object: T): T; - -export declare function notRouteTo404(router: Router, toRoute: RoutesRule | { - redirect: any; - path: string; -}, parseToRule: totalNextRoute, navType: NAVTYPE): RoutesRule | totalNextRoute | never; - export declare type objectAny = { [propName: string]: any; }; @@ -191,8 +141,6 @@ export declare interface originMixins extends uniNavApiRule { export declare type pageTypeRule = 'app' | 'page' | 'component'; -export declare function paramsToQuery(router: Router, toRule: totalNextRoute | string): totalNextRoute | string; - export declare type platformRule = 'h5' | 'app-plus' | 'app-lets' | 'mp-weixin' | 'mp-baidu' | 'mp-alipay' | 'mp-toutiao' | 'mp-qq' | 'mp-360'; export declare type PromiseResolve = (value?: void | PromiseLike | undefined) => void; @@ -213,34 +161,12 @@ export declare type proxyDepsRule = { export declare type proxyHookName = 'beforeHooks' | 'afterHooks'; -export declare interface proxyHooksConfig { - onLaunch?: hookRule; - onShow?: hookRule; - onHide?: hookRule; - onError?: hookRule; - onInit?: hookRule; - onLoad?: hookRule; - onReady?: hookRule; - onUnload?: hookRule; - onResize?: hookRule; - destroyed?: hookRule; - created?: hookRule; - beforeCreate?: hookRule; - beforeMount?: hookRule; - mounted?: hookRule; - beforeDestroy?: hookRule; -} - export declare type reloadNavRule = totalNextRoute | false | undefined | string; -export declare function removeSimpleValue(array: Array, value: string): Boolean; - export declare type reNavMethodRule = 'navigateTo' | 'redirectTo' | 'reLaunch' | 'switchTab'; export declare type reNotNavMethodRule = 'navigateBack'; -export declare function resolveAbsolutePath(path: string, router: Router): string | never; - export declare enum rewriteMethodToggle { 'navigateTo' = "push", 'navigate' = "push", @@ -251,12 +177,12 @@ export declare enum rewriteMethodToggle { } export declare interface Router { + [key: string]: any; readonly lifeCycle: LifeCycleConfig; readonly options: InstantiateConfig; $lockStatus: boolean; $route: object | null; enterPath: string; - runId: number; Vue: any; appMain: { NAVTYPE: reNavMethodRule | reNotNavMethodRule; @@ -293,8 +219,6 @@ export declare interface routeRule { [propName: string]: any; } -export declare function routesForMapRoute(router: Router, path: string, mapArrayKey: Array, deepFind?: boolean | undefined): RoutesRule | never; - export declare type routesMapKeysRule = 'finallyPathList' | 'finallyPathMap' | 'aliasPathMap' | 'pathMap' | 'nameMap' | 'vueRouteMap'; export declare interface routesMapRule { @@ -331,8 +255,6 @@ export declare interface startAnimationRule { export declare type startAnimationType = 'slide-in-right' | 'slide-in-left' | 'slide-in-top' | 'slide-in-bottom' | 'pop-in' | 'fade-in' | 'zoom-out' | 'zoom-fade-out' | 'none'; -export declare function timeOut(time: number): Promise; - export declare interface totalNextRoute extends h5NextRule, navtoRule { path: string; delta?: number; @@ -372,13 +294,6 @@ export declare interface uniNavApiRule { }; } -export declare function urlToJson(url: string): { - path: string; - query: objectAny; -}; - -export declare function voidFun(...args: any): void; - export declare type vueHookNameRule = 'onLaunch' | 'onShow' | 'onHide' | 'onError' | 'onInit' | 'onLoad' | 'onReady' | 'onUnload' | 'onResize' | 'created' | 'beforeMount' | 'mounted' | 'beforeDestroy' | 'destroyed'; export declare type vueOptionRule = { diff --git a/node_modules/uni-simple-router/dist/uni-simple-router.js b/node_modules/uni-simple-router/dist/uni-simple-router.js index ba264ee..7e25d3c 100644 --- a/node_modules/uni-simple-router/dist/uni-simple-router.js +++ b/node_modules/uni-simple-router/dist/uni-simple-router.js @@ -1 +1 @@ -!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.Router=t():e.Router=t()}(self,(function(){return e={779:(e,t,r)=>{var o=r(173);e.exports=function e(t,r,n){return o(r)||(n=r||n,r=[]),n=n||{},t instanceof RegExp?function(e,t){var r=e.source.match(/\((?!\?)/g);if(r)for(var o=0;o{e.exports=Array.isArray||function(e){return"[object Array]"==Object.prototype.toString.call(e)}},844:function(e,t,r){"use strict";var o=this&&this.__assign||function(){return(o=Object.assign||function(e){for(var t,r=1,o=arguments.length;r{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.addKeepAliveInclude=void 0;var o=r(789),n=["",""],a=n[0],i=n[1];t.addKeepAliveInclude=function(e){var t=getApp(),r=t.keepAliveInclude;if(0===e.runId&&0===r.length){i=t.$route.params.__id__;var n=(a=t.$route.meta.name)+"-"+i;t.keepAliveInclude.push(n)}else if(""!==a)for(var u=t.keepAliveInclude,l=0;l0?t.vueEachArray[r](e,o,(function(){n&&n()})):t.myEachHook(e,o,(function(a){!1===a?n(!1):t.vueEachArray[r](e,o,(function(e){n(a)}))}),t.router,!0)}},t}(Array);t.MyArray=n,t.proxyEachHook=function(e,t){for(var r=["beforeHooks","afterHooks"],o=0;o0)return!1;window.location.reload()}),0)}else e.mount[0].app.$mount(),e.mount=[]}},814:function(e,t){"use strict";var r=this&&this.__assign||function(){return(r=Object.assign||function(e){for(var t,r=1,o=arguments.length;r{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.getEnterPath=void 0,t.getEnterPath=function(e,t){switch(t.options.platform){case"mp-alipay":case"mp-weixin":case"mp-toutiao":case"mp-qq":return e.$options.mpInstance.route;case"mp-baidu":return e.$options.mpInstance.is||e.$options.mpInstance.pageinstance.route}return e.$options.mpInstance.route}},282:(e,t,r)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.proxyHookName=t.proxyHookDeps=t.lifeCycle=t.baseConfig=t.mpPlatformReg=void 0;var o=r(883),n=r(99);t.mpPlatformReg="(^mp-weixin$)|(^mp-baidu$)|(^mp-alipay$)|(^mp-toutiao$)|(^mp-qq$)|(^mp-360$)",t.baseConfig={h5:{paramsToQuery:!1,vueRouterDev:!1,vueNext:!1,mode:"hash",base:"/",linkActiveClass:"router-link-active",linkExactActiveClass:"router-link-exact-active",scrollBehavior:function(e,t,r){return{x:0,y:0}},fallback:!0},APP:{registerLoadingPage:!0,loadingPageStyle:function(){return JSON.parse('{"backgroundColor":"#FFF"}')},loadingPageHook:function(e){e.show()},launchedHook:function(){plus.navigator.closeSplashscreen()},animation:{}},applet:{animationDuration:300},beforeProxyHooks:{onLoad:function(e,t,r){var o=e[0];t([n.parseQuery({query:o},r)])}},platform:"h5",keepUniOriginNav:!1,debugger:!1,routerBeforeEach:function(e,t,r){r()},routerAfterEach:function(e,t){},routerErrorEach:function(e,t){t.$lockStatus=!1,o.err(e,t,!0)},detectBeforeLock:function(e,t,r){},routes:[{path:"/choose-location"},{path:"/open-location"},{path:"/preview-image"}]},t.lifeCycle={beforeHooks:[],afterHooks:[],routerBeforeHooks:[],routerAfterHooks:[],routerErrorHooks:[]},t.proxyHookDeps={resetIndex:[],hooks:{},options:{}},t.proxyHookName=["onLaunch","onShow","onHide","onError","onInit","onLoad","onReady","onUnload","onResize","created","beforeMount","mounted","beforeDestroy","destroyed"]},801:(e,t,r)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.createRouteMap=void 0;var o=r(883),n=r(789);t.createRouteMap=function(e,t){var r={finallyPathList:[],finallyPathMap:Object.create(null),aliasPathMap:Object.create(null),pathMap:Object.create(null),vueRouteMap:Object.create(null),nameMap:Object.create(null)};return t.forEach((function(t){var a=n.getRoutePath(t,e),i=a.finallyPath,u=a.aliasPath,l=a.path;if(null==l)throw new Error("请提供一个完整的路由对象，包括以绝对路径开始的 ‘path’ 字符串 "+JSON.stringify(t));if(i instanceof Array&&!e.options.h5.vueRouterDev&&"h5"===e.options.platform)throw new Error("非 vueRouterDev 模式下，route.alias 目前无法提供数组类型！ "+JSON.stringify(t));var c=i,s=u;"h5"!==e.options.platform&&0!==c.indexOf("/")&&"*"!==l&&o.warn("当前路由对象下，route："+JSON.stringify(t)+" 是否缺少了前缀 ‘/’",e,!0),r.finallyPathMap[c]||(r.finallyPathMap[c]=t,r.aliasPathMap[s]=t,r.pathMap[l]=t,r.finallyPathList.push(c),null!=t.name&&(r.nameMap[t.name]=t))})),r}},662:(e,t,r)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.registerEachHooks=t.registerRouterHooks=t.registerHook=void 0;var o=r(366),n=r(169);function a(e,t){e[0]=t}t.registerHook=a,t.registerRouterHooks=function(e,t){return a(e.routerBeforeHooks,(function(e,r,o){t.routerBeforeEach(e,r,o)})),a(e.routerAfterHooks,(function(e,r){t.routerAfterEach(e,r)})),a(e.routerErrorHooks,(function(e,r){t.routerErrorEach(e,r)})),e},t.registerEachHooks=function(e,t,r){a(e.lifeCycle[t],(function(e,a,i,u,l){l?n.onTriggerEachHook(e,a,u,o.hookToggle[t],i):r(e,a,i)}))}},460:function(e,t,r){"use strict";var o=this&&this.__assign||function(){return(o=Object.assign||function(e){for(var t,r=1,o=arguments.length;r0)return O}if(""!==u)return h(t);throw new Error(r+" 路径无法在路由表中找到！检查跳转路径及路由表")},t.getDataType=v,t.copyData=function(e){return JSON.parse(JSON.stringify(e))},t.removeSimpleValue=function(e,t){for(var r=0;r3},t.baseClone=y,t.deepClone=g,t.lockDetectWarn=function(e,t,r,o,n,a){if(void 0===n&&(n={}),"afterHooks"===a)o();else{var i=e.options.detectBeforeLock;i&&i(e,t,r),e.$lockStatus?e.options.routerErrorEach({type:2,msg:"当前页面正在处于跳转状态，请稍后再进行跳转....",NAVTYPE:r,uniActualData:n},e):o()}},t.assertParentChild=function(e,t){for(;null!=t.$parent;){var r=t.$parent.$mp;if(r.page&&r.page.is===e)return!0;t=t.$parent}try{if(t.$mp.page.is===e||t.$mp.page.route===e)return!0}catch(e){return!1}return!1},t.resolveAbsolutePath=function(e,t){var r=/^\/?([^\?\s]+)(\?.+)?$/,o=e.trim();if(!r.test(o))throw new Error("【"+e+"】 路径错误，请提供完整的路径(10001)。");var n=o.match(r);if(null==n)throw new Error("【"+e+"】 路径错误，请提供完整的路径(10002)。");var a=n[2]||"";if(/^\.\/[^\.]+/.test(o))return(t.currentRoute.path+e).replace(/[^\/]+\.\//,"");var i=n[1].replace(/\//g,"\\/").replace(/\.\./g,"[^\\/]+").replace(/\./g,"\\."),u=new RegExp("^\\/"+i+"$"),l=t.options.routes.filter((function(e){return u.test(e.path)}));if(1!==l.length)throw new Error("【"+e+"】 路径错误，尝试转成绝对路径失败，请手动转成绝对路径(10003)。");return l[0].path+a},t.deepDecodeQuery=function e(t){for(var r="[object Array]"===v(t)?[]:{},o=Object.keys(t),n=0;n{"use strict";function r(e,t,r,o){if(void 0===o&&(o=!1),!o){var n="[object Object]"===t.toString();if(!1===t)return!1;if(n&&!1===t[e])return!1}return console[e](r),!0}Object.defineProperty(t,"__esModule",{value:!0}),t.warnLock=t.log=t.warn=t.err=t.isLog=void 0,t.isLog=r,t.err=function(e,t,o){r("error",t.options.debugger,e,o)},t.warn=function(e,t,o){r("warn",t.options.debugger,e,o)},t.log=function(e,t,o){r("log",t.options.debugger,e,o)},t.warnLock=function(e){console.warn(e)}},607:function(e,t,r){"use strict";var o=this&&this.__createBinding||(Object.create?function(e,t,r,o){void 0===o&&(o=r),Object.defineProperty(e,o,{enumerable:!0,get:function(){return t[r]}})}:function(e,t,r,o){void 0===o&&(o=r),e[o]=t[r]}),n=this&&this.__exportStar||function(e,t){for(var r in e)"default"===r||Object.prototype.hasOwnProperty.call(t,r)||o(t,e,r)};Object.defineProperty(t,"__esModule",{value:!0}),t.createRouter=t.RouterMount=t.runtimeQuit=void 0,n(r(366),t),n(r(309),t),n(r(789),t);var a=r(814);Object.defineProperty(t,"runtimeQuit",{enumerable:!0,get:function(){return a.runtimeQuit}});var i=r(963);Object.defineProperty(t,"RouterMount",{enumerable:!0,get:function(){return i.RouterMount}}),Object.defineProperty(t,"createRouter",{enumerable:!0,get:function(){return i.createRouter}});var u="2.0.8-BETA.4";/[A-Z]/g.test(u)&&console.warn("【"+"UNI-SIMPLE-ROUTER".toLocaleLowerCase()+" 提示】：当前版本 "+u.toLocaleLowerCase()+" 此版本为测试版。有BUG请退回正式版，线上正式版本：2.0.7")},366:(e,t)=>{"use strict";var r,o,n;Object.defineProperty(t,"__esModule",{value:!0}),t.rewriteMethodToggle=t.navtypeToggle=t.hookToggle=void 0,(n=t.hookToggle||(t.hookToggle={})).beforeHooks="beforeEach",n.afterHooks="afterEach",n.enterHooks="beforeEnter",(o=t.navtypeToggle||(t.navtypeToggle={})).push="navigateTo",o.replace="redirectTo",o.replaceAll="reLaunch",o.pushTab="switchTab",o.back="navigateBack",(r=t.rewriteMethodToggle||(t.rewriteMethodToggle={})).navigateTo="push",r.navigate="push",r.redirectTo="replace",r.reLaunch="replaceAll",r.switchTab="pushTab",r.navigateBack="back"},309:(e,t)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0})},925:(e,t,r)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.beforeProxyHook=void 0;var o=r(789),n=r(883);t.beforeProxyHook=function(e,t){var r=e.$options,a=t.options.beforeProxyHooks;if(null==r)return!1;if(null==a)return!1;for(var i=Object.keys(a),u=function(e){var u=i[e],l=r[u];if(l)for(var c=a[u],s=function(e){if(l[e].toString().includes("UNI-SIMPLE-ROUTER"))return"continue";var r=l.splice(e,1,(function(){for(var e=this,n=[],a=0;a 当前组件不适合"+u+"，或者 hook: "+u+" 不存在，已为你规避处理，可以忽略。",t)},l=0;l0){var u=void 0;switch("h5"===e.options.platform?u=i.$options.beforeRouteLeave:null!=i.$vm&&(u=i.$vm.$options.beforeRouteLeave),n.getDataType(u)){case"[object Array]":a=(a=u[0]).bind(i);break;case"[object Function]":a=u.bind(i.$vm)}}return s(a,t,r,e,o)}function s(e,t,r,o,n,a){void 0===a&&(a=!0),null!=e&&e instanceof Function?!0===a?e(t,r,n,o,!1):(e(t,r,(function(){}),o,!1),n()):n()}function p(e,t,r,o,a,i){var u=n.forMatNextToFrom(e,t,r),l=u.matTo,c=u.matFrom;"h5"===e.options.platform?f(a,0,i,e,l,c,o):f(a.slice(0,4),0,(function(){i((function(){f(a.slice(4),0,n.voidFun,e,l,c,o)}))}),e,l,c,o)}function f(e,r,i,u,c,s,p){var h=n.routesForMapRoute(u,c.path,["finallyPathMap","pathMap"]);if(e.length-1{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.resetPageHook=t.resetAndCallPageHook=t.proxyPageHook=t.createFullPath=t.createToFrom=void 0;var o=r(282),n=r(789),a=r(890),i=r(99);function u(e){for(var t=e.proxyHookDeps,r=0,o=Object.entries(t.hooks);r{[propName: string]: any;}",t):e[r]=u}else{if(!n.assertDeepObject(o))return e;var l=JSON.stringify(o);e[r]={query:l}}return e},t.parseQuery=function(e,t){var r=t.options.parseQuery;if(r)e=r(n.copyData(e)),"[object Object]"!==n.getDataType(e)&&i.warn("请按格式返回参数： parseQuery?:(jsonQuery:{[propName: string]: any;})=>{[propName: string]: any;}",t);else if(Reflect.get(e,"query")){var o=Reflect.get(e,"query");if("string"==typeof o)try{o=JSON.parse(o)}catch(e){i.warn("尝试解析深度对象失败，按原样输出。"+e,t)}if("object"==typeof o)return n.deepDecodeQuery(o)}return e},t.stringifyQuery=function(e){var t=e?Object.keys(e).map((function(t){var r=e[t];if(void 0===r)return"";if(null===r)return s(t);if(Array.isArray(r)){var o=[];return r.forEach((function(e){void 0!==e&&(null===e?o.push(s(t)):o.push(s(t)+"="+s(e)))})),o.join("&")}return s(t)+"="+s(r)})).filter((function(e){return e.length>0})).join("&"):null;return t?"?"+t:""}},314:function(e,t,r){"use strict";var o=this&&this.__awaiter||function(e,t,r,o){return new(r||(r=Promise))((function(n,a){function i(e){try{l(o.next(e))}catch(e){a(e)}}function u(e){try{l(o.throw(e))}catch(e){a(e)}}function l(e){var t;e.done?n(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(i,u)}l((o=o.apply(e,t||[])).next())}))},n=this&&this.__generator||function(e,t){var r,o,n,a,i={label:0,sent:function(){if(1&n[0])throw n[1];return n[1]},trys:[],ops:[]};return a={next:u(0),throw:u(1),return:u(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function u(a){return function(u){return function(a){if(r)throw new TypeError("Generator is already executing.");for(;i;)try{if(r=1,o&&(n=2&a[0]?o.return:a[0]?o.throw||((n=o.return)&&n.call(o),0):o.next)&&!(n=n.call(o,a[1])).done)return n;switch(o=0,n&&(a=[2&a[0],n.value]),a[0]){case 0:case 1:n=a;break;case 4:return i.label++,{value:a[1],done:!1};case 5:i.label++,o=a[1],a=[0];continue;case 7:a=i.ops.pop(),i.trys.pop();continue;default:if(!((n=(n=i.trys).length>0&&n[n.length-1])||6!==a[0]&&2!==a[0])){i=0;continue}if(3===a[0]&&(!n||a[1]>n[0]&&a[1]0&&Reflect.has(t,"index")){var r=i.getUniCachePage(0);if(0===Object.keys(r).length)return!1;var o=r,n=o.$options.onTabItemTap;if(n)for(var a=0;a0&&n[n.length-1])||6!==a[0]&&2!==a[0])){i=0;continue}if(3===a[0]&&(!n||a[1]>n[0]&&a[1]{var o=r(173);e.exports=function e(t,r,n){return o(r)||(n=r||n,r=[]),n=n||{},t instanceof RegExp?function(e,t){var r=e.source.match(/\((?!\?)/g);if(r)for(var o=0;o{e.exports=Array.isArray||function(e){return"[object Array]"==Object.prototype.toString.call(e)}},844:function(e,t,r){"use strict";var o=this&&this.__assign||function(){return(o=Object.assign||function(e){for(var t,r=1,o=arguments.length;r0?t.vueEachArray[r](e,o,(function(){n&&n()})):t.myEachHook(e,o,(function(a){!1===a?n(!1):t.vueEachArray[r](e,o,(function(e){n(a)}))}),t.router,!0)}},t}(Array);t.MyArray=n,t.proxyEachHook=function(e,t){for(var r=["beforeHooks","afterHooks"],o=0;o0)return!1;window.location.reload()}),0)}else e.mount[0].app.$mount(),e.mount=[]}},814:function(e,t){"use strict";var r=this&&this.__assign||function(){return(r=Object.assign||function(e){for(var t,r=1,o=arguments.length;r{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.getEnterPath=void 0,t.getEnterPath=function(e,t){switch(t.options.platform){case"mp-alipay":case"mp-weixin":case"mp-toutiao":case"mp-qq":return e.$options.mpInstance.route;case"mp-baidu":return e.$options.mpInstance.is||e.$options.mpInstance.pageinstance.route}return e.$options.mpInstance.route}},282:(e,t,r)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.proxyHookName=t.proxyHookDeps=t.lifeCycle=t.baseConfig=t.mpPlatformReg=void 0;var o=r(883);t.mpPlatformReg="(^mp-weixin$)|(^mp-baidu$)|(^mp-alipay$)|(^mp-toutiao$)|(^mp-qq$)|(^mp-360$)",t.baseConfig={h5:{paramsToQuery:!1,vueRouterDev:!1,vueNext:!1,mode:"hash",base:"/",linkActiveClass:"router-link-active",linkExactActiveClass:"router-link-exact-active",scrollBehavior:function(e,t,r){return{x:0,y:0}},fallback:!0},APP:{registerLoadingPage:!0,loadingPageStyle:function(){return JSON.parse('{"backgroundColor":"#FFF"}')},loadingPageHook:function(e){e.show()},launchedHook:function(){plus.navigator.closeSplashscreen()},animation:{}},applet:{animationDuration:300},platform:"h5",keepUniOriginNav:!1,debugger:!1,routerBeforeEach:function(e,t,r){r()},routerAfterEach:function(e,t){},routerErrorEach:function(e,t){t.$lockStatus=!1,o.err(e,t,!0)},detectBeforeLock:function(e,t,r){},routes:[{path:"/choose-location"},{path:"/open-location"},{path:"/preview-image"}]},t.lifeCycle={beforeHooks:[],afterHooks:[],routerBeforeHooks:[],routerAfterHooks:[],routerErrorHooks:[]},t.proxyHookDeps={resetIndex:[],hooks:{},options:{}},t.proxyHookName=["onLaunch","onShow","onHide","onError","onInit","onLoad","onReady","onUnload","onResize","created","beforeMount","mounted","beforeDestroy","destroyed"]},801:(e,t,r)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.createRouteMap=void 0;var o=r(883),n=r(789);t.createRouteMap=function(e,t){var r={finallyPathList:[],finallyPathMap:Object.create(null),aliasPathMap:Object.create(null),pathMap:Object.create(null),vueRouteMap:Object.create(null),nameMap:Object.create(null)};return t.forEach((function(t){var a=n.getRoutePath(t,e),i=a.finallyPath,u=a.aliasPath,l=a.path;if(null==l)throw new Error("请提供一个完整的路由对象，包括以绝对路径开始的 ‘path’ 字符串 "+JSON.stringify(t));if(i instanceof Array&&!e.options.h5.vueRouterDev&&"h5"===e.options.platform)throw new Error("非 vueRouterDev 模式下，route.alias 目前无法提供数组类型！ "+JSON.stringify(t));var p=i,c=u;"h5"!==e.options.platform&&0!==p.indexOf("/")&&"*"!==l&&o.warn("当前路由对象下，route："+JSON.stringify(t)+" 是否缺少了前缀 ‘/’",e,!0),r.finallyPathMap[p]||(r.finallyPathMap[p]=t,r.aliasPathMap[c]=t,r.pathMap[l]=t,r.finallyPathList.push(p),null!=t.name&&(r.nameMap[t.name]=t))})),r}},662:(e,t,r)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.registerEachHooks=t.registerRouterHooks=t.registerHook=void 0;var o=r(366),n=r(169);function a(e,t){e[0]=t}t.registerHook=a,t.registerRouterHooks=function(e,t){return a(e.routerBeforeHooks,(function(e,r,o){t.routerBeforeEach(e,r,o)})),a(e.routerAfterHooks,(function(e,r){t.routerAfterEach(e,r)})),a(e.routerErrorHooks,(function(e,r){t.routerErrorEach(e,r)})),e},t.registerEachHooks=function(e,t,r){a(e.lifeCycle[t],(function(e,a,i,u,l){l?n.onTriggerEachHook(e,a,u,o.hookToggle[t],i):r(e,a,i)}))}},460:function(e,t,r){"use strict";var o=this&&this.__assign||function(){return(o=Object.assign||function(e){for(var t,r=1,o=arguments.length;r0)return P}if(""!==u)return h(t);throw new Error(r+" 路径无法在路由表中找到！检查跳转路径及路由表")},t.getDataType=v,t.copyData=function(e){return JSON.parse(JSON.stringify(e))},t.getUniCachePage=function(e){var t=getCurrentPages();if(null==e)return t;if(0===t.length)return t;var r=t.reverse()[e];return null==r?[]:r},t.urlToJson=function(e){var t={},r=e.split("?"),o=r[0],n=r[1];if(null!=n)for(var a=0,i=n.split("&");a3},t.baseClone=y,t.deepClone=g,t.lockDetectWarn=function(e,t,r,o,n,a){if(void 0===n&&(n={}),"afterHooks"===a)o();else{var i=e.options.detectBeforeLock;i&&i(e,t,r),e.$lockStatus?e.options.routerErrorEach({type:2,msg:"当前页面正在处于跳转状态，请稍后再进行跳转....",NAVTYPE:r,uniActualData:n},e):o()}},t.assertParentChild=function(e,t){for(;null!=t.$parent;){var r=t.$parent.$mp;if(r.page&&r.page.is===e)return!0;t=t.$parent}try{if(t.$mp.page.is===e||t.$mp.page.route===e)return!0}catch(e){return!1}return!1},t.resolveAbsolutePath=function(e,t){var r=/^\/?([^\?\s]+)(\?.+)?$/,o=e.trim();if(!r.test(o))throw new Error("【"+e+"】 路径错误，请提供完整的路径(10001)。");var n=o.match(r);if(null==n)throw new Error("【"+e+"】 路径错误，请提供完整的路径(10002)。");var a=n[2]||"";if(/^\.\/[^\.]+/.test(o))return(t.currentRoute.path+e).replace(/[^\/]+\.\//,"");var i=n[1].replace(/\//g,"\\/").replace(/\.\./g,"[^\\/]+").replace(/\./g,"\\."),u=new RegExp("^\\/"+i+"$"),l=t.options.routes.filter((function(e){return u.test(e.path)}));if(1!==l.length)throw new Error("【"+e+"】 路径错误，尝试转成绝对路径失败，请手动转成绝对路径(10003)。");return l[0].path+a},t.deepDecodeQuery=function e(t){for(var r="[object Array]"===v(t)?[]:{},o=Object.keys(t),n=0;n{"use strict";function r(e,t,r,o){if(void 0===o&&(o=!1),!o){var n="[object Object]"===t.toString();if(!1===t)return!1;if(n&&!1===t[e])return!1}return console[e](r),!0}Object.defineProperty(t,"__esModule",{value:!0}),t.warnLock=t.log=t.warn=t.err=t.isLog=void 0,t.isLog=r,t.err=function(e,t,o){r("error",t.options.debugger,e,o)},t.warn=function(e,t,o){r("warn",t.options.debugger,e,o)},t.log=function(e,t,o){r("log",t.options.debugger,e,o)},t.warnLock=function(e){console.warn(e)}},607:function(e,t,r){"use strict";var o=this&&this.__createBinding||(Object.create?function(e,t,r,o){void 0===o&&(o=r),Object.defineProperty(e,o,{enumerable:!0,get:function(){return t[r]}})}:function(e,t,r,o){void 0===o&&(o=r),e[o]=t[r]}),n=this&&this.__exportStar||function(e,t){for(var r in e)"default"===r||Object.prototype.hasOwnProperty.call(t,r)||o(t,e,r)};Object.defineProperty(t,"__esModule",{value:!0}),t.createRouter=t.RouterMount=t.runtimeQuit=void 0,n(r(366),t),n(r(309),t);var a=r(814);Object.defineProperty(t,"runtimeQuit",{enumerable:!0,get:function(){return a.runtimeQuit}});var i=r(963);Object.defineProperty(t,"RouterMount",{enumerable:!0,get:function(){return i.RouterMount}}),Object.defineProperty(t,"createRouter",{enumerable:!0,get:function(){return i.createRouter}})},366:(e,t)=>{"use strict";var r,o,n;Object.defineProperty(t,"__esModule",{value:!0}),t.rewriteMethodToggle=t.navtypeToggle=t.hookToggle=void 0,(n=t.hookToggle||(t.hookToggle={})).beforeHooks="beforeEach",n.afterHooks="afterEach",n.enterHooks="beforeEnter",(o=t.navtypeToggle||(t.navtypeToggle={})).push="navigateTo",o.replace="redirectTo",o.replaceAll="reLaunch",o.pushTab="switchTab",o.back="navigateBack",(r=t.rewriteMethodToggle||(t.rewriteMethodToggle={})).navigateTo="push",r.navigate="push",r.redirectTo="replace",r.reLaunch="replaceAll",r.switchTab="pushTab",r.navigateBack="back"},309:(e,t)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0})},169:function(e,t,r){"use strict";var o=this&&this.__rest||function(e,t){var r={};for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.indexOf(o)<0&&(r[o]=e[o]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols){var n=0;for(o=Object.getOwnPropertySymbols(e);n0){var u=void 0;switch("h5"===e.options.platform?u=i.$options.beforeRouteLeave:null!=i.$vm&&(u=i.$vm.$options.beforeRouteLeave),n.getDataType(u)){case"[object Array]":a=(a=u[0]).bind(i);break;case"[object Function]":a=u.bind(i.$vm)}}return p(a,t,r,e,o)}function p(e,t,r,o,n,a){void 0===a&&(a=!0),null!=e&&e instanceof Function?!0===a?e(t,r,n,o,!1):(e(t,r,(function(){}),o,!1),n()):n()}function c(e,t,r,o,a,i){var u=n.forMatNextToFrom(e,t,r),l=u.matTo,p=u.matFrom;"h5"===e.options.platform?s(a,0,i,e,l,p,o):s(a.slice(0,4),0,(function(){i((function(){s(a.slice(4),0,n.voidFun,e,l,p,o)}))}),e,l,p,o)}function s(e,r,i,l,p,c,f){var h=n.routesForMapRoute(l,p.path,["finallyPathMap","pathMap"]);if(e.length-1{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.resetPageHook=t.resetAndCallPageHook=t.proxyPageHook=t.createFullPath=t.createToFrom=void 0;var o=r(282),n=r(789),a=r(890),i=r(99);function u(e){for(var t=e.proxyHookDeps,r=0,o=Object.entries(t.hooks);r{[propName: string]: any;}",t):e[r]=u}else{if(!n.assertDeepObject(o))return e;var l=JSON.stringify(o);e[r]={query:l}}return e},t.parseQuery=function(e,t){var r=t.options.parseQuery;if(r)e=r(n.copyData(e)),"[object Object]"!==n.getDataType(e)&&i.warn("请按格式返回参数： parseQuery?:(jsonQuery:{[propName: string]: any;})=>{[propName: string]: any;}",t);else if(Reflect.get(e,"query")){var o=Reflect.get(e,"query");if("string"==typeof o)try{o=JSON.parse(o)}catch(e){i.warn("尝试解析深度对象失败，按原样输出。"+e,t)}if("object"==typeof o)return n.deepDecodeQuery(o)}return e},t.stringifyQuery=function(e){var t=e?Object.keys(e).map((function(t){var r=e[t];if(void 0===r)return"";if(null===r)return c(t);if(Array.isArray(r)){var o=[];return r.forEach((function(e){void 0!==e&&(null===e?o.push(c(t)):o.push(c(t)+"="+c(e)))})),o.join("&")}return c(t)+"="+c(r)})).filter((function(e){return e.length>0})).join("&"):null;return t?"?"+t:""}},314:(e,t,r)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.rewriteMethod=void 0;var o=r(366),n=r(789),a=r(883),i=r(809),u=["navigateTo","redirectTo","reLaunch","switchTab","navigateBack"];t.rewriteMethod=function(e){!1===e.options.keepUniOriginNav&&u.forEach((function(t){var r=uni[t];uni[t]=function(u,l,p,c){void 0===l&&(l=!1),l?i.uniOriginJump(e,r,t,u,p,c):("app-plus"===e.options.platform&&0===Object.keys(e.appMain).length&&(e.appMain={NAVTYPE:t,path:u.url}),function(e,t,r){if("app-plus"===r.options.platform){var i=null;e&&(i=e.openType),null!=i&&"appLaunch"===i&&(t="reLaunch")}if("reLaunch"===t&&'{"url":"/"}'===JSON.stringify(e)&&(a.warn("uni-app 原生方法：reLaunch({url:'/'}) 默认被重写啦！你可以使用 this.$Router.replaceAll() 或者 uni.reLaunch({url:'/?xxx=xxx'})",r,!0),t="navigateBack",e={from:"backbutton"}),"navigateBack"===t){var u=1;null==e&&(e={delta:1}),"[object Number]"===n.getDataType(e.delta)&&(u=e.delta),r.back(u,e)}else{var l=o.rewriteMethodToggle[t],p=e.url;if(!p.startsWith("/")){var c=n.resolveAbsolutePath(p,r);p=c,e.url=c}if("switchTab"===t){var s=n.routesForMapRoute(r,p,["pathMap","finallyPathList"]),f=n.getRoutePath(s,r).finallyPath;if("[object Array]"===n.getDataType(f)&&a.warn("uni-app 原生方法跳转路径为："+p+"。此路为是tab页面时，不允许设置 alias 为数组的情况，并且不能为动态路由！当然你可以通过通配符*解决！",r,!0),"*"===f&&a.warn("uni-app 原生方法跳转路径为："+p+"。在路由表中找不到相关路由表！当然你可以通过通配符*解决！",r,!0),"h5"===r.options.platform){var h=e.success;e.success=function(){for(var t=[],r=0;r0&&Reflect.has(t,"index")){var r=n.getUniCachePage(0);if(0===Object.keys(r).length)return!1;var o=r,a=o.$options.onTabItemTap;if(a)for(var i=0;i0&&n[n.length-1])||6!==a[0]&&2!==a[0])){i=0;continue}if(3===a[0]&&(!n||a[1]>n[0]&&a[1] 一个更为简洁的[Vue-router](https://router.vuejs.org/zh/)，专为 [uni-app](https://uniapp.dcloud.io/) 量身打造", "main": "dist/uni-simple-router.js", "types": "dist/uni-simple-router.d.ts", @@ -12,7 +12,7 @@ "lintFix": "eslint --ext .js,.ts src --fix", "test": "jest test/query-toggle.spec.ts", "publish": "node ./publish/index.js", - "build": "node ./publish/build.js" + "build":"node ./publish/build.js" }, "repository": { "type": "git", diff --git a/node_modules/uni-simple-router/progress.md b/node_modules/uni-simple-router/progress.md new file mode 100644 index 0000000..97f7684 --- /dev/null +++ b/node_modules/uni-simple-router/progress.md @@ -0,0 +1,16 @@ +## Fixes bug +* `小程序` 端 `onLoad`、`onShow` 执行不标准的BUG。(#206,#224,#291) +* `小程序` 端 启动页必须写 `onLoad` 才会执行的BUG。 +* `APP` 端 tab 拦截后无法自动还原选中区域现在已修复。 +* H5端设置 `aliasPath` 后，无法使用 `aliasPath` 跨端跳转 (#302) +* 重写代理生命周期逻辑、保证执行各端执行顺序 (#312) + +## Revise +* 参数可以直接传递 `null`。但是需要注意：**在非深度对象传参的情况下，小程序会将 `null` 解析为字符串`undefined`** +* 多端情况下自定义启动参数不仅限制于 `query` 传递深度参数，任何组合都可以 (#307,#301) +* 去除 `keyword` 白名单字段 +* 调整小程序启动页面生命周期的执行，让在小程序下的生命周期能更贴近App、H5 +* `routerErrorEach` 新增回调参数、包括：`NAVTYPE`、`uniActualData`、`level` + +## Known Issues +* `APP` 端启动页为tab时，拦截到其他页面后底部tabbar 还依然存在，请避免把原生 `tabbar` 页设置成启动页。你可以在 `beforeEach` 中使用 next 到tabbar页效果一致 \ No newline at end of file diff --git a/node_modules/uni-simple-router/src/H5/patch.ts b/node_modules/uni-simple-router/src/H5/patch.ts deleted file mode 100644 index 6275cf7..0000000 --- a/node_modules/uni-simple-router/src/H5/patch.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { removeSimpleValue } from '../helpers/utils'; -import { Router} from '../options/base'; - -let [dynamicCacheName, __id__] = ['', '']; - -export const addKeepAliveInclude = function( - router:Router -):void{ - // 【Fixe】 https://github.com/SilurianYang/uni-simple-router/issues/316 2021年12月10日14:30:13 - const app = getApp(); - const keepAliveInclude:Array = app.keepAliveInclude; - if (router.runId === 0 && keepAliveInclude.length === 0) { - __id__ = app.$route.params.__id__; - dynamicCacheName = app.$route.meta.name; - const cacheId = dynamicCacheName + '-' + __id__; - app.keepAliveInclude.push(cacheId) - } else { - if (dynamicCacheName !== '') { - const arrayCacheId = app.keepAliveInclude; - for (let i = 0; i < arrayCacheId.length; i++) { - const cacheId:string = arrayCacheId[i]; - const cacheIdReg = new RegExp(`${dynamicCacheName}-(\\d+)$`); - const firstCacheId = `${dynamicCacheName}-${__id__}`; - if (cacheIdReg.test(cacheId) && cacheId !== firstCacheId) { - removeSimpleValue(arrayCacheId, firstCacheId); - dynamicCacheName = ''; - break; - } - } - } - } -} diff --git a/node_modules/uni-simple-router/src/app/appPatch.ts b/node_modules/uni-simple-router/src/app/appPatch.ts index dce8464..c9b07ba 100644 --- a/node_modules/uni-simple-router/src/app/appPatch.ts +++ b/node_modules/uni-simple-router/src/app/appPatch.ts @@ -1,4 +1,4 @@ -import { navtoRule, objectAny, Router, totalNextRoute } from '../options/base'; +import { objectAny, Router, totalNextRoute } from '../options/base'; import { AppConfig } from '../options/config'; let quitBefore:number|null = null; @@ -7,7 +7,7 @@ let TABBAR:objectAny|null = null; export function registerLoddingPage( router:Router, ):void{ - if (router.options.APP?.registerLoadingPage) { + if (router.options.registerLoadingPage) { const { loadingPageHook, loadingPageStyle } = router.options.APP as AppConfig; // 获取app所有配置 const view = new plus.nativeObj.View('router-loadding', { top: '0px', @@ -40,29 +40,6 @@ export function runtimeQuit( } } -export function HomeNvueSwitchTab( - router:Router, - to:navtoRule, - oldMethod:Function -):Promise { - return new Promise(( - resolve:(value:boolean)=>void - ) => { - if (router.runId !== 0) { - return resolve(false) - } - if (!(__uniConfig.tabBar && Array.isArray(__uniConfig.tabBar.list))) { - return resolve(false) - } - // Fixe https://github.com/SilurianYang/uni-simple-router/issues/373 2022-4-3 19:40:59 - oldMethod({ - url: __uniConfig.entryPagePath, - animationDuration:0, - complete: () => resolve(true) - }); - }) -} - export function tabIndexSelect( to:totalNextRoute, from:totalNextRoute diff --git a/node_modules/uni-simple-router/src/component/link.vue b/node_modules/uni-simple-router/src/component/link.vue index 7f2b755..873f412 100644 --- a/node_modules/uni-simple-router/src/component/link.vue +++ b/node_modules/uni-simple-router/src/component/link.vue @@ -36,23 +36,17 @@ export default { methods: { formatNav(text) { if (text != null && text.constructor === String) { - const keyArray = []; - text = text.replace(/((\w+)|('\s*(\w+)\s*')|("\s*(\w+)\s*"))\s*(?=:)/g, function (val) { - const key = `"${val.trim().replace(/"|'/g, '')}"`; - keyArray.push(key); - return key + text = text.replace(/\'/g, ''); + text = text.replace(/(\w+)(?=:)/g, function (val) { + return `"${val}"`; + }); + text = text.replace(/:\s*([^,{}\s"]+)/g, function (val) { + const arr = val.split(':'); + return `:"${arr[1].trim()}"`; }); - const removeReg=/('|")/g; - for (let i = 0; i < keyArray.length; i++) { - const key = keyArray[i]; - text=text.replace(new RegExp(`${key}\\s*:\\s*('[^']+')`, 'g'),(...args)=>{ - const $1=args[1]; - return `${key}:"${$1.replace(removeReg,'')}"` - }) - } try { - text=JSON.parse(text); - } catch (error) {} + text = JSON.parse(text); + } catch (e) {} } if (this.append) { let pathArr = this.$Route.path.split('/'); diff --git a/node_modules/uni-simple-router/src/global.d.ts b/node_modules/uni-simple-router/src/global.d.ts index eed451f..74a6427 100644 --- a/node_modules/uni-simple-router/src/global.d.ts +++ b/node_modules/uni-simple-router/src/global.d.ts @@ -4,6 +4,4 @@ declare var __uniConfig:any; declare var __uniRoutes:any; declare function getCurrentPages(isAll:boolean|undefined=false):any; declare function getApp(args?:{allowDefault: true}):any; -declare var $npm_package_name:string; -declare var $npm_package_version:string; -declare var $npm_package_last_version:string; \ No newline at end of file +declare var $npm_package_name:string; \ No newline at end of file diff --git a/node_modules/uni-simple-router/src/helpers/config.ts b/node_modules/uni-simple-router/src/helpers/config.ts index 5abbe48..1c376f0 100644 --- a/node_modules/uni-simple-router/src/helpers/config.ts +++ b/node_modules/uni-simple-router/src/helpers/config.ts @@ -1,7 +1,6 @@ import {err} from './warn' import { InstantiateConfig, LifeCycleConfig} from '../options/config' import { vueHookNameRule, proxyDepsRule } from '../options/base'; -import { parseQuery } from '../public/query'; export const mpPlatformReg = '(^mp-weixin$)|(^mp-baidu$)|(^mp-alipay$)|(^mp-toutiao$)|(^mp-qq$)|(^mp-360$)' // 小程序下不能直接导出正则 需要重新组装成正则 不然bug一推 诡异 @@ -27,11 +26,6 @@ export const baseConfig:InstantiateConfig = { applet: { animationDuration: 300 }, - beforeProxyHooks: { - onLoad: ([options], next, router) => { - next([parseQuery({query: options}, router)]) - } - }, platform: 'h5', keepUniOriginNav: false, debugger: false, diff --git a/node_modules/uni-simple-router/src/helpers/mixins.ts b/node_modules/uni-simple-router/src/helpers/mixins.ts index f2cf06a..9a02f34 100644 --- a/node_modules/uni-simple-router/src/helpers/mixins.ts +++ b/node_modules/uni-simple-router/src/helpers/mixins.ts @@ -8,7 +8,6 @@ import { forceGuardEach } from '../public/methods'; import { assertParentChild, voidFun } from './utils'; import { getEnterPath } from '../applets/appletPatch'; import { mpPlatformReg } from './config'; -import {beforeProxyHook} from '../public/beforeProxyHook' let registerRouter:boolean = false; let onloadProxyOk:boolean = false; @@ -35,7 +34,6 @@ export function getMixins(Vue:any, router: Router):{ const toggleHooks = { h5: { beforeCreate(this: any): void { - beforeProxyHook(this, router); if (this.$options.router) { router.$route = this.$options.router; // 挂载vue-router到路由对象下 let vueRouteMap:RoutesRule[]|RoutesRule = []; @@ -53,7 +51,6 @@ export function getMixins(Vue:any, router: Router):{ }, 'app-plus': { beforeCreate(this: any): void { - beforeProxyHook(this, router); if (!registerRouter) { registerRouter = true; proxyPageHook(this, router, 'app'); @@ -63,8 +60,6 @@ export function getMixins(Vue:any, router: Router):{ }, 'app-lets': { beforeCreate(this: any): void { - beforeProxyHook(this, router); - // 保证这个函数不会被重写 const pluginMark = $npm_package_name; voidFun(pluginMark); diff --git a/node_modules/uni-simple-router/src/helpers/utils.ts b/node_modules/uni-simple-router/src/helpers/utils.ts index 96534dc..7fbd76f 100644 --- a/node_modules/uni-simple-router/src/helpers/utils.ts +++ b/node_modules/uni-simple-router/src/helpers/utils.ts @@ -204,20 +204,6 @@ export function copyData(object:T): T { return JSON.parse(JSON.stringify(object)) } -export function removeSimpleValue( - array:Array, - value:string -):Boolean { - for (let i = 0; i < array.length; i++) { - const it = array[i]; - if (it === value) { - array.splice(i, 1); - return true - } - } - return false -} - export function getUniCachePage(pageIndex?:number):T|[] { const pages:T = getCurrentPages(); if (pageIndex == null) { @@ -421,7 +407,7 @@ export function resolveAbsolutePath( } const query:string = paramsArray[2] || ''; if (/^\.\/[^\.]+/.test(trimPath)) { // 当前路径下 - const navPath:string = (router as unknown as {currentRoute:{path:string}}).currentRoute.path + path; + const navPath:string = router.currentRoute.path + path; return navPath.replace(/[^\/]+\.\//, ''); } const relative = paramsArray[1].replace(/\//g, `\\/`).replace(/\.\./g, `[^\\/]+`).replace(/\./g, '\\.'); diff --git a/node_modules/uni-simple-router/src/index.ts b/node_modules/uni-simple-router/src/index.ts index d29f77d..3d5812f 100644 --- a/node_modules/uni-simple-router/src/index.ts +++ b/node_modules/uni-simple-router/src/index.ts @@ -1,6 +1,5 @@ export * from './options/base' export * from './options/config' -export * from './helpers/utils' export { runtimeQuit @@ -10,8 +9,3 @@ export { RouterMount, createRouter } from './public/router' - -const version = $npm_package_version; -if (/[A-Z]/g.test(version)) { - console.warn(`【${$npm_package_name.toLocaleLowerCase()} 提示】：当前版本 ${version.toLocaleLowerCase()} 此版本为测试版。有BUG请退回正式版，线上正式版本：${$npm_package_last_version}`) -} diff --git a/node_modules/uni-simple-router/src/options/base.ts b/node_modules/uni-simple-router/src/options/base.ts index 56cd37d..2f23883 100644 --- a/node_modules/uni-simple-router/src/options/base.ts +++ b/node_modules/uni-simple-router/src/options/base.ts @@ -208,12 +208,12 @@ export interface RoutesRule { } export interface Router { + [key:string]:any; readonly lifeCycle: LifeCycleConfig; readonly options: InstantiateConfig; $lockStatus:boolean; $route: object | null; enterPath:string; - runId:number; Vue:any; appMain:{ NAVTYPE:reNavMethodRule|reNotNavMethodRule, diff --git a/node_modules/uni-simple-router/src/options/config.ts b/node_modules/uni-simple-router/src/options/config.ts index 2330c7c..fc7efdc 100644 --- a/node_modules/uni-simple-router/src/options/config.ts +++ b/node_modules/uni-simple-router/src/options/config.ts @@ -25,25 +25,6 @@ export interface appletConfig { animationDuration?:number; // 页面切换时间，有助于路由锁精准解锁 } -type hookRule=(args:Array, next:(args:Array)=>void, router:Router)=>void; -export interface proxyHooksConfig{ - onLaunch?:hookRule; - onShow?:hookRule; - onHide?:hookRule; - onError?:hookRule; - onInit?:hookRule; - onLoad?:hookRule; - onReady?:hookRule; - onUnload?:hookRule; - onResize?:hookRule; - destroyed?:hookRule; - created?:hookRule; - beforeCreate?:hookRule; - beforeMount?:hookRule; - mounted?:hookRule; - beforeDestroy?:hookRule; -} - export interface debuggerArrayConfig{ error?:boolean; warn?:boolean; @@ -57,7 +38,6 @@ export interface InstantiateConfig { h5?: H5Config; APP?: AppConfig; applet?:appletConfig; - beforeProxyHooks?:proxyHooksConfig; debugger?: debuggerConfig; // 是否处于开发阶段 设置为true则打印日志 routerBeforeEach?: (to:navtoRule, from:navtoRule, next:(rule?: navtoRule|false)=>void) => void; // router 前置路由函数 每次触发跳转前先会触发此函数 routerAfterEach?: (to:navtoRule, from:navtoRule, next?: Function) => void; // router 后置路由函数 每次触发跳转后会触发此函数 diff --git a/node_modules/uni-simple-router/src/public/beforeProxyHook.ts b/node_modules/uni-simple-router/src/public/beforeProxyHook.ts deleted file mode 100644 index cfb907a..0000000 --- a/node_modules/uni-simple-router/src/public/beforeProxyHook.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { voidFun } from '../helpers/utils'; -import { warn } from '../helpers/warn'; -import { Router, vueHookNameRule } from '../options/base'; - -export function beforeProxyHook( - Vim:any, - router:Router -):boolean { - const hookOptions = Vim.$options; - const {beforeProxyHooks} = router.options; - if (hookOptions == null) { - return false; - } - if (beforeProxyHooks == null) { - return false; - } - const keyArray = Object.keys(beforeProxyHooks) as Array; - for (let i = 0; i < keyArray.length; i++) { - const key = keyArray[i]; - const hooksArray:Array|null = hookOptions[key]; - if (hooksArray) { - const beforeProxyFun = beforeProxyHooks[key]; - for (let j = 0; j < hooksArray.length; j++) { - const hookFun = hooksArray[j]; - if (hookFun.toString().includes($npm_package_name)) { - continue - } - const [oldHook] = hooksArray.splice(j, 1, function myReplace(this: any, ...args:Array) { - const pluginMarkId = $npm_package_name; - voidFun(pluginMarkId); - - if (beforeProxyFun) { - beforeProxyFun.call(this, args, (options) => { - oldHook.apply(this, options) - }, router); - } else { - oldHook.apply(this, args) - } - }); - } - } else { - warn(`beforeProxyHooks ===> 当前组件不适合${key}，或者 hook: ${key} 不存在，已为你规避处理，可以忽略。`, router) - } - } - return true -} diff --git a/node_modules/uni-simple-router/src/public/hooks.ts b/node_modules/uni-simple-router/src/public/hooks.ts index 7252e34..e784b42 100644 --- a/node_modules/uni-simple-router/src/public/hooks.ts +++ b/node_modules/uni-simple-router/src/public/hooks.ts @@ -18,7 +18,6 @@ import { } from '../helpers/utils' import { navjump } from './methods'; import { proxyH5Mount } from '../H5/proxyHook'; -import { addKeepAliveInclude } from '../H5/patch'; import { tabIndexSelect } from '../app/appPatch'; export const ERRORHOOK:Array<(error:navErrorRule, router:Router)=>void> = [ @@ -34,10 +33,7 @@ export const HOOKLIST: hookListRule = [ router.$lockStatus = false; if (router.options.platform === 'h5') { proxyH5Mount(router); - // 【Fixe】 https://github.com/SilurianYang/uni-simple-router/issues/316 2021年12月10日14:30:13 - addKeepAliveInclude(router); } - router.runId++; return callHook(router.lifeCycle.routerAfterHooks[0], to, from, router, next, false) } ]; diff --git a/node_modules/uni-simple-router/src/public/methods.ts b/node_modules/uni-simple-router/src/public/methods.ts index 4b77e5d..39cbc98 100644 --- a/node_modules/uni-simple-router/src/public/methods.ts +++ b/node_modules/uni-simple-router/src/public/methods.ts @@ -64,11 +64,6 @@ export function navjump( level = +to; } else { level = to.delta || 1; - // 主要剥离事件函数 - animation = { - ...animation || {}, - ...(to as uniBackApiRule) - } } if (router.options.platform === 'h5') { (router.$route as any).go(-level); diff --git a/node_modules/uni-simple-router/src/public/rewrite.ts b/node_modules/uni-simple-router/src/public/rewrite.ts index e281950..5ab8bb2 100644 --- a/node_modules/uni-simple-router/src/public/rewrite.ts +++ b/node_modules/uni-simple-router/src/public/rewrite.ts @@ -27,7 +27,6 @@ import { } from '../helpers/warn' import {uniOriginJump} from './uniOrigin' -import { HomeNvueSwitchTab } from '../app/appPatch'; const rewrite: Array = [ 'navigateTo', @@ -36,19 +35,6 @@ const rewrite: Array = [ 'switchTab', 'navigateBack' ]; -const cacheOldMethod:{ - navigateTo:Function; - redirectTo:Function; - reLaunch:Function; - switchTab:Function; - navigateBack:Function; -} = { - navigateTo: () => {}, - redirectTo: () => {}, - reLaunch: () => {}, - switchTab: () => {}, - navigateBack: () => {} -} export function rewriteMethod( router:Router @@ -56,20 +42,14 @@ export function rewriteMethod( if (router.options.keepUniOriginNav === false) { rewrite.forEach(name => { const oldMethod: Function = uni[name]; - cacheOldMethod[name] = oldMethod; - uni[name] = async function( + uni[name] = function( params:originMixins|{from:string}|navtoRule, originCall:boolean = false, callOkCb?:Function, forceNav?:boolean - ):Promise { - + ):void { if (originCall) { - if (router.options.platform === 'app-plus') { - await HomeNvueSwitchTab(router, (params as navtoRule), cacheOldMethod['reLaunch']); - } uniOriginJump(router, oldMethod, name, params as originMixins, callOkCb, forceNav) - } else { if (router.options.platform === 'app-plus') { if (Object.keys(router.appMain).length === 0) { @@ -81,8 +61,6 @@ export function rewriteMethod( } callRouterMethod(params as uniNavApiRule, name, router); } - - }; }) } @@ -104,7 +82,8 @@ function callRouterMethod( if (funName === 'reLaunch' && JSON.stringify(option) === '{"url":"/"}') { warn( `uni-app 原生方法：reLaunch({url:'/'}) 默认被重写啦！你可以使用 this.$Router.replaceAll() 或者 uni.reLaunch({url:'/?xxx=xxx'})`, - router + router, + true ); funName = 'navigateBack'; option = { @@ -134,13 +113,15 @@ function callRouterMethod( if (getDataType(finallyPath) === '[object Array]') { warn( `uni-app 原生方法跳转路径为：${path}。此路为是tab页面时，不允许设置 alias 为数组的情况，并且不能为动态路由！当然你可以通过通配符*解决！`, - router + router, + true ); } if ((finallyPath as string) === '*') { warn( `uni-app 原生方法跳转路径为：${path}。在路由表中找不到相关路由表！当然你可以通过通配符*解决！`, - router + router, + true ); } // Fixe h5 端无法触发 onTabItemTap hook 2021年6月3日17:26:47 diff --git a/node_modules/uni-simple-router/src/public/router.ts b/node_modules/uni-simple-router/src/public/router.ts index 0832afc..220d96a 100644 --- a/node_modules/uni-simple-router/src/public/router.ts +++ b/node_modules/uni-simple-router/src/public/router.ts @@ -10,14 +10,11 @@ import {rewriteMethod} from '../public/rewrite' let AppReadyResolve:PromiseResolve = () => {}; const AppReady:Promise = new Promise(resolve => (AppReadyResolve = resolve)); -function createRouter( - params: InstantiateConfig -):Router { +function createRouter(params: InstantiateConfig):Router { const options = assertNewOptions(params); const router:Router = { options, mount: [], - runId: 0, Vue: null, proxyHookDeps: proxyHookDeps, appMain: {}, @@ -109,11 +106,7 @@ function createRouter( return router; } -function RouterMount( - Vim:any, - router:Router, - el:string | undefined = '#app' -) :void|never { +function RouterMount(Vim:any, router:Router, el:string | undefined = '#app') :void|never { if (getDataType>(router.mount) === '[object Array]') { router.mount.push({ app: Vim, diff --git a/node_modules/uni-simple-router/webpack/webpack.common.js b/node_modules/uni-simple-router/webpack/webpack.common.js index 1f4cca7..344fc05 100644 --- a/node_modules/uni-simple-router/webpack/webpack.common.js +++ b/node_modules/uni-simple-router/webpack/webpack.common.js @@ -1,24 +1,6 @@ const {resolve} = require('path'); const CopyPlugin = require('copy-webpack-plugin'); const webpack =require('webpack'); -const cmd = require('node-cmd'); - - -const {data:versions,err} = cmd.runSync('npm v uni-simple-router versions'); - -if(err){ - console.log('获取线上版本失败，无法继续打包。。。') - process.exit(1); -} - -let lastVersion=''; -const list=JSON.parse(versions.replace(/'/g,'"')).reverse(); -for(let i=0;i { return JSON.stringify(process.env.npm_package_name.toLocaleUpperCase()) - }, true ), - $npm_package_version: webpack.DefinePlugin.runtimeValue(() => { - return JSON.stringify(process.env.npm_package_version.toLocaleUpperCase()) - }, true ), - $npm_package_last_version: webpack.DefinePlugin.runtimeValue(() => { - return JSON.stringify(lastVersion) - }, true ), + }, true ) }) ], }; diff --git a/node_modules/uni-simple-router/webpack/webpack.dev.js b/node_modules/uni-simple-router/webpack/webpack.dev.js index 281fc01..79b1374 100644 --- a/node_modules/uni-simple-router/webpack/webpack.dev.js +++ b/node_modules/uni-simple-router/webpack/webpack.dev.js @@ -1,24 +1,22 @@ -const {merge} = require('webpack-merge'); +const {merge} = require("webpack-merge"); const {resolve} = require('path'); -const common = require('./webpack.common.js'); +const common = require("./webpack.common.js"); const CopyPlugin = require('copy-webpack-plugin'); -const output = resolve(__dirname, '../examples/uni-simple-router2.0/dist'); +const output=resolve(__dirname, '../examples/uni-simple-router2.0/dist'); module.exports = merge(common, { - mode: 'development', - devtool: 'source-map', - output: { - path: output, + mode: 'development', + devtool: 'source-map', + output: { + path:output , filename: 'uni-simple-router.js', - }, - plugins: [ - new CopyPlugin([ - { - force: true, - from: resolve(__dirname, '../src/component'), - to: output, - } - ]), - ], -}); + }, + plugins: [ + new CopyPlugin([{ + force: true, + from: resolve(__dirname, '../src/component'), + to: output, + }]), + ] +}); \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 98e4880..588acb7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,16 @@ { - "name": "支付密码输入安全模拟键盘", - "version": "1.1.0", + "name": "dtx_store", + "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "支付密码输入安全模拟键盘", - "version": "1.1.0", + "name": "dtx_store", + "version": "1.0.0", + "license": "ISC", "dependencies": { "uni-read-pages": "^1.0.5", - "uni-simple-router": "^2.0.8-beta.4", + "uni-simple-router": "^2.0.7", "uview-ui": "^2.0.31" } }, @@ -20,9 +21,9 @@ "hasInstallScript": true }, "node_modules/uni-simple-router": { - "version": "2.0.8-beta.4", - "resolved": "https://registry.npmjs.org/uni-simple-router/-/uni-simple-router-2.0.8-beta.4.tgz", - "integrity": "sha512-ipTHhOaRvjV8qrt3HosX5pNMhwFYBnFOuKyV5joH0evfXubjrGI5tjdwpmwzfW5h3VBth3iAqScv+pW/QmIJXw==" + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/uni-simple-router/-/uni-simple-router-2.0.7.tgz", + "integrity": "sha512-8FKv5dw7Eoonm0gkO8udprrxzin0fNUI0+AvIphFkFRH5ZmP5ZWJ2pvnWzb2NiiqQSECTSU5VSB7HhvOSwD5eA==" }, "node_modules/uview-ui": { "version": "2.0.31", @@ -40,9 +41,9 @@ "integrity": "sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA==" }, "uni-simple-router": { - "version": "2.0.8-beta.4", - "resolved": "https://registry.npmjs.org/uni-simple-router/-/uni-simple-router-2.0.8-beta.4.tgz", - "integrity": "sha512-ipTHhOaRvjV8qrt3HosX5pNMhwFYBnFOuKyV5joH0evfXubjrGI5tjdwpmwzfW5h3VBth3iAqScv+pW/QmIJXw==" + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/uni-simple-router/-/uni-simple-router-2.0.7.tgz", + "integrity": "sha512-8FKv5dw7Eoonm0gkO8udprrxzin0fNUI0+AvIphFkFRH5ZmP5ZWJ2pvnWzb2NiiqQSECTSU5VSB7HhvOSwD5eA==" }, "uview-ui": { "version": "2.0.31", diff --git a/package.json b/package.json index 16764c7..35f15a1 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,9 @@ "main": "main.js", "dependencies": { "uni-read-pages": "^1.0.5", - "uni-simple-router": "^2.0.8-beta.4", + "uni-simple-router": "^2.0.7", "uview-ui": "^2.0.31" }, - "author": "唐明明", - "license": "ISC" + "author": "唐明明", + "license": "ISC" } diff --git a/pages/auth/auth.vue b/pages/auth/auth.vue index e50d78c..e05c08c 100644 --- a/pages/auth/auth.vue +++ b/pages/auth/auth.vue @@ -31,167 +31,158 @@