diff --git a/components/optimization/optimization.js b/components/optimization/optimization.js index 6a1aa1a..c183a0c 100644 --- a/components/optimization/optimization.js +++ b/components/optimization/optimization.js @@ -29,8 +29,19 @@ Component({ let couponChannelId = e.currentTarget.dataset.id let couponId = e.currentTarget.dataset.couponid let mallTenantId = e.currentTarget.dataset.malltenantid + + const data = { + couponChannelId, + couponId, + mallTenantId + } + + // const path = `/pages/coupon/detail/index?couponChannelId=${couponChannelId}&couponId=${couponId}&mallTenantId=${mallTenantId}` + + const path = `/pages/coupon/detail/index?params=${JSON.stringify(data)}` + console.log(path, 'path'); tt.navigateTo({ - url: `/pages/coupon/detail/index?couponChannelId=${couponChannelId}&couponId=${couponId}&mallTenantId=${mallTenantId}`, + url: path, }) }, setIndex(e) { diff --git a/index/index.js b/index/index.js index ab3a2a0..f745505 100644 --- a/index/index.js +++ b/index/index.js @@ -233,6 +233,7 @@ Page({ }].concat(res.data) }); }).catch(err => { + if (err.code == 1053) return tt.showModal({ title: '提示', content: err.message ? err.message : err.data, @@ -310,6 +311,7 @@ Page({ console.log(that.data.businessData, 'businessData'); }).catch(err => { tt.hideLoading(); + if (err.code == 1053) return tt.showModal({ title: '提示', content: err.message ? err.message : err.data, @@ -933,6 +935,7 @@ Page({ }) }) .catch(err => { + if (err.code == 1053) return tt.showModal({ title: '提示', content: err.message, @@ -1061,6 +1064,7 @@ Page({ // that.getGameOne(app.globalData.token) // that.getStaticGame(app.globalData.token) that.getGg(app.globalData.token) + if (err.code == 1053) return tt.showModal({ title: "提示", content: err.message, @@ -1136,6 +1140,7 @@ Page({ // that.getGameOne(app.globalData.token) // that.getStaticGame(app.globalData.token) that.getGg(app.globalData.token) + if (err.code == 1053) return tt.showModal({ title: "提示", content: err.message, diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 3ae1f84..287393f 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -512,9 +512,17 @@ Page({ /** * 获取用户信息 */ - onLoad(options) { + onLoad(option) { + let options = null + if (option.params) { + options = JSON.parse(option.params) + } else { + options = option + } + const dealData = options => { console.log(options, 'options'); + if (options.mallTenantId || options.tenantId) { tt.setStorageSync('locationSwitch', 0); this.setData({ diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 3344e63..4e43a2f 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -200,6 +200,8 @@ Page({ status = 3 } else if (refundOrderStatus == 4) { //退款失败 status = 4 + } else { // 退款处理中 + status = 0 } that.setData({ @@ -207,7 +209,7 @@ Page({ }) } else { - status = 0 + } that.setData({ orderStatus: status, @@ -801,7 +803,13 @@ Page({ /** * 生命周期函数--监听页面加载 */ - onLoad: function (options) { + onLoad: function (option) { + let options = null + if (option.params) { + options = JSON.parse(option.params) + } else { + options = option + } // this.getSeUrl() if (options.mallTenantId) { this.setData({ diff --git a/pages/order/index/index.js b/pages/order/index/index.js index 9d56643..4e86f78 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -209,13 +209,27 @@ Page({ }, gotopay: function (e) { let level = e.currentTarget.dataset.level + + const params = { + orderId: e.currentTarget.dataset.id, + mallTenantId: this.data.mallTenantId, + flag: 'pay' + } + if (level == 0) { + // tt.navigateTo({ + // url: `/pages/order/detail/index?orderId=${e.currentTarget.dataset.id}&mallTenantId=${this.data.mallTenantId}&flag='pay'` + // }) tt.navigateTo({ - url: `/pages/order/detail/index?orderId=${e.currentTarget.dataset.id}&mallTenantId=${this.data.mallTenantId}&flag='pay'` + url: `/pages/order/detail/index?params=${JSON.stringify(params) }` }) } else { + // tt.navigateTo({ + // url: `/pages/order/detail/index?orderId=${e.currentTarget.dataset.id}&mallTenantId=${this.data.mallTenantId}&dingdan=order&flag='pay'` + // }) + params.dingdan = 'order' tt.navigateTo({ - url: `/pages/order/detail/index?orderId=${e.currentTarget.dataset.id}&mallTenantId=${this.data.mallTenantId}&dingdan=order&flag='pay'` + url: `/pages/order/detail/index?params=${JSON.stringify(params) }` }) } diff --git a/project.private.config.json b/project.private.config.json new file mode 100644 index 0000000..4b0a09e --- /dev/null +++ b/project.private.config.json @@ -0,0 +1,63 @@ +{ + "condition": { + "miniprogram": { + "current": -1, + "list": [ + { + "id": 1678508631604, + "name": "pages/main/index", + "pathName": "pages/main/index", + "query": "type=uc&tenantId=1033", + "scene": "990001", + "launchFrom": "scan", + "location": "qr_code" + }, + { + "id": 1678428610317, + "name": "index/index", + "pathName": "pages/main/index", + "query": "type=scanIn&tenantId=1034", + "scene": "990001", + "launchFrom": "scan", + "location": "qr_code" + }, + { + "id": 1678330099779, + "name": "scanIn", + "pathName": "pages/main/index", + "query": "scene=t:scanInAu:1034", + "scene": "990001", + "launchFrom": "scan", + "location": "qr_code" + }, + { + "id": 1678687102364, + "name": "奥尔良鸡腿(昌东)", + "pathName": "pages/main/index", + "query": "type=cd&couponChannelId=790733288312070144&tenantId=1032", + "scene": "990001", + "launchFrom": "scan", + "location": "qr_code" + }, + { + "id": 1679365133968, + "name": "爽口酸萝卜一份(昌西)", + "pathName": "pages/main/index", + "query": "type=cd&couponChannelId=792625127019700224&tenantId=1033", + "scene": "990001", + "launchFrom": "scan", + "location": "qr_code" + }, + { + "id": 1685600905887, + "name": "pages/coupon/detail/index", + "pathName": "pages/coupon/detail/index", + "query": "couponChannelId=823002244776124416&couponId=822994443689451520&mallTenantId=1032", + "scene": "011007", + "launchFrom": "scan", + "location": "audit" + } + ] + } + } +}