From 4780ae5b18000dac4519ca743fa3b32ff8d5f12c Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Thu, 2 Feb 2023 17:06:32 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=B8=E9=94=80=E8=87=AA=E6=8F=90?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/order/order/orderDetail.vue | 9 ++++++++-
 seller/src/views/order/order/orderList.vue   | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index 5fd939fb..cef64414 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -117,7 +117,7 @@
           </template>
         </Col>
         <Col span="12">
-          <div class="div-item">
+          <div class="div-item" v-if="orderInfo.order.deliveryMethod != 'SELF_PICK_UP'">
             <div class="div-item-left">收货信息：</div>
             <div class="div-item-right">
               {{ orderInfo.order.consigneeName }}
@@ -126,6 +126,13 @@
               {{ orderInfo.order.consigneeDetail }}
             </div>
           </div>
+          <div class="div-item"  v-if="orderInfo.order.deliveryMethod == 'SELF_PICK_UP'">
+            <div class="div-item-left">自提信息：</div>
+            <div class="div-item-right">
+              {{ orderInfo.order.storeAddressPath }}
+              {{ orderInfo.order.storeAddressMobile }}
+            </div>
+          </div>
           <div class="div-item">
             <div class="div-item-left">支付方式：</div>
             <div class="div-item-right">
diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue
index 5db5354a..8aaf7b54 100644
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@@ -39,6 +39,7 @@
             <Option value="DELIVERED">已发货</Option>
             <Option value="COMPLETED">已完成</Option>
             <Option value="CANCELLED">已取消</Option>
+            <Option value="STAY_PICKED_UP">待自提</Option>
           </Select>
         </Form-item>
         <Form-item label="订单类型" prop="orderType">
@@ -225,6 +226,10 @@ export default {
               return h("div", [
                 h("tag", { props: { color: "geekblue" } }, "待发货"),
               ]);
+            }else if (params.row.orderStatus == "STAY_PICKED_UP") {
+              return h("div", [
+                h("tag", { props: { color: "geekblue" } }, "待自提"),
+              ]);
             } else if (params.row.orderStatus == "DELIVERED") {
               return h("div", [
                 h("tag", { props: { color: "cyan" } }, "已发货"),

From f0628c59952468971846995215a510deb00681ed Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Thu, 2 Feb 2023 18:04:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=B1=E6=95=88=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/home/userCenter/MyTracks.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/buyer/src/pages/home/userCenter/MyTracks.vue b/buyer/src/pages/home/userCenter/MyTracks.vue
index 94464f28..a75d69fa 100644
--- a/buyer/src/pages/home/userCenter/MyTracks.vue
+++ b/buyer/src/pages/home/userCenter/MyTracks.vue
@@ -112,7 +112,9 @@ export default {
       tracksList(this.params).then((res) => {
         this.spinShow = false;
         if (res.success && res.result.records.length) {
-          this.list = res.result.records;
+          this.list = res.result.records.filter(item =>{
+            return item != null
+          });
           this.total = res.result.total
         } else {
           this.list = [];

From cfd2529caf0cfafc41ca1eb3258e448be4b5f784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E8=89=AFking?= <2244255345@qq.com>
Date: Fri, 3 Feb 2023 10:06:22 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E5=88=AB?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/page/article-manage/hotWords.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manager/src/views/page/article-manage/hotWords.vue b/manager/src/views/page/article-manage/hotWords.vue
index 2753774b..450d4c39 100644
--- a/manager/src/views/page/article-manage/hotWords.vue
+++ b/manager/src/views/page/article-manage/hotWords.vue
@@ -34,7 +34,7 @@ export default {
       templatesWay: [
         {
           template: "todayHotWords",
-          label: "今日热次",
+          label: "今日热词",
         },
         {
           template: "historyHotWords",