Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

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"

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;

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 {

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="暂无筛选结果"

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;

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="暂无数据"

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="暂无数据"

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>

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="暂无数据"

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;

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"

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="暂无数据"

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 {

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="暂无筛选结果"

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="暂无数据"

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 {