From 55fb1700c6d2e18eb9e7ec07a8d07dfcd8100583 Mon Sep 17 00:00:00 2001 From: GJW200011 <2399547226@qq.com> Date: Thu, 21 Oct 2021 14:21:32 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E8=BD=AE=E6=AC=A1=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E4=BF=AE=E6=94=B9+=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/ui/dram_activeleft.png | Bin 5674 -> 3287 bytes images/ui/dram_activeright.png | Bin 5501 -> 3345 bytes pages/user/my_order/my_order.js | 50 ++++++++++++++++++++++-------- pages/user/my_order/my_order.wxml | 15 ++++++--- 4 files changed, 47 insertions(+), 18 deletions(-) diff --git a/images/ui/dram_activeleft.png b/images/ui/dram_activeleft.png index e508371511e18bccf3c033c7c0b9575e2310bf10..5c22a7ac0355a8ddc2b109ffd0c8ecf0e0ea9698 100644 GIT binary patch literal 3287 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 E53A9g;s5{u diff --git a/images/ui/dram_activeright.png b/images/ui/dram_activeright.png index dac42fe85320728b3c122e31119358530b032bf7..c056e2ada358ffd1253901cce7a3897ed0558c03 100644 GIT binary patch literal 3345 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 diff --git a/pages/user/my_order/my_order.js b/pages/user/my_order/my_order.js index f2f1f70..444a707 100644 --- a/pages/user/my_order/my_order.js +++ b/pages/user/my_order/my_order.js @@ -14,13 +14,14 @@ Page({ switch_: ["麻花官网", "第三方平台"], page: 1 }, - //回到顶部 - goTop: function (e) { // 一键回到顶部 - if (wx.pageScrollTo) { - wx.pageScrollTo({ - scrollTop: 0 - }) - }}, + //回到顶部 + goTop: function (e) { // 一键回到顶部 + if (wx.pageScrollTo) { + wx.pageScrollTo({ + scrollTop: 0 + }) + } + }, init_order(type) { http("/api/v1/order-list", "get", { type @@ -37,12 +38,33 @@ Page({ }, detail(e) { wx.navigateTo({ - url: '/pages/user/order_detail/order_detail?order_no=' + e.currentTarget.dataset.order_no+'&_type='+this.data._type, + url: '/pages/user/order_detail/order_detail?order_no=' + e.currentTarget.dataset.order_no + '&_type=' + this.data._type, }) }, pay(e) { wx.navigateTo({ - url: '/pages/user/order_detail/order_detail?order_no=' + e.currentTarget.dataset.order_no+'&_type='+this.data._type, + url: '/pages/user/order_detail/order_detail?order_no=' + e.currentTarget.dataset.order_no + '&_type=' + this.data._type, + }) + }, + dele(e) { + var that = this + wx.showModal({ + content: '订单删除不可恢复,是否删除?', + success(res) { + if (res.confirm) { + http("/api/v1/order-delete", "get", { + order_no: e.currentTarget.dataset.order_no + }).then(res => { + wx.showToast({ + title: '删除成功!', + duration: 1000 + }) + setTimeout(() => { + that.init_order(1) + }, 200); + }) + } + } }) }, cancel(e) { @@ -55,10 +77,12 @@ Page({ order_no: e.currentTarget.dataset.order_no }).then(res => { wx.showToast({ - title: '取消订单成功!', + title: '取消成功!', duration: 1000 }) - that.init_order(1) + setTimeout(() => { + that.init_order(1) + }, 200); }) } } @@ -115,10 +139,10 @@ Page({ onReachBottom: function () { if (this.data.has_more) { wx.showNavigationBarLoading(); //在标题栏中显示加载图标 - let page = this.data.page + 1 + let page = this.data.page + 1 let _data = { type: this.data._type, - page + page } http("/api/v1/order-list", "get", _data).then(res => { wx.hideNavigationBarLoading(); //完成停止加载图标 diff --git a/pages/user/my_order/my_order.wxml b/pages/user/my_order/my_order.wxml index a93bae7..60abb0e 100644 --- a/pages/user/my_order/my_order.wxml +++ b/pages/user/my_order/my_order.wxml @@ -6,8 +6,7 @@ 还未查询到您的观看记录 - + 订单号:{{item.order_no}} @@ -28,9 +27,15 @@ - - 取消订单 - 立即支付 + + + 取消订单 + 立即支付 + + + + 删除订单 +