| @@ -1,23 +1,21 @@ | |||
| { | |||
| "ext": { | |||
| "attr": { | |||
| "configUrl": "https://c.malls.iformall.com/C/api" | |||
| "configUrl": "https://ctest.malls.iformall.com/C/api" | |||
| }, | |||
| "name": "吾悦广场", | |||
| "weappId": "tt48a23e1fd79d648801" | |||
| "name": "富茂券券集团版", | |||
| "weappId": "tt620e14b3fd30264101" | |||
| }, | |||
| "window": { | |||
| "backgroundTextStyle": "light", | |||
| "navigationBarTextStyle": "black", | |||
| "navigationBarTitleText": "Mini Program", | |||
| "navigationBarBackgroundColor": "#fff" | |||
| }, | |||
| "extAppid": "tt48a23e1fd79d648801", | |||
| "extAppid": "tt620e14b3fd30264101", | |||
| "extEnable": true, | |||
| "directCommit": false, | |||
| "networkTimeout": { | |||
| "request": 30000, | |||
| "downloadFile": 10000 | |||
| }, | |||
| "requiredPrivateInfos": ["chooseLocation", "getLocation"] | |||
| } | |||
| } | |||
| @@ -16,7 +16,7 @@ Page({ | |||
| mallTenantId: '' | |||
| }, | |||
| onLoad: function (options) { | |||
| console.log(options, 'options'); | |||
| console.log(options, 'options!!!!!!!'); | |||
| if (options.mallTenantId) { | |||
| this.setData({ | |||
| @@ -321,7 +321,9 @@ Page({ | |||
| tt.hideLoading() | |||
| // 有价券 | |||
| if (!type && type != 'free') { | |||
| console.log('Over Here! type'); | |||
| setTimeout(() => { | |||
| console.log(_this.data.orderFlag, orderId, that.data.mallTenantId, 'notice!!!'); | |||
| let url = "" | |||
| if (_this.data.orderFlag) { | |||
| tt.redirectTo({ | |||
| @@ -335,6 +337,7 @@ Page({ | |||
| }, 1600); | |||
| } else if (type == 'free') { | |||
| console.log('Over Here! type2'); | |||
| tt.navigateTo({ | |||
| url: `/pages/order/detail/index?orderId=${orderId | |||
| }&mallTenantId=${that.data.mallTenantId}` | |||
| @@ -343,6 +346,7 @@ Page({ | |||
| }) | |||
| .catch(err => { | |||
| console.log(err); | |||
| console.log('Over Here! type3'); | |||
| if (!type) { | |||
| setTimeout(function () { | |||
| _this.payOrderUpdate(orderId, payOrderId, status, reason, type, _this, composeOrderType); | |||
| @@ -925,7 +929,7 @@ Page({ | |||
| console.log(err) | |||
| if (err.code == 11004) { | |||
| tt.navigateTo({ | |||
| url: `/pages/getuserinfo/getuserinfo?fromflag=confirmation&confirmationFlag=${that.data.couponChannelId}`, | |||
| url: `/pages/getuserinfo/getuserinfo?fromflag=confirmation&confirmationFlag=${that.data.couponChannelId}&mallTenantId=${that.data.mallTenantId}`, | |||
| }) | |||
| } else { | |||
| tt.showToast({ | |||
| @@ -125,9 +125,17 @@ Page({ | |||
| } | |||
| //确定订单 | |||
| if (options && options.confirmationFlag) { | |||
| that.setData({ | |||
| confirmationFlag: options.confirmationFlag | |||
| }) | |||
| if (options.mallTenantId) { | |||
| that.setData({ | |||
| confirmationFlag: options.confirmationFlag, | |||
| mallTenantId: options.confirmationFlag | |||
| }) | |||
| } else { | |||
| that.setData({ | |||
| confirmationFlag: options.confirmationFlag | |||
| }) | |||
| } | |||
| } | |||
| // 我的 | |||
| if (options && options.mineFlag) { | |||
| @@ -470,7 +478,7 @@ Page({ | |||
| that.judgePhonelngo() | |||
| } else if (that.data.fromflag == 'confirmation' && that.data.confirmationFlag) { | |||
| //订单确认 confirmation | |||
| app.globalData.skipUrl = `/pages/coupon/confirmation/confirmation?couponChannelId=${that.data.confirmationFlag}`, | |||
| app.globalData.skipUrl = `/pages/coupon/confirmation/confirmation?couponChannelId=${that.data.confirmationFlag}&mallTenantId=${that.data.mallTenantId}`, | |||
| app.globalData.skip = 'redirectTo' | |||
| that.judgePhonelngo() | |||
| } else if (that.data.fromflag == 'coupondetail' && that.data.couponChannelIdflag) { | |||
| @@ -17,7 +17,7 @@ | |||
| "projectname": "tt富茂C", | |||
| "condition": { | |||
| "miniprogram": { | |||
| "current": 1678428610317, | |||
| "current": 1678687102364, | |||
| "list": [ | |||
| { | |||
| "id": 1678508631604, | |||
| @@ -54,6 +54,15 @@ | |||
| "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" | |||
| } | |||
| ] | |||
| } | |||