From b119445151e645078ebf42cac0248c89334964f8 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Fri, 20 Oct 2023 13:59:54 +0800
Subject: [PATCH] 1

---
 src/App.vue                                        |   1 +
 src/components/FirstJob/joblist.vue                |   2 +-
 src/components/FirstJob/joblist1.vue               |   2 +-
 src/components/merchantManagement/dataScreen.vue   |   3 +-
 src/components/merchantManagement/memberInfo.vue   |  21 ++-
 .../usercenter/components/dataStatistics.vue       | 153 ++++++++++---------
 .../userinfo/usercenter/components/mybalance.vue   |   2 +-
 .../userinfo/usercenter/components/mybill.vue      |  53 ++++++-
 .../userinfo/usercenter/components/townsman.vue    |   6 +-
 src/style/index.less                               | 167 ++++++++-------------
 src/views/main.vue                                 |  48 +++++-
 src/views/merchantBack.vue                         |   8 +
 12 files changed, 276 insertions(+), 190 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index efac328..7374bbc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -67,4 +67,5 @@ body {
   width: auto !important;
   overflow: revert !important;
 }
+
 </style>
diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index 167bd8e..021f1be 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -470,7 +470,7 @@
             </div>
           </div>
         </div>
-        <div class="pagecontainer">
+        <div class="pagecontainer f40">
           <a-pagination :current="+formvalue.pageNum" :default-current="1" :defaultPageSize="8" :total="formvalue.total" @change="pageChange" />
           <div class="ant-pagination-options-quick-jumper">
             跳至
diff --git a/src/components/FirstJob/joblist1.vue b/src/components/FirstJob/joblist1.vue
index 3f61a52..b730a73 100644
--- a/src/components/FirstJob/joblist1.vue
+++ b/src/components/FirstJob/joblist1.vue
@@ -344,7 +344,7 @@
             </div>
           </div>
         </div>
-        <div class="pagecontainer">
+        <div class="pagecontainer f40">
           <a-pagination
             :current="+formvalue.pageNum"
             :default-current="1"
diff --git a/src/components/merchantManagement/dataScreen.vue b/src/components/merchantManagement/dataScreen.vue
index c8e8a8e..d346e42 100644
--- a/src/components/merchantManagement/dataScreen.vue
+++ b/src/components/merchantManagement/dataScreen.vue
@@ -68,7 +68,8 @@ export default {
   color: #fff;
   background-color: #fff;
   border: none;
-  width: 92px;
+  // width: 92px;
+  padding: 0 12px;
   height: 24px;
   background: #1890ff;
   border-radius: 4px;
diff --git a/src/components/merchantManagement/memberInfo.vue b/src/components/merchantManagement/memberInfo.vue
index 59af0a1..d56f8fc 100644
--- a/src/components/merchantManagement/memberInfo.vue
+++ b/src/components/merchantManagement/memberInfo.vue
@@ -52,9 +52,9 @@
           <a v-if="loginUserInfo.agencyRole != 3" class="delete" @click="deleteMemeber(record)">删除</a>
         </div>
       </a-table>
-      <div class="pagecontainer">
+      <div class="pagecontainer mt16">
         <a-pagination :current="+pagination.pageNum" :default-current="1" :defaultPageSize="8" :total="pagination.total" @change="onChange" />
-        <div class="ant-pagination-options-quick-jumper">
+        <div class="ant-pagination-options-quick-jumper f14 ml12">
           <span>共{{ pagination.total }}条，</span>跳至
           <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
         </div>
@@ -1007,4 +1007,21 @@ export default {
     }
   }
 }
+/deep/.spinstyle {
+  .ant-spin-dot-item {
+    background-color: #1890ff !important;
+  }
+  .ant-spin-text {
+    color: #1890ff !important;
+  }
+}
+.pagecontainer {
+  // position: absolute;
+  // bottom: 0;
+  // left: 50%;
+  width: 100%;
+  // transform: translateX(-50%);
+  display: flex;
+  // justify-content: center;
+}
 </style>
