diff --git a/pages/exchangeCard/exchangeCard.js b/pages/exchangeCard/exchangeCard.js index 2a657b2..62b3dd7 100644 --- a/pages/exchangeCard/exchangeCard.js +++ b/pages/exchangeCard/exchangeCard.js @@ -123,7 +123,7 @@ Page({ }, /** 根据卡id查询卡详情*/ - getCardDetail(cardId) { + getCardDetail(cardId, goGive) { const that = this Http.get({ url: config.api.getCardDetail, @@ -134,13 +134,27 @@ Page({ // 取不到时清空参数 that.setData({ title: res.data.title || "", - phone: res.data.ownerPhone.slice(0, 3) + `****` + res.data.ownerPhone.slice(7) || "", + phone: res.data.ownerPhone || "", + hidePhone: res.data.ownerPhone ? (res.data.ownerPhone.slice(0, 3) + `****` + res.data.ownerPhone.slice(7)) : '', ownerUserId: res.data.ownerUserId || "", eCardId: res.data.eCardId || "", owned: res.data.owned || "", remainAmount: res.data.remainAmount / 100 || "", isSHowInfoCard: true // 显示卡详情 }) + if (goGive) { + if ((this.data.ownerUserId && this.data.eCardId) || e.detail.value.code) { + if ((this.data.owned && this.data.owned == 1) || e.detail.value.code) { + wx.navigateTo({ + url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${this.data.eCardId}`, + }) + } else { + this.Toast('当前用户不是该卡的持有者,无法转赠!', 'none') + } + } else { + this.Toast('该卡未绑定', 'none') + } + } }) .catch(err => { console.log(err); @@ -194,26 +208,15 @@ Page({ }, submit() { - const data = this.data const e = { detail: { value: { code: this.data.code } } } this.searchCard(e) - this.getCouponOrderByPassword(data.code) + this.getCouponOrderByPassword(this.data.code) }, goGive() { - if (this.data.ownerUserId && this.data.eCardId) { - if (this.data.owned && this.data.owned == 1) { - wx.navigateTo({ - url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${this.data.eCardId}`, - }) - } else { - this.Toast('当前用户不是该卡的持有者,无法转赠!', 'none') - } - } else { - this.Toast('该卡未绑定', 'none') - } + this.getCardDetail(this.data.code, true) }, // 检查用户登录状态 diff --git a/pages/exchangeCard/exchangeCard.wxml b/pages/exchangeCard/exchangeCard.wxml index b3e5664..6ebfef0 100644 --- a/pages/exchangeCard/exchangeCard.wxml +++ b/pages/exchangeCard/exchangeCard.wxml @@ -30,8 +30,8 @@ 卡名称:{{title}} 卡余额:{{remainAmount}} - - 持卡人手机号:{{phone}} + + 持卡人手机号:{{hidePhone}}