diff --git a/assets/images/negatived.png b/assets/images/negatived.png
new file mode 100644
index 0000000..d21fe16
Binary files /dev/null and b/assets/images/negatived.png differ
diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js
index 0eb7a07..0db109d 100644
--- a/pages/ConsumeDetail/ConsumeDetail.js
+++ b/pages/ConsumeDetail/ConsumeDetail.js
@@ -136,7 +136,7 @@ Page({
let that = this;
if (options.cardId) {
- // that.cardpayList(options.cardId);
+ that.cardpayList(options.cardId);
that.cardDetail(options.cardId);
}
@@ -163,19 +163,20 @@ Page({
Http.get(parmer)
.then(res => {
console.log(res);
- if (res.code == 200 && res.data.list.length > 0) {
+ if (res.code == 200 && res.data.list && res.data.list.length > 0) {
+ wx.hideLoading();
+ res.data.list.map(file => {
+ file.updateDate = util.formatTime(file.updateDate, "yyyy-MM-dd hh:mm:ss")
+ })
that.setData({
- showPage: true
+ showPage: true,
+ data: res.data.list
})
- } else { }
- wx.hideLoading();
- res.data.list.map(file => {
- file.updateDate = util.formatTime(file.updateDate, "yyyy-MM-dd hh:mm:ss")
- })
- that.setData({
- data: res.data.list
- });
+ } else {
+ wx.hideLoading();
+ }
}).catch(err => {
+ console.log(err, 'err');
wx.showToast({
title: err.message,
icon: 'none',
diff --git a/pages/ConsumeDetail/ConsumeDetail.wxml b/pages/ConsumeDetail/ConsumeDetail.wxml
index 7e1a752..4dc5322 100644
--- a/pages/ConsumeDetail/ConsumeDetail.wxml
+++ b/pages/ConsumeDetail/ConsumeDetail.wxml
@@ -25,7 +25,7 @@
{{more}}
交易记录
-
+
暂无交易明细
diff --git a/pages/cardorder/cardUse/cardUse.js b/pages/cardorder/cardUse/cardUse.js
index 7cf15d0..9a9e936 100644
--- a/pages/cardorder/cardUse/cardUse.js
+++ b/pages/cardorder/cardUse/cardUse.js
@@ -23,7 +23,8 @@ Page({
QRdata: {},
isShowQR: true,
showhieRq: false,
- cardId: ''
+ cardId: '',
+ showImg: ''
},
cardDetail(couponOrderId) {
@@ -161,6 +162,12 @@ Page({
})
},
+ goCheck() {
+ wx.navigateTo({
+ url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${this.data.data.id}`,
+ })
+ },
+
// 无法转赠
goGiveNone() {
if (this.data.data.amount !== this.data.data.remainingAmount) {
@@ -251,9 +258,11 @@ Page({
if (options.cardId) {
this.cardDetail(options.cardId);
this.setData({
- cardId: options.cardId
+ cardId: options.cardId,
+ showImg: options.showImg
})
}
+ console.log(this.data.showImg, 'showImg');
},
/**
diff --git a/pages/cardorder/cardUse/cardUse.wxml b/pages/cardorder/cardUse/cardUse.wxml
index 62393ad..227df26 100644
--- a/pages/cardorder/cardUse/cardUse.wxml
+++ b/pages/cardorder/cardUse/cardUse.wxml
@@ -44,22 +44,37 @@
-->
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
-
-
+
+
点一点刷新二维码
- 二维码在
+ 二维码在
{{expiredSeconds}}s
后失效
@@ -134,8 +149,10 @@
-->
-
-
+
+
+
+
diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js
index 3f46878..cc8674f 100644
--- a/pages/cardorder/index/index.js
+++ b/pages/cardorder/index/index.js
@@ -124,27 +124,17 @@ Page({
},
// 跳转到详情
gotoConsumeDetail: function (e) {
- if (e.currentTarget.dataset.id) {
- // wx.navigateTo({
- // url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${e.currentTarget.dataset.id}`,
- // })
- wx.navigateTo({
- url: `/pages/cardorder/cardUse/cardUse?cardId=${e.currentTarget.dataset.id}`,
- })
- }
- },
-
- gotoConsumeDetailII: function (e) {
console.log(e, 'e');
if (e.currentTarget.dataset.id) {
// wx.navigateTo({
// url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${e.currentTarget.dataset.id}`,
// })
wx.navigateTo({
- url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${e.currentTarget.dataset.id}`,
+ url: `/pages/cardorder/cardUse/cardUse?cardId=${e.currentTarget.dataset.id}&showImg=${e.currentTarget.dataset.showimg}`,
})
}
},
+
//点击跳转到券详情页面
gotouse: function (e) {
if (this.data.mystatus == '' || this.data.mystatus == 'undefined') {
diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml
index e1e6a35..2e5670d 100644
--- a/pages/cardorder/index/index.wxml
+++ b/pages/cardorder/index/index.wxml
@@ -23,9 +23,9 @@
-
+
-
+
余{{item.remainingAmount/100}}元
{{item.expiredTime}}到期