diff --git a/src/components/userinfo/usercenter/components/dataStatistics.vue b/src/components/userinfo/usercenter/components/dataStatistics.vue
index 4319233..8a1cd41 100644
--- a/src/components/userinfo/usercenter/components/dataStatistics.vue
+++ b/src/components/userinfo/usercenter/components/dataStatistics.vue
@@ -91,10 +91,11 @@
     <a-modal class="townsmanDetailModal" centered v-model="townsmanDetailVisible" width="1200px" @cancel="townsmanDetailModalClose" :footer="null" destroyOnClose>
       <div slot="title" destoryOnClose>明细</div>
       <div class="searchinput">
-        <a-input placeholder="请输入老乡姓名/身份证号" @keyup.enter="onSearch" @input="resetsearch" v-model.trim="billPagination.keys">
+        <a-input-search placeholder="请输入老乡姓名" v-model.trim="billPagination.keys" enter-button allowClear @search="onSearch" @keyup.enter="onSearch" @input="resetsearch" />
+        <!-- <a-input placeholder="请输入老乡姓名/身份证号" @keyup.enter="onSearch" @input="resetsearch" v-model.trim="billPagination.keys">
           <i slot="prefix" class="iconfont icon-sousuo"></i>
           <button slot="suffix" @click="onSearch">搜索</button>
-        </a-input>
+        </a-input>-->
       </div>
       <a-table :columns="billColumns" :scroll="{ x: 1100}" :data-source="billList" class="detailTable" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index">
         <span slot="storeJobName" slot-scope="text">{{text}}</span>
@@ -104,7 +105,7 @@
       </a-table>
       <div class="pagecontainer">
         <a-pagination :current="billPagination.pageNum" :default-current="1" :defaultPageSize="8" :total="billPagination.total" @change="onChange" />
-        <div class="ant-pagination-options-quick-jumper">
+        <div class="ant-pagination-options-quick-jumper ml12">
           <span>共{{ billPagination.total }}条，</span>跳至
           <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
         </div>
