From 8142e29639110a81d9baadfbbbdc84bd04a8b63e Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Tue, 28 Aug 2018 10:50:45 +0800 Subject: [PATCH 1/6] =?UTF-8?q?id=E6=94=B9=E4=B8=BAcouponChannelId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/coupon/detail/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index b4fd4da..9a68a5e 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -29,7 +29,7 @@ Page({ Http.get({ url: config.api.couponDetail, data: { - id: options.couponChannelId, + couponChannelId: options.couponChannelId, } }).then(res => { console.log(res); From dbf63edb81957485b592dfc2387d724950a2b87e Mon Sep 17 00:00:00 2001 From: meo <958484406@qq.com> Date: Tue, 28 Aug 2018 12:25:06 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85,?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E7=9A=84=E5=88=A4=E6=96=AD?= =?UTF-8?q?][=E5=A2=9E=E5=8A=A0]:=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=B8=B2=E6=9F=93=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E9=92=88=E5=AF=B9=E4=B8=8D=E5=90=8C=E7=9A=84=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=9A=84=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.js | 7 ++- pages/couponorder/detail/index.js | 4 +- pages/order/detail/index.js | 75 +++++++++++++++++++------------ pages/order/detail/index.wxml | 35 +++++++-------- pages/order/detail/index.wxss | 10 ++++- pages/order/index/index.js | 20 +++++---- pages/order/index/index.wxml | 10 +++-- pages/order/index/index.wxss | 2 +- 8 files changed, 97 insertions(+), 66 deletions(-) diff --git a/config/config.js b/config/config.js index 914c92f..e788e02 100755 --- a/config/config.js +++ b/config/config.js @@ -55,6 +55,11 @@ var config = { * 订单列表 */ orderList: "/order/list", + + /** + * 订单详情 + */ + orderDetail: "/order/detail", /** * 券包 */ @@ -131,4 +136,4 @@ for (var key in config.api) { config.api[key] = apiPrefix + config.api[key]; } */ -module.exports = config; \ No newline at end of file +module.exports = config; diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js index 94be8c2..cf9bd9c 100644 --- a/pages/couponorder/detail/index.js +++ b/pages/couponorder/detail/index.js @@ -46,9 +46,9 @@ Page({ phone: function() { let that = this; console.log(that.data); - if (that.data.merchantLinkPhone) { + if (that.data.data.merchantLinkPhone) { wx.makePhoneCall({ - phoneNumber: that.data.merchantLinkPhone //仅为示例,并非真实的电话号码 + phoneNumber: that.data.data.merchantLinkPhone //仅为示例,并非真实的电话号码 }); } } diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index daae2ca..45e920a 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -1,65 +1,82 @@ -Page({ +let config = require("../../../config/config.js"); +let Http = require("../../../utils/HttpBasics"); +let app = getApp(); +Page({ /** * 页面的初始数据 */ - data: { - - }, + data: {}, /** * 生命周期函数--监听页面加载 */ - onLoad: function (options) { - + onLoad: function(options) { + let that = this; + console.log(options.orderId); + Http.get({ + url: config.api.orderDetail, + data: { + orderId: options.orderId + } + }).then(res => { + console.log(res); + console.log("我是订单详情"); + that.setData({ + data: res.data + }); + }); + }, + couponorderdetail: function(e) { + console.log(e); + wx.navigateTo({ + url: `/pages/couponorder/detail/index?quancode=${ + e.currentTarget.dataset.quancode + }`, + success: function(res) { + // success + console.log("点击跳转到券详情页面"); + }, + fail: function() { + // fail + }, + complete: function() { + // complete + } + }); }, - /** * 生命周期函数--监听页面初次渲染完成 */ - onReady: function () { - - }, + onReady: function() {}, /** * 生命周期函数--监听页面显示 */ - onShow: function () { - - }, + onShow: function(options) {}, /** * 生命周期函数--监听页面隐藏 */ - onHide: function () { - - }, + onHide: function() {}, /** * 生命周期函数--监听页面卸载 */ - onUnload: function () { - - }, + onUnload: function() {}, /** * 页面相关事件处理函数--监听用户下拉动作 */ - onPullDownRefresh: function () { - - }, + onPullDownRefresh: function() {}, /** * 页面上拉触底事件的处理函数 */ - onReachBottom: function () { - - }, + onReachBottom: function() {}, /** * 用户点击右上角分享 */ - onShareAppMessage: function () { - - } -}) \ No newline at end of file + onShareAppMessage: function() {} +}); diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index bf9429c..0b9b51d 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -1,30 +1,28 @@ - 付款成功,请尽快到门店使用 + 付款成功,请尽快到门店使用 - 黑椒牛排 + {{data.subTitle}} - 购买数量:1件 + {{data.title}} + + - 下单时间:2018-07-10 11:30 - - - - - - ¥1.00 - ¥59.00 + 下单时间:{{data.paymentTime}} + @@ -35,27 +33,26 @@ 适用门店 - + 兑换码: - 1234567890 + {{data.id}} - - + 下单时间 - 2018-07-10 11:30 + {{data.paymentTime}} 订单编号 - 1234567890 + {{data.orderNumber}} 订单金额 - ¥1.00 + ¥{{data.salePrice/100}} \ No newline at end of file diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index 20218f1..f4e205b 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -35,7 +35,7 @@ display: flex; margin: 0 4%; margin-top: 2%; - border-bottom: 1px solid #ededed; + /* border-bottom: 1px solid #ededed; */ } .logo { @@ -60,7 +60,7 @@ } .info view:nth-child(1) { - margin-bottom: 72rpx; + margin-bottom: 30rpx; } .info view:nth-child(1) text { @@ -119,6 +119,7 @@ justify-content: space-between; padding-left: 4%; padding-right: 4%; + border-bottom:1rpx solid #eee; } .classif>view text{ font-size: 30rpx; @@ -142,4 +143,9 @@ .classif>view:nth-child(6) text:nth-child(2){ color: #FF3434; font-weight: bold; +} +.spcode{ + width: 60rpx; + display: inline-block; + margin-top: 15rpx; } \ No newline at end of file diff --git a/pages/order/index/index.js b/pages/order/index/index.js index 4889e61..2fd7ce6 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -6,15 +6,15 @@ Page({ data: { tabs: [ { - key: 0, + key: "all", name: "全部" }, { - key: 1, + key: 0, name: "待付款" }, { - key: 2, + key: 1, name: "已完成" } ], @@ -30,10 +30,10 @@ Page({ current_scroll: e.id }); }, - gotopay:function(){ - console.log("000000"); + gotopay:function(e){ + console.log("orderId"+e.currentTarget.dataset.id); wx.navigateTo({ - url: '/pages/order/detail/index', + url: `/pages/order/detail/index?orderId=${e.currentTarget.dataset.id}`, success: function(res){ // success }, @@ -54,16 +54,18 @@ Page({ * key==0 * 不发送该字段 */ - if (key == 0) { + if (key == 'all') { var variable = { pageNum: pageNum, - pageSize: 5 + pageSize: 5, + paymentType:0 }; } else { var variable = { pageNum: pageNum, pageSize: 5, - orderStatus: key + orderStatus: key, + paymentType:0 }; } diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml index 23d0c16..5106a92 100644 --- a/pages/order/index/index.wxml +++ b/pages/order/index/index.wxml @@ -11,7 +11,9 @@ {{item.title}} - 等待付款 + 等待付款 + 已付款 + 取消 {{item.subTitle}} @@ -24,8 +26,10 @@ ¥{{item.salePrice/100}} ¥{{item.price/100}} - - 支付 + + 查看详情 + 支付 + 支付 diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss index 13ff835..e7c0039 100644 --- a/pages/order/index/index.wxss +++ b/pages/order/index/index.wxss @@ -25,7 +25,7 @@ display: flex; margin: 0 4%; margin-top: 2%; - border-bottom: 1px solid #ededed; + border-bottom: 1rpx solid #ededed; } .logo { From 91f86acad2e1bd85e86cbc3ce3ad469e4c6a8cd6 Mon Sep 17 00:00:00 2001 From: meo <958484406@qq.com> Date: Tue, 28 Aug 2018 15:39:18 +0800 Subject: [PATCH 3/6] =?UTF-8?q?[=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=85=91=E6=8D=A2=E7=A0=81=E5=BC=B9=E5=87=BA=E5=B1=82][?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0]:=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=85=91=E6=8D=A2=E7=A0=81=E5=BC=B9=E5=87=BA=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/couponorder/index/index.js | 2 +- pages/couponorder/index/index.wxml | 1 + pages/order/detail/index.js | 79 ++++++++--- pages/order/detail/index.wxml | 19 ++- pages/order/detail/index.wxss | 203 +++++++++++++++++++++++++---- 5 files changed, 259 insertions(+), 45 deletions(-) diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js index 2140fb3..a1243bf 100644 --- a/pages/couponorder/index/index.js +++ b/pages/couponorder/index/index.js @@ -22,7 +22,7 @@ Page({ name: "已退款" } ], - list: [{wm:'000'}], + list: [], current: "0", current_scroll: "0", page: 1, diff --git a/pages/couponorder/index/index.wxml b/pages/couponorder/index/index.wxml index f77430e..04ce5bf 100644 --- a/pages/couponorder/index/index.wxml +++ b/pages/couponorder/index/index.wxml @@ -11,6 +11,7 @@ + - + 兑换码: {{data.id}} @@ -55,4 +55,19 @@ ¥{{data.salePrice/100}} - \ No newline at end of file + + + + + + + + + + + + + + 兑换码:{{data.id}} + + diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index f4e205b..d9bb3de 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -1,11 +1,11 @@ -@import '../../../app.wxss'; +@import "../../../app.wxss"; .order { width: 100%; } .tips { width: 92%; height: 88rpx; - background: #00C0FF; + background: #00c0ff; color: #fff; padding: 0 4%; line-height: 88rpx; @@ -19,7 +19,7 @@ height: 32rpx; background: #fff; border-radius: 50%; - color: #00C0FF; + color: #00c0ff; line-height: 32rpx; text-align: center; display: inline-block; @@ -72,13 +72,15 @@ font-size: 24rpx; } -.info view:nth-child(2), .info view:nth-child(3) { +.info view:nth-child(2), +.info view:nth-child(3) { color: #ff3434; font-size: 24rpx; padding-left: 4%; } -.info view:nth-child(2) text, .info view:nth-child(3) text { +.info view:nth-child(2) text, +.info view:nth-child(3) text { font-size: 22rpx; color: #b8b8b8; } @@ -94,7 +96,7 @@ padding: 0 4%; display: flex; justify-content: space-between; - border-bottom: 20rpx solid #EDEDED; + border-bottom: 20rpx solid #ededed; } .payment view:nth-child(2) text:nth-child(1) { @@ -112,40 +114,197 @@ .classif { width: 100%; } -.classif>view{ +.classif > view { height: 88rpx; line-height: 88rpx; display: flex; justify-content: space-between; padding-left: 4%; padding-right: 4%; - border-bottom:1rpx solid #eee; + border-bottom: 1rpx solid #eee; } -.classif>view text{ +.classif > view text { font-size: 30rpx; } -.classif>view text:nth-child(2){ - color: #B8B8B8; - font-size: 30rpx; +.classif > view text:nth-child(2) { + color: #b8b8b8; + font-size: 30rpx; } -.classif>view:nth-child(1) { +.classif > view:nth-child(1) { display: block; } -.classif>view:nth-child(1) text:nth-child(2) { +.classif > view:nth-child(1) text:nth-child(2) { padding-left: 15rpx; } -.classif>view:nth-child(3),.classif>view:nth-child(4) { - border-top: 20rpx solid #EDEDED; +.classif > view:nth-child(3), +.classif > view:nth-child(4) { + border-top: 20rpx solid #ededed; } -.classif>view:nth-child(3) view text:nth-child(2) { - padding-left: 15rpx; -} -.classif>view:nth-child(6) text:nth-child(2){ - color: #FF3434; +.classif > view:nth-child(3) view text:nth-child(2) { + padding-left: 15rpx; +} +.classif > view:nth-child(6) text:nth-child(2) { + color: #ff3434; font-weight: bold; } -.spcode{ +.spcode { width: 60rpx; display: inline-block; margin-top: 15rpx; +} + +/*mask*/ +.drawer_screen { + position: absolute; + width: 100%; + height: 100%; + top: 0; + left: 0; + z-index: 1000; + background: #000; + opacity: 0.5; + overflow: hidden; +} + +.drawer_box { + width: 650rpx; + position: fixed; + overflow: hidden; + top: 50%; + left: 0; + z-index: 1001; + margin: -150px 50rpx 0 50rpx; + border-radius: 3px; +} +.drawer_title { + padding: 15px; + font: 20px "microsoft yahei"; + text-align: center; +} +.drawer_content { + height: 210px; + overflow-y: scroll; /*超出父盒子高度可滚动*/ +} +.btn_ok { + padding: 10px; + font: 20px "microsoft yahei"; + text-align: center; + border-top: 1px solid #e8e8ea; + color: #3cc51f; +} +.top { + padding-top: 8px; +} +.bottom { + padding-bottom: 8px; +} +.title { + height: 30px; + line-height: 30px; + width: 160rpx; + text-align: center; + display: inline-block; + font: 300 28rpx/30px "microsoft yahei"; +} +.input_base { + border: 2rpx solid #ccc; + padding-left: 10rpx; + margin-right: 50rpx; +} +.input_h30 { + height: 30px; + line-height: 30px; +} +.input_h60 { + height: 60px; +} +.input_view { + font: 12px "microsoft yahei"; + background: #fff; + color: #000; + line-height: 30px; +} +input { + font: 12px "microsoft yahei"; + background: #fff; + color: #000; +} +radio { + margin-right: 20px; +} +.grid { + display: -webkit-box; + display: box; +} +.col-0 { + -webkit-box-flex: 0; + box-flex: 0; +} +.col-1 { + -webkit-box-flex: 1; + box-flex: 1; +} +.fl { + float: left; +} +.fr { + float: right; +} + + +.panel { + width: 600rpx; + border-radius: 10rpx; + background-color: #fff; + margin: 30rpx auto 0; + padding: 30rpx 0; + position: relative; + z-index: 10000000000; +} +.pane2{ + background: #fff; + opacity: .6; +} +.pane2 image{ + width: 500rpx; + display: block; + margin: 40rpx auto 0; +} + +.barcode { + height: 100rpx; + width: 500rpx; + margin: 0 auto; +} + +.barnum { + height: 46rpx; + line-height: 46rpx; + font-size: 32rpx; + text-align: center; + letter-spacing: 2rpx; + white-space: nowrap; + color: #999; +} + +.barnum text { + color: #333; +} + +.barcode > canvas { + width: 500rpx; + height: 100rpx; +} + +.qrcode { + height: 370rpx; + display: flex; + flex-direction: column; + justify-content: flex-end; + align-items: center; +} + +.qrcode > canvas { + width: 350rpx; + height: 400rpx; } \ No newline at end of file From e91b07d299de67faa0496022738ea818c8f18b42 Mon Sep 17 00:00:00 2001 From: meo <958484406@qq.com> Date: Tue, 28 Aug 2018 16:37:05 +0800 Subject: [PATCH 4/6] =?UTF-8?q?[=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E9=97=B4=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/detail/index.js | 14 +++++++++++++- pages/order/detail/index.wxml | 20 ++++++++------------ pages/order/detail/index.wxss | 18 +++++++++++++++--- project.config.json | 2 +- utils/util.js | 22 +++++++++++++++++++++- 5 files changed, 58 insertions(+), 18 deletions(-) diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 23738c4..16c7576 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -59,7 +59,7 @@ Page({ console.log(this.data.flag); util.barcode("barcode" + this.data.flag, quancode, 500, 100); - util.qrcode("qrcode" + this.data.flag, quancode, 350, 400); + util.qrcode("qrcode" + this.data.flag, quancode, 350, 350); this.setData({ flag: this.data.flag }); @@ -82,8 +82,20 @@ Page({ that.setData({ data: res.data }); + + //createDate 创建时间 + //paymentTime 支付时间 + var createDate = util.fmtDate(res.data.createDate); + // var paymentTime = util.fmtDate(res.data.paymentTime); + + console.log(createDate); + that.setData({ + createDate:createDate, + // paymentTime:util.timechuo(paymentTime), + }) }); }, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index b57a2fb..d386672 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -19,19 +19,15 @@ 购买数量:1件 --> - 下单时间:{{data.paymentTime}} + 下单时间:{{createDate}} - - 有效期: - 2018-07-10 至 2018-07-10 - - + 适用门店 - + {{data.merchantName}} @@ -44,7 +40,7 @@ 下单时间 - {{data.paymentTime}} + {{createDate}} 订单编号 @@ -52,7 +48,7 @@ 订单金额 - ¥{{data.salePrice/100}} + ¥{{data.salePrice/100}} @@ -63,11 +59,11 @@ - + - + 兑换码:{{data.id}} - + \ No newline at end of file diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index d9bb3de..6208d9a 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -47,6 +47,7 @@ .logo image { width: 100%; height: 100%; + border-radius:16rpx; } .info view:nth-child(1) { @@ -244,6 +245,7 @@ radio { -webkit-box-flex: 1; box-flex: 1; } + .fl { float: left; } @@ -251,7 +253,13 @@ radio { float: right; } - +.clearfix:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; + } .panel { width: 600rpx; border-radius: 10rpx; @@ -297,7 +305,7 @@ radio { } .qrcode { - height: 370rpx; + height: 340rpx; display: flex; flex-direction: column; justify-content: flex-end; @@ -306,5 +314,9 @@ radio { .qrcode > canvas { width: 350rpx; - height: 400rpx; + height: 350rpx; +} +.jine{ + color: #f96563!important; + font-size: 36rpx!important; } \ No newline at end of file diff --git a/project.config.json b/project.config.json index 8030779..a31ddee 100644 --- a/project.config.json +++ b/project.config.json @@ -11,7 +11,7 @@ "newFeature": true }, "compileType": "miniprogram", - "libVersion": "2.2.2", + "libVersion": "2.2.4", "appid": "wx8eb8275b78db4ede", "projectname": "%E5%AF%8C%E8%8C%82%E6%94%AF%E4%BB%98%E6%B5%8B%E8%AF%95", "isGameTourist": false, diff --git a/utils/util.js b/utils/util.js index 37c8e1c..0fe687f 100644 --- a/utils/util.js +++ b/utils/util.js @@ -76,9 +76,29 @@ function fmtDate(obj) { d.substring(d.length - 2, d.length) ); } + +function timechuo(startTime) { + var s1 = new Date(startTime.replace(/-/g, "/")); + var s2 = new Date(); + var runTime = parseInt((s1.getTime() - s2.getTime()) / 1000); + var year = Math.floor(runTime / 86400 / 365); + var runTime = runTime % (86400 * 365); + var month = Math.floor(runTime / 86400 / 30); + var runTime = runTime % (86400 * 30); + var day = Math.floor(runTime / 86400); + var runTime = runTime % 86400; + var hour = Math.floor(runTime / 3600); + var runTime = runTime % 3600; + var minute = Math.floor(runTime / 60); + var runTime = runTime % 60; + var second = runTime; + console.log(month, day, hour, minute, second); + return (day+"天"+hour+"小时"+minute+"分钟") +} module.exports = { formatTime: formatTime, barcode: barc, qrcode: qrc, - fmtDate: fmtDate + fmtDate: fmtDate, + timechuo:timechuo }; From dcd1974c570050d9b7a0338bd62d9bfcf4a1b156 Mon Sep 17 00:00:00 2001 From: meo <958484406@qq.com> Date: Tue, 28 Aug 2018 18:02:17 +0800 Subject: [PATCH 5/6] =?UTF-8?q?[=E6=94=AF=E4=BB=98][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=9A=84=E5=A4=B1=E8=B4=A5=E7=9A=84=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/img/fail.png | Bin 0 -> 6838 bytes pages/coupon/detail/index.js | 76 +++++++++++++++++++++------------- pages/order/detail/index.js | 3 -- pages/order/detail/index.wxss | 3 +- pages/order/index/index.wxss | 2 +- pages/rushToBuy/index.wxml | 1 - pages/user/index.wxss | 4 +- utils/util.js | 1 + 8 files changed, 54 insertions(+), 36 deletions(-) create mode 100644 assets/img/fail.png diff --git a/assets/img/fail.png b/assets/img/fail.png new file mode 100644 index 0000000000000000000000000000000000000000..406cda1aeac7315b67672b67fb06f3a1fbd604a1 GIT binary patch literal 6838 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 RAD}=WLw#et8eO~S{{gny;tc=* literal 0 HcmV?d00001 diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 9a68a5e..51b6882 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -82,15 +82,18 @@ Page({ }) .then(res => { console.log("payOrderUpdate then", res); - wx.showToast({ - title: "购买成功", - duration: 2500 - }); + // wx.showToast({ + // title: "购买成功", + // duration: 2500 + // }); }) .catch(err => { console.log("payOrderUpdate catch", err); }); }, + /** + * 发起支付 + */ orderFunc() { var that = this; wx.showLoading({ @@ -105,6 +108,10 @@ Page({ data: {} }) .then(res => { + console.log(res); + /** + * orderSave 下单 + */ return Http.post({ url: config.api.orderSave, data: { @@ -136,6 +143,9 @@ Page({ }); if (res.data.payment > 0) { // 支付金额不为0 + /** + * 支付订单创建 + */ Http.post({ url: config.api.payOrderCreate, data: { @@ -154,49 +164,59 @@ Page({ signType: "MD5", paySign: res.data.paySign, success: res => { + console.log(res); + console.log("姐在检查付款异常"); + that.payOrderUpdate(that.data.orderId, payOrderId, 1); // 支付成功 + console.log(res); - console.log("支付成功"); - wx.showToast({ - title: "购买成功", - duration: 2500 - }); + if(res.errMsg=='requestPayment:ok'){ + wx.showToast({ + title: "购买成功", + duration: 2500 + }); + } + wx.navigateBack({ delta: 2 }); }, + fail: res => { that.payOrderUpdate(that.data.orderId, payOrderId, 2); // 支付失败 console.log(res); - console.log("支付失败"); return; }, complete: res => { console.log(res); console.log("支付完成"); - var url = res.data.url; - console.log("get url", url); + // var url = res.data.url; + // console.log("get url", url); if (res.errMsg == "requestPayment:ok") { wx.showModal({ title: "提示", content: "支付成功" }); - if (url) { - setTimeout(function () { - wx.redirectTo({ - url: "/pages" + url - }); - }, 2000); - } else { - setTimeout(() => { - wx.navigateBack(); - }, 2000); - } - } else { - wx.showModal({ - title: "错误提示", - content: res.errMsg - }); + // if (url) { + // setTimeout(function () { + // wx.redirectTo({ + // url: "/pages" + url + // }); + // }, 2000); + // } else { + // setTimeout(() => { + // wx.navigateBack(); + // }, 2000); + // } + } + + else { + wx.showToast({ + title:'支付失败', + image:'./../../../assets/img/fail.png', + duration: 1500, + mask:false + }) } return; } diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 16c7576..ba79212 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -84,14 +84,11 @@ Page({ }); //createDate 创建时间 - //paymentTime 支付时间 var createDate = util.fmtDate(res.data.createDate); - // var paymentTime = util.fmtDate(res.data.paymentTime); console.log(createDate); that.setData({ createDate:createDate, - // paymentTime:util.timechuo(paymentTime), }) }); }, diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index 6208d9a..5c70f34 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -133,13 +133,14 @@ } .classif > view:nth-child(1) { display: block; + border-top:20rpx solid #f8f8f8; } .classif > view:nth-child(1) text:nth-child(2) { padding-left: 15rpx; } .classif > view:nth-child(3), .classif > view:nth-child(4) { - border-top: 20rpx solid #ededed; + border-top: 20rpx solid #f8f8f8; } .classif > view:nth-child(3) view text:nth-child(2) { padding-left: 15rpx; diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss index e7c0039..1d8fd52 100644 --- a/pages/order/index/index.wxss +++ b/pages/order/index/index.wxss @@ -88,7 +88,7 @@ padding: 0 4%; display: flex; justify-content: space-between; - border-bottom: 20rpx solid #ededed; + border-bottom: 20rpx solid #f8f8f8; } .payment view:nth-child(1) text:nth-child(1) { diff --git a/pages/rushToBuy/index.wxml b/pages/rushToBuy/index.wxml index 57fc25e..0077ffd 100644 --- a/pages/rushToBuy/index.wxml +++ b/pages/rushToBuy/index.wxml @@ -24,7 +24,6 @@ 剩余件数:{{item.remainInventory}}件 购买 - diff --git a/pages/user/index.wxss b/pages/user/index.wxss index ed27b4a..0f9db78 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -1,10 +1,10 @@ .margin { - background: #f5f5f5; + background: #f8f8f8; height: 20rpx; } .user { - background: #f5f5f5; + background: #f8f8f8; min-height: 100vh; } diff --git a/utils/util.js b/utils/util.js index 0fe687f..85b263a 100644 --- a/utils/util.js +++ b/utils/util.js @@ -77,6 +77,7 @@ function fmtDate(obj) { ); } +//计算下单的时间与现在的时间的 function timechuo(startTime) { var s1 = new Date(startTime.replace(/-/g, "/")); var s2 = new Date(); From 0980086307717d65c7ad9534e6512859e00fac4b Mon Sep 17 00:00:00 2001 From: meo <958484406@qq.com> Date: Tue, 28 Aug 2018 18:18:52 +0800 Subject: [PATCH 6/6] =?UTF-8?q?[=E6=88=91=E7=9A=84][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E6=88=91=E7=9A=84=3D>=E5=85=A8=E9=83=A8=E8=AE=A2=E5=8D=95=20?= =?UTF-8?q?=E5=BE=85=E4=BB=98=E6=AC=BE=E8=AE=A2=E5=8D=95=20=E5=B7=B2?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=AE=A2=E5=8D=95=E5=AF=B9=E5=BA=94=E5=88=B0?= =?UTF-8?q?=E7=9B=B8=E5=BA=94=E7=9A=84=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/coupon/detail/index.js | 1 + pages/user/index.wxml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 51b6882..85a5610 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -208,6 +208,7 @@ Page({ // wx.navigateBack(); // }, 2000); // } + } else { diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 17af6f8..05da31e 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -9,13 +9,13 @@ - + 我的订单 全部订单 - + 待付款 @@ -23,7 +23,7 @@ - + 已完成