Browse Source

子广场券包显示异常

soldDate
HolyKnightIX 2 years ago
parent
commit
f72c87012b
7 changed files with 31 additions and 28 deletions
  1. +2
    -2
      pages/coupon/confirmation/confirmation.js
  2. +4
    -3
      pages/coupon/detail/index.js
  3. +1
    -1
      pages/couponorder/detail/index.js
  4. +1
    -1
      pages/couponorder/index/index.js
  5. +2
    -2
      pages/couponorder/index/index.ttml
  6. +18
    -16
      pages/getPhone/getPhone.js
  7. +3
    -3
      project.config.json

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

@@ -896,7 +896,7 @@ Page({
*/ */
if (app.globalData.ifCongPh == 1) { if (app.globalData.ifCongPh == 1) {
tt.navigateTo({ tt.navigateTo({
url: `/pages/getPhone/getPhone?couponChannelId=${that.data.couponChannelId}&path=qr`,
url: `/pages/getPhone/getPhone?couponChannelId=${that.data.couponChannelId}&mallTenantId=${that.data.mallTenantId}&path=qr`,
}); });
} else { } else {
this.setData({ this.setData({
@@ -906,7 +906,7 @@ Page({
} else if (err.code == 11006) { } else if (err.code == 11006) {
// 用户手机已加密 // 用户手机已加密
tt.navigateTo({ tt.navigateTo({
url: `/pages/getPhone/getPhone?couponChannelId=${that.data.couponChannelId}&path=qr`
url: `/pages/getPhone/getPhone?couponChannelId=${that.data.couponChannelId}&mallTenantId=${that.data.mallTenantId}&path=qr`
}); });
} else { } else {
tt.showToast({ tt.showToast({


+ 4
- 3
pages/coupon/detail/index.js View File

@@ -485,12 +485,13 @@ Page({
*/ */
onLoad(options) { onLoad(options) {
console.log(options, 'options'); console.log(options, 'options');
if (options.mallTenantId) {
if (options.mallTenantId || options.tenantId) {
this.setData({ this.setData({
mallTenantId: options.mallTenantId,
mallTenantId: options.mallTenantId || options.tenantId,
}) })
} }



this.setData({ this.setData({
mouldType: app.globalData.mouldType, mouldType: app.globalData.mouldType,
}) })
@@ -926,7 +927,7 @@ Page({
* *
*/ */
tt.redirectTo({ tt.redirectTo({
url: "/pages/getphoneInfo/index?path=index&cuserId=" + that.data.cardData.cuserId + "&couponChannelId=" + that.data.cardData.couponChannelId + "&userName=" + that.data.cardData.userName + "&coverImg=" + that.data.cardData.coverImg + "&avatarUrl=" + that.data.cardData.avatarUrl + "&couponOrderId=" + that.data.cardData.couponOrderId + "&updateDate=" + that.data.cardData.updateDate,
url: "/pages/getphoneInfo/index?path=index&cuserId=" + that.data.cardData.cuserId + "&couponChannelId=" + that.data.cardData.couponChannelId + "&userName=" + that.data.cardData.userName + "&coverImg=" + that.data.cardData.coverImg + "&avatarUrl=" + that.data.cardData.avatarUrl + "&couponOrderId=" + that.data.cardData.couponOrderId + "&updateDate=" + that.data.cardData.updateDate
}); });
} else if (err.code == 11006) { } else if (err.code == 11006) {
// 用户手机已加密 // 用户手机已加密


+ 1
- 1
pages/couponorder/detail/index.js View File

@@ -129,7 +129,7 @@ Page({
url: config.api.couponOrderDetail, url: config.api.couponOrderDetail,
data: { data: {
couponOrderId: options.quancode, couponOrderId: options.quancode,
mallTenantId: tt.getStorageSync('mallTenantId') || ''
mallTenantId: options.mallTenantId
} }
}).then(res => { }).then(res => {
if (res.data.tenantId) { if (res.data.tenantId) {


+ 1
- 1
pages/couponorder/index/index.js View File

@@ -49,7 +49,7 @@ Page({
bindPickerChange(e) { bindPickerChange(e) {
const index = e.detail.value const index = e.detail.value
const mallTenantId = this.data.shopList[index].tenantId const mallTenantId = this.data.shopList[index].tenantId
// tt.setStorageSync('mallTenantId', mallTenantId)
tt.setStorageSync('mallTenantId', mallTenantId)
// tt.setStorageSync('mallIndex', index) // tt.setStorageSync('mallIndex', index)
this.setData({ this.setData({
index: index, index: index,


+ 2
- 2
pages/couponorder/index/index.ttml View File

@@ -35,11 +35,11 @@
</view> </view>
</view> </view>
<navigator class="useBtn" tt:if="{{item.couponOrderStatus==0}}" <navigator class="useBtn" tt:if="{{item.couponOrderStatus==0}}"
url="/pages/couponorder/detail/index?quancode={{item.id}}&couponorderstatus={{boatFlag}}&validStatus={{item.validStatus}}"
url="/pages/couponorder/detail/index?quancode={{item.id}}&couponorderstatus={{boatFlag}}&validStatus={{item.validStatus}}&mallTenantId={{item.tenantId}}"
hover-class="navigator-hover" open-type="navigate">去使用</navigator> hover-class="navigator-hover" open-type="navigate">去使用</navigator>
<navigator class="nouseBtn" <navigator class="nouseBtn"
tt:if="{{item.couponOrderStatus==1||item.couponOrderStatus==2||item.couponOrderStatus==3}}" tt:if="{{item.couponOrderStatus==1||item.couponOrderStatus==2||item.couponOrderStatus==3}}"
url="/pages/couponorder/detail/index?quancode={{item.id}}&couponorderstatus={{boatFlag}}&validStatus={{item.validStatus}}"
url="/pages/couponorder/detail/index?quancode={{item.id}}&couponorderstatus={{boatFlag}}&validStatus={{item.validStatus}}&mallTenantId={{item.tenantId}}"
hover-class="navigator-hover" open-type="navigate">查看</navigator> hover-class="navigator-hover" open-type="navigate">查看</navigator>


</view> </view>


+ 18
- 16
pages/getPhone/getPhone.js View File

@@ -16,16 +16,18 @@ Page({
couponId: "", couponId: "",
// skip: app.globalData.skip // skip: app.globalData.skip
}, },
onLoad: function(options) {

onLoad: function (options) {
var that = this; var that = this;
console.log(options.skipUrl, "options.skipUrl")
if (options.skipUrl) { if (options.skipUrl) {
that.setData({ that.setData({
skipUrl: options.skipUrl skipUrl: options.skipUrl
}) })
} }

if (options.mallTenantId) {
that.setData({
mallTenantId: options.mallTenantId
})
}
that.setData({ that.setData({
path: options.path path: options.path
}) })
@@ -44,7 +46,7 @@ Page({
}); });
} }


if (options && options.mineFlag) {
if (options && options.mineFlag) {
that.setData({ that.setData({
mineFlag: options.mineFlag mineFlag: options.mineFlag
}) })
@@ -77,7 +79,7 @@ Page({
}); });
}) })
}, },
onShow: function() {
onShow: function () {
tt.checkSession({ tt.checkSession({
success() { success() {
//session_key 未过期,并且在本生命周期一直有效 //session_key 未过期,并且在本生命周期一直有效
@@ -105,15 +107,15 @@ Page({
} }
}) })
}, },
backHome(){
backHome() {
console.log("我调用的返回"); console.log("我调用的返回");
tt.navigateBack({ tt.navigateBack({
delta: 1, delta: 1,
success: (res) => { success: (res) => {
}, },
fail: (res) => { fail: (res) => {
}, },
}); });


@@ -122,11 +124,11 @@ Page({
// success: (res) => { // success: (res) => {
// }, // },
// fail: (res) => { // fail: (res) => {
// }, // },
// }); // });
}, },
getPhoneNumber: function(e) {
getPhoneNumber: function (e) {
var that = this; var that = this;
var iv = e.detail.iv; var iv = e.detail.iv;
var encryptedData = e.detail.encryptedData; var encryptedData = e.detail.encryptedData;
@@ -137,7 +139,7 @@ Page({
iv: iv iv: iv
} }
}).then(res => { }).then(res => {
app.globalData.phone = res.data.phone; app.globalData.phone = res.data.phone;
if (that.data.skipUrl == '1') { if (that.data.skipUrl == '1') {
console.log(app.globalData.skip, app.globalData.skipUrl, "跳转地址") console.log(app.globalData.skip, app.globalData.skipUrl, "跳转地址")
@@ -161,7 +163,7 @@ Page({
url: app.globalData.skipUrl, url: app.globalData.skipUrl,
}) })
return; return;
}else if (app.globalData.skip == 'navigateBack') {
} else if (app.globalData.skip == 'navigateBack') {
tt.navigateBack({ tt.navigateBack({
delta: 1, delta: 1,
}) })
@@ -229,7 +231,7 @@ Page({
}) })
} else if (that.data.path == 'index' && that.data.paramData.cuserId) { } else if (that.data.path == 'index' && that.data.paramData.cuserId) {
tt.redirectTo({ tt.redirectTo({
url: "/pages/coupon/detail/index?cuserId=" + that.data.paramData.cuserId + '&couponChannelId=' + that.data.paramData.couponChannelId + '&coverImg=' + that.data.paramData.coverImg + '&avatarUrl=' + that.data.paramData.avatarUrl + '&userName=' + that.data.paramData.userName + '&couponOrderId=' + that.data.paramData.couponOrderId + "&updateDate=" + that.data.paramData.updateDate
url: "/pages/coupon/detail/index?cuserId=" + that.data.paramData.cuserId + '&couponChannelId=' + that.data.paramData.couponChannelId + '&coverImg=' + that.data.paramData.coverImg + '&avatarUrl=' + that.data.paramData.avatarUrl + '&userName=' + that.data.paramData.userName + '&couponOrderId=' + that.data.paramData.couponOrderId + "&updateDate=" + that.data.paramData.updateDate + "&mallTenantId=" + that.data.mallTenantId,
}) })
} }
/** /**
@@ -251,10 +253,10 @@ Page({
tt.showToast({ tt.showToast({
title: res.data.msg, title: res.data.msg,
icon: "success", icon: "success",
success: function(res) {
success: function (res) {
if (that.data.couponChannelId) { if (that.data.couponChannelId) {
tt.redirectTo({ tt.redirectTo({
url: "/pages/coupon/detail/index?couponChannelId=" + that.data.couponChannelId + "&flag=pay"
url: "/pages/coupon/detail/index?couponChannelId=" + that.data.couponChannelId + "&flag=pay" + "&mallTenantId=" + that.data.mallTenantId,
}) })
} else { } else {
tt.redirectTo({ tt.redirectTo({


+ 3
- 3
project.config.json View File

@@ -21,9 +21,9 @@
"list": [ "list": [
{ {
"id": 1670551556787, "id": 1670551556787,
"name": "pages/coupon/detail/index",
"pathName": "pages/coupon/detail/index",
"query": "couponChannelId=760764417613029376&couponId=760349248090595328",
"name": "pages/main/index",
"pathName": "pages/main/index",
"query": "type=cd&couponChannelId=762472141677453312&tenantId=1032",
"scene": "990001", "scene": "990001",
"launchFrom": "scan", "launchFrom": "scan",
"location": "qr_code" "location": "qr_code"


Loading…
Cancel
Save