From d6d6a124a49a977fbd1ebc6f7ac22e16dd0e47b4 Mon Sep 17 00:00:00 2001 From: YWQ HK IX <568170040@qq.com> Date: Fri, 10 Mar 2023 18:28:20 +0800 Subject: [PATCH] upload --- index/index.js | 5 +++-- pages/index/index.js | 4 +++- pages/main/index.js | 7 +++++++ project.config.json | 6 +++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/index/index.js b/index/index.js index 2268d0e..555b1a8 100644 --- a/index/index.js +++ b/index/index.js @@ -120,7 +120,8 @@ Page({ index: tt.getStorageSync('mallIndex') || 0, locateData: {}, scanIn: false, // 扫码进入首页 - scanInTenantId: '' + scanInTenantId: '', + scene: "" }, getCongig() { //获取小程序是否开通授权手机号 @@ -221,7 +222,7 @@ Page({ url: config.api.businessList, data: { filter: 2, - mallTenantId: this.data.mallTenantId || that.data.scanInTenantId || "", + mallTenantId: this.data.mallTenantId || this.data.scanInTenantId || "", } }).then(res => { this.setData({ diff --git a/pages/index/index.js b/pages/index/index.js index 6b1b37f..03b6db0 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -77,6 +77,8 @@ Page({ options.id = this.data.newArr[2]; } else if (options.type == 'ts') { options.id = this.data.newArr[2]; + } else if (options.type == 'ts') { + options.id = this.data.newArr[2]; } } } @@ -291,7 +293,7 @@ Page({ // 首页 else if (app.globalData.type == 'in') { tt.reLaunch({ - url: '/index/index' + url: `/index/index` }); } // 停车 diff --git a/pages/main/index.js b/pages/main/index.js index fe1a5ac..402d6a9 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -91,6 +91,8 @@ Page({ options.id = this.data.newArr[2]; } else if (options.type == 'wjLsit') { options.id = this.data.newArr[2]; + } else if (options.type == 'scanIn') { + options.tenantId = this.data.newArr[2] || ""; } } } @@ -577,6 +579,11 @@ Page({ tt.navigateTo({ url: '/index/searchbar' }) + } // 门店 + else if (app.globalData.type == 'scanIn') { + tt.navigateTo({ + url: `/index/index?type=in&tenantId=${options.tenantId}` + }) } else { tt.reLaunch({ url: '/index/index', diff --git a/project.config.json b/project.config.json index 0aebaf3..fc7243c 100644 --- a/project.config.json +++ b/project.config.json @@ -29,10 +29,10 @@ "location": "qr_code" }, { - "id": 1671727084768, + "id": 1678428610317, "name": "index/index", "pathName": "pages/main/index", - "query": "type=cd&couponChannelId=762472141677453312&tenantId=1032", + "query": "type=in&tenantId=1033", "scene": "990001", "launchFrom": "scan", "location": "qr_code" @@ -50,7 +50,7 @@ "id": 1678330099779, "name": " index/index(scanIn)", "pathName": "index/index", - "query": "type=in&tenantId=1034", + "query": "type=in&tenantId=1033", "scene": "990001", "launchFrom": "scan", "location": "qr_code"