From 90babcbf11945719d253f4cb49f5b7c9c1cce858 Mon Sep 17 00:00:00 2001 From: fox <1466778434@qq.com> Date: Sat, 22 Mar 2025 20:06:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E6=83=A0=E5=88=B8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/couponList/couponList.vue | 228 ++++++----------------- pages.json | 18 +- pages/index/center.vue | 4 +- pages_order/mine/coupon.vue | 66 +++++-- pages_order/static/coupon/coupon-bg-overtime.png | Bin 0 -> 22769 bytes pages_order/static/coupon/coupon-bg-used.png | Bin 0 -> 22503 bytes pages_order/static/coupon/coupon-bg-useful.png | Bin 0 -> 23432 bytes 7 files changed, 120 insertions(+), 196 deletions(-) create mode 100644 pages_order/static/coupon/coupon-bg-overtime.png create mode 100644 pages_order/static/coupon/coupon-bg-used.png create mode 100644 pages_order/static/coupon/coupon-bg-useful.png diff --git a/components/couponList/couponList.vue b/components/couponList/couponList.vue index 0db611d..21d1ee4 100644 --- a/components/couponList/couponList.vue +++ b/components/couponList/couponList.vue @@ -2,45 +2,23 @@ - - - - - - - - - ¥ - - {{ item.money }} - - - - - - 限{{ formatDate(item.stateTime) }} - {{ formatDate(item.endTime) }} - - - 满{{ item.useMoney }}可用 - - - - - - - - - - {{ status[item.state] }} - - - - - - + + + + + + + + + + {{ item.money }} + {{ `有效期至${item.endTime}` }} @@ -69,6 +47,26 @@ //获取优惠券列表 getCouponList() { + // todo: delte test data + + this.couponList = [ + { + state: 0, + money: 40, + endTime: '2025-06-12', + }, + { + state: 1, + money: 40, + endTime: '2025-06-12', + }, + { + state: 2, + money: 40, + endTime: '2025-06-12', + }, + ] + return let requestData = { ...this.queryParams, state: this.state ? this.state : 0 @@ -120,147 +118,35 @@ \ No newline at end of file diff --git a/pages.json b/pages.json index 80c1151..259d95b 100644 --- a/pages.json +++ b/pages.json @@ -73,6 +73,15 @@ { "path": "mine/withdraw" }, + { + "path": "mine/runningWater" + }, + { + "path": "mine/promotion" + }, + { + "path": "mine/coupon" + }, { "path": "mine/verifyRecord" }, @@ -82,9 +91,6 @@ { "path": "mine/purse" }, - { - "path": "mine/runningWater" - }, { "path": "mine/address" }, @@ -118,9 +124,6 @@ { "path": "mine/recharge" }, - { - "path": "mine/promotion" - }, { "path": "home/notice" }, @@ -136,9 +139,6 @@ { "path": "mine/moreCommodity" }, - { - "path": "mine/coupon" - }, { "path": "mine/updateUser" }, diff --git a/pages/index/center.vue b/pages/index/center.vue index 110035e..a868c79 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -98,13 +98,11 @@ 我的团队 - 邀请好友 - - + 优惠券 diff --git a/pages_order/mine/coupon.vue b/pages_order/mine/coupon.vue index 4f33ee5..811becf 100644 --- a/pages_order/mine/coupon.vue +++ b/pages_order/mine/coupon.vue @@ -1,12 +1,35 @@