From 57bf4a91592e4773bb4d266e2b7d02524f754474 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Sun, 9 Oct 2022 15:45:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 v2_0_0_C/coupon/myOrder.html | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/v2_0_0_C/coupon/myOrder.html b/v2_0_0_C/coupon/myOrder.html
index b56c953..ef22392 100644
--- a/v2_0_0_C/coupon/myOrder.html
+++ b/v2_0_0_C/coupon/myOrder.html
@@ -28,7 +28,7 @@
             <div class="content-item" v-for="item in orderList" :key="item.order_number">
                 <div class="top">
                     <p class="time">{{item.update_time}}</p>
-                    <p class="status" :style="{color:statusColor(item.status)}">{{item.status_text}}
+                    <p class="status" :style="{color:statusColor(item)}">{{item.status_text}}
                     </p>
                 </div>
                 <div class="middle">
@@ -44,7 +44,10 @@
                 <div class="bottom">
                     <p class="money">实付金额：￥<span>{{item.pay_amount}}</span></p>
                     <p class="button" @click="immediatelyPay(item)" v-show="item.status===6">立即支付</p>
-                    <p class="button" @click="goExchange(item)" v-show="item.status===0">去兑换</p>
+                    <!-- 立减金待领取 -->
+                    <p class="button" @click="goExchange(item)" v-show="item.status===1&&item.type===2">去兑换</p>
+                    <!-- 立减金领取过期 -->
+                    <p class="button filter" v-show="item.status===5&&item.type===2">去兑换</p>
                 </div>
             </div>
             <!-- 空状态 -->
@@ -111,19 +114,13 @@
 
             methods: {
                 /* 根据不同状态展示 订单样式和表现 */
-                statusColor (status) {
-                    switch (status) {
-                        /* 兑换码状态 */
-                        case 3:
-                            return '#FD553D'
-                        case 2:
-                            return '#44D27D'
-                        case 6:
-                            return '#F28542'
-
-                        /* 立减金状态 */
-                        case 4:
-                            return '#4193EE'
+                statusColor ({ type, status }) {
+                    if (type === 1) {
+                        const colorArray = ['#FD553D', '#FD553D', '#44D27D', '#F28542', '#4193EE', '#F28542', '#4193EE']
+                        return colorArray[status];
+                    } else {
+                        const colorArray = ['#FD553D', '#FD553D', '#44D27D', '#F28542', '#4193EE', '#F28542', '#4193EE']
+                        return colorArray[status];
                     }
                 },
 
@@ -232,14 +229,7 @@
                             }
                             return
                         }
-
-                        if (code === 200) {
-                            data.map(item => {
-                                if (item.type === 2 && item.status === 2) item.status = 4
-                                if (item.type === 2 && item.status === 1) item.status = 6
-                            })
-                            this.orderList = data
-                        }
+                        if (code === 200) this.orderList = data
                     })
                 },
 

From 0f2d0e95328457ac9f998319f8d2722ae3a5b52d Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Sun, 9 Oct 2022 15:48:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E9=BB=98=E8=AE=A4=E4=B8=BA=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=AE=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 v2_0_0_C/coupon/exchange.html | 2 +-
 v2_0_0_C/coupon/myOrder.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2_0_0_C/coupon/exchange.html b/v2_0_0_C/coupon/exchange.html
index 5e65077..ca5c879 100644
--- a/v2_0_0_C/coupon/exchange.html
+++ b/v2_0_0_C/coupon/exchange.html
@@ -205,7 +205,7 @@
                     'https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220120/9bedd7af6a8a570be8f2858564f9ec6d.png'
                 ],
                 show: false,  /* 控制支付弹窗 */
-                payType: 1, /* 支付方式 */
+                payType: 2, /* 支付方式 */
 
                 /* 提示框状态 */
                 popShow: false,
diff --git a/v2_0_0_C/coupon/myOrder.html b/v2_0_0_C/coupon/myOrder.html
index ef22392..03f52a1 100644
--- a/v2_0_0_C/coupon/myOrder.html
+++ b/v2_0_0_C/coupon/myOrder.html
@@ -79,7 +79,7 @@
             el: "#app",
             data () {
                 return {
-                    active: 1, /* 选择支付方式 */
+                    active: 2, /* 选择支付方式 */
                     show: false,  /* 支付弹窗状态 */
                     limit: 50,
                     page: 1,

From e317c8131f83339964d83d384d1fb4c8398268b6 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Sun, 9 Oct 2022 15:56:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 v2_0_0_C/coupon/myOrder.html | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/v2_0_0_C/coupon/myOrder.html b/v2_0_0_C/coupon/myOrder.html
index 03f52a1..b7de6f3 100644
--- a/v2_0_0_C/coupon/myOrder.html
+++ b/v2_0_0_C/coupon/myOrder.html
@@ -28,7 +28,7 @@
             <div class="content-item" v-for="item in orderList" :key="item.order_number">
                 <div class="top">
                     <p class="time">{{item.update_time}}</p>
-                    <p class="status" :style="{color:statusColor(item)}">{{item.status_text}}
+                    <p class="status" :style="{color:statusColor(item.status)}">{{item.status_text}}
                     </p>
                 </div>
                 <div class="middle">
@@ -114,14 +114,9 @@
 
             methods: {
                 /* 根据不同状态展示 订单样式和表现 */
-                statusColor ({ type, status }) {
-                    if (type === 1) {
-                        const colorArray = ['#FD553D', '#FD553D', '#44D27D', '#F28542', '#4193EE', '#F28542', '#4193EE']
-                        return colorArray[status];
-                    } else {
-                        const colorArray = ['#FD553D', '#FD553D', '#44D27D', '#F28542', '#4193EE', '#F28542', '#4193EE']
-                        return colorArray[status];
-                    }
+                statusColor (status) {
+                    const colorArray = ['#f28542', '#f28542', '#44D27D', '#fd553d', '#fd553d', '#aaaaaa', '#fd553d'];
+                    return colorArray[status];
                 },
 
                 /* 图标分流 */