From 01f728a8d489896ceb706fd863c6d1c506accd7e Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Sat, 29 Dec 2018 16:02:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=A7=A3=E5=86=B3=E5=B0=8F=E7=BA=A2=E7=82=B9?= =?UTF-8?q?=E7=9A=84bug]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/images/fail.png | Bin 0 -> 8450 bytes pages/ConsumeDetail/ConsumeDetail.js | 7 --- pages/cardorder/index/index.js | 4 +- pages/cardorder/index/index.wxml | 2 +- pages/coupon/detail/index.js | 51 +++++++++++++------ pages/discountCardList/discountCardList.js | 9 +--- pages/discountCardList/discountCardList.json | 2 +- pages/discountCardList/discountCardList.wxml | 2 +- pages/discountCardList/discountCardList.wxss | 1 + pages/index/index.wxml | 2 +- pages/order/detail/index.wxml | 5 -- pages/paySuccess/paySuccess.wxml | 2 +- pages/scanPay/scanPay.wxml | 2 +- pages/user/index.js | 18 +++++++ pages/user/index.wxml | 4 +- 15 files changed, 65 insertions(+), 46 deletions(-) create mode 100644 assets/images/fail.png diff --git a/assets/images/fail.png b/assets/images/fail.png new file mode 100644 index 0000000000000000000000000000000000000000..698614ade374b1f5a807fd6538adb9606c0a2b76 GIT binary patch literal 8450 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 YHROR6HCC5<00bbok%eKczI(#|10kL+p8x;= literal 0 HcmV?d00001 diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js index 54c6822..e679219 100644 --- a/pages/ConsumeDetail/ConsumeDetail.js +++ b/pages/ConsumeDetail/ConsumeDetail.js @@ -82,13 +82,6 @@ Page({ showPage: true }) } else { - wx.showModal({ - title: '抱歉', - content: '暂无消费记录', - showCancel: false, - success: function (res) { - } - }) } wx.hideLoading(); res.data.list.map(file => { diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index 9c33704..eca2e96 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -33,8 +33,8 @@ Page({ onShow: function() { let that = this; wx.setStorage({ - key: 'couponNum', - data: "couponNum1", + key: 'couponNum2', + data: "couponNum3", }) wx.hideTabBarRedDot({ index: 2 diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml index 1b4f23b..c6c692e 100644 --- a/pages/cardorder/index/index.wxml +++ b/pages/cardorder/index/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index d43db10..13d599d 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -223,6 +223,11 @@ Page({ couponId: options.couponId, title: that.data.data.title ? that.data.data.title : '', }); + if(options.cardType){ + that.setData({ + cardType: options.cardType + }) + } var parmer = { url: config.api.couponDetail, data: { @@ -354,56 +359,56 @@ Page({ if (err.code == "2011") { wx.showToast({ title: "商户信息没找到", - image:imgurl.fail.url, + image:'./../../../assets/images/fail.png', duration: 2000, mask: false }); } else if (err.code == "2013") { wx.showToast({ title: "商户信息禁用", - image:imgurl.fail.url, + image:'./../../../assets/images/fail.png', duration: 2000, mask: false }); } else if (err.code == "3000") { wx.showToast({ title: "库存不足", - image:imgurl.fail.url, + image:'./../../../assets/images/fail.png', duration: 2000, mask: false }); } else if (err.code == "3001") { wx.showToast({ title: "领取达到上限", - image:imgurl.fail.url, + image:'./../../../assets/images/fail.png', duration: 2000, mask: false }); } else if (err.code == "3002") { wx.showToast({ title: "订单失败", - image:imgurl.fail.url, + image:'./../../../assets/images/fail.png', duration: 2000, mask: false }); } else if (err.code == "3003") { wx.showToast({ title: "订单不存在", - image:imgurl.fail.url, + image:'./../../../assets/images/fail.png', duration: 2000, mask: false }); } else if (err.code == "3004") { wx.showToast({ title: "订单不存在", - image:imgurl.fail.url, + image:'./../../../assets/images/fail.png', duration: 2000, mask: false }); } else if (err.code == "4003") { wx.showToast({ title: "卡券已作废", - image:imgurl.fail.url, + image:'./../../../assets/images/fail.png', duration: 2000, mask: false }); @@ -475,10 +480,17 @@ Page({ /** * 用户支付成功以后跳转到券包列表 */ - wx.setStorage({ - key: 'couponNum', - data: "couponNum", - }) + if(that.data.cardType == 7){ + wx.setStorage({ + key: 'couponNum2', + data: "couponNum2" + }) + }else{ + wx.setStorage({ + key: 'couponNum', + data: "couponNum" + }) + } } }, fail: res => { @@ -506,10 +518,17 @@ Page({ } else { // 免费券 that.payOrderUpdate(orderId, "0", 1, '', 'free'); - wx.setStorage({ - key: 'couponNum', - data: "couponNum" - }) + if(that.data.cardType == 7){ + wx.setStorage({ + key: 'couponNum2', + data: "couponNum2" + }) + }else{ + wx.setStorage({ + key: 'couponNum', + data: "couponNum" + }) + } } } }) diff --git a/pages/discountCardList/discountCardList.js b/pages/discountCardList/discountCardList.js index 1cf3a75..f9368fa 100644 --- a/pages/discountCardList/discountCardList.js +++ b/pages/discountCardList/discountCardList.js @@ -23,13 +23,6 @@ Page({ }, onShow: function () { let that = this; - wx.setStorage({ - key: 'couponNum', - data: "couponNum1", - }) - wx.hideTabBarRedDot({ - index: 2 - }) Http.get({ url: config.api.businessList, data: { @@ -58,7 +51,7 @@ Page({ gotouse: function (e) { console.log(e.currentTarget.dataset.couponid) wx.navigateTo({ - url: `/pages/coupon/detail/index?couponChannelId=${e.currentTarget.dataset.quancode}&couponId=${e.currentTarget.dataset.couponid}` + url: `/pages/coupon/detail/index?couponChannelId=${e.currentTarget.dataset.quancode}&couponId=${e.currentTarget.dataset.couponid}&cardType=${e.currentTarget.dataset.type}` }); }, getList(key, pageNum) { diff --git a/pages/discountCardList/discountCardList.json b/pages/discountCardList/discountCardList.json index 3e3cbf1..c36e07f 100644 --- a/pages/discountCardList/discountCardList.json +++ b/pages/discountCardList/discountCardList.json @@ -3,5 +3,5 @@ "i-tab": "../../../dist/tab/index", "i-tabs": "../../../dist/tabs/index" }, - "navigationBarTitleText": "优惠卡" + "navigationBarTitleText": "消费卡" } \ No newline at end of file diff --git a/pages/discountCardList/discountCardList.wxml b/pages/discountCardList/discountCardList.wxml index dd054ff..923066b 100644 --- a/pages/discountCardList/discountCardList.wxml +++ b/pages/discountCardList/discountCardList.wxml @@ -13,7 +13,7 @@ - + diff --git a/pages/discountCardList/discountCardList.wxss b/pages/discountCardList/discountCardList.wxss index c4aef49..7c485f1 100644 --- a/pages/discountCardList/discountCardList.wxss +++ b/pages/discountCardList/discountCardList.wxss @@ -140,6 +140,7 @@ color:#FF3535!important; background: none; border-top:1px solid #eee; + border-radius: 0!important; } button::after{ border: none; } .buycardbtn button text{ diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 5acfd5a..3d278bd 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -9,7 +9,7 @@ - 优惠卡 + 消费卡 diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index a28e1fb..dc6b280 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -20,11 +20,6 @@ 下单时间:{{createDate}} -