From 4b9948ec4008aa27d901893041f661d4e3c0c1fd Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Wed, 26 Jun 2024 15:59:53 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Arefactor=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E6=9B=B4=E6=94=B9=E9=A3=8E=E7=90=B4=E6=8A=98=E5=8F=A0?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20=E5=92=8Ctabs=E6=A0=87=E7=AD=BE=E6=BF=80?=
 =?UTF-8?q?=E6=B4=BB=E6=A0=B7=E5=BC=8F=20=E3=80=90=E6=8F=8F=09=E8=BF=B0?=
 =?UTF-8?q?=E3=80=91=EF=BC=9A=20=09[=E5=8E=9F=E5=9B=A0]=EF=BC=9A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=AF=E8=AF=BB=E6=80=A7=20=09[=E8=BF=87=E7=A8=8B]?=
 =?UTF-8?q?=EF=BC=9A=E5=AD=97=E4=BD=93=E6=A0=B7=E5=BC=8F=E5=8F=98=E8=89=B2?=
 =?UTF-8?q?=20=E5=8A=A0=E7=B2=97=20=09[=E5=BD=B1=E5=93=8D]=EF=BC=9A=20?=
 =?UTF-8?q?=E3=80=90=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            | 19 +++++++++++--------
 src/views/layout/components/headbar.vue |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/components/QuestTabs.vue b/src/components/QuestTabs.vue
index d0f0dc8..935269b 100644
--- a/src/components/QuestTabs.vue
+++ b/src/components/QuestTabs.vue
@@ -4,14 +4,14 @@
       <template v-if="list.length != 0">
         <el-collapse-item class="mainFontColor" v-for="(item, index) in list" :key="index" :name="item.id">
           <template slot="title">
-            <div class="clearB w-100">
-              <div class="fb l w-30">
+            <div class="clearB w-100" :class="activeNames === item.id ? 'fc-b fb' : ''">
+              <div class="l w-30">
                 订单ID：{{ item.id }}
               </div>
-              <div v-if="item.refund_status !== '申请中'" class="r fb w-70 fr p-r-15">
+              <div v-if="item.refund_status !== '申请中'" class="r w-70 fr p-r-15">
                 下单时间：{{ parseTime(item.order_time) }}
               </div>
-              <div v-else class="r fb w-70 fr p-r-15">
+              <div v-else class="r w-70 fr p-r-15">
                 申请时间：{{ parseTime(item.refundapply_time) }}
               </div>
             </div>
@@ -30,7 +30,7 @@
             <el-descriptions-item label="订单详情" span="3">
               <el-table v-for="spu, i in item.product_snapshot" :show-header="i === 0" :data="spu.sku_arr"
                 style="width: 100%">
-                <el-table-column prop="sku_name" label="名称">
+                <el-table-column prop="sku_name" :label="spu.spu_name">
                 </el-table-column>
                 <el-table-column label="编号">
                   <template slot-scope="scope">
@@ -81,10 +81,10 @@
               </el-button-group>
               <el-button-group v-else-if="item.refund_status !== '申请中' && item.shipment_status == '已发货'">
                 <el-button type="primary" icon="iconfont icon-chengjie">
-                  <font class="m-l-5">未能送达</font>
+                  <font class="m-l-5">已送达</font>
                 </el-button>
                 <el-button type="danger" icon="iconfont icon-cuowu">
-                  <font class="m-l-5">安全送达</font>
+                  <font class="m-l-5">未送达</font>
                 </el-button>
               </el-button-group>
             </el-descriptions-item>
@@ -195,7 +195,6 @@ export default {
   watch: {
   },
   created () {
-    console.log(this.list)
   }
 }
 </script>
@@ -205,4 +204,8 @@ export default {
   display: flex;
   justify-content: space-between;
 }
+
+.demo {
+  background-color: darkgray !important;
+}
 </style>
diff --git a/src/views/layout/components/headbar.vue b/src/views/layout/components/headbar.vue
index 9f9cd7b..219bc43 100644
--- a/src/views/layout/components/headbar.vue
+++ b/src/views/layout/components/headbar.vue
@@ -44,7 +44,7 @@
       <el-button-group class="m-l-20 m-b-15">
         <SelectionShopId v-model="shop_id" />
       </el-button-group>
-      <el-tabs type="card">
+      <el-tabs type="border-card">
         <el-tab-pane>
           <template slot="label">
             <span>未接单</span>