| @@ -27,7 +27,7 @@ Component({ | |||||
| type: Boolean, | type: Boolean, | ||||
| value: false | value: false | ||||
| }, | }, | ||||
| }, | }, | ||||
| data: { | data: { | ||||
| @@ -37,7 +37,7 @@ Component({ | |||||
| navigationBarHeight: (app.statusBarHeight + 44) + 'px', | navigationBarHeight: (app.statusBarHeight + 44) + 'px', | ||||
| }, | }, | ||||
| methods: { | methods: { | ||||
| backHome: function () { | backHome: function () { | ||||
| let url = app.globalData.goHomeUrl | let url = app.globalData.goHomeUrl | ||||
| wx.switchTab({ | wx.switchTab({ | ||||
| @@ -51,13 +51,28 @@ Component({ | |||||
| }) | }) | ||||
| }, | }, | ||||
| back: function () { | back: function () { | ||||
| wx.navigateBack({ | |||||
| delta: 1 | |||||
| }) | |||||
| // wx.navigateBack({ | |||||
| // delta: 1 | |||||
| // }) | |||||
| const pages = getCurrentPages(); | |||||
| console.log(`页面栈:${JSON.stringify(pages)}`, pages.length); | |||||
| if (pages.length === 2) { | |||||
| wx.navigateBack({ | |||||
| delta: 1 | |||||
| }); | |||||
| } else if (pages.length === 1) { | |||||
| wx.reLaunch({ | |||||
| url: '/pages/theme/index1/index', | |||||
| }) | |||||
| } else { | |||||
| wx.navigateBack({ | |||||
| delta: 1 | |||||
| }); | |||||
| } | |||||
| } | } | ||||
| }, | }, | ||||
| attached: function(){ | |||||
| attached: function () { | |||||
| let pages = getCurrentPages(); | let pages = getCurrentPages(); | ||||
| if (pages.length <= 1) { | if (pages.length <= 1) { | ||||
| this.setData({ | this.setData({ | ||||
| @@ -1,7 +1,14 @@ | |||||
| { | { | ||||
| "ext": { | "ext": { | ||||
| "attr": { | "attr": { | ||||
| "mchId": "1602801645", | |||||
| "car": { | |||||
| "etcp": { | |||||
| "etcpAppId": "wx192b7d2e8dcbefd0", | |||||
| "etcpVersion": "release", | |||||
| "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" | |||||
| } | |||||
| }, | |||||
| "mchId": "1604439800", | |||||
| "imgProxy": [ | "imgProxy": [ | ||||
| { | { | ||||
| "newUrl": "https://ctest.malls.iformall.com/img", | "newUrl": "https://ctest.malls.iformall.com/img", | ||||
| @@ -17,16 +24,12 @@ | |||||
| } | } | ||||
| ], | ], | ||||
| "configUrl": "https://ctest.malls.iformall.com/C/api", | "configUrl": "https://ctest.malls.iformall.com/C/api", | ||||
| "etcpAppId": "wx219a81b9c87aa4f7", | |||||
| "etcpVersion": "release", | |||||
| "businessSwitch": "0", | |||||
| "businessVersion": "1", | |||||
| "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback", | |||||
| "businessSwitch": "1", | |||||
| "ifHaveWebSocket": "0", | "ifHaveWebSocket": "0", | ||||
| "ifHaveCarModular": "1" | "ifHaveCarModular": "1" | ||||
| }, | }, | ||||
| "name": "富茂光谷测试版", | |||||
| "weappId": "wx219a81b9c87aa4f7", | |||||
| "name": "金泸商务", | |||||
| "weappId": "wx649b3be73c1afe47", | |||||
| "appVersion": "C.test.5.2.0" | "appVersion": "C.test.5.2.0" | ||||
| }, | }, | ||||
| "debug": false, | "debug": false, | ||||
| @@ -74,15 +77,15 @@ | |||||
| }, | }, | ||||
| "plugins": { | "plugins": { | ||||
| "auto-points-plugin": { | "auto-points-plugin": { | ||||
| "version": "2.4.0", | |||||
| "version": "1.3.0", | |||||
| "provider": "wxfab2bf944bfc4da6" | "provider": "wxfab2bf944bfc4da6" | ||||
| }, | }, | ||||
| "live-player-plugin": { | "live-player-plugin": { | ||||
| "version": "1.2.5", | |||||
| "version": "1.3.4", | |||||
| "provider": "wx2b03c6e691cd7370" | "provider": "wx2b03c6e691cd7370" | ||||
| } | } | ||||
| }, | }, | ||||
| "extAppid": "wx219a81b9c87aa4f7", | |||||
| "extAppid": "wx649b3be73c1afe47", | |||||
| "extEnable": true, | "extEnable": true, | ||||
| "permission": { | "permission": { | ||||
| "scope.userLocation": { | "scope.userLocation": { | ||||
| @@ -16,7 +16,7 @@ | |||||
| "autoAudits": false, | "autoAudits": false, | ||||
| "showShadowRootInWxmlPanel": true, | "showShadowRootInWxmlPanel": true, | ||||
| "scopeDataCheck": false, | "scopeDataCheck": false, | ||||
| "uglifyFileName": false, | |||||
| "uglifyFileName": true, | |||||
| "checkInvalidKey": true, | "checkInvalidKey": true, | ||||
| "checkSiteMap": true, | "checkSiteMap": true, | ||||
| "uploadWithSourceMap": true, | "uploadWithSourceMap": true, | ||||
| @@ -29,7 +29,8 @@ | |||||
| "useMultiFrameRuntime": true, | "useMultiFrameRuntime": true, | ||||
| "useApiHook": true, | "useApiHook": true, | ||||
| "useApiHostProcess": true, | "useApiHostProcess": true, | ||||
| "useIsolateContext": true | |||||
| "useIsolateContext": true, | |||||
| "ignoreUploadUnusedFiles": true | |||||
| }, | }, | ||||
| "compileType": "miniprogram", | "compileType": "miniprogram", | ||||
| "libVersion": "2.11.2", | "libVersion": "2.11.2", | ||||
| @@ -4,5 +4,5 @@ | |||||
| "setting": { | "setting": { | ||||
| "compileHotReLoad": true | "compileHotReLoad": true | ||||
| }, | }, | ||||
| "libVersion": "2.26.2" | |||||
| "libVersion": "2.27.0" | |||||
| } | } | ||||