From 9e781f1e0309afaf9d0ac8883e9e99f95e1e9b05 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Fri, 21 Dec 2018 20:29:53 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B8=E5=8C=85=EF=BC=8C=E5=8D=A1=E5=8C=85?= =?UTF-8?q?=EF=BC=8C=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=EF=BC=8C=E6=89=AB?= =?UTF-8?q?=E4=B8=80=E6=89=AB=E4=BB=98=E6=AC=BE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/images/give.png | Bin 0 -> 10764 bytes assets/images/icon01.png | Bin 0 -> 1543 bytes pages/cardorder/index/index.js | 35 ++++-------- pages/cardorder/index/index.wxml | 21 +++----- pages/cardorder/index/index.wxss | 55 +++++++++---------- pages/couponorder/index/index.wxml | 1 + pages/couponorder/index/index.wxss | 21 +++++--- pages/order/index/index.wxml | 12 ++--- pages/order/index/index.wxss | 9 +++- pages/scanPay/scanPay.js | 84 +++++++++++++++++++++++++++-- pages/scanPay/scanPay.wxml | 8 +-- pages/scanPay/scanPay.wxss | 7 ++- pages/user/index.wxml | 17 ------ pages/user/index.wxss | 6 +-- 14 files changed, 164 insertions(+), 112 deletions(-) create mode 100644 assets/images/give.png create mode 100644 assets/images/icon01.png diff --git a/assets/images/give.png b/assets/images/give.png new file mode 100644 index 0000000000000000000000000000000000000000..2c606f30fde8dad60a515b198776348f11ad785f GIT binary patch literal 10764 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 U*}CV5a(M#EifZs0d5e($2NH}Jg#Z8m literal 0 HcmV?d00001 diff --git a/assets/images/icon01.png b/assets/images/icon01.png new file mode 100644 index 0000000000000000000000000000000000000000..08712fcb7303c96c1be8c8a5bf8b3f9772b4a825 GIT binary patch literal 1543 zcmV+i2Kf1jP);K{qD8j^{z&#weABP1Y8JQ0bB~40vrbH0Tkd*pfdkY?y(z? zpPzsgz&pU(z(>GDskI&f90gnpTmxJH91ZLjIGe!z_k2DH+f|3o&)>_yedY4KLeZ!90Pm~JRR4u0oW1??F_(83MOTw zioSLoa62G)X|qD$T3AkR0-gdM1(uXjJoPSrYONYg(YOb=4LDTr0`~;+=riD9;IUH5 zH@h5h13<0yB;YRKKH%I`mG!};_X7BHrIa=KUYs~ReD`_exi_poZ5h7pTI=z^Edl&8 z9aW2eAHbIY4*}1YQod^d-z#q9aNxku_T*q!ZBO6PFn@%SX~>CE%GL%39rR}4en8-p z0$&@zRgy;n`09asPw`9VI1{)8I1%t5I&CUI7go8x9|N6wy)qPSnUb8AueF{K!0!zl z1B+|j1L6f8Q;V+(;8H`d1|}Wj{E$p#sW0HJqYS&|C!uO@0Bh3f0bHsG{9~gD&_&0QO6sSf*G&>|SFKNu`%_~Wseb@|DW!OjDLzhdd_3Td zmvtaH??L|lbr;VZlGY6MTSv%Yd*B@bc6z;&#XIfX@#X&>@LH?9PL9u4rkEjrTW5|( zoE+8B-GEWcC}&C6CvbzB8gBG{JgS^kr4+Np))qH2yD9>J zxp3wcedQ|pj6uzs(vbfGuozg|1-Oe^WZ13{w1;q$Oga1HxKuIWvwSp5G&^j^@wg^| z>Y(NsLj2peZKDMg#wsXgY{s-RCfMdVj%Hp+Fom1^L zC)YU*O4F%{D&%)MmX4;xO{T1kjks+-9wA>fvF@~BHj3I?90Z0DPo@L*9xb?)HETx? z(E1tM;t}%ga$OGC9JK|e^|Lx@T0R4bvSyRXDEO|WSSjVl)~Gu~POWX8(hT_qi{X$j zaH%A48>aTMU$U=VO0iec`e|cvgN+t9$+DY!R#3$r$SB~_$lnXpqSw&9w3M>3HR_fY z*NQgy<+c^R-7FI?IX()w-}#s@*=W-88%inJhiQd>CW{-=<>Yn^q1+|1L_w)AnTn25 zmi*3x=?8;0b>(yGDO-~hW z(Da_AzTX*YGYfps^c1)qDwFtsLu3EEL9SkFwa&8`Rr{3Eo+v!>ep=&eoD>Hs}pN%Ab;GsJEpyZKV{7Wi(bGnuSXC&6Qw>S9XhYc=eSQ zf1oigbOB2zt8B}txsD5SpsHjlgF5_|fU~4c( { - that.merChantId = res.result; - console.log(res); wx.navigateTo({ - url: `/pages/scanPay/scanPay?`, + url: `/pages/scanPay/scanPay?merChant=${res.result}&cardid=${e.currentTarget.dataset.cardid}`, }) }, fail: (res) => { @@ -56,27 +54,7 @@ Page({ } }) }, - // gotoPayMoney:function(){ - // let that = this; - // Http.post({ - // url: config.api.orderCreate, - // data: { - // cardId: e.currentTarget.dataset.cardid, - // merchantCode: that.data.merChantId, - // totalFee: "5" - // } - // }) - // .then(res => { - // console.log(res) - // }) - // .catch(err => { - // wx.showModal({ - // title: "抱歉", - // content: err.message, - // showCancel: false - // }) - // }) - // }, + //点击跳转到券详情页面 gotouse: function (e) { if (this.data.mystatus == '' || this.data.mystatus == 'undefined') { @@ -124,6 +102,15 @@ Page({ } res.data.list.map(file => { file.expiredTime = util.fmtDate(file.expiredTime); + if (file.remainingAmount > 0 && 500 >= file.remainingAmount){ + file.background = '#7184E2' + } + else if (file.remainingAmount > 500 && 5000 >= file.remainingAmount) { + file.background = '#63AAE6' + } + else if (file.remainingAmount > 5000) { + file.background = '#E2A471' + } }); setTimeout(function () { that.setData({ diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml index b1cb034..d2fbb9d 100644 --- a/pages/cardorder/index/index.wxml +++ b/pages/cardorder/index/index.wxml @@ -14,27 +14,22 @@ - + - {{item.title}} + - - {{item.subTitle}} + + {{item.expiredTime}}到期 + 金额{{item.remainingAmount/10000}} - 扫一扫 - 已失效 + 扫一扫付款 + 已失效 - - - 有效期至: - {{item.expiredTime}} - + diff --git a/pages/cardorder/index/index.wxss b/pages/cardorder/index/index.wxss index 91a8908..a9e9751 100644 --- a/pages/cardorder/index/index.wxss +++ b/pages/cardorder/index/index.wxss @@ -26,23 +26,16 @@ .mms { width: 690rpx; - height: 170rpx !important; background: #fff; - padding: 30rpx 0 0; + padding: 36rpx 0 0; margin: 0 auto 40rpx; border-radius: 16rpx; - border-top: 8rpx solid #02b7ff; box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); } -.detail_msg { - display: flex; - padding-bottom: 26rpx; -} - .expiretime { display: block; - width: 100%; + width: 100%!important; text-align: left; text-indent: 1em; height: 40rpx; @@ -51,7 +44,14 @@ color: #333; letter-spacing: 0; } - +.expiretime .fr{ + margin-right: 20rpx; +} +.money{ + margin-left: 10rpx; + font-size: 30rpx; + font-weight: bold; +} .liness { display: block; width: 100%; @@ -86,19 +86,19 @@ font-size: 32rpx; line-height: 32rpx; height: 32rpx; - color: #333; + color: #fff; letter-spacing: 0; width: 400rpx; display: inline-block; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; + margin-bottom: 10rpx; } .info view:nth-child(2) { - padding-left: 2%; - font-size: 22rpx; - color: #333; + font-size: 26rpx; + color: #fff; letter-spacing: 0; margin-top: 6rpx; display: inline-block; @@ -108,32 +108,25 @@ width: 400rpx; } -.info view:nth-child(3) { - margin-left: 20rpx; -} .btns { - position: absolute; - right: 57rpx; - top: 38rpx; - width: 120rpx; - height: 48rpx; - line-height: 48rpx; + height: 80rpx; + line-height: 80rpx; text-align: center; - border: 2rpx solid #02c0ff; - border-radius: 60rpx; - color: #02c0ff; + color: #fff; font-size: 28rpx; + margin-top: 46rpx; + border-top:1px solid #e6e6e6; } .active { color: #fff; - background: #02c0ff; + opacity: .6; } .txt1 { - font-size: 22rpx; - color: #333; + font-size: 24rpx; + color: #fff; letter-spacing: 0; } @@ -203,3 +196,7 @@ text-align: center; line-height: 32px; } +.title .fr{ + width: 30rpx; + margin-right: 10rpx; +} \ No newline at end of file diff --git a/pages/couponorder/index/index.wxml b/pages/couponorder/index/index.wxml index e7358bb..e03d5ab 100644 --- a/pages/couponorder/index/index.wxml +++ b/pages/couponorder/index/index.wxml @@ -36,6 +36,7 @@ {{item.expiredTime}} + {{content}} diff --git a/pages/couponorder/index/index.wxss b/pages/couponorder/index/index.wxss index 91a8908..8678b32 100644 --- a/pages/couponorder/index/index.wxss +++ b/pages/couponorder/index/index.wxss @@ -25,8 +25,9 @@ } .mms { + position: relative; width: 690rpx; - height: 170rpx !important; + height: 197rpx !important; background: #fff; padding: 30rpx 0 0; margin: 0 auto 40rpx; @@ -45,9 +46,9 @@ width: 100%; text-align: left; text-indent: 1em; - height: 40rpx; - line-height: 36rpx; - font-size: 22rpx; + height:54rpx; + line-height:54rpx; + font-size: 26rpx; color: #333; letter-spacing: 0; } @@ -114,14 +115,14 @@ .btns { position: absolute; - right: 57rpx; + right: 30rpx; top: 38rpx; width: 120rpx; height: 48rpx; line-height: 48rpx; text-align: center; border: 2rpx solid #02c0ff; - border-radius: 60rpx; + border-radius: 10rpx; color: #02c0ff; font-size: 28rpx; } @@ -132,7 +133,7 @@ } .txt1 { - font-size: 22rpx; + font-size: 26rpx; color: #333; letter-spacing: 0; } @@ -203,3 +204,9 @@ text-align: center; line-height: 32px; } +.sendImg{ + position: absolute; + width: 100rpx; + top:109rpx; + right:72rpx; +} \ No newline at end of file diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml index 862bf93..da9bb6a 100644 --- a/pages/order/index/index.wxml +++ b/pages/order/index/index.wxml @@ -21,6 +21,9 @@ {{item.subTitle}} 面额:{{item.price/100}}元{{item.price/100}}小时 + + + 下单时间:{{item.createDate}} @@ -41,15 +44,6 @@ 去支付 - - - 退款失败 diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss index ef686a5..7f0ce30 100644 --- a/pages/order/index/index.wxss +++ b/pages/order/index/index.wxss @@ -20,6 +20,7 @@ } .detail_msg { + position: relative; width: 92%; background: #fff; display: flex; @@ -28,6 +29,12 @@ padding-top: 30rpx; border-bottom: 1rpx solid #eee; } +.sendImg{ + position: absolute; + width: 100rpx; + top: 100rpx; + right: 6rpx; +} .logo { display: block; @@ -188,7 +195,7 @@ text-overflow: ellipsis; float: right; font-size: 28rpx; border: 2rpx solid #02c0ff; - border-radius: 30rpx; + border-radius: 10rpx; } .payment view:nth-child(2) text { diff --git a/pages/scanPay/scanPay.js b/pages/scanPay/scanPay.js index 240cb3c..2133317 100644 --- a/pages/scanPay/scanPay.js +++ b/pages/scanPay/scanPay.js @@ -1,20 +1,96 @@ -// pages/scanPay/scanPay.js +const util = require("../../utils/util.js"); +const config = require("../../config/config.js"); +const Http = require("../../utils/HttpBasics"); +let app = getApp(); Page({ /** * 页面的初始数据 */ data: { - + merChant:{}, + focus: true, + inputValue: '' }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + console.log(options) + let that = this; + that.setData({ + merChant: JSON.parse(options.merChant), + cardid:options.cardid + }) + }, + bindKeyInput(e) { + console.log(e) + this.setData({ + inputValue: e.detail.value + }) + console.log(this.data.inputValue) + }, + gotoPayMoney:function(){ + let that = this; + Http.post({ + url: config.api.orderCreate, + data: { + cardId: that.data.cardid, + merchantCode: that.data.merChant.merchant_id, + totalFee: that.data.inputValue + } + }) + .then(res => { + console.log(res) + }) + .catch(err => { + wx.showModal({ + title: "抱歉", + content: err.message, + showCancel: false + }) + }) + }, + gotoPayMoneys(e) { + var that = this; + if (wx.canIUse("checkIsSupportSoterAuthentication")) { + //判断此接口是否可用 + console.log(e) + wx.checkIsSupportSoterAuthentication({ + success: function (res) { + console.log('本机支持的 SOTER 生物认证', res); + var keys = []; + for (var key in res) { + keys.push(res[key]) + } + console.log(res) + that.setData({ + print: keys//页面中输出支持情况 + }) + if (res.supportMode == "fingerPrint") { + wx.startSoterAuthentication({ + requestAuthModes: ['fingerPrint'], + challenge: '123456', + authContent: "请用指纹解锁", + success: function (res) { + console.log('js', res); + }, + fail: function (res) { + that.setData({ + c: "用户取消了指纹识别,或调用出现错误" + }) + } + }) + } else { + that.setData({ + b: "当前该设备不支持指纹识别" + }) + } + } + }) + } }, - /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/scanPay/scanPay.wxml b/pages/scanPay/scanPay.wxml index 82aceb3..8178506 100644 --- a/pages/scanPay/scanPay.wxml +++ b/pages/scanPay/scanPay.wxml @@ -1,12 +1,12 @@ - 付款给呷脯呷脯 - + 付款给{{merChant.merchant_name}} + 金额 ¥ - 200 - + + \ No newline at end of file diff --git a/pages/scanPay/scanPay.wxss b/pages/scanPay/scanPay.wxss index a8c3b28..3ecf88c 100644 --- a/pages/scanPay/scanPay.wxss +++ b/pages/scanPay/scanPay.wxss @@ -36,8 +36,13 @@ color:rgba(51,51,51,1); } .money .num{ - font-size:77rpx; + font-size:60rpx!important; font-family:PingFang-SC-Bold; font-weight:bold; color:rgba(51,51,51,1); + display: inline-block!important; + width: 300rpx; + height: 60rpx; + margin-top: 20rpx; + line-height: 60rpx; } \ No newline at end of file diff --git a/pages/user/index.wxml b/pages/user/index.wxml index ecd9809..3b6db3d 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -29,23 +29,6 @@ 我的订单 - - 查看全部 - - - - - - - 待付款 - - - - - - - - 已完成 diff --git a/pages/user/index.wxss b/pages/user/index.wxss index 008b826..99f9c37 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -183,11 +183,11 @@ page{ right: 0; top: 0; bottom: 0; - width: 44rpx; - height: 44rpx; + width: 30rpx; + height: 30rpx; line-height: 44rpx; color: #c7c7cc; - font-size: 44rpx; + font-size: 30rpx; margin: auto; }