@@ -152,7 +153,7 @@ export default {
       rowSelection,
       billPagination: {
         pageNum: 1,
-        pageSize: 8,
+        pageSize: 10,
         total: null, //分页配置
         status: 0,
         keys: null,
@@ -221,7 +222,7 @@ export default {
           state: '报名中',
         },
       ],
-      contentListSearchForm: { pageNum: 1, pageSize: 8, keys: '' },
+      contentListSearchForm: { pageNum: 1, pageSize: 10, keys: '' },
       townsmanDetailVisible: false,
       isspinning: false,
       totalObj: {
@@ -701,7 +702,7 @@ export default {
       this.townsmanDetailVisible = false
       this.billPagination = {
         pageNum: 1,
-        pageSize: 8,
+        pageSize: 10,
         total: null, //分页配置
         status: 0,
         keys: null,
@@ -767,6 +768,14 @@ export default {
           this.dateType = '入职时间'
           this.dateVal = 'status40OperateTime'
           break
+        case 60:
+          this.dateType = '入职时间'
+          this.dateVal = 'status40OperateTime'
+          break
+        case 70:
+          this.dateType = '交付时间'
+          this.dateVal = 'status40OperateTime'
+          break
         default:
           break
       }
@@ -838,9 +847,9 @@ export default {
   }
   /deep/ .ant-modal-content {
     .ant-modal-body {
-      min-height: 640px;
-      max-height: 700px;
-      padding-bottom: 90px;
+      min-height: 780px;
+      max-height: 780px;
+      padding-bottom: 50px;
       overflow: auto;
     }
   }
@@ -913,73 +922,21 @@ export default {
   width: 326px;
   margin-bottom: 16px;
   position: relative;
-  .ant-input {
-    // width: 300px;
-    position: relative;
-    height: 32px;
-    text-indent: 10px;
-    background: #fff;
-    // border: 1px solid rgba(77, 87, 94, 0.3);
-    border-radius: 0px;
-    box-shadow: 0px 2px 4px 0px transparent;
-    font-size: 14px !important;
-    padding-right: 0;
-    border-color: #ddd;
-    // z-index: ;
-    &::placeholder {
-      text-indent: 10px;
-      font-size: 14px !important;
-    }
-    &:hover {
-      border-color: #ff4400;
-      box-shadow: none;
-    }
-    &:focus {
-      border-color: #ff4400;
-    }
-  }
-  .ant-input-affix-wrapper {
-    .ant-input-prefix {
-      position: absolute;
-      width: 20px;
-      right: 0;
-      top: 16px;
-      i {
-        color: #c9c9c9;
-      }
-    }
-    .ant-input-suffix {
-      // position: absolute;
-      right: 0px !important;
-    }
-  }
-  button {
-    width: 70px;
-    height: 32px;
-    color: white;
-    background: #ff4400;
-    border-color: #ff4400;
-    border: none;
-    border-radius: 0px;
-    font-size: 14px;
-    box-shadow: none;
-    cursor: pointer;
-    outline: none;
-    &:hover {
-      background-color: #ff4400cc;
-    }
-    // &:focus {
-    //   border: none;
-    // }
-  }
 }
 
 .pagecontainer {
-  position: absolute;
-  bottom: 0;
-  left: 50%;
+  // position: absolute;
+  // bottom: 0;
+  // left: 50%;
   width: 100%;
-  transform: translateX(-50%);
+  // transform: translateX(-50%);
+  display: flex;
+  // justify-content: center;
+}
+/deep/.ant-btn-primary:hover {
+  border-color: #40a9ff;
+  background-color: #40a9ff;
+  color: #fff;
 }
 .detailTable {
   /deep/.ant-table-body {
@@ -1053,7 +1010,57 @@ export default {
   position: absolute;
   left: 0px;
 }
-
+/deep/.spinstyle {
+  .ant-spin-dot-item {
+    background-color: #1890ff !important;
+  }
+  .ant-spin-text {
+    color: #1890ff !important;
+  }
+}
+/deep/.ant-calendar-panel {
+  .ant-calendar-month-panel-selected-cell .ant-calendar-month-panel-month {
+    background: #1890ff !important;
+  }
+  .ant-calendar-date:hover {
+    border-color: #1890ff !important;
+    background-color: #fff;
+    color: #1890ff !important;
+  }
+  .ant-calendar-today .ant-calendar-date {
+    background-color: #1890ff !important;
+    border-color: #1890ff !important;
+    color: #fff;
+  }
+  .ant-calendar-range .ant-calendar-selected-start-date .ant-calendar-date,
+  .ant-calendar-range .ant-calendar-selected-end-date .ant-calendar-date {
+    background-color: #1890ff !important;
+    border-color: #1890ff !important;
+    color: #fff;
+  }
+  .ant-calendar-range .ant-calendar-in-range-cell::before {
+    background: #e6f7ff !important;
+  }
+  .ant-calendar-range .ant-calendar-selected-start-date .ant-calendar-date:hover,
+  .ant-calendar-range .ant-calendar-selected-end-date .ant-calendar-date:hover {
+    background: #1890ff !important;
+  }
+  .ant-calendar-header a:hover {
+    color: #1890ff !important;
+  }
+  .ant-calendar-month-panel-selected-cell .ant-calendar-month-panel-month:hover,
+  .ant-calendar-year-panel-selected-cell .ant-calendar-year-panel-year,
+  .ant-calendar-decade-panel-selected-cell .ant-calendar-decade-panel-decade,
+  .ant-calendar-decade-panel-selected-cell .ant-calendar-decade-panel-decade:hover,
+  .ant-calendar-year-panel-selected-cell .ant-calendar-year-panel-year:hover {
+    background: #1890ff !important;
+  }
+  .ant-calendar-month-panel-month:hover,
+  .ant-calendar-year-panel-year:hover,
+  .ant-calendar-decade-panel-decade:hover {
+    background: #e6f7ff !important;
+  }
+}
 // /deep/.ant-popover .ant-popover-content .ant-popover-inner-content {
 //   width: 200px !important;
 // }
diff --git a/src/components/userinfo/usercenter/components/mybalance.vue b/src/components/userinfo/usercenter/components/mybalance.vue
index 26e9568..bafcffe 100644
--- a/src/components/userinfo/usercenter/components/mybalance.vue
+++ b/src/components/userinfo/usercenter/components/mybalance.vue
@@ -34,7 +34,7 @@
         >
           <a slot="name" slot-scope="text">{{ text }}</a>
         </a-table>
-        <div class="pagecontainer">
+        <div class="pagecontainer f40">
           <a-pagination
             :current="+pagination.pageNum"
             :default-current="1"
diff --git a/src/components/userinfo/usercenter/components/mybill.vue b/src/components/userinfo/usercenter/components/mybill.vue
index cc7459f..5e0d9d5 100644
--- a/src/components/userinfo/usercenter/components/mybill.vue
+++ b/src/components/userinfo/usercenter/components/mybill.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="mybill-container w">
+  <div class="mybill-container f40 w">
     <div class="contenttitle">
       <ul @click="resetpag">
         <li @click="pagination.status = -1" :class="{ townsmanactive: pagination.status === -1 }">
@@ -52,14 +52,14 @@
     </div>
     <div class="contentbody">
       <div class="searchbox">
-        <div class="searchinput">
+        <div class="searchinput f40">
           <a-input placeholder="搜索工单号/职位/姓名/电话/身份证号" allowClear @keyup.enter="onSearch" @input="resetsearch" v-model="pagination.keys">
             <i slot="prefix" class="iconfont icon-sousuo"></i>
             <button slot="suffix" @click="onSearch">搜索</button>
           </a-input>
           <div>
             <div>报名时间：</div>
-            <a-range-picker style @change="dateChange" class />
+            <a-range-picker style @change="dateChange" class dropdownClassName="f40" />
           </div>
         </div>
         <div class="pagechange">
@@ -128,7 +128,7 @@
           </div>
         </div>
       </div>
-      <div class="pagecontainer" v-if="billList.length !== 0">
+      <div class="pagecontainer f40" v-if="billList.length !== 0">
         <a-pagination :current="+pagination.pageNum" :default-current="1" :defaultPageSize="10" :total="pagination.total" @change="onChange" />
         <div class="ant-pagination-options-quick-jumper">
           <span>共{{ pagination.total }}条，</span>
@@ -1165,7 +1165,7 @@ export default {
       .ant-calendar-picker-input {
         display: flex;
         padding-left: 0;
-        justify-content: space-between;
+        justify-content: center;
         // margin-left: 20px;
         width: 260px;
         border-color: #ccc;
@@ -1557,4 +1557,47 @@ export default {
     }
   }
 }
+/deep/ .ant-calendar-panel {
+  .ant-calendar-month-panel-selected-cell .ant-calendar-month-panel-month {
+    background: #ff4400;
+  }
+  .ant-calendar-date:hover {
+    border-color: #ff4400;
+    background-color: #fff;
+    color: #ff4400;
+  }
+  .ant-calendar-today .ant-calendar-date {
+    background-color: #ff4400;
+    border-color: #ff4400;
+    color: #fff;
+  }
+  .ant-calendar-range .ant-calendar-selected-start-date .ant-calendar-date,
+  .ant-calendar-range .ant-calendar-selected-end-date .ant-calendar-date {
+    background-color: #ff4400;
+    border-color: #ff4400;
+    color: #fff;
+  }
+  .ant-calendar-range .ant-calendar-in-range-cell::before {
+    background: #fff3ef;
+  }
+  .ant-calendar-range .ant-calendar-selected-start-date .ant-calendar-date:hover,
+  .ant-calendar-range .ant-calendar-selected-end-date .ant-calendar-date:hover {
+    background: #ff4400;
+  }
+  .ant-calendar-header a:hover {
+    color: #ff4400;
+  }
+  .ant-calendar-month-panel-selected-cell .ant-calendar-month-panel-month:hover,
+  .ant-calendar-year-panel-selected-cell .ant-calendar-year-panel-year,
+  .ant-calendar-decade-panel-selected-cell .ant-calendar-decade-panel-decade,
+  .ant-calendar-decade-panel-selected-cell .ant-calendar-decade-panel-decade:hover,
+  .ant-calendar-year-panel-selected-cell .ant-calendar-year-panel-year:hover {
+    background: #ff4400;
+  }
+  .ant-calendar-month-panel-month:hover,
+  .ant-calendar-year-panel-year:hover,
+  .ant-calendar-decade-panel-decade:hover {
+    background: #fff3ef;
+  }
+}
 </style>
diff --git a/src/components/userinfo/usercenter/components/townsman.vue b/src/components/userinfo/usercenter/components/townsman.vue
index c8cd8d0..1676268 100644
--- a/src/components/userinfo/usercenter/components/townsman.vue
+++ b/src/components/userinfo/usercenter/components/townsman.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="townsman-container w">
+  <div class="townsman-container f40 w">
     <div class="contenttitle">
       <ul @click="resetpag">
         <li @click="pagination.status = 0" :class="{ townsmanactive: pagination.status === 0 }">
@@ -36,11 +36,11 @@
           <button @click="changepage(1)">下一页</button>
         </div>
       </div>
-      <a-table :columns="columns" :data-source="data" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :locale="tablenodata" :rowKey="(record) => record.index">
+      <a-table :columns="columns" class="" :data-source="data" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :locale="tablenodata" :rowKey="(record) => record.index">
         <a slot="name" slot-scope="text" style="height:0px">{{ text }}</a>
         <a slot="userDetail" style="color: #ff4400;height:0px" slot-scope="text, text1" @click="toDetail(text1)">详情</a>
       </a-table>
-      <div class="pagecontainer">
+      <div class="pagecontainer f40">
         <a-pagination :current="+pagination.pageNum" :default-current="1" :defaultPageSize="8" :total="pagination.total" @change="onChange" />
         <div class="ant-pagination-options-quick-jumper">
           <span>共{{ pagination.total }}条，</span>跳至
diff --git a/src/style/index.less b/src/style/index.less
index dab8970..a114f45 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -136,8 +136,8 @@ i {
 .dil {
 	display: inline;
 }
-.cf4{
-  color: #ff4400;
+.cf4 {
+	color: #ff4400;
 }
 .dib {
 	display: inline-block;
@@ -317,8 +317,8 @@ i {
 .pb8 {
 	padding-bottom: 8px;
 }
-.mb0{
-  margin-bottom: 0;
+.mb0 {
+	margin-bottom: 0;
 }
 .p16 {
 	padding: 16px;
@@ -395,31 +395,32 @@ i {
 	align-items: center;
 	justify-content: space-between;
 }
-.flex1{
-  flex: 1;
+.flex1 {
+	flex: 1;
 }
 .dn {
-  display: none;
+	display: none;
 }
-.bodyContainer{
-  padding: 16px;
-  height: 97%;
-  background-color: #fff;
+.bodyContainer {
+	padding: 16px;
+	height: 97%;
+	background-color: #fff;
 }
 //通用类名样式结束
 
 //svg图标
 .svg_icon {
-  width: 1em; height: 1em;
-  fill: currentColor;
-  overflow: hidden;
-  display: inline-block;
-  vertical-align: middle;
-  min-width: 30px;
-  text-align: center;
-  font-size: 20px;
-  font-weight: normal;
-  margin-right: 2px;
+	width: 1em;
+	height: 1em;
+	fill: currentColor;
+	overflow: hidden;
+	display: inline-block;
+	vertical-align: middle;
+	min-width: 30px;
+	text-align: center;
+	font-size: 20px;
+	font-weight: normal;
+	margin-right: 2px;
 }
 
 // 公用样式类名
@@ -469,7 +470,7 @@ i {
 	}
 }
 // 分页器样式
-.pagecontainer {
+.pagecontainer.f40 {
 	display: flex;
 	justify-content: center;
 	text-align: center;
@@ -800,87 +801,51 @@ p.bottombox {
 	}
 }
 // 日期选择器样式
-.ant-calendar-month-panel-selected-cell .ant-calendar-month-panel-month {
-	background: #ff4400;
-}
-.ant-calendar-date:hover {
-	border-color: #ff4400;
-	background-color: #fff;
-	color: #ff4400;
-}
-.ant-calendar-today .ant-calendar-date {
-	background-color: #ff4400;
-	border-color: #ff4400;
-	color: #fff;
-}
-.ant-calendar-range .ant-calendar-selected-start-date .ant-calendar-date,
-.ant-calendar-range .ant-calendar-selected-end-date .ant-calendar-date {
-	background-color: #ff4400;
-	border-color: #ff4400;
-	color: #fff;
-}
-.ant-calendar-range .ant-calendar-in-range-cell::before {
-	background: #fff3ef;
-}
-.ant-calendar-range .ant-calendar-selected-start-date .ant-calendar-date:hover,
-.ant-calendar-range .ant-calendar-selected-end-date .ant-calendar-date:hover {
-	background: #ff4400;
-}
-.ant-calendar-header a:hover {
-	color: #ff4400;
-}
-.ant-calendar-month-panel-selected-cell .ant-calendar-month-panel-month:hover,
-.ant-calendar-year-panel-selected-cell .ant-calendar-year-panel-year,
-.ant-calendar-decade-panel-selected-cell .ant-calendar-decade-panel-decade,
-.ant-calendar-decade-panel-selected-cell .ant-calendar-decade-panel-decade:hover,
-.ant-calendar-year-panel-selected-cell .ant-calendar-year-panel-year:hover {
-	background: #ff4400;
-}
-.ant-calendar-month-panel-month:hover,
-.ant-calendar-year-panel-year:hover,
-.ant-calendar-decade-panel-decade:hover {
-	background: #fff3ef;
+.f40 {
+	.ant-calendar-month-panel-selected-cell .ant-calendar-month-panel-month {
+		background: #ff4400;
+	}
+	.ant-calendar-date:hover {
+		border-color: #ff4400;
+		background-color: #fff;
+		color: #ff4400;
+	}
+	.ant-calendar-today .ant-calendar-date {
+		background-color: #ff4400;
+		border-color: #ff4400;
+		color: #fff;
+	}
+	.ant-calendar-range .ant-calendar-selected-start-date .ant-calendar-date,
+	.ant-calendar-range .ant-calendar-selected-end-date .ant-calendar-date {
+		background-color: #ff4400;
+		border-color: #ff4400;
+		color: #fff;
+	}
+	.ant-calendar-range .ant-calendar-in-range-cell::before {
+		background: #fff3ef;
+	}
+	.ant-calendar-range .ant-calendar-selected-start-date .ant-calendar-date:hover,
+	.ant-calendar-range .ant-calendar-selected-end-date .ant-calendar-date:hover {
+		background: #ff4400;
+	}
+	.ant-calendar-header a:hover {
+		color: #ff4400;
+	}
+	.ant-calendar-month-panel-selected-cell .ant-calendar-month-panel-month:hover,
+	.ant-calendar-year-panel-selected-cell .ant-calendar-year-panel-year,
+	.ant-calendar-decade-panel-selected-cell .ant-calendar-decade-panel-decade,
+	.ant-calendar-decade-panel-selected-cell .ant-calendar-decade-panel-decade:hover,
+	.ant-calendar-year-panel-selected-cell .ant-calendar-year-panel-year:hover {
+		background: #ff4400;
+	}
+	.ant-calendar-month-panel-month:hover,
+	.ant-calendar-year-panel-year:hover,
+	.ant-calendar-decade-panel-decade:hover {
+		background: #fff3ef;
+	}
 }
 // 全体样式
-.ant-table-thead > tr > th .ant-table-column-sorter .ant-table-column-sorter-inner .ant-table-column-sorter-up.on,
-.ant-table-thead > tr > th .ant-table-column-sorter .ant-table-column-sorter-inner .ant-table-column-sorter-down.on {
-	color: #ff4400;
-}
-.ant-table-thead > tr.ant-table-row-hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td,
-.ant-table-tbody > tr.ant-table-row-hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td,
-.ant-table-thead > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td,
-.ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td {
-	background: #fff3ef;
-}
-.ant-radio-checked .ant-radio-inner {
-	border-color: #ff4400 !important;
-	box-shadow: none !important;
-}
-.ant-radio-checked .ant-radio-inner::after {
-	background-color: #ff4400 !important;
-}
-.ant-radio:hover .ant-radio-inner {
-	border-color: #ff4400 !important;
-	box-shadow: none;
-}
-.ant-radio-checked .ant-radio-inner::after {
-	background-color: #ff4400 !important;
-}
-.ant-radio-checked:hover .ant-radio-inner {
-	border-color: #ff4400 !important;
-}
-.ant-radio {
-	border-color: #ddd !important;
-	box-shadow: none !important;
-}
-.ant-btn-primary:hover {
-	border-color: #ff4400;
-	background-color: #ff5416;
-	color: #fff;
-}
-.ant-input:hover {
-	border-color: #ff4400;
-}
+
 .ant-select-selection:active {
 	box-shadow: none;
 }
diff --git a/src/views/main.vue b/src/views/main.vue
index f0c5ab4..986dece 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -18,9 +18,9 @@
             <li>
               <router-link to="/mytownsman" :class="routertitleindex == 4 ? 'titleactive' : ''">我的老乡</router-link>
             </li>
-            <li>
+            <!-- <li>
               <router-link to="/dataStatistics" :class="routertitleindex == 6 ? 'titleactive' : ''">团队数据</router-link>
-            </li>
+            </li>-->
             <!-- <li>
               <router-link to="/serviceoutlets"
                 ><a
@@ -1028,4 +1028,48 @@ export default {
     // box-shadow: 3px 3px 3px 3px #00000033;
   }
 }
+.f40 {
+  /deep/ .ant-table {
+    .ant-table-thead > tr > th .ant-table-column-sorter .ant-table-column-sorter-inner .ant-table-column-sorter-up.on,
+    .ant-table-thead > tr > th .ant-table-column-sorter .ant-table-column-sorter-inner .ant-table-column-sorter-down.on {
+      color: #ff4400;
+    }
+    .ant-table-thead > tr.ant-table-row-hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td,
+    .ant-table-tbody > tr.ant-table-row-hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td,
+    .ant-table-thead > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td,
+    .ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td {
+      background: #fff3ef;
+    }
+    .ant-radio-checked .ant-radio-inner {
+      border-color: #ff4400 !important;
+      box-shadow: none !important;
+    }
+    .ant-radio-checked .ant-radio-inner::after {
+      background-color: #ff4400 !important;
+    }
+    .ant-radio:hover .ant-radio-inner {
+      border-color: #ff4400 !important;
+      box-shadow: none;
+    }
+    .ant-radio-checked .ant-radio-inner::after {
+      background-color: #ff4400 !important;
+    }
+    .ant-radio-checked:hover .ant-radio-inner {
+      border-color: #ff4400 !important;
+    }
+    .ant-radio {
+      border-color: #ddd !important;
+      box-shadow: none !important;
+    }
+    .ant-btn-primary:hover {
+      border-color: #ff4400;
+      background-color: #ff5416;
+      color: #fff;
+    }
+    .ant-input:hover {
+      border-color: #ff4400;
+    }
+  }
+
+}
 </style>
diff --git a/src/views/merchantBack.vue b/src/views/merchantBack.vue
index 36024a0..1c982b6 100644
--- a/src/views/merchantBack.vue
+++ b/src/views/merchantBack.vue
@@ -459,4 +459,12 @@ header.header,
     color: #1890ff;
   }
 }
+/deep/.spinstyle {
+  .ant-spin-dot-item {
+    background-color: #1890ff !important;
+  }
+  .ant-spin-text {
+    color: #1890ff !important;
+  }
+}
 </style>