From b62a8ecc9b5aa1e07d0f4b29b5d78e8a60bced90 Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Wed, 26 Jun 2024 15:24:15 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afix=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91=EF=BC=9A?=
 =?UTF-8?q?=E5=BE=85=E6=89=A7=E8=A1=8C=E8=AE=A2=E5=8D=95=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=A0=8F=20=E6=94=B9=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3=20?=
 =?UTF-8?q?=E3=80=90=E6=8F=8F=09=E8=BF=B0=E3=80=91=EF=BC=9A=20=09[?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0]=EF=BC=9A=E5=8F=AA=E5=8F=96=20=E5=B7=B2?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=20=E6=9C=AA=E9=80=81=E8=BE=BE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=20=09[=E8=BF=87=E7=A8=8B]=EF=BC=9A=E4=BB=8EgetPaidOrd?=
 =?UTF-8?q?erList=E6=8E=A5=E5=8F=A3=E6=8B=BF=E6=95=B0=E6=8D=AE=20=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=97=B6=E4=B9=9F=E8=B0=83=E7=94=A8=E6=AD=A4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20=09[=E5=BD=B1=E5=93=8D]=EF=BC=9A=20=E3=80=90?=
 =?UTF-8?q?=E7=BB=93=09=E6=9D=9F=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 src/components/QuestTabs.vue            |  8 ++++++--
 src/store/index.js                      | 18 +++++++++---------
 src/views/layout/components/headbar.vue | 16 ++++++++--------
 src/views/layout/index.vue              |  4 ++--
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/components/QuestTabs.vue b/src/components/QuestTabs.vue
index c245da0..d0f0dc8 100644
--- a/src/components/QuestTabs.vue
+++ b/src/components/QuestTabs.vue
@@ -8,8 +8,11 @@
               <div class="fb l w-30">
                 订单ID：{{ item.id }}
               </div>
-              <div class="r fb w-70 fr p-r-15">
-                下单时间：{{ parseTime(item.addtime) }}
+              <div v-if="item.refund_status !== '申请中'" class="r fb w-70 fr p-r-15">
+                下单时间：{{ parseTime(item.order_time) }}
+              </div>
+              <div v-else class="r fb w-70 fr p-r-15">
+                申请时间：{{ parseTime(item.refundapply_time) }}
               </div>
             </div>
           </template>
@@ -192,6 +195,7 @@ export default {
   watch: {
   },
   created () {
+    console.log(this.list)
   }
 }
 </script>
