diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js
index 420d62c..0eb7a07 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);
}
diff --git a/pages/ConsumeDetail/ConsumeDetail.wxml b/pages/ConsumeDetail/ConsumeDetail.wxml
index dca270f..7e1a752 100644
--- a/pages/ConsumeDetail/ConsumeDetail.wxml
+++ b/pages/ConsumeDetail/ConsumeDetail.wxml
@@ -6,7 +6,8 @@
有效期:{{cardDetail.expiredTime}}
余额:
- {{cardDetail.remainingAmount/100}}元
+ {{cardDetail.remainingAmount/100}}元
+
适用门店
@@ -24,7 +25,7 @@
{{more}}
交易记录
-
+
暂无交易明细
-
+
\ No newline at end of file
diff --git a/pages/cardorder/cardUse/cardUse.js b/pages/cardorder/cardUse/cardUse.js
index f9a2e4d..7cf15d0 100644
--- a/pages/cardorder/cardUse/cardUse.js
+++ b/pages/cardorder/cardUse/cardUse.js
@@ -22,7 +22,8 @@ Page({
tempFilePath: '',
QRdata: {},
isShowQR: true,
- showhieRq: false
+ showhieRq: false,
+ cardId: ''
},
cardDetail(couponOrderId) {
@@ -249,6 +250,9 @@ Page({
console.log(options);
if (options.cardId) {
this.cardDetail(options.cardId);
+ this.setData({
+ cardId: options.cardId
+ })
}
},
@@ -263,7 +267,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow() {
-
+ this.cardDetail(this.data.cardId);
},
/**
@@ -284,7 +288,7 @@ Page({
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
-
+ this.cardDetail(this.data.cardId);
},
/**
diff --git a/pages/cardorder/cardUse/cardUse.json b/pages/cardorder/cardUse/cardUse.json
index fe481ec..806539c 100644
--- a/pages/cardorder/cardUse/cardUse.json
+++ b/pages/cardorder/cardUse/cardUse.json
@@ -7,5 +7,6 @@
"shop": "../../../components/shop/shop"
},
"navigationBarTitleText": "使用消费卡",
+ "enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#F4F5F9"
}
\ No newline at end of file
diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js
index 48f456c..4c8bc33 100644
--- a/pages/cardorder/index/index.js
+++ b/pages/cardorder/index/index.js
@@ -256,12 +256,25 @@ Page({
});
this.getList(detail.key, 1);
},
+
+ onShow() {
+ const that = this;
+ this.getList(that.data.current_scroll, that.data.page);
+ },
+
onReachBottom: function () {
- var that = this;
+ const that = this;
that.data.page++;
that.setData({
page: that.data.page
});
that.getList(that.data.current_scroll, that.data.page);
- }
+ },
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+ const that = this;
+ this.getList(that.data.current_scroll, that.data.page);
+ },
});
\ No newline at end of file
diff --git a/pages/cardorder/index/index.json b/pages/cardorder/index/index.json
index a9565ff..748abed 100644
--- a/pages/cardorder/index/index.json
+++ b/pages/cardorder/index/index.json
@@ -5,5 +5,6 @@
"navbar": "../../../components/navbar/navbar"
},
"navigationBarTitleText": "我的卡包",
+ "enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#F4F5F9"
}
\ No newline at end of file