From d9a5f3f06a14b8a6dff010f4e65f048b2a428283 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Fri, 24 Mar 2023 11:02:01 +0800
Subject: [PATCH 1/4] =?UTF-8?q?improve:=20=E5=AE=A2=E6=9C=8D=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/kefu/pc/components/rightMenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/admin/src/pages/kefu/pc/components/rightMenu.vue b/template/admin/src/pages/kefu/pc/components/rightMenu.vue
index 9f3685ab7..805091b07 100644
--- a/template/admin/src/pages/kefu/pc/components/rightMenu.vue
+++ b/template/admin/src/pages/kefu/pc/components/rightMenu.vue
@@ -147,7 +147,7 @@
                   <Button
                     class="btn"
                     type="primary"
-                    v-if="item._status._type == 1 && item._status._type != 0"
+                    v-if="item._status._type == 1 && item._status._type != 0 && item.shipping_type != 2"
                     @click.stop="openDelivery(item)"
                     >发货</Button
                   >

From d4239384468f104d4b4c51d7fd99705a5f83c1f1 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Fri, 24 Mar 2023 11:02:19 +0800
Subject: [PATCH 2/4] =?UTF-8?q?improve:=20=E7=A0=8D=E4=BB=B7=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/marketing/storeBargain/create.vue    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/template/admin/src/pages/marketing/storeBargain/create.vue b/template/admin/src/pages/marketing/storeBargain/create.vue
index a9cd6b137..333314057 100644
--- a/template/admin/src/pages/marketing/storeBargain/create.vue
+++ b/template/admin/src/pages/marketing/storeBargain/create.vue
@@ -295,7 +295,7 @@
                 </FormItem>
               </Col>
             </Row>
-            <div v-show="current === 2">
+            <div v-if="current === 2">
               <FormItem label="内容：">
                 <WangEditor
                   style="width: 90%"
@@ -304,7 +304,7 @@
                 ></WangEditor>
               </FormItem>
             </div>
-            <div v-show="current === 3">
+            <div v-if="current === 3">
               <FormItem label="规则：">
                 <WangEditor
                   style="width: 90%"
@@ -789,6 +789,8 @@ export default {
           this.formValidate = info;
           this.formValidate.rule = info.rule === null ? '' : info.rule;
           this.$set(this.formValidate, 'items', info.attrs.items);
+          this.description = this.formValidate.description;
+
           this.columns = info.attrs.header;
           let radio = {
             title: '选择',
@@ -885,6 +887,9 @@ export default {
               }
             }
             this.current += 1;
+            setTimeout((e) => {
+              this.formValidate.description += ' ';
+            }, 0);
           } else {
             return this.$Message.warning('请完善您的信息');
           }
@@ -892,6 +897,11 @@ export default {
       } else {
         if (this.formValidate.image) {
           this.current += 1;
+          if (this.current == 3) {
+            setTimeout((e) => {
+              this.formValidate.rule += ' ';
+            }, 0);
+          }
         } else {
           this.$Message.warning('请选择商品');
         }

From a34688e63270d98d1753ad156bfc68994f63297c Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Fri, 24 Mar 2023 11:02:37 +0800
Subject: [PATCH 3/4] =?UTF-8?q?improve:=20=E5=8F=91=E7=A5=A8=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/order/invoice/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/template/admin/src/pages/order/invoice/index.vue b/template/admin/src/pages/order/invoice/index.vue
index 59c0612b1..85e490bee 100644
--- a/template/admin/src/pages/order/invoice/index.vue
+++ b/template/admin/src/pages/order/invoice/index.vue
@@ -68,7 +68,7 @@
           </Row>
         </Form>
       </div>
-    </card>
+    </Card>
     <Card :bordered="false" dis-hover>
       <Tabs v-model="currentTab" @on-click="onClickTab" v-if="tablists" class="mb20">
         <TabPane :label="'全部发票（' + tablists.all + '）'" name=" " />
@@ -535,7 +535,7 @@ export default {
       this.getList();
     },
     getTabs() {
-      orderInvoiceChart()
+      orderInvoiceChart(this.orderData)
         .then((res) => {
           this.tablists = res.data;
         })
@@ -546,6 +546,7 @@ export default {
     // 精确搜索()
     orderSearch() {
       this.orderData.page = 1;
+      this.getTabs();
       this.getList();
     },
     // 具体日期搜索()；

From 0e9454932f7680a6a88c72f3d3fc049cfb3a38eb Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Fri, 24 Mar 2023 11:03:04 +0800
Subject: [PATCH 4/4] =?UTF-8?q?improve:=20=E6=8E=A5=E5=8F=A3=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6/=E9=A1=B5=E9=9D=A2title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/api/order.js | 3 ++-
 template/uni-app/pages.json     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/template/admin/src/api/order.js b/template/admin/src/api/order.js
index 0d817a3b7..6ba1e119c 100644
--- a/template/admin/src/api/order.js
+++ b/template/admin/src/api/order.js
@@ -26,10 +26,11 @@ export function orderList(data) {
  * @description 发票头部统计
  * @param {Object} param data {Object} 传值参数
  */
-export function orderInvoiceChart() {
+export function orderInvoiceChart(data) {
   return request({
     url: 'order/invoice/chart',
     method: 'get',
+    params: data,
   });
 }
 
diff --git a/template/uni-app/pages.json b/template/uni-app/pages.json
index 2d9c22c9b..8bb91361f 100644
--- a/template/uni-app/pages.json
+++ b/template/uni-app/pages.json
@@ -395,7 +395,7 @@
 				{
 					"path": "user_invoice_order/index",
 					"style": {
-						"navigationBarTitleText": "订单详情",
+						"navigationBarTitleText": "发票详情",
 						"app-plus": {
 							// #ifdef APP-PLUS
 							"titleNView": {