From 0e06250ff1326725003eed33a5a2e6454770170b Mon Sep 17 00:00:00 2001 From: YWQ HK IX <568170040@qq.com> Date: Sun, 30 Oct 2022 13:01:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB=E9=A1=B5=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/navbar/navbar.js | 29 ++++++++++++++++++++++------- ext.json | 25 ++++++++++++++----------- project.config.json | 5 +++-- project.private.config.json | 2 +- 4 files changed, 40 insertions(+), 21 deletions(-) diff --git a/components/navbar/navbar.js b/components/navbar/navbar.js index c387af0..0b83877 100644 --- a/components/navbar/navbar.js +++ b/components/navbar/navbar.js @@ -27,7 +27,7 @@ Component({ type: Boolean, value: false }, - + }, data: { @@ -37,7 +37,7 @@ Component({ navigationBarHeight: (app.statusBarHeight + 44) + 'px', }, methods: { - + backHome: function () { let url = app.globalData.goHomeUrl wx.switchTab({ @@ -51,13 +51,28 @@ Component({ }) }, 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(); if (pages.length <= 1) { this.setData({ diff --git a/ext.json b/ext.json index ac328e8..34dfe10 100644 --- a/ext.json +++ b/ext.json @@ -1,7 +1,14 @@ { "ext": { "attr": { - "mchId": "1602801645", + "car": { + "etcp": { + "etcpAppId": "wx192b7d2e8dcbefd0", + "etcpVersion": "release", + "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" + } + }, + "mchId": "1604439800", "imgProxy": [ { "newUrl": "https://ctest.malls.iformall.com/img", @@ -17,16 +24,12 @@ } ], "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", "ifHaveCarModular": "1" }, - "name": "富茂光谷测试版", - "weappId": "wx219a81b9c87aa4f7", + "name": "金泸商务", + "weappId": "wx649b3be73c1afe47", "appVersion": "C.test.5.2.0" }, "debug": false, @@ -74,15 +77,15 @@ }, "plugins": { "auto-points-plugin": { - "version": "2.4.0", + "version": "1.3.0", "provider": "wxfab2bf944bfc4da6" }, "live-player-plugin": { - "version": "1.2.5", + "version": "1.3.4", "provider": "wx2b03c6e691cd7370" } }, - "extAppid": "wx219a81b9c87aa4f7", + "extAppid": "wx649b3be73c1afe47", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/project.config.json b/project.config.json index 200eb69..0a33f27 100644 --- a/project.config.json +++ b/project.config.json @@ -16,7 +16,7 @@ "autoAudits": false, "showShadowRootInWxmlPanel": true, "scopeDataCheck": false, - "uglifyFileName": false, + "uglifyFileName": true, "checkInvalidKey": true, "checkSiteMap": true, "uploadWithSourceMap": true, @@ -29,7 +29,8 @@ "useMultiFrameRuntime": true, "useApiHook": true, "useApiHostProcess": true, - "useIsolateContext": true + "useIsolateContext": true, + "ignoreUploadUnusedFiles": true }, "compileType": "miniprogram", "libVersion": "2.11.2", diff --git a/project.private.config.json b/project.private.config.json index 6692461..4cbe363 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -4,5 +4,5 @@ "setting": { "compileHotReLoad": true }, - "libVersion": "2.26.2" + "libVersion": "2.27.0" } \ No newline at end of file