From 5d5a8455239758cc9f634a5661b61b5ef11548b0 Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Thu, 14 Sep 2023 15:06:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E6=80=A7=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/home/home.vue                      | 2 +-
 seller/src/views/promotion/pintuan/pintuan-edit.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/seller/src/views/home/home.vue b/seller/src/views/home/home.vue
index eedc74e9..639fbe3f 100644
--- a/seller/src/views/home/home.vue
+++ b/seller/src/views/home/home.vue
@@ -162,7 +162,7 @@
           </div>
           <div>
             <div class="counts">{{ homeData.goodsNum || 0 }}</div>
-            <div>整体商品数量</div>
+            <div>上架商品数量</div>
           </div>
 
         </div>
diff --git a/seller/src/views/promotion/pintuan/pintuan-edit.vue b/seller/src/views/promotion/pintuan/pintuan-edit.vue
index 7905544d..fc6f6a9c 100644
--- a/seller/src/views/promotion/pintuan/pintuan-edit.vue
+++ b/seller/src/views/promotion/pintuan/pintuan-edit.vue
@@ -35,7 +35,7 @@
             </Radio>
           </RadioGroup>
           <br />
-          <span style="color: #cccccc">开启虚拟成团后，24小时人数未满的团，系统将会模拟匿名买家凑满人数，使该团成团；您只需要对已付款参团的真实买家发货；建议合理开启以提高</span>
+          <span style="color: #cccccc">开启虚拟成团后，24小时人数未满的团，系统将会模拟匿名买家凑满人数，使该团成团；您只需要对已付款参团的真实买家发货；建议合理开启以提高成团率</span>
         </FormItem>
         <FormItem label="拼团规则" prop="pintuanRule">
           <Input v-model="form.pintuanRule" type="textarea" :rows="4" clearable maxlength="255" style="width: 260px" />
@@ -173,7 +173,7 @@ export default {
           this.form = data;
           // 此处将值转换为 1 true ，0 false 不然ivew radio组件会报错
           this.form.fictitious ? this.$set(this.form, "fictitious", 1)  : this.$set(this.form, "fictitious", 0);
-    
+
        }
       });
     },

From 76fc55fdd0dd9ed28994f7b48f540e0e21eb1245 Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Thu, 14 Sep 2023 16:58:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?improve:=20=E7=BB=9F=E4=B8=80=E7=89=A9?=
 =?UTF-8?q?=E6=B5=81=E5=8D=95=E5=8F=B7=E5=90=8D=E8=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/home/orderCenter/AfterSale.vue               | 4 ++--
 buyer/src/pages/home/orderCenter/AfterSaleDetail.vue         | 4 ++--
 manager/src/views/order/after-order/afterSaleOrderDetail.vue | 2 +-
 seller/src/views/order/after-order/reurnGoodsOrderDetail.vue | 2 +-
 seller/src/views/order/order/orderDetail.vue                 | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/buyer/src/pages/home/orderCenter/AfterSale.vue b/buyer/src/pages/home/orderCenter/AfterSale.vue
index fdd92c5b..d0f89578 100644
--- a/buyer/src/pages/home/orderCenter/AfterSale.vue
+++ b/buyer/src/pages/home/orderCenter/AfterSale.vue
@@ -95,8 +95,8 @@
               <Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option>
             </Select>
           </FormItem>
-          <FormItem label="快递单号" prop="logisticsNo">
-            <Input v-model="form.logisticsNo" placeholder="请填写快递单号"></Input>
+          <FormItem label="物流单号" prop="logisticsNo">
+            <Input v-model="form.logisticsNo" placeholder="请填写物流单号"></Input>
           </FormItem>
           <FormItem label="发货时间" prop="mDeliverTime">
             <DatePicker type="date" style="width:100%" v-model="form.mDeliverTime" @on-change="changeTime"
diff --git a/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
index 859ebf5d..ffd9359a 100644
--- a/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
+++ b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
@@ -85,8 +85,8 @@
               <Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option>
             </Select>
           </FormItem>
-          <FormItem label="快递单号" prop="logisticsNo">
-            <Input v-model="form.logisticsNo" placeholder="请填写快递单号"></Input>
+          <FormItem label="物流单号" prop="logisticsNo">
+            <Input v-model="form.logisticsNo" placeholder="请填写物流单号"></Input>
           </FormItem>
           <FormItem label="发货时间" prop="mDeliverTime">
             <DatePicker type="date" style="width:100%" v-model="form.mDeliverTime" @on-change="changeTime" format="yyyy-MM-dd" placeholder="选择发货时间"></DatePicker>
diff --git a/manager/src/views/order/after-order/afterSaleOrderDetail.vue b/manager/src/views/order/after-order/afterSaleOrderDetail.vue
index 083ec6c3..912326a6 100644
--- a/manager/src/views/order/after-order/afterSaleOrderDetail.vue
+++ b/manager/src/views/order/after-order/afterSaleOrderDetail.vue
@@ -340,7 +340,7 @@
           </dd>
         </dl>
         <dl>
-          <dt>快递单号：</dt>
+          <dt>物流单号：</dt>
           <dd>
             <div class="text-box">{{ afterSaleInfo.mlogisticsNo }}</div>
           </dd>
diff --git a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
index 8cefad8c..4a34fa73 100644
--- a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
+++ b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
@@ -326,7 +326,7 @@
           </dd>
         </dl>
         <dl>
-          <dt>快递单号：</dt>
+          <dt>物流单号：</dt>
           <dd>
             <div nctype="ordersSn" class="text-box">{{ logisticsInfo.logisticCode }}</div>
           </dd>
diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index 30ad2a27..740c61c0 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -357,7 +357,7 @@
           </dd>
         </dl>
         <dl>
-          <dt>快递单号：</dt>
+          <dt>物流单号：</dt>
           <dd>
             <div nctype="ordersSn" class="text-box">
               {{ logisticsInfo.logisticCode || orderInfo.order.logisticsNo }}