From b7391aef7bd8d1f5e47ed1aaa1a10f7fe529dfd3 Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Thu, 29 Dec 2022 22:02:12 +0800 Subject: [PATCH] upload --- pages/couponorder/index/index.js | 4 +- pages/order/index/index.js | 72 +++++++++++++++----------------- 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js index 4224751..1198f29 100644 --- a/pages/couponorder/index/index.js +++ b/pages/couponorder/index/index.js @@ -49,7 +49,7 @@ Page({ bindPickerChange(e) { const index = e.detail.value const mallTenantId = this.data.shopList[index].tenantId - tt.setStorageSync('mallTenantId', mallTenantId) + // tt.setStorageSync('mallTenantId', mallTenantId) // tt.setStorageSync('mallIndex', index) this.setData({ index: index, @@ -155,7 +155,5 @@ Page({ }, onShow: function () { this.getList() - } - }) \ No newline at end of file diff --git a/pages/order/index/index.js b/pages/order/index/index.js index 7da7678..1d24452 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -96,58 +96,52 @@ Page({ }) }, onLoad(e) { - - // this.setData({ - // current_scroll: e.id - // }); - this.setData({ - // tt.getStorageSync('mallIndex') || - index: 0, - }) - }, - onShow() { Http.get({ url: '/mall/subMall?isAll=1', }).then(res => { this.setData({ shopList: res.data, - mallTenantId: tt.getStorageSync('mallTenantId') || res.data[0].tenantId + // tt.getStorageSync('mallTenantId') || + mallTenantId: res.data[0].tenantId }); - this.getList(this.data.boatFlag, 1); - Http.get({ - url: config.api.checkUserStatus, - data: { - token: app.globalData.token - } - }).then(res => { - Http.get({ - url: config.api.checkPhoneStatus - }).then(res => {}).catch(err => { - if (app.globalData.ifCongPh == 1) { - app.globalData.skip = 'navigateBack' - tt.navigateTo({ - url: `/pages/getPhone/getPhone?skipUrl=1`, - }) - } else { - this.setData({ - showBox: true - }) - } - }) - }).catch(err => { + console.log(this.data.shopList, 'list'); - if (err.code == 11004) { //未授权抖音 - app.globalData.type = 'mo' + }).catch(err => { + console.log(err, 'err'); + }) + }, + onShow() { + this.getList(this.data.boatFlag, 1); + Http.get({ + url: config.api.checkUserStatus, + data: { + token: app.globalData.token + } + }).then(res => { + Http.get({ + url: config.api.checkPhoneStatus + }).then(res => {}).catch(err => { + if (app.globalData.ifCongPh == 1) { + app.globalData.skip = 'navigateBack' tt.navigateTo({ - url: '/pages/getuserinfo/getuserinfo', - - }); + url: `/pages/getPhone/getPhone?skipUrl=1`, + }) + } else { + this.setData({ + showBox: true + }) } }) }).catch(err => { - }) + if (err.code == 11004) { //未授权抖音 + app.globalData.type = 'mo' + tt.navigateTo({ + url: '/pages/getuserinfo/getuserinfo', + }); + } + }) this.setData({ ifshowtab: app.globalData.ifshowtab, allow_load: true