diff --git a/src/store/index.js b/src/store/index.js
index 8bf2765..990739b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -19,7 +19,7 @@ const store = new Vuex.Store({
     categoryList: [], // 分类列表(小程序)
     spuList: [], // 商品spu列表
     skuList: [], // 商品sku列表
-    orderList: [], // 订单列表
+    paidOrderList: [], // 已付款 订单列表
     logList: [], // 操作日志列表
     crosFrequency: null // 对频macadd
   },
@@ -73,10 +73,10 @@ const store = new Vuex.Store({
       state.skuList = list
     },
     /**
-     * @description: 设置订单列表
+     * @description: 设置 已付款 订单列表
      */
-    setOrderList (state, list) {
-      state.orderList = list
+    setPaidOrderList (state, list) {
+      state.paidOrderList = list
     },
     /**
      * @description: 向操作日志列表最后插入新的信息
@@ -929,18 +929,18 @@ const store = new Vuex.Store({
      * @description: 获取订单列表
      * @return {*} 列表
      */
-    async fetchOrderList ({ commit }) {
-      const res = await api.get('getOrderList', 'Admin')
+    async fetchPaidOrderList ({ commit }) {
+      const res = await api.get('getPaidOrderList', 'Admin')
       if (res.data.status === 1) {
-        const list = res.data.orderList
+        const list = res.data.paidOrderList
         list.forEach((item, index) => { // 拿到订单列表数据 直接把订单列表数据反序列化
           if (item.product_snapshot !== '') {
             list[index].product_snapshot = JSON.parse(item.product_snapshot)
           }
         })
-        commit('setOrderList', list)
+        commit('setPaidOrderList', list)
       } else {
-        commit('setOrderList', [])
+        commit('setPaidOrderList', [])
       }
       return res
     },
diff --git a/src/views/layout/components/headbar.vue b/src/views/layout/components/headbar.vue
index ff89091..9f9cd7b 100644
--- a/src/views/layout/components/headbar.vue
+++ b/src/views/layout/components/headbar.vue
@@ -32,7 +32,7 @@
       <el-button :type="pendingCount + processingCount + shippedCount + requestedCount !== 0 ? 'primary' : ''"
         @click="drawer = true" size="small" :icon="orderIcon" circle></el-button>
     </el-badge>
-    <el-drawer :visible.sync="drawer" size="40%" :append-to-body="true" :modal-append-to-body="false">
+    <el-drawer :visible.sync="drawer" size="60%" :append-to-body="true" :modal-append-to-body="false">
       <template slot="title">
         <div>
           <i class="l f-s-18 iconfont icon-jinjidingdan m-r-5 l-h-18"></i>
@@ -130,16 +130,16 @@ export default {
       return this.$store.state.settings.photoPath + this.$store.state.user.photo
     },
     /**
-     * @description: 获取订单列表
+     * @description: 获取 所有已付款订单列表
      */
-    orderList () {
-      return this.$store.state.orderList.filter(item => item.shop_id === this.shop_id)
+    paidOrderList () {
+      return this.$store.state.paidOrderList.filter(item => item.shop_id === this.shop_id)
     },
     /**
      * @description: 过滤 未接单 并且没有申请退款的 订单
      */
     pendingList () {
-      return this.orderList.filter(item => item.main_status === '已付款' && item.shipment_status === '未接单' && item.refund_status !== '申请中')
+      return this.paidOrderList.filter(item => item.main_status === '已付款' && item.shipment_status === '未接单' && item.refund_status !== '申请中')
     },
     /**
      * @description: 未接单 总数
@@ -151,7 +151,7 @@ export default {
      * @description: 过滤 已接单 并且没有申请退款的 订单
      */
     processingList () {
-      return this.orderList.filter(item => item.main_status === '已付款' && item.shipment_status === '已接单' && item.refund_status !== '申请中')
+      return this.paidOrderList.filter(item => item.main_status === '已付款' && item.shipment_status === '已接单' && item.refund_status !== '申请中')
     },
     /**
      * @description: 已接单 总数
@@ -163,7 +163,7 @@ export default {
      * @description: 过滤 已发货 并且没有申请退款的 订单
      */
     shippedList () {
-      return this.orderList.filter(item => item.main_status === '已付款' && item.shipment_status === '已发货' && item.refund_status !== '申请中')
+      return this.paidOrderList.filter(item => item.main_status === '已付款' && item.shipment_status === '已发货' && item.refund_status !== '申请中')
     },
     /**
      * @description: 已发货 总数
@@ -175,7 +175,7 @@ export default {
      * @description: 过滤 退款申请中 订单
      */
     requestedList () {
-      return this.orderList.filter(item => item.refund_status === '申请中')
+      return this.paidOrderList.filter(item => item.refund_status === '申请中')
     },
     /**
      * @description: 退款申请中 总数
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index dab1025..2ca82bb 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -67,7 +67,7 @@ export default {
     this.$store.dispatch('fetchCategoryList')// 获取分类列表（小程序）
     this.$store.dispatch('fetchSpuList')// 获取商品spu列表
     this.$store.dispatch('fetchSkuList')// 获取商品sku列表
-    this.$store.dispatch('fetchOrderList')// 获取订单列表
+    this.$store.dispatch('fetchPaidOrderList')// 获取订单列表
   },
   watch: {
     /**
@@ -117,7 +117,7 @@ export default {
       mqtt.doSubscribe(`refreshQuestList/${this.shop_id}`, (res) => {
         if (res.topic.indexOf(`refreshQuestList/${this.shop_id}`) > -1) {
           this.$store.dispatch('fetchSiteList')// 刷新站点列表
-          this.$store.dispatch('fetchOrderList')// 刷新订单列表 ps:待发货及待收货 并且不是退款成功状态
+          this.$store.dispatch('fetchPaidOrderList')// 刷新订单列表 ps:待发货及待收货 并且不是退款成功状态
         }
       })
     }