diff --git a/index/index.js b/index/index.js index 555b1a8..327d056 100644 --- a/index/index.js +++ b/index/index.js @@ -889,6 +889,13 @@ Page({ setTimeout(function () { that.alphaClick1(); }, 8000) + + setTimeout(() => { + that.getBannerlist(); + that.getBusinessList() + that.getCouponChannelList(that.data.busineKye) + }, 1000) + }, diff --git a/pages/main/index.js b/pages/main/index.js index e9a3c37..915e65f 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -410,7 +410,15 @@ Page({ tt.redirectTo({ url: `/pages/index/searchbar/detail/index?id=${options.id}` }); + } + // 通过扫码进入首页 + else if (app.globalData.type == 'scanIn') { + console.log('scanIn!!!!!!!'); + tt.navigateTo({ + url: `/index/index?type=in&tenantId=${options.tenantId}` + }) } else { + console.log('/index/index'); // 主页 tt.reLaunch({ url: '/index/index' @@ -587,7 +595,8 @@ Page({ tt.navigateTo({ url: '/index/searchbar' }) - } // 门店 + } + // 首页 else if (app.globalData.type == 'scanIn') { tt.navigateTo({ url: `/index/index?type=in&tenantId=${options.tenantId}` diff --git a/project.config.json b/project.config.json index b21a921..aaf0cf0 100644 --- a/project.config.json +++ b/project.config.json @@ -17,7 +17,7 @@ "projectname": "tt富茂C", "condition": { "miniprogram": { - "current": 1678330099779, + "current": 1678428610317, "list": [ { "id": 1678508631604, @@ -32,7 +32,7 @@ "id": 1678428610317, "name": "index/index", "pathName": "pages/main/index", - "query": "type=in&tenantId=1033", + "query": "type=scanIn&tenantId=1032", "scene": "990001", "launchFrom": "scan", "location": "qr_code"