From 7af2d605d4b761b57c6cf259938b4198299bde30 Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Fri, 24 Feb 2023 14:23:02 +0800 Subject: [PATCH] upload --- assets/images/QRCODE.png | Bin 0 -> 1900 bytes pages/cardorder/cardUse/cardUse.js | 154 +++++++++++++++++++++++++-- pages/cardorder/cardUse/cardUse.wxml | 45 +++++--- pages/cardorder/cardUse/cardUse.wxss | 12 ++- pages/cardorder/index/index.wxml | 3 + pages/couponorder/detail/index.js | 2 +- 6 files changed, 188 insertions(+), 28 deletions(-) create mode 100644 assets/images/QRCODE.png diff --git a/assets/images/QRCODE.png b/assets/images/QRCODE.png new file mode 100644 index 0000000000000000000000000000000000000000..fd29c534b04f9ce325cf2505cb69248e1f5cabb0 GIT binary patch literal 1900 zcmV-y2b1`TP)Px+CP_p=RCr$PT}yHsHxO+M6&H8*4a`Mkac6F%@-Fg8q9a%*h<$_P2J%TF?Ns!_ z%8s1}JUIq5x4CigRBJhfo}^mRCVH;^Cm*P3xX|M>T>+3ewI z*EW{`!{NJ2o2GwiDn14qBl2nTZTu1GYh4&1eI35J_-I9b(~Qd`$@|IV{+0yLpd}(C z02QDX6{G?vS14kJfV!@i3P1&*0wAlb$+lDg5e9+W1#lODs1#!W#sG`~kQLKpTgCuo z#sJ1#8)F{oAb>VoSvCQ(04v(~)AZ6>`-`f+#28~`FT0mpHc4*s(&2?u!LI01HGqOf zXKya7ri!u&F#R@;_EZ%~?~0MT>2!Rl!N6rh0yvOCfk{iwJr)hd+l*A(e zj)VZn*#(4nBmfCe&YMA=7+@f2dZm%GJsZa{=Bl0sB7H_yqOaaoDS&UVMSpKfCXfVZ z;eil@oFo7V5G{E_7XU0hx_|~;5~a!50doqOk^m$?X)lH#OzdvpqC7}GRWrFV^y_hLo&Mz4QhGqF~6siiUIPLf20!SnO;122m7ga5xp zk<&~-Glfh;h`rlj;WL4SMo>}V5THl^UJ;|dA_gItHgMIf4WwOHeN+GkGKc~o6F~xK zs2$k`nV^jzkO~la9%`$O1aL!77eE)Vj{xHTYFpMo!&Cq&K&c;$KnTVl5LmgfOpys< z5SSfF&EAZC@!~_Q38=lEB)LW3;6>gJ7Ll3un?#v=jfjW3T__I_v4gCt;Rr;#+N9y* zWcM5hkN_R01_?j{bR2<>51$G^0(2aKjt`#-Kmv3efsPNq@Ylm#U!~5&_4M?7)U)!k zPRu8Nf4Pg%eidIAclCAn^ErF~wY0B?Bku*Aon72UJUtsUkFhRxuHuQQtFIvslxlfB ze0PRO0F1LF0EU;!nhLNDQ{fXqbO9>f1sPERf?zvbhzdXjh?4tY5V#@|T|fykwW^XX zpag8`0_Xzh0ya3nT|l79Fa~I844_R{+g>sfYkv>qkE$4B02NG_kuL^lLbh@}A`$?b zTa`5lP-772o1vi9XNrG2Z?j)Peeew|@OKwkL*6YY?TQ#A58%Tg2>cEbz=tF9d!@So zU&ly*ZG?R8%7>@scM@O+r63Y&kPfgR0W_e|1!z!m+E4+g0Q=-XvRn)T3oXEdh3Nt` z*wO`PP%6&_h%wh@o_^KzVs7N0yf0X<%LWEu4<@zhy9|7%f&=^TC`R1ZyV}K9z+P)G z+O#f4J4tLN&ET=4cuW|I0%F~K>|Q<)kXlMm(Ysw5Fq;i zqbxt1=>4-I*~h4&%PKUURWDno0ABPr3?RTF25eBf8~ydIs*rj~0PS7*BmlCu#79=B zG9(5-Duz}J34lOL0vtjMA|71;mIpv+3QYtR0D+bYKm`~_Il+7g$HEOz0YqB23qUSE zu!;FYMBb{j&Eo>VcC!^<@H){vozVUu(+)kO0V(Vzwl} z60b)ia-)ULmtI9cEkgm2^sZSRi≫Yp()Ce8ikhXx#(|XNS35pkr#@ST>0000 { @@ -29,20 +37,28 @@ Page({ that.setData({ showPage: true, data: res.data, - supportTransfer: res.data.supportTransfer + supportTransfer: res.data.supportTransfer, + code: res.data.id, + codeS: res.data.id.slice(0, 4) + `******` + res.data.id.slice(14), }) + + if (res.data.wxCardInfo.status) { + this.setData({ + isShowQR: false + }) + } else { + that.getQR(res.data.id, res.data.tenantId) + } + /** * 若可转赠获取用户头像信息 */ - if (res.data.supportTransfer) { - that.getUserInfo() - } - if (that.data.cardDetail.merchantVoList && that.data.cardDetail.merchantVoList.length <= 4) { + if (that.data.merchantVoList && that.data.merchantVoList.length <= 4) { that.setData({ - height: that.data.cardDetail.merchantVoList.length * 140 + 'rpx', + height: that.data.merchantVoList.length * 140 + 'rpx', showMore: false }) - } else if (that.data.cardDetail.merchantVoList && that.data.cardDetail.merchantVoList.length > 4) { + } else if (that.data.merchantVoList && that.data.cardDetail.length > 4) { that.setData({ height: 4 * 140 + 'rpx' }) @@ -54,6 +70,124 @@ Page({ }) }, + showId() { + let this_ = this; + if (!this_.data.showIdFalg) { + wx.showModal({ + content: '是否查看完整券码', + success(res) { + if (res.confirm) { + this_.setData({ + showIdFalg: true + }) + } else if (res.cancel) { + console.log('用户点击取消') + } + } + }) + } else { + this.setData({ + showIdFalg: false + }) + } + }, + + // 获取动态二维码 + getQR(cardId, cardTenantId) { + Http.get({ + url: `/couponOrder/cardDynamicId?cardId=${cardId}&cardTenantId=${cardTenantId}`, + }).then(res => { + console.log(res.data); + this.setData({ + expiredSeconds: res.data.expiredSeconds + }) + let url = JSON.stringify({ + END: "C", + TYPE: "card", + ID: res.data.dynamicRq, + TENANTID: res.data.cardTenantId + }) + this.createQrCode(url, "qrcode", 350, 350); + }).catch(err => { + wx.showToast({ + title: err.message, + icon: none + }) + }) + }, + + goGive() { + wx.navigateTo({ + url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${this.data.data.id}`, + }) + }, + + // 扫一扫去支付 + gotoPay: function () { + app.globalData.previewFlag = true + let that = this; + console.log(that.data.data.id, that.data.data.remainingAmount / 100); + wx.scanCode({ + success: (res) => { + if (util.isJSON(res.result)) { + let value = JSON.parse(res.result); + if (value.END == 'B' && value.TYPE == 'merchant' && value.ID) { + Http.get({ + url: config.api.findByCode, + data: { + merchantCode: value.ID, + } + }) + .then(res => { + if (res.code == 200) { + let merChantDetail = JSON.stringify(res.data); + if (merChantDetail && that.data.data.id && that.data.data.remainingamount / 100) { + merChantDetail = encodeURIComponent(merChantDetail) + wx.navigateTo({ + url: `/pages/scanPay/scanPay?merChant=${merChantDetail}&cardid=${that.data.data.id}&remainingAmount=${that.data.data.remainingamount}`, + }) + } + } + }) + .catch(err => { + console.log(err) + }) + } else { + wx.showToast({ + title: "未识别到商户二维码", + icon: "none", + mask: false + }) + } + } else { + wx.showToast({ + title: "未识别到商户二维码", + icon: "none", + mask: false + }) + } + }, + fail: (res) => { + wx.showToast({ + title: "未识别到商户二维码", + icon: "none", + mask: false + }) + } + }) + }, + + createQrCode: function (url, canvasId, cavW, cavH) { + console.log('createQrCode!'); + //调用插件中的draw方法,绘制二维码图片 + let that = this; + QR.api.draw(url, canvasId, cavW, cavH, function (res) { + that.setData({ + tempFilePath: res + }) + }); + }, + /** * 生命周期函数--监听页面加载 */ diff --git a/pages/cardorder/cardUse/cardUse.wxml b/pages/cardorder/cardUse/cardUse.wxml index f3f2f38..2f90b27 100644 --- a/pages/cardorder/cardUse/cardUse.wxml +++ b/pages/cardorder/cardUse/cardUse.wxml @@ -10,9 +10,9 @@ {{data.title}} {{data.subTitle}} - 余额:{{data.couponPrice/100}} - 余额:{{data.salePrice/100}} - 余额:{{data.couponPrice/100}} + 余额:{{data.remainingAmount/100}} + 余额:{{data.salePrice/100}} + 余额:{{data.remainingAmount/100}} 过期不退款 @@ -20,9 +20,9 @@ - + 有效期至: - {{expiredTime}} + {{data.expiredTime}} 有效期: @@ -39,14 +39,21 @@ - + - + + - + + + + + + + 点一点刷新二维码 @@ -87,7 +94,7 @@ {{more}} --> - + - - + 手机号2018.05.25 + --> + + + + - - - - + + + + + + \ No newline at end of file diff --git a/pages/cardorder/cardUse/cardUse.wxss b/pages/cardorder/cardUse/cardUse.wxss index aadeb22..afe2384 100644 --- a/pages/cardorder/cardUse/cardUse.wxss +++ b/pages/cardorder/cardUse/cardUse.wxss @@ -368,4 +368,14 @@ page { height: 40rpx; float: left; margin: 20rpx 0 0 20rpx !important; -} */ \ No newline at end of file +} */ +.bottomBtn { + padding: 50rpx; +} + +.bottomBtn .btn { + color: #fff; + font-weight: 600; + background-color: #ff7e2d; + margin-bottom: 20rpx; +} \ No newline at end of file diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml index 91b7009..1a8d65c 100644 --- a/pages/cardorder/index/index.wxml +++ b/pages/cardorder/index/index.wxml @@ -35,8 +35,11 @@ {{item.title}} + + + 再次购买 已过期 余额已用完 diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js index 2a93e36..96012dc 100644 --- a/pages/couponorder/detail/index.js +++ b/pages/couponorder/detail/index.js @@ -147,6 +147,7 @@ Page({ }); }) }, + showId() { let this_ = this; if (!this_.data.showIdFalg) { @@ -167,7 +168,6 @@ Page({ showIdFalg: false }) } - }, onLoad: function (options) {