From c8407395f11e7297975a21385511516e77996185 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 27 Feb 2023 14:52:09 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/cms/articleCategory/index.vue   |  4 ++--
 .../admin/src/pages/finance/balance/index.vue |  6 +-----
 .../src/pages/finance/capitalFlow/index.vue   |  3 +--
 .../src/pages/finance/commission/index.vue    |  1 -
 .../pages/marketing/point_record/index.vue    |  7 +------
 .../marketing/storeBargain/bargainList.vue    |  1 -
 .../storeCombination/combinaList.vue          |  1 -
 .../components/tableList.vue                  |  2 +-
 .../admin/src/pages/order/invoice/index.vue   |  1 -
 .../admin/src/pages/order/refund/index.vue    |  5 +++--
 .../src/pages/product/productList/index.vue   |  2 +-
 .../src/pages/product/productReply/index.vue  |  2 +-
 .../pages/setting/membershipLevel/index.vue   |  2 +-
 .../pages/setting/multiLanguage/country.vue   |  4 ++--
 .../src/pages/user/grade/record/index.vue     |  1 -
 .../pages/extension/customer_list/chat.vue    | 19 +++++++++++--------
 16 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/template/admin/src/pages/cms/articleCategory/index.vue b/template/admin/src/pages/cms/articleCategory/index.vue
index bc3ba2c13..bf296f1a1 100644
--- a/template/admin/src/pages/cms/articleCategory/index.vue
+++ b/template/admin/src/pages/cms/articleCategory/index.vue
@@ -36,9 +36,9 @@
           </Col>
         </Row>
       </Form>
-      <Divider dashed />
+      <!-- <Divider dashed /> -->
       <vxe-table
-        class="vxeTable"
+        class="vxeTable mt25"
         highlight-hover-row
         :loading="loading"
         header-row-class-name="false"
diff --git a/template/admin/src/pages/finance/balance/index.vue b/template/admin/src/pages/finance/balance/index.vue
index bbfd43e8c..cf1198075 100644
--- a/template/admin/src/pages/finance/balance/index.vue
+++ b/template/admin/src/pages/finance/balance/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <Card :bordered="false" dis-hover class="ivu-mt mb10">
       <Form
         ref="formValidate"
         :model="formValidate"
@@ -295,10 +295,6 @@ export default {
   margin: 3px 0;
 }
 
-.tabform {
-  margin-bottom: 10px;
-}
-
 .Refresh {
   font-size: 12px;
   color: #1890FF;
diff --git a/template/admin/src/pages/finance/capitalFlow/index.vue b/template/admin/src/pages/finance/capitalFlow/index.vue
index aea2a0d26..b3f869375 100644
--- a/template/admin/src/pages/finance/capitalFlow/index.vue
+++ b/template/admin/src/pages/finance/capitalFlow/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <Card :bordered="false" dis-hover class="ivu-mt mb10">
       <Form
         ref="formValidate"
         :model="formValidate"
@@ -302,7 +302,6 @@ export default {
 }
 
 .tabform {
-  margin-bottom: 10px;
 }
 
 .Refresh {
diff --git a/template/admin/src/pages/finance/commission/index.vue b/template/admin/src/pages/finance/commission/index.vue
index e6342e48d..1d4cdf6f2 100644
--- a/template/admin/src/pages/finance/commission/index.vue
+++ b/template/admin/src/pages/finance/commission/index.vue
@@ -54,7 +54,6 @@
         ref="table"
         :columns="columns"
         :data="tabList"
-        class="mt25"
         :loading="loading"
         no-data-text="暂无数据"
         no-filtered-data-text="暂无筛选结果"
diff --git a/template/admin/src/pages/marketing/point_record/index.vue b/template/admin/src/pages/marketing/point_record/index.vue
index 24621b271..c87679487 100644
--- a/template/admin/src/pages/marketing/point_record/index.vue
+++ b/template/admin/src/pages/marketing/point_record/index.vue
@@ -1,12 +1,11 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <Card :bordered="false" dis-hover class="ivu-mt mb10">
       <Form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
-        class="tabform"
         @submit.native.prevent
       >
         <Row :gutter="24" type="flex">
@@ -296,10 +295,6 @@ export default {
   margin: 3px 0;
 }
 
-.tabform {
-  margin-bottom: 10px;
-}
-
 .Refresh {
   font-size: 12px;
   color: #1890FF;
diff --git a/template/admin/src/pages/marketing/storeBargain/bargainList.vue b/template/admin/src/pages/marketing/storeBargain/bargainList.vue
index 58edde922..68570c093 100644
--- a/template/admin/src/pages/marketing/storeBargain/bargainList.vue
+++ b/template/admin/src/pages/marketing/storeBargain/bargainList.vue
@@ -45,7 +45,6 @@
       <Table
         :columns="columns1"
         :data="tableList"
-        class="mt25"
         :loading="loading"
         highlight-row
         no-userFrom-text="暂无数据"
diff --git a/template/admin/src/pages/marketing/storeCombination/combinaList.vue b/template/admin/src/pages/marketing/storeCombination/combinaList.vue
index 6645cade9..ba22b23fd 100644
--- a/template/admin/src/pages/marketing/storeCombination/combinaList.vue
+++ b/template/admin/src/pages/marketing/storeCombination/combinaList.vue
@@ -46,7 +46,6 @@
       <Table
         :columns="columns1"
         :data="tableList"
-        class="mt25"
         :loading="loading"
         highlight-row
         no-userFrom-text="暂无数据"
diff --git a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue b/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue
index 5a99a1315..f4d9c5f36 100644
--- a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue
+++ b/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue
@@ -12,7 +12,7 @@
       @on-select-all="selectAll"
       @on-select-all-cancel="selectAll"
       @on-select-cancel="onSelectCancel"
-      class="orderData mt25"
+      class="orderData"
     >
       <template slot-scope="{ row, index }" slot="order_id">
         <span v-text="row.order_id" style="display: block"></span>
diff --git a/template/admin/src/pages/order/invoice/index.vue b/template/admin/src/pages/order/invoice/index.vue
index 94ffc21c9..cf594b2d0 100644
--- a/template/admin/src/pages/order/invoice/index.vue
+++ b/template/admin/src/pages/order/invoice/index.vue
@@ -78,7 +78,6 @@
         :columns="columns"
         :data="orderList"
         ref="table"
-        class="mt25"
         :loading="loading"
         highlight-row
         no-userFrom-text="暂无数据"
diff --git a/template/admin/src/pages/order/refund/index.vue b/template/admin/src/pages/order/refund/index.vue
index 2930d1ffa..0be8af516 100644
--- a/template/admin/src/pages/order/refund/index.vue
+++ b/template/admin/src/pages/order/refund/index.vue
@@ -53,7 +53,6 @@
         :columns="thead"
         :data="tbody"
         ref="table"
-        class="mt25"
         :loading="loading"
         highlight-row
         no-userFrom-text="暂无数据"
@@ -668,7 +667,9 @@ export default {
 .code {
   position: relative;
 }
-
+.ivu-form-item{
+  
+}
 .QRpic {
   width: 180px;
   height: 259px;
diff --git a/template/admin/src/pages/product/productList/index.vue b/template/admin/src/pages/product/productList/index.vue
index 3a7aa2da4..1e7a7779c 100644
--- a/template/admin/src/pages/product/productList/index.vue
+++ b/template/admin/src/pages/product/productList/index.vue
@@ -73,7 +73,7 @@
         ref="table"
         :columns="artFrom.type !== '1' && artFrom.type !== '2' ? columns2 : columns"
         :data="tableList"
-        class="ivu-mt"
+        class="ivu-mt mt25"
         :loading="loading"
         highlight-row
         @on-select="handleSelectRow"
diff --git a/template/admin/src/pages/product/productReply/index.vue b/template/admin/src/pages/product/productReply/index.vue
index f76e98521..d84acbe05 100644
--- a/template/admin/src/pages/product/productReply/index.vue
+++ b/template/admin/src/pages/product/productReply/index.vue
@@ -76,7 +76,7 @@
         ref="table"
         :columns="columns"
         :data="tableList"
-        class="ivu-mt"
+        class="ivu-mt mt25"
         :loading="loading"
         @on-sort-change="sortMethod"
         no-data-text="暂无数据"
diff --git a/template/admin/src/pages/setting/membershipLevel/index.vue b/template/admin/src/pages/setting/membershipLevel/index.vue
index 212a9fe1c..bcd1c3a8d 100644
--- a/template/admin/src/pages/setting/membershipLevel/index.vue
+++ b/template/admin/src/pages/setting/membershipLevel/index.vue
@@ -26,7 +26,6 @@
         :columns="columns1"
         :data="tabList"
         ref="table"
-        class="mt25"
         :loading="loading"
         highlight-row
         no-userFrom-text="暂无数据"
@@ -525,6 +524,7 @@ export default {
 
 .headers {
   background-color: #fff;
+  margin-bottom 20px
 }
 
 /deep/ .ivu-modal-mask {
diff --git a/template/admin/src/pages/setting/multiLanguage/country.vue b/template/admin/src/pages/setting/multiLanguage/country.vue
index c6d7001ef..fe6332f43 100644
--- a/template/admin/src/pages/setting/multiLanguage/country.vue
+++ b/template/admin/src/pages/setting/multiLanguage/country.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <Card :bordered="false" dis-hover class="ivu-mt mb10">
       <Form
         ref="formValidate"
         :model="formValidate"
@@ -37,7 +37,7 @@
         ref="table"
         :columns="columns"
         :data="tabList"
-        class="ivu-mt"
+        class="ivu-mt mt25"
         :loading="loading"
         no-data-text="暂无数据"
         no-filtered-data-text="暂无筛选结果"
diff --git a/template/admin/src/pages/user/grade/record/index.vue b/template/admin/src/pages/user/grade/record/index.vue
index cb09c039b..4453a97ef 100644
--- a/template/admin/src/pages/user/grade/record/index.vue
+++ b/template/admin/src/pages/user/grade/record/index.vue
@@ -61,7 +61,6 @@
         :columns="thead"
         :data="tbody"
         ref="table"
-        class="mt25"
         :loading="loading"
         highlight-row
         no-userFrom-text="暂无数据"
diff --git a/template/uni-app/pages/extension/customer_list/chat.vue b/template/uni-app/pages/extension/customer_list/chat.vue
index e20f893d3..a5ca078b3 100644
--- a/template/uni-app/pages/extension/customer_list/chat.vue
+++ b/template/uni-app/pages/extension/customer_list/chat.vue
@@ -306,11 +306,11 @@
 			});
 			// 超时了
 			uni.$once('timeout', () => {
-				uni.showLoading({
-					title: '重连中',
-					mask: true
+				uni.showLoading({
+					title: '重连中',
+					mask: true
 				})
-				this.chatList = []
+				this.chatList = []
 				initSocket()
 			});
 			// 链接成功
@@ -456,8 +456,11 @@
 						this.chatList = [...res.data.serviceList, ...this.chatList];
 
 						this.$nextTick(() => {
-							this.setPageScrollTo(selector);
-							this.isScroll = res.data.serviceList.length >= this.limit;
+							if (this.chatList.length) {
+								this.setPageScrollTo(selector);
+								this.isScroll = res.data.serviceList.length >= this.limit;
+							}
+
 						});
 						this.$socket.send({
 							data: {
@@ -921,14 +924,14 @@
 		font-size: 28rpx;
 		color: #333333;
 		height: 85rpx;
-		font-weight: 800;
+		font-weight: 800;
 		line-height: 40rpx;
 		overflow: hidden;
 		text-overflow: ellipsis;
 		display: -webkit-box;
 		-webkit-line-clamp: 2;
 		-webkit-box-orient: vertical;
-		text-align: left !important;
+		text-align: left !important;
 	}
 
 	.broadcast_details_pic {