Browse Source

upload

soldDate
HolyKnightIX 1 year ago
parent
commit
fafd6a5ecf
4 changed files with 33 additions and 14 deletions
  1. +5
    -7
      ext.json
  2. +6
    -2
      pages/coupon/confirmation/confirmation.js
  3. +12
    -4
      pages/getuserinfo/getuserinfo.js
  4. +10
    -1
      project.config.json

+ 5
- 7
ext.json View File

@@ -1,23 +1,21 @@
{ {
"ext": { "ext": {
"attr": { "attr": {
"configUrl": "https://c.malls.iformall.com/C/api"
"configUrl": "https://ctest.malls.iformall.com/C/api"
}, },
"name": "吾悦广场",
"weappId": "tt48a23e1fd79d648801"
"name": "富茂券券集团版",
"weappId": "tt620e14b3fd30264101"
}, },
"window": { "window": {
"backgroundTextStyle": "light", "backgroundTextStyle": "light",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "Mini Program",
"navigationBarBackgroundColor": "#fff" "navigationBarBackgroundColor": "#fff"
}, },
"extAppid": "tt48a23e1fd79d648801",
"extAppid": "tt620e14b3fd30264101",
"extEnable": true, "extEnable": true,
"directCommit": false, "directCommit": false,
"networkTimeout": { "networkTimeout": {
"request": 30000, "request": 30000,
"downloadFile": 10000 "downloadFile": 10000
},
"requiredPrivateInfos": ["chooseLocation", "getLocation"]
}
} }

+ 6
- 2
pages/coupon/confirmation/confirmation.js View File

@@ -16,7 +16,7 @@ Page({
mallTenantId: '' mallTenantId: ''
}, },
onLoad: function (options) { onLoad: function (options) {
console.log(options, 'options');
console.log(options, 'options!!!!!!!');


if (options.mallTenantId) { if (options.mallTenantId) {
this.setData({ this.setData({
@@ -321,7 +321,9 @@ Page({
tt.hideLoading() tt.hideLoading()
// 有价券 // 有价券
if (!type && type != 'free') { if (!type && type != 'free') {
console.log('Over Here! type');
setTimeout(() => { setTimeout(() => {
console.log(_this.data.orderFlag, orderId, that.data.mallTenantId, 'notice!!!');
let url = "" let url = ""
if (_this.data.orderFlag) { if (_this.data.orderFlag) {
tt.redirectTo({ tt.redirectTo({
@@ -335,6 +337,7 @@ Page({


}, 1600); }, 1600);
} else if (type == 'free') { } else if (type == 'free') {
console.log('Over Here! type2');
tt.navigateTo({ tt.navigateTo({
url: `/pages/order/detail/index?orderId=${orderId url: `/pages/order/detail/index?orderId=${orderId
}&mallTenantId=${that.data.mallTenantId}` }&mallTenantId=${that.data.mallTenantId}`
@@ -343,6 +346,7 @@ Page({
}) })
.catch(err => { .catch(err => {
console.log(err); console.log(err);
console.log('Over Here! type3');
if (!type) { if (!type) {
setTimeout(function () { setTimeout(function () {
_this.payOrderUpdate(orderId, payOrderId, status, reason, type, _this, composeOrderType); _this.payOrderUpdate(orderId, payOrderId, status, reason, type, _this, composeOrderType);
@@ -925,7 +929,7 @@ Page({
console.log(err) console.log(err)
if (err.code == 11004) { if (err.code == 11004) {
tt.navigateTo({ 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 { } else {
tt.showToast({ tt.showToast({


+ 12
- 4
pages/getuserinfo/getuserinfo.js View File

@@ -125,9 +125,17 @@ Page({
} }
//确定订单 //确定订单
if (options && options.confirmationFlag) { 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) { if (options && options.mineFlag) {
@@ -470,7 +478,7 @@ Page({
that.judgePhonelngo() that.judgePhonelngo()
} else if (that.data.fromflag == 'confirmation' && that.data.confirmationFlag) { } else if (that.data.fromflag == 'confirmation' && that.data.confirmationFlag) {
//订单确认 confirmation //订单确认 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' app.globalData.skip = 'redirectTo'
that.judgePhonelngo() that.judgePhonelngo()
} else if (that.data.fromflag == 'coupondetail' && that.data.couponChannelIdflag) { } else if (that.data.fromflag == 'coupondetail' && that.data.couponChannelIdflag) {


+ 10
- 1
project.config.json View File

@@ -17,7 +17,7 @@
"projectname": "tt富茂C", "projectname": "tt富茂C",
"condition": { "condition": {
"miniprogram": { "miniprogram": {
"current": 1678428610317,
"current": 1678687102364,
"list": [ "list": [
{ {
"id": 1678508631604, "id": 1678508631604,
@@ -54,6 +54,15 @@
"scene": "990001", "scene": "990001",
"launchFrom": "scan", "launchFrom": "scan",
"location": "qr_code" "location": "qr_code"
},
{
"id": 1678687102364,
"name": "辣炒年糕",
"pathName": "pages/main/index",
"query": "type=cd&couponChannelId=790733288312070144&tenantId=1032",
"scene": "990001",
"launchFrom": "scan",
"location": "qr_code"
} }
] ]
} }


Loading…
Cancel
Save