From cd5228451c88414e9a1d4aa02524e3fecb2011a8 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Wed, 2 Jan 2019 19:48:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BD=BF=E7=94=A8=E8=A7=84=E5=88=99=EF=BC=8C?= =?UTF-8?q?=E5=8D=A1=E5=8C=85=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E6=8C=87=E7=BA=B9=E6=94=AF=E4=BB=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 1 + assets/images/share.png | Bin 0 -> 5275 bytes pages/ConsumeDetail/ConsumeDetail.js | 1 + pages/ConsumeDetail/ConsumeDetail.json | 2 +- pages/ConsumeDetail/ConsumeDetail.wxml | 50 ++++--------------- pages/ConsumeDetail/ConsumeDetail.wxss | 49 +++++++++++++++--- pages/cardorder/index/index.js | 11 ++++- pages/cardorder/index/index.wxml | 3 +- pages/cardorder/index/index.wxss | 11 +++++ pages/cardorder/userule/userule.js | 66 +++++++++++++++++++++++++ pages/cardorder/userule/userule.json | 3 ++ pages/cardorder/userule/userule.wxml | 42 ++++++++++++++++ pages/cardorder/userule/userule.wxss | 14 ++++++ pages/coupon/detail/index.wxml | 2 +- pages/coupon/detail/index.wxss | 8 +-- pages/grade/grade.wxss | 2 +- pages/index/index.wxml | 2 +- pages/order/detail/index.wxml | 4 +- pages/scanPay/scanPay.js | 23 ++++----- 19 files changed, 224 insertions(+), 70 deletions(-) create mode 100644 assets/images/share.png create mode 100644 pages/cardorder/userule/userule.js create mode 100644 pages/cardorder/userule/userule.json create mode 100644 pages/cardorder/userule/userule.wxml create mode 100644 pages/cardorder/userule/userule.wxss 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 0000000000000000000000000000000000000000..8b5e50be16055761967a6afa01f65629405ecc75 GIT binary patch literal 5275 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 literal 0 HcmV?d00001 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.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(); } }) },