diff --git a/assets/images/give.png b/assets/images/give.png new file mode 100644 index 0000000..2c606f3 Binary files /dev/null and b/assets/images/give.png differ diff --git a/assets/images/icon01.png b/assets/images/icon01.png new file mode 100644 index 0000000..08712fc Binary files /dev/null and b/assets/images/icon01.png differ diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index af260e9..718771b 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -45,10 +45,8 @@ Page({ let that = this; wx.scanCode({ success: (res) => { - 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; }