diff --git a/app.json b/app.json
index 181f49f..baeb2d2 100644
--- a/app.json
+++ b/app.json
@@ -16,6 +16,7 @@
"pages/couponorder/detail/index",
"pages/cardorder/index/index",
"pages/cardorder/detail/index",
+ "pages/cardorder/userule/userule",
"pages/order/detail/index",
"pages/order/index/index",
"pages/success/index",
diff --git a/assets/images/share.png b/assets/images/share.png
new file mode 100644
index 0000000..8b5e50b
Binary files /dev/null and b/assets/images/share.png differ
diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js
index e679219..d3c9c6a 100644
--- a/pages/ConsumeDetail/ConsumeDetail.js
+++ b/pages/ConsumeDetail/ConsumeDetail.js
@@ -12,6 +12,7 @@ Page({
quesGouUrl: imgurl.ques_gou.url,
headbgUrl: imgurl.headbg.url,
quesBgUrl: imgurl.ques_bg.url,
+ dingdanUrl: imgurl.dingdan.url,
cardDetail:null,
data: {
title: null
diff --git a/pages/ConsumeDetail/ConsumeDetail.json b/pages/ConsumeDetail/ConsumeDetail.json
index b4079cf..2a07fc1 100644
--- a/pages/ConsumeDetail/ConsumeDetail.json
+++ b/pages/ConsumeDetail/ConsumeDetail.json
@@ -1,3 +1,3 @@
{
- "navigationBarTitleText": "消费记录"
+ "navigationBarTitleText": "交易明细"
}
\ No newline at end of file
diff --git a/pages/ConsumeDetail/ConsumeDetail.wxml b/pages/ConsumeDetail/ConsumeDetail.wxml
index aebf204..6403837 100644
--- a/pages/ConsumeDetail/ConsumeDetail.wxml
+++ b/pages/ConsumeDetail/ConsumeDetail.wxml
@@ -1,46 +1,16 @@
-
-
- {{cardDetail.title}}
-
- 有效期:{{cardDetail.expiredTime}}
- 余额:¥{{cardDetail.remainingAmount/100}}
+
+
+ {{item.merchantName}}
+ -{{item.deductionAmount/100}}元
-
-
-
- 购买须知
-
-
- {{cardDetail.remark}}
+
+ {{item.updateDate}}
+ 余 {{item.cardRemainAmount/100}}元
-
- 适用门店:
-
-
-
-
-
-
- {{item.merchantName}}
- {{item.addr}}{{item.buildingName}}{{item.floorName}}
-
-
-
-
-
-
- 交易明细:
-
-
- {{item.merchantName}}
- -{{item.deductionAmount/100}}元
-
-
- {{item.updateDate}}
- 余额:{{item.cardRemainAmount/100}}元
-
-
+
+
+ 暂无交易明细
\ No newline at end of file
diff --git a/pages/ConsumeDetail/ConsumeDetail.wxss b/pages/ConsumeDetail/ConsumeDetail.wxss
index 84c072f..22e991b 100644
--- a/pages/ConsumeDetail/ConsumeDetail.wxss
+++ b/pages/ConsumeDetail/ConsumeDetail.wxss
@@ -1,6 +1,3 @@
-.notes {
- padding: 32rpx;
-}
.record text:nth-of-type(2n+1) {
float: left;
@@ -20,13 +17,14 @@
}
.record1 text:nth-of-type(1) {
- font-size: 32rpx;
+ font-size:30rpx;
+ font-family:PingFang-SC-Bold;
+ color:rgba(51,51,51,1);
}
-.record1 {
- margin-top: 15rpx;
+.list {
+ padding: 18rpx 0;
}
-
.title {
display: block;
font-weight: bold;
@@ -37,6 +35,10 @@
.record2 {
margin-top: 16rpx;
+ color:rgba(153,153,153,1)!important;
+}
+.record2 text{
+ font-size: 30rpx;
}
.posi {
@@ -147,4 +149,37 @@
margin: auto;
width: 50rpx;
height: 50rpx;
+}
+.list{
+ padding: 20rpx 32rpx;
+ border-bottom:1px solid #EAEAEA;
+}
+.notess{
+ padding: 0 32rpx;
+}
+.dingdan {
+ margin-top: 33rpx;
+}
+
+.dingdan text:nth-of-type(1) {
+ display: block;
+ font-size: 34rpx;
+ color: #333;
+ letter-spacing: 0;
+ text-align: center;
+}
+
+.dingdan text:nth-of-type(2) {
+ display: block;
+ font-size: 28rpx;
+ color: #999;
+ letter-spacing: 0;
+ text-align: center;
+}
+
+.dingdan image {
+ display: block;
+ width: 300rpx;
+ height: 300rpx;
+ margin: 0 auto 16rpx;
}
\ No newline at end of file
diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js
index f3edbb2..283417c 100644
--- a/pages/cardorder/index/index.js
+++ b/pages/cardorder/index/index.js
@@ -29,7 +29,11 @@ Page({
},
onShow: function() {
let that = this;
- that.getList(4,1);
+ if (that.data.current_scroll==4){
+ that.getList(4, 1);
+ }else{
+ that.getList('5,6,7', 1);
+ }
wx.setStorage({
key: 'couponNum2',
data: "couponNum3",
@@ -38,6 +42,11 @@ Page({
index: 2
})
},
+ userule:function(){
+ wx.navigateTo({
+ url: '/pages/cardorder/userule/userule',
+ })
+ },
// 扫一扫去支付
gotoPay: function(e) {
let that = this;
diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml
index c6c692e..8db5c62 100644
--- a/pages/cardorder/index/index.wxml
+++ b/pages/cardorder/index/index.wxml
@@ -24,7 +24,7 @@
{{item.expiredTime}}到期
- 金额{{item.remainingAmount/100}}元
+ 余额{{item.remainingAmount/100}}元
扫一扫付款
@@ -41,6 +41,7 @@
+ 适用规则
{{content}}
diff --git a/pages/cardorder/index/index.wxss b/pages/cardorder/index/index.wxss
index 6e3ec9c..d2451b9 100644
--- a/pages/cardorder/index/index.wxss
+++ b/pages/cardorder/index/index.wxss
@@ -235,3 +235,14 @@
color: rgba(255, 53, 53, 1);
margin-left: 30rpx;
}
+
+.userule {
+ text-align: center;
+ font-size: 28rpx;
+ font-family: PingFang-SC-Regular;
+ font-weight: 400;
+ color: rgba(2, 192, 255, 1);
+ line-height: 44rpx;
+ margin-top: 30rpx;
+ padding-bottom: 30rpx;
+}
diff --git a/pages/cardorder/userule/userule.js b/pages/cardorder/userule/userule.js
new file mode 100644
index 0000000..960fe0c
--- /dev/null
+++ b/pages/cardorder/userule/userule.js
@@ -0,0 +1,66 @@
+// pages/cardorder/userule/userule.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/cardorder/userule/userule.json b/pages/cardorder/userule/userule.json
new file mode 100644
index 0000000..d9d772a
--- /dev/null
+++ b/pages/cardorder/userule/userule.json
@@ -0,0 +1,3 @@
+{
+ "navigationBarTitleText": "使用规则"
+}
\ No newline at end of file
diff --git a/pages/cardorder/userule/userule.wxml b/pages/cardorder/userule/userule.wxml
new file mode 100644
index 0000000..9651d6e
--- /dev/null
+++ b/pages/cardorder/userule/userule.wxml
@@ -0,0 +1,42 @@
+
+
+
+ 1、如何使用xx卡?
+
+
+ 在门店消费后结算时,打开xx小程序,选择“我的”-“卡包”,选择扣款的消费卡,点击卡面上的”付款“,扫描
+
+
+
+
+ 2、xx卡内余额不够支付最后一次消费额时怎么办?
+
+
+ 建议部分消费额用xx卡支付,部分消费额用微信、支付宝、刷卡或现金支付。
+
+
+
+
+ 3、购买xx卡后,是否能退?
+
+
+ xx卡一经出售,即完成开卡,不能退款。
+
+
+
+
+ 4、xx卡会过期吗?
+
+
+ 会过期。请在卡面有效期内将面额使用完毕。
+
+
+
+
+ 5、注意事项
+
+
+ 在法律允许的范围内,XX商场保留对上述规则的解释权。 更多详情可至xx商场服务台咨询。
+
+
+
\ No newline at end of file
diff --git a/pages/cardorder/userule/userule.wxss b/pages/cardorder/userule/userule.wxss
new file mode 100644
index 0000000..f55c02e
--- /dev/null
+++ b/pages/cardorder/userule/userule.wxss
@@ -0,0 +1,14 @@
+.list {
+ margin-top: 30rpx;
+}
+.lists{
+ padding: 0 30rpx 36rpx;
+}
+.content {
+ font-size: 24rpx;
+ color: rgba(51, 51, 51, 1);
+ line-height: 50rpx;
+}
+.title{
+ font-size: 30rpx;
+}
\ No newline at end of file
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 5b752e0..329f072 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -7,7 +7,7 @@
-
+
diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss
index 98bb73e..57d3819 100644
--- a/pages/coupon/detail/index.wxss
+++ b/pages/coupon/detail/index.wxss
@@ -33,20 +33,20 @@ page {
.fenxiang {
position: absolute;
- right: 36rpx;
+ right: 28rpx;
top: 27rpx;
- width: 77rpx;
+ width: 108rpx;
}
.fenxiang image {
- width: 50rpx;
+ width: 108rpx;
position: absolute;
top: 0;
right: 0;
}
.user-motto {
- width: 100rpx;
+ width: 118rpx;
border: 0;
background: none;
height: 60rpx;
diff --git a/pages/grade/grade.wxss b/pages/grade/grade.wxss
index 53a0388..6a7e309 100644
--- a/pages/grade/grade.wxss
+++ b/pages/grade/grade.wxss
@@ -191,7 +191,7 @@ visibility: hidden;
margin-left: 10rpx;
}
.growthbg{
- margin-top: 40rpx;
+ margin:0 40rpx;
padding: 0 30rpx;
}
.growthbg image{
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 3d278bd..2c48c1b 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -29,6 +29,6 @@
{{levelName}}
-
+
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index 068edd2..bed1a3e 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -79,7 +79,7 @@
-
+
\ No newline at end of file
diff --git a/pages/scanPay/scanPay.js b/pages/scanPay/scanPay.js
index 767814a..29a7fe2 100644
--- a/pages/scanPay/scanPay.js
+++ b/pages/scanPay/scanPay.js
@@ -35,7 +35,6 @@ Page({
gotoPayMoney: function() {
let that = this;
// 卡余额充足的时候,才可以付钱
- console.log(Number(that.data.remainingAmount) >= Number(that.data.inputValue))
if (that.data.inputValue != "" && Number(that.data.remainingAmount) >= Number(that.data.inputValue)) {
Http.post({
url: config.api.cardPayOrder,
@@ -95,11 +94,12 @@ Page({
success: (res) => {
console.log(res)
if (parseInt(res.isEnrolled) <= 0) {
- wx.showModal({
- title: '错误',
- content: '您暂未录入指纹信息,请录入后重试',
- showCancel: false
- })
+ // wx.showModal({
+ // title: '错误',
+ // content: '您暂未录入指纹信息,请录入后重试',
+ // showCancel: false
+ // })
+ that.gotoPayMoney();
return
}
startSoterAuthentication();
@@ -116,11 +116,12 @@ Page({
},
fail: (err) => {
console.error(err);
- wx.showModal({
- title: '抱歉',
- content: '您的设备不支持指纹识别',
- showCancel: false
- })
+ // wx.showModal({
+ // title: '抱歉',
+ // content: '您的设备不支持指纹识别',
+ // showCancel: false
+ // })
+ that.gotoPayMoney();
}
})
},