diff --git a/src/App.vue b/src/App.vue
index 300a8ea..5bc2aaf 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -38,37 +38,72 @@ export default {
 
 <style>
 @import "./font-style/font.css";
+
+ /* #app .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
+#app .sidebar-container .el-submenu .el-menu-item {
+  width: 203px !important;
+} */
+
+#app .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
+#app .sidebar-container .el-submenu .el-menu-item {
+  min-width: 203px !important;
+} 
+
+#app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__title,
+#app .sidebar-container .theme-dark .el-submenu .el-menu-item {
+  /* padding-left: 25px !important; */
+  border-radius: 6px;
+}
+
+#app .sidebar-container a {
+  border-radius: 6px;
+}
+
+/* .nest-menu {
+  width: 183px;
+  border-radius: 6px !important;
+  margin-left: 8px;
+} */
+
 .el-collapse-item__arrow {
-    transform: rotate(270deg);
+  transform: rotate(270deg);
 }
-.el-collapse-item__wrap{
+
+.el-collapse-item__wrap {
   border: none;
 }
-.el-collapse-item__header{
+
+.el-collapse-item__header {
   position: absolute;
   right: 15px;
   top: 0;
-  border:none;
+  border: none;
   font-size: 22px;
   z-index: 999;
 }
-.el-collapse{
+
+.el-collapse {
   border: none;
 }
-.el-collapse-item__content{
+
+.el-collapse-item__content {
   padding-bottom: 0;
 }
-.app-breadcrumb.el-breadcrumb{
+
+.app-breadcrumb.el-breadcrumb {
   font-size: 16px !important;
 }
-.navbar{
- padding-top: 10px !important;
- height: 70px !important;
+
+.navbar {
+  padding-top: 10px !important;
+  height: 70px !important;
 }
-.hamburger{
+
+.hamburger {
   width: 26px !important;
   height: 26px !important;
 }
+
 .el-form {
   padding: 0px;
   padding-top: 18px;
@@ -91,7 +126,8 @@ export default {
   background: rgba(0, 0, 0, 0) !important;
   border-bottom: none !important;
 }
-.tags-view-container .tags-view-wrapper .tags-view-item{
+
+.tags-view-container .tags-view-wrapper .tags-view-item {
   font-size: 14px !important;
   border-color: #fff !important;
   border-radius: 4px;
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 558aa4c..9d1a3aa 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -130,7 +130,7 @@
 
   .hideSidebar {
     .sidebar-container {
-      width: 54px !important;
+      width: 64px !important;
     }
 
     .main-container {
diff --git a/src/views/carddealer/carddealerCard/index.vue b/src/views/carddealer/carddealerCard/index.vue
index faddd2b..8559f8d 100644
--- a/src/views/carddealer/carddealerCard/index.vue
+++ b/src/views/carddealer/carddealerCard/index.vue
@@ -5,35 +5,35 @@
         <div class="bar"></div>
         <div class="text">收款卡列表</div>
       </div> -->
-     
+
     </div>
 
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="96px"
-        class="flex form" style="position: relative">
-        <el-form-item label="姓名或卡号" prop="cardHolder">
-          <el-input size="medium" v-model="queryParams.cardHolder" placeholder="请输入姓名或卡号"
-            @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
-        </el-form-item>
-        <el-form-item label="码商名称" prop="carddealerName">
-          <el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入码商名称"
-            @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
-        </el-form-item>
-        <el-form-item label="银行名称" prop="bankName">
-          <el-input size="medium" v-model="queryParams.bankName" placeholder="请输入银行名称" @keyup.enter.native="handleQuery"
-            style="width: 180px; border-color: #e6f1ff" />
-        </el-form-item>
-        <!-- <el-form-item label="创建时间">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="96px" class="flex form"
+      style="position: relative">
+      <el-form-item label="姓名或卡号" prop="cardHolder">
+        <el-input size="medium" v-model="queryParams.cardHolder" placeholder="请输入姓名或卡号" @keyup.enter.native="handleQuery"
+          style="width: 180px; border-color: #e6f1ff" />
+      </el-form-item>
+      <el-form-item label="码商名称" prop="carddealerName">
+        <el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入码商名称"
+          @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
+      </el-form-item>
+      <el-form-item label="银行名称" prop="bankName">
+        <el-input size="medium" v-model="queryParams.bankName" placeholder="请输入银行名称" @keyup.enter.native="handleQuery"
+          style="width: 180px; border-color: #e6f1ff" />
+      </el-form-item>
+      <!-- <el-form-item label="创建时间">
           <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
             range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"></el-date-picker>
         </el-form-item> -->
-        <el-form-item>
-          <div class="searchTop flexBet" style="align-items: center">
-            <el-row :gutter="10" class="mb8">
-              <el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
-            </el-row>
-
-            <!-- <el-row :gutter="10" class="mb8" style="margin-left: 20px">
+      <el-form-item>
+        <div class="searchTop flexBet" style="align-items: center">
+          <el-row :gutter="10" class="mb8">
+            <el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
+          </el-row>
+
+          <!-- <el-row :gutter="10" class="mb8" style="margin-left: 20px">
               <el-col :span="1.5">
                 <el-button type="primary" plain icon="" size="medium" @click="handleAdd()">添加码商</el-button>
               </el-col>
@@ -41,18 +41,18 @@
                 <el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
               </el-col>
             </el-row> -->
-          </div>
-        </el-form-item>
-      </el-form>
+        </div>
+      </el-form-item>
+    </el-form>
 
-      <!-- <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row> -->
 
     <div class="bg">
-  
 
-      <el-table stripe :data="infoList" v-loading="loading">
+
+      <el-table stripe :data="infoList" v-loading="loading" :row-class-name="tableRowClassName">
         <el-table-column label="卡号" align="center" prop="cardNumber" />
         <el-table-column label="状态" align="center" prop="status" width="140px">
           <template slot-scope="scope">
@@ -66,10 +66,9 @@
         <el-table-column label="银行名称" align="center" prop="bankName" />
         <el-table-column label="姓名" align="center" prop="cardHolder" />
         <el-table-column label="支行名称" align="center" prop="cardOrganization" />
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="更新时间" align="center" prop="updateTime" min-width="180" />
 
-        <el-table-column :label="'每日限额'" align="center" prop="dayReceiveMax" min-width="120">
+
+        <!-- <el-table-column :label="'每日限额'" align="center" prop="dayReceiveMax" min-width="120">
           <template slot-scope="scope">
             {{ parseFloat(NumberDiv(scope.row.dayReceiveMax, 100)).toFixed(2) }}
           </template>
@@ -78,8 +77,18 @@
           <template slot-scope="scope">
             {{ parseFloat(NumberDiv(scope.row.todayReceived, 100)).toFixed(2) }}
           </template>
+        </el-table-column> -->
+
+        <el-table-column :label="'日限额/已收款'" align="center" prop="storeNo" min-width="180">
+          <template slot-scope="scope">
+            {{ parseFloat(NumberDiv(scope.row.dayReceiveMax, 100)).toFixed(2) }}/{{
+              parseFloat(NumberDiv(scope.row.todayReceived, 100)).toFixed(2) }}
+
+          </template>
         </el-table-column>
-        <el-table-column :label="'日最大收款笔数'" align="center" prop="dayReceiveMax">
+
+
+        <!-- <el-table-column :label="'日最大收款笔数'" align="center" prop="dayReceiveMax">
           <template slot-scope="scope">
             {{ scope.row.dayMaxNumber }}
           </template>
@@ -88,7 +97,17 @@
           <template slot-scope="scope">
             {{ scope.row.todayNumber }}
           </template>
+        </el-table-column> -->
+
+        <el-table-column :label="'日笔数/已收'" align="center" prop="storeNo" min-width="150">
+          <template slot-scope="scope">
+            {{ scope.row.dayMaxNumber }}/{{ scope.row.todayNumber }}
+
+          </template>
         </el-table-column>
+
+
+
         <el-table-column :label="'连续多笔未支付笔数'" align="center" prop="dayReceiveMax">
           <template slot-scope="scope">
             {{ scope.row.consecutiveUnpaidCnt }}
@@ -97,7 +116,8 @@
         <el-table-column label="下卡原因" align="center" prop="downReason" />
         <el-table-column :label="'收款区间'" align="center" prop="singleMin" min-width="180">
           <template slot-scope="scope">
-            {{ parseFloat(NumberDiv(scope.row.singleMin, 100)).toFixed(2) }} ~ {{ parseFloat(NumberDiv(scope.row.singleMax, 100)).toFixed(2) }}
+            {{ parseFloat(NumberDiv(scope.row.singleMin, 100)).toFixed(2) }} ~ {{
+              parseFloat(NumberDiv(scope.row.singleMax, 100)).toFixed(2) }}
           </template>
         </el-table-column>
 
@@ -114,7 +134,8 @@
         </el-table-column>
 
 
-
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="更新时间" align="center" prop="updateTime" min-width="180" />
         <el-table-column label="创建时间" align="center" prop="createTime" min-width="180" />
 
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="150">
@@ -272,7 +293,16 @@ export default {
     this.getList();
   },
   methods: {
-    timerHandler(queryParams){
+
+    tableRowClassName({ row, rowIndex }) {
+      if (row.dayReceiveMax == row.todayReceived) {
+        return "greenOrder";
+      }
+     if(row.singleReceiveMax == row.singleMax){
+      return "redOrder";
+     }
+    },
+    timerHandler(queryParams) {
       listCarddealerCard(this.queryParams).then(response => {
         this.infoList = response.rows;
         this.total = Number(response.total);
@@ -427,3 +457,20 @@ export default {
   }
 };
 </script>
+<style>
+.greenOrder {
+  background: #E9FEEA !important;
+}
+.redOrder {
+    background: #FDF2F2 !important;
+}
+</style>
+<style scoped>
+::v-deep .el-table tbody tr:hover>td {
+  background-color: rgba(0, 0, 0, 0) !important
+}
+
+::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
+  background: none !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/configuration/daifuConfig.vue b/src/views/configuration/daifuConfig.vue
index e65d445..041924f 100644
--- a/src/views/configuration/daifuConfig.vue
+++ b/src/views/configuration/daifuConfig.vue
@@ -37,14 +37,14 @@
                         <el-switch v-model="form.orderCanSplit" :active-value="1" :inactive-value="2">
                         </el-switch>
                         <div style="font-size: 12px;color:rgb(187, 187, 187)">
-                            默认禁用，启用后代付单可以拆分多比子单
+                            默认不可拆单，启用后可拆分多笔子单
                         </div>
                     </el-form-item>
                     <el-form-item label="订单是否默认可抢单" prop="orderCanLock">
                         <el-switch v-model="form.orderCanLock" :active-value="1" :inactive-value="2">
                         </el-switch>
                         <div style="font-size: 12px;color:rgb(187, 187, 187)">
-                            默认禁用，启用后代付单创建后默认可抢单
+                            默认不可抢单，启用后可抢单
                         </div>
                     </el-form-item>
 
diff --git a/src/views/configuration/daishouConfig.vue b/src/views/configuration/daishouConfig.vue
index 16af662..c72f2df 100644
--- a/src/views/configuration/daishouConfig.vue
+++ b/src/views/configuration/daishouConfig.vue
@@ -31,6 +31,9 @@
                             style="width: 560px;border-color: #E6F1FF;">
                             <template slot="append">分钟</template>
                         </el-input>
+                        <div style="font-size: 12px;color:rgb(187, 187, 187)">
+                            订单有效期过后{{form.orderAmountUnfreezeTime}}分钟解冻
+                        </div>
                     </el-form-item>
                     <el-form-item label="码商代收接单最小余额" prop="carddealerMinBalance">
                         <el-input v-model="form.carddealerMinBalance" placeholder="请输入码商代收接单最小余额"
@@ -114,7 +117,7 @@ export default {
             open: false,
             // 表单参数
             form: {
-
+                
             },
             rules: {
                 orderExpiredTime: [
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index 977f32f..46c9e57 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -30,11 +30,19 @@
         <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="margin-left:8px">
         <div class="searchTop flexBet" style="align-items: center;">
           <el-row :gutter="10" class="mb8">
             <el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
+            <el-button type="danger" plain icon="el-icon-delete" size="medium" :disabled="multiple" @click="handleDelete"
+            v-hasPermi="['monitor:logininfor:remove']">删除</el-button>
+            <el-button type="danger" plain icon="el-icon-delete" size="medium" @click="handleClean"
+            v-hasPermi="['monitor:logininfor:remove']">清空</el-button>
+            <el-button type="primary" plain icon="el-icon-unlock" size="medium" :disabled="single" @click="handleUnlock"
+            v-hasPermi="['monitor:logininfor:unlock']">解锁</el-button>
+            <el-button type="warning" plain icon="el-icon-download" size="medium" @click="handleExport"
+            v-hasPermi="['monitor:logininfor:export']">导出</el-button>
           </el-row>
 
 
@@ -43,7 +51,7 @@
       </el-form-item>
     </el-form>
 
-    <div class="searchTop flexBet">
+    <!-- <div class="searchTop flexBet">
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button type="danger" plain icon="el-icon-delete" size="medium" :disabled="multiple" @click="handleDelete"
@@ -67,7 +75,7 @@
 
 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 </el-row>
-    </div>
+    </div> -->
 
     <div class="bg">
 
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index 00952b4..cd4bb63 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -33,17 +33,23 @@
         <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="margin-left:8px">
         <div class="searchTop flexBet" style="align-items: center;">
           <el-row :gutter="10" class="mb8">
             <el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
+            <el-button type="danger" plain icon="el-icon-delete" size="medium" :disabled="multiple" @click="handleDelete"
+            v-hasPermi="['monitor:operlog:remove']">删除</el-button>
+            <el-button type="danger" plain icon="el-icon-delete" size="medium" @click="handleClean"
+            v-hasPermi="['monitor:operlog:remove']">清空</el-button>
+            <el-button type="warning" plain icon="el-icon-download" size="medium" @click="handleExport"
+            v-hasPermi="['monitor:operlog:export']">导出</el-button>
           </el-row>
         </div>
       </el-form-item>
     </el-form>
 
-    <div class="searchTop flexBet" style="align-items: center;">
+    <!-- <div class="searchTop flexBet" style="align-items: center;">
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button type="danger" plain icon="el-icon-delete" size="medium" :disabled="multiple" @click="handleDelete"
@@ -61,7 +67,7 @@
       <el-row :gutter="10" class="mb8">
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
-    </div>
+    </div> -->
 
 
     <div class="bg">
diff --git a/src/views/order/TransferOrder/daifuSonOrder.vue b/src/views/order/TransferOrder/daifuSonOrder.vue
index ebe3ec5..3a45129 100644
--- a/src/views/order/TransferOrder/daifuSonOrder.vue
+++ b/src/views/order/TransferOrder/daifuSonOrder.vue
@@ -136,8 +136,7 @@
                             : scope.row.orderStatus == 4 ? '驳回' : scope.row.orderStatus == 5 ? '已撤销' : '已关闭' }}
                     </template>
                 </el-table-column>
-                <el-table-column label="创建时间" align="center" prop="createTime" min-width="180" />
-                <el-table-column label="更新时间" align="center" prop="updateTime" min-width="180" />
+          
                 <el-table-column label="码商" align="center" prop="carddealerName" />
                 <el-table-column :label="'付款卡(必须一致)'" align="center" prop="payeeRealAmount" min-width="180">
                     <template slot-scope="scope">
@@ -152,6 +151,8 @@
                         </el-button>
                     </template>
                 </el-table-column> -->
+                <el-table-column label="创建时间" align="center" prop="createTime" min-width="180" />
+                <el-table-column label="更新时间" align="center" prop="updateTime" min-width="180" />
 
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
                     min-width="100">
diff --git a/src/views/order/TransferOrder/index.vue b/src/views/order/TransferOrder/index.vue
index dd09880..4e74973 100644
--- a/src/views/order/TransferOrder/index.vue
+++ b/src/views/order/TransferOrder/index.vue
@@ -515,6 +515,9 @@ export default {
   },
   methods: {
     tableRowClassName({ row, rowIndex }) {
+      if(row.payeeRealAmount!=row.reqAmount&&row.orderStatus == 2){
+        return "blueOrder";
+      }
       if (row.orderStatus == 3) {
         return "redOrder";
       }
@@ -737,6 +740,9 @@ export default {
 };
 </script>
 <style>
+.blueOrder {
+    background: #c8e5f8 !important;
+}
 .yellowOrder {
   background: #FEFEE5 !important;
 }
diff --git a/src/views/order/TransferOrder/readyOrder.vue b/src/views/order/TransferOrder/readyOrder.vue
index c1f8a1f..5a57535 100644
--- a/src/views/order/TransferOrder/readyOrder.vue
+++ b/src/views/order/TransferOrder/readyOrder.vue
@@ -521,6 +521,12 @@ export default {
     },
     methods: {
         tableRowClassName({ row, rowIndex }) {
+            if(row.autoConfirm == 2 && row.payeeRealAmount==row.reqAmount){
+                return "greyOrder";
+            }
+            if (row.canRace == 1) {
+                return "blueOrder";
+            }
             if (row.orderStatus == 3) {
                 return "redOrder";
             }
@@ -810,6 +816,12 @@ export default {
 };
 </script>
 <style>
+.greyOrder {
+    background: #F4F4F5 !important;
+}
+.blueOrder {
+    background: #c8e5f8 !important;
+}
 .yellowOrder {
     background: #FEFEE5 !important;
 }
diff --git a/src/views/order/carddealerOrder/readyOrder.vue b/src/views/order/carddealerOrder/readyOrder.vue
index 34c50e0..81352c3 100644
--- a/src/views/order/carddealerOrder/readyOrder.vue
+++ b/src/views/order/carddealerOrder/readyOrder.vue
@@ -5,54 +5,52 @@
         <div class="bar"></div>
         <div class="text">未完成提现订单</div>
       </div> -->
-     
+
     </div>
 
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="106px"
-        class="flex form" style="position: relative">
-        <el-form-item label="码商名称" prop="carddealerName">
-          <el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入码商名称"
-            @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
-        </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="106px" class="flex form"
+      style="position: relative">
+      <el-form-item label="码商名称" prop="carddealerName">
+        <el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入码商名称"
+          @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
+      </el-form-item>
 
-        <el-form-item label="订单号" prop="orderNo">
-          <el-input size="medium" v-model="queryParams.orderNo" placeholder="请输入订单号" @keyup.enter.native="handleQuery"
-            style="width: 180px; border-color: #e6f1ff" />
-        </el-form-item>
-        <el-form-item label="商户订单号" prop="merchantOrderNo">
-          <el-input size="medium" v-model="queryParams.merchantOrderNo" placeholder="请输入商户订单号"
-            @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
-        </el-form-item>
+      <el-form-item label="订单号" prop="orderNo">
+        <el-input size="medium" v-model="queryParams.orderNo" placeholder="请输入订单号" @keyup.enter.native="handleQuery"
+          style="width: 180px; border-color: #e6f1ff" />
+      </el-form-item>
+      <el-form-item label="商户订单号" prop="merchantOrderNo">
+        <el-input size="medium" v-model="queryParams.merchantOrderNo" placeholder="请输入商户订单号"
+          @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
+      </el-form-item>
 
-        <el-form-item label="创建时间">
-          <el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-            :unlink-panels="true"
-            :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <div class="searchTop flexBet" style="align-items: center">
-            <el-row :gutter="10" class="mb8">
-              <el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
-            </el-row>
-
-            <!-- <el-row :gutter="10" class="mb8" style="margin-left: 20px">
+      <el-form-item label="创建时间">
+        <el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
+          :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <div class="searchTop flexBet" style="align-items: center">
+          <el-row :gutter="10" class="mb8">
+            <el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
+          </el-row>
+
+          <!-- <el-row :gutter="10" class="mb8" style="margin-left: 20px">
               <el-col :span="1.5">
                 <el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
               </el-col>
             </el-row> -->
-          </div>
-        </el-form-item>
-      </el-form>
-      
-      <!-- <el-row :gutter="10" class="mb8">
+        </div>
+      </el-form-item>
+    </el-form>
+
+    <!-- <el-row :gutter="10" class="mb8">
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row> -->
 
     <div class="bg">
- 
+
 
       <el-table stripe :data="infoList" v-loading="loading" :row-class-name="tableRowClassName">
         <el-table-column label="订单号" align="center" prop="orderNo" />
@@ -109,8 +107,7 @@
             <el-button size="small" type="text" @click="handleOut(scope.row)" style="color: #006eff">关闭</el-button>
             <el-button size="small" type="text" @click="handleSuccess(scope.row)" style="color: #006eff">成功</el-button>
             <el-button size="small" type="text" @click="handleView(scope.row)" style="color: #006eff">详情</el-button>
-            <el-button size="small" type="text" @click="handleSonOrder(scope.row)" style="color: #006eff"
-             >子单</el-button>
+            <el-button size="small" type="text" @click="handleSonOrder(scope.row)" style="color: #006eff">子单</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -449,6 +446,12 @@ export default {
   },
   methods: {
     tableRowClassName({ row, rowIndex }) {
+      if (row.autoConfirm == 2 && row.payeeRealAmount == row.reqAmount) {
+        return "greyOrder";
+      }
+      if (row.canRace == 1) {
+        return "blueOrder";
+      }
       if (row.orderStatus == 3) {
         return "redOrder";
       }
@@ -496,7 +499,7 @@ export default {
     change() {
       this.$forceUpdate()
     },
-  
+
     init() {
       common_api.carddealerChannelAll().then((response) => {
         this.carddealerCon = response.data;
@@ -704,6 +707,14 @@ export default {
 };
 </script>
 <style>
+.greyOrder {
+  background: #F4F4F5 !important;
+}
+
+.blueOrder {
+  background: #c8e5f8 !important;
+}
+
 .yellowOrder {
   background: #FEFEE5 !important;
 }
@@ -720,6 +731,7 @@ export default {
 ::v-deep .el-table tbody tr:hover>td {
   background-color: rgba(0, 0, 0, 0) !important
 }
+
 ::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
   background: none !important;
 }
diff --git a/src/views/order/payOrder/csOrder.vue b/src/views/order/payOrder/csOrder.vue
index 3585021..2d31af4 100644
--- a/src/views/order/payOrder/csOrder.vue
+++ b/src/views/order/payOrder/csOrder.vue
@@ -176,6 +176,9 @@
             <el-form-item label="订单请求金额">
               {{ parseFloat(NumberDiv(detailInfoList.reqAmount, 100)).toFixed(2) }}
             </el-form-item>
+            <el-form-item label="实付金额">
+              {{ parseFloat(NumberDiv(detailInfoList.paymentAmount, 100)).toFixed(2) }}
+            </el-form-item>
             <el-form-item label="手续费">
               {{ parseFloat(NumberDiv(detailInfoList.merchantFee, 100)).toFixed(2) }}
             </el-form-item>
diff --git a/src/views/order/payOrder/index.vue b/src/views/order/payOrder/index.vue
index af3a61b..6911c66 100644
--- a/src/views/order/payOrder/index.vue
+++ b/src/views/order/payOrder/index.vue
@@ -164,6 +164,9 @@
             <el-form-item label="订单请求金额">
               {{ parseFloat(NumberDiv(detailInfoList.reqAmount, 100)).toFixed(2) }}
             </el-form-item>
+            <el-form-item label="实付金额">
+              {{ parseFloat(NumberDiv(detailInfoList.paymentAmount, 100)).toFixed(2) }}
+            </el-form-item>
             <el-form-item label="手续费">
               {{ parseFloat(NumberDiv(detailInfoList.merchantFee, 100)).toFixed(2) }}
             </el-form-item>
@@ -204,7 +207,7 @@
                 detailInfoList.notifyStatus == 2 ? '通知进行中' : '超时' }}
             </el-form-item>
             <el-form-item label="回调方式" v-if="detailInfoList.orderStatus!=3">
-              {{ detailInfoList.isAutoNotify == 1 ? '自动回调' : '手动回调' }}
+              {{ detailInfoList.smsId == 0 ? '手动回调' : '自动回调' }}
             </el-form-item>
             <el-form-item label="通道费率">
               {{ detailInfoList.merchantRate + '%+' + parseFloat(NumberDiv(detailInfoList.merchantSingleFee, 100)).toFixed(2) }}
diff --git a/src/views/order/payOrder/wwc.vue b/src/views/order/payOrder/wwc.vue
index d59e666..4e23590 100644
--- a/src/views/order/payOrder/wwc.vue
+++ b/src/views/order/payOrder/wwc.vue
@@ -5,89 +5,85 @@
         <div class="bar"></div>
         <div class="text">待支付</div>
       </div> -->
-  
-    </div>
-
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px"
-        class="flex form" style="position: relative">
-        <el-form-item label="平台订单号" prop="orderNo">
-          <el-input size="medium" v-model="queryParams.orderNo" placeholder="请输入平台订单号" @keyup.enter.native="handleQuery"
-            style="width: 180px; border-color: #e6f1ff" />
-        </el-form-item>
-        <el-form-item label="商户订单号" prop="merchantOrderNo">
-          <el-input size="medium" v-model="queryParams.merchantOrderNo" placeholder="请输入商户订单号"
-            @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
-        </el-form-item>
-
-        <el-form-item label="卡号" prop="carddealerCardNumber">
-          <el-input size="medium" v-model="queryParams.carddealerCardNumber" placeholder="请输入卡号"
-            @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
-        </el-form-item>
-
-        <el-form-item label="商户名称" prop="merchantName">
-          <el-input size="medium" v-model="queryParams.merchantName" placeholder="请输入商户名称"
-            @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
-        </el-form-item>
 
-        <el-form-item label="码商名称" prop="carddealerName">
-          <el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入码商名称"
-            @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
-        </el-form-item>
-
-        <el-form-item label="姓名" prop="carddealerCardHolder">
-          <el-input size="medium" v-model="queryParams.carddealerCardHolder" placeholder="请输入姓名"
-            @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
-        </el-form-item>
-        <el-collapse>
-      <el-collapse-item name="1">
-        <el-form-item label="订单金额" prop="reqAmount">
-          <el-input size="medium" v-model="queryParams.reqAmount" placeholder="请输入订单金额" @keyup.enter.native="handleQuery"
-            style="width: 180px; border-color: #e6f1ff" />
-        </el-form-item>
-
-        <el-form-item label="通道" prop="platformChannelId">
-          <el-select v-model="queryParams.platformChannelId" placeholder="请选择通道" clearable size="medium">
-            <el-option v-for="(item, i) in channelAll" :key="i" :label="item.channelName" :value="item.id"></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="状态" prop="orderStatus">
-          <el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="medium">
-            <el-option v-for="(item, i) in statusAll" :key="i" :label="item.label" :value="item.value"></el-option>
-          </el-select>
-        </el-form-item>
+    </div>
 
-        <el-form-item label="创建时间">
-          <el-date-picker v-model="dateRange[0]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-            :unlink-panels="true"
-            :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-        </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px" class="flex form"
+      style="position: relative">
+      <el-form-item label="平台订单号" prop="orderNo">
+        <el-input size="medium" v-model="queryParams.orderNo" placeholder="请输入平台订单号" @keyup.enter.native="handleQuery"
+          style="width: 180px; border-color: #e6f1ff" />
+      </el-form-item>
+      <el-form-item label="商户订单号" prop="merchantOrderNo">
+        <el-input size="medium" v-model="queryParams.merchantOrderNo" placeholder="请输入商户订单号"
+          @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
+      </el-form-item>
+
+      <el-form-item label="卡号" prop="carddealerCardNumber">
+        <el-input size="medium" v-model="queryParams.carddealerCardNumber" placeholder="请输入卡号"
+          @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
+      </el-form-item>
+
+      <el-form-item label="商户名称" prop="merchantName">
+        <el-input size="medium" v-model="queryParams.merchantName" placeholder="请输入商户名称" @keyup.enter.native="handleQuery"
+          style="width: 180px; border-color: #e6f1ff" />
+      </el-form-item>
+
+      <el-form-item label="码商名称" prop="carddealerName">
+        <el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入码商名称"
+          @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
+      </el-form-item>
+
+      <el-form-item label="姓名" prop="carddealerCardHolder">
+        <el-input size="medium" v-model="queryParams.carddealerCardHolder" placeholder="请输入姓名"
+          @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
+      </el-form-item>
+      <el-collapse>
+        <el-collapse-item name="1">
+          <el-form-item label="订单金额" prop="reqAmount">
+            <el-input size="medium" v-model="queryParams.reqAmount" placeholder="请输入订单金额"
+              @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
+          </el-form-item>
+
+          <el-form-item label="通道" prop="platformChannelId">
+            <el-select v-model="queryParams.platformChannelId" placeholder="请选择通道" clearable size="medium">
+              <el-option v-for="(item, i) in channelAll" :key="i" :label="item.channelName" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="状态" prop="orderStatus">
+            <el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="medium">
+              <el-option v-for="(item, i) in statusAll" :key="i" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="创建时间">
+            <el-date-picker v-model="dateRange[0]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+              :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="更新时间">
+            <el-date-picker v-model="dateRange[1]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+              :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+          </el-form-item>
+        </el-collapse-item>
+      </el-collapse>
+      <el-form-item style="margin-left:10px">
+        <div class="searchTop flexBet" style="align-items: center">
+          <el-row :gutter="10" class="mb8">
+            <el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
+            <el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
+          </el-row>
 
-        <el-form-item label="更新时间">
-          <el-date-picker v-model="dateRange[1]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-            :unlink-panels="true"
-            :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-        </el-form-item>
-      </el-collapse-item>
-  </el-collapse>
-        <el-form-item style="margin-left:10px">
-          <div class="searchTop flexBet" style="align-items: center">
-            <el-row :gutter="10" class="mb8">
-              <el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
-              <el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
-            </el-row>
 
-           
-          </div>
-        </el-form-item>
-      </el-form>
+        </div>
+      </el-form-item>
+    </el-form>
 
-      <!-- <div class="searchTop flexBet">
+    <!-- <div class="searchTop flexBet">
         <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
                 <el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
@@ -100,7 +96,7 @@
 
 
     <div class="bg">
-   
+
 
       <el-table stripe :data="infoList" v-loading="loading" :row-class-name="tableRowClassName">
         <el-table-column label="平台订单号" align="center" prop="orderNo" />
@@ -175,6 +171,9 @@
             <el-form-item label="订单请求金额">
               {{ parseFloat(NumberDiv(detailInfoList.reqAmount, 100)).toFixed(2) }}
             </el-form-item>
+            <el-form-item label="实付金额">
+              {{ parseFloat(NumberDiv(detailInfoList.paymentAmount, 100)).toFixed(2) }}
+            </el-form-item>
             <el-form-item label="手续费">
               {{ parseFloat(NumberDiv(detailInfoList.merchantFee, 100)).toFixed(2) }}
             </el-form-item>
@@ -218,7 +217,8 @@
               {{ detailInfoList.isAutoNotify == 1 ? '自动回调' : '手动回调' }}
             </el-form-item>
             <el-form-item label="通道费率">
-              {{ detailInfoList.merchantRate + '%+' + parseFloat(NumberDiv(detailInfoList.merchantSingleFee, 100)).toFixed(2) }}
+              {{ detailInfoList.merchantRate + '%+' + parseFloat(NumberDiv(detailInfoList.merchantSingleFee,
+                100)).toFixed(2) }}
             </el-form-item>
             <el-form-item label="操作人">
               {{ detailInfoList.notifyRemark }}
@@ -236,7 +236,7 @@
     </el-dialog>
 
 
-    <!-- 超时 -->
+    <!-- 已收款 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="订单金额" prop="reqAmount">
@@ -445,7 +445,7 @@ export default {
           { required: true, message: "发起的金额不能为空", trigger: "blur" }
         ]
       },
-      reqAmount:null,
+      reqAmount: null,
     };
   },
   created() {
@@ -472,8 +472,10 @@ export default {
       const id = row.orderNo;
       getPayOrder(id).then((response) => {
         this.form = response.data;
-        this.form.reqAmount = this.NumberDiv(this.form.reqAmount, 100)
-        this.form.paymentAmount = this.NumberDiv(this.form.paymentAmount, 100)
+        let a = response.data.reqAmount
+        let b = response.data.reqAmount
+        this.form.reqAmount = this.NumberDiv(a, 100)
+        this.form.paymentAmount = this.NumberDiv(b, 100)
         this.open = true;
         this.title = "已收款";
       });
@@ -554,7 +556,7 @@ export default {
       this.queryParams.reqAmount ? reqAmount = this.NumberMul(this.queryParams.reqAmount, 100) : this.queryParams.reqAmount
       reqAmount = parseFloat(reqAmount)
       this.queryParams.pageNum = 1;
-      reqAmount ? this.reqAmount=reqAmount : this.reqAmount=null
+      reqAmount ? this.reqAmount = reqAmount : this.reqAmount = null
       reqAmount ? this.getList(reqAmount) : this.getList(null)
     },
     /** 重置按钮操作 */
@@ -666,6 +668,7 @@ export default {
 ::v-deep .el-table tbody tr:hover>td {
   background-color: rgba(0, 0, 0, 0) !important
 }
+
 ::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
   background: none !important;
 }
diff --git a/src/views/platform/platformWaterDetail/index.vue b/src/views/platform/platformWaterDetail/index.vue
index ceb3cd4..b69011c 100644
--- a/src/views/platform/platformWaterDetail/index.vue
+++ b/src/views/platform/platformWaterDetail/index.vue
@@ -11,7 +11,7 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="106px" class="flex form"
       style="position: relative">
 
-      <el-form-item label="" prop="businessNo">
+      <el-form-item label="单号" prop="businessNo">
         <el-input size="medium" v-model="queryParams.businessNo" placeholder="请输入流水号或业务单号或商户订单号"
           @keyup.enter.native="handleQuery" style="width: 280px; border-color: #e6f1ff" />
       </el-form-item>
@@ -86,7 +86,7 @@
         </el-table-column>
         <el-table-column :label="'金额类型'" align="center" prop="amountType">
           <template slot-scope="scope">
-            {{ scope.row.amountType == 1 ? '分佣' : scope.row.amountType == 2 ? '冻结' : '押金' }}
+            {{ scope.row.amountType == 1 ? (scope.row.accountType == 2 ? '分佣' : '余额') : scope.row.amountType == 2 ? '冻结' : '押金' }}
           </template>
         </el-table-column>
         <el-table-column :label="'变动金额'" align="center" prop="change_amount">
@@ -163,7 +163,7 @@ export default {
           value: null,
         },
         {
-          label: '分佣',
+          label: '分佣/余额',
           value: 1,
         },
         {
diff --git a/src/views/staticsRecord/cardTimeStatistics.vue b/src/views/staticsRecord/cardTimeStatistics.vue
index 7a08368..89d939d 100644
--- a/src/views/staticsRecord/cardTimeStatistics.vue
+++ b/src/views/staticsRecord/cardTimeStatistics.vue
@@ -22,6 +22,7 @@
                         <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
                         <el-button type="primary" plain icon="" size="medium" @click="handleExport">导出</el-button>
                     </el-row>
+                    <div style="color:red;margin-left:20px;margin-bottom:8px;font-size:12px">统计是按照订单时间统计</div>
                   
                 </div>
             </el-form-item>
diff --git a/src/views/staticsRecord/dayEndStatistics.vue b/src/views/staticsRecord/dayEndStatistics.vue
index 99c5216..a5861b9 100644
--- a/src/views/staticsRecord/dayEndStatistics.vue
+++ b/src/views/staticsRecord/dayEndStatistics.vue
@@ -22,6 +22,7 @@
                         <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
                     <el-button type="primary" plain icon="" size="medium" @click="handleExport">导出</el-button>
                     </el-row>
+                    <div style="color:red;margin-left:20px;margin-bottom:8px;font-size:12px">统计是按照订单时间统计</div>
 
 
                 </div>
diff --git a/src/views/staticsRecord/dayStatistics.vue b/src/views/staticsRecord/dayStatistics.vue
index bcc9f89..7efedaa 100644
--- a/src/views/staticsRecord/dayStatistics.vue
+++ b/src/views/staticsRecord/dayStatistics.vue
@@ -24,6 +24,7 @@
                             <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
                             <el-button type="primary" plain icon="" size="medium" @click="handleExport">下载</el-button>
                         </el-row>
+                        <div style="color:red;margin-left:20px;margin-bottom:8px;font-size:12px">统计是按照订单时间统计</div>
 
                     
                     </div>
diff --git a/src/views/staticsRecord/mechantTimeStatistics.vue b/src/views/staticsRecord/mechantTimeStatistics.vue
index e763bf6..090ee72 100644
--- a/src/views/staticsRecord/mechantTimeStatistics.vue
+++ b/src/views/staticsRecord/mechantTimeStatistics.vue
@@ -22,7 +22,7 @@
                         <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
                     <el-button type="primary" plain icon="" size="medium" @click="handleExport">导出</el-button>
                     </el-row>
-
+                    <div style="color:red;margin-left:20px;margin-bottom:8px;font-size:12px">统计是按照订单时间统计</div>
 
                 </div>
             </el-form-item>
diff --git a/src/views/staticsRecord/merchantCardStat.vue b/src/views/staticsRecord/merchantCardStat.vue
index 46befb5..f2556be 100644
--- a/src/views/staticsRecord/merchantCardStat.vue
+++ b/src/views/staticsRecord/merchantCardStat.vue
@@ -29,13 +29,14 @@
                         :default-time="['00:00:00', '23:59:59']"
                         ></el-date-picker>
                 </el-form-item>
-                <el-form-item>
+                <el-form-item style="margin-left:8px">
                     <div class="searchTop flexBet" style="align-items: center">
                         <el-row :gutter="10" class="mb8">
                             <el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
                             <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
                             <el-button type="primary" plain icon="" size="medium" @click="handleExport">导出</el-button>
                         </el-row>
+                        <div style="color:red;margin-left:20px;margin-bottom:8px;font-size:12px">统计是按照订单时间统计</div>
                   
                     </div>
                 </el-form-item>
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 65cea3d..56052a3 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -27,11 +27,21 @@
         <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="margin-left:8px">
         <div class="searchTop flexBet" style="align-items: center;">
           <el-row :gutter="10" class="mb8">
             <el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
+            <el-button type="primary" plain icon="el-icon-plus" size="medium" @click="handleAdd"
+            v-hasPermi="['system:config:add']">新增</el-button>
+            <el-button type="success" plain icon="el-icon-edit" size="medium" :disabled="single" @click="handleUpdate"
+            v-hasPermi="['system:config:edit']">修改</el-button>
+            <el-button type="danger" plain icon="el-icon-delete" size="medium" :disabled="multiple" @click="handleDelete"
+            v-hasPermi="['system:config:remove']">删除</el-button>
+            <el-button type="warning" plain icon="el-icon-download" size="medium" @click="handleExport"
+            v-hasPermi="['system:config:export']">导出</el-button>
+            <el-button type="danger" plain icon="el-icon-refresh" size="medium" @click="handleRefreshCache"
+            v-hasPermi="['system:config:remove']">刷新缓存</el-button>
           </el-row>
 
 
@@ -41,7 +51,7 @@
     </el-form>
 
 
-    <div class="searchTop flexBet">
+    <!-- <div class="searchTop flexBet">
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button type="primary" plain icon="el-icon-plus" size="medium" @click="handleAdd"
@@ -69,7 +79,7 @@
 
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
-    </div>
+    </div> -->
 
     <div class="bg">
 
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 4cd3257..8754cad 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -28,11 +28,21 @@
         <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="margin-left:8px">
         <div class="searchTop flexBet" style="align-items: center;">
           <el-row :gutter="10" class="mb8">
             <el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
+            <el-button type="primary" plain icon="el-icon-plus" size="medium" @click="handleAdd"
+            v-hasPermi="['system:dict:add']">新增</el-button>
+            <el-button type="success" plain icon="el-icon-edit" size="medium" :disabled="single" @click="handleUpdate"
+            v-hasPermi="['system:dict:edit']">修改</el-button>
+            <el-button type="danger" plain icon="el-icon-delete" size="medium" :disabled="multiple" @click="handleDelete"
+            v-hasPermi="['system:dict:remove']">删除</el-button>
+            <el-button type="warning" plain icon="el-icon-download" size="medium" @click="handleExport"
+            v-hasPermi="['system:dict:export']">导出</el-button>
+            <el-button type="danger" plain icon="el-icon-refresh" size="medium" @click="handleRefreshCache"
+            v-hasPermi="['system:dict:remove']">刷新缓存</el-button>
           </el-row>
 
 
@@ -41,7 +51,7 @@
       </el-form-item>
     </el-form>
 
-    <div class="searchTop flexBet" style="align-items: center;">
+    <!-- <div class="searchTop flexBet" style="align-items: center;">
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button type="primary" plain icon="el-icon-plus" size="medium" @click="handleAdd"
@@ -68,7 +78,7 @@
 
 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 </el-row>
-    </div>
+    </div> -->
 
     <div class="bg">
 
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 7b682c6..670f3ef 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -6,41 +6,46 @@
         <div class="bar"></div>
         <div class="text">角色管理</div>
       </div> -->
-    
+
     </div>
 
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" class="flex form"
-      >
-        <el-form-item label="角色名称" prop="roleName">
-          <el-input size="medium" v-model="queryParams.roleName" placeholder="请输入角色名称" clearable
-            style="width: 240px;border-color: #E6F1FF;" @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item label="权限字符" prop="roleKey">
-          <el-input size="medium" v-model="queryParams.roleKey" placeholder="请输入权限字符" clearable
-            style="width: 240px;border-color: #E6F1FF;" @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select size="medium" v-model="queryParams.status" placeholder="角色状态" clearable
-            style="width: 240px;border-color: #E6F1FF;">
-            <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
-              :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="创建时间">
-          <el-date-picker v-model="dateRange" style="width: 240px;border-color: #E6F1FF;" value-format="yyyy-MM-dd"
-            type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <div class="searchTop flexBet" style="align-items: center;">
-            <el-row :gutter="10" class="mb8">
-              <el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
-            </el-row>
-          </div>
-        </el-form-item>
-      </el-form>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" class="flex form">
+      <el-form-item label="角色名称" prop="roleName">
+        <el-input size="medium" v-model="queryParams.roleName" placeholder="请输入角色名称" clearable
+          style="width: 240px;border-color: #E6F1FF;" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="权限字符" prop="roleKey">
+        <el-input size="medium" v-model="queryParams.roleKey" placeholder="请输入权限字符" clearable
+          style="width: 240px;border-color: #E6F1FF;" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select size="medium" v-model="queryParams.status" placeholder="角色状态" clearable
+          style="width: 240px;border-color: #E6F1FF;">
+          <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker v-model="dateRange" style="width: 240px;border-color: #E6F1FF;" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item style="margin-left:8px">
+        <div class="searchTop flexBet" style="align-items: center;">
+          <el-row :gutter="10" class="mb8">
+            <el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+              v-hasPermi="['system:role:add']">新增</el-button>
+            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+              v-hasPermi="['system:role:edit']">修改</el-button>
+            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+              v-hasPermi="['system:role:remove']">删除</el-button>
+          </el-row>
+        </div>
+      </el-form-item>
+    </el-form>
 
-      <div class="searchTop flexBet" style="align-items: center;">
+    <!-- <div class="searchTop flexBet" style="align-items: center;">
       <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
@@ -54,10 +59,10 @@
                 <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
                   @click="handleDelete" v-hasPermi="['system:role:remove']">删除</el-button>
               </el-col>
-              <!-- <el-col :span="1.5">
+              <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
                   v-hasPermi="['system:role:export']">导出</el-button>
-              </el-col> -->
+              </el-col> 
             </el-row>
 
 
@@ -66,7 +71,7 @@
 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 </el-row>
 
-          </div>
+          </div>-->
 
 
     <div class="bg">
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 0b4453b..3f8fe8c 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -37,10 +37,20 @@
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="medium" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
+            <el-button type="primary" plain icon="el-icon-plus" size="medium" @click="handleAdd"
+              v-hasPermi="['system:user:add']">新增</el-button>
+              <el-button type="primary" plain icon="el-icon-edit" size="medium" :disabled="single" @click="handleUpdate"
+              v-hasPermi="['system:user:edit']">修改</el-button>
+              <el-button type="primary" plain icon="el-icon-delete" size="medium" :disabled="multiple" @click="handleDelete"
+              v-hasPermi="['system:user:remove']">删除</el-button>
           </el-form-item>
+
+
+
+
         </el-form>
 
-        <el-row :gutter="10" class="mb8">
+        <!-- <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button type="primary" plain icon="el-icon-plus" size="medium" @click="handleAdd"
               v-hasPermi="['system:user:add']">新增</el-button>
@@ -53,7 +63,7 @@
             <el-button type="primary" plain icon="el-icon-delete" size="medium" :disabled="multiple" @click="handleDelete"
               v-hasPermi="['system:user:remove']">删除</el-button>
           </el-col>
-          <!-- <el-col :span="1.5">
+          <el-col :span="1.5">
             <el-button type="primary" plain icon="el-icon-upload2" size="medium" @click="handleImport"
               v-hasPermi="['system:user:import']">导入</el-button>
           </el-col>
@@ -61,9 +71,9 @@
             <el-button type="primary" plain icon="el-icon-download" size="medium" @click="handleExport"
               v-hasPermi="['system:user:export']">导出</el-button>
           </el-col> -->
-          <!-- :columns="columns" -->
+          <!-- :columns="columns" 
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
+        </el-row>-->
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index ad530f9..f3b5b60 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -12,27 +12,33 @@
             </div>
             <ul class="list-group list-group-striped">
               <li class="list-group-item">
-                <svg-icon icon-class="user" />用户名称
+                <!-- <svg-icon icon-class="user" /> -->
+                用户名称
                 <div class="pull-right">{{ user.userName }}</div>
               </li>
               <li class="list-group-item">
-                <svg-icon icon-class="phone" />手机号码
+                <!-- <svg-icon icon-class="phone" /> -->
+                手机号码
                 <div class="pull-right">{{ user.phonenumber }}</div>
               </li>
               <li class="list-group-item">
-                <svg-icon icon-class="email" />用户邮箱
+                <!-- <svg-icon icon-class="email" /> -->
+                用户邮箱
                 <div class="pull-right">{{ user.email }}</div>
               </li>
               <li class="list-group-item">
-                <svg-icon icon-class="tree" />所属部门
+                <!-- <svg-icon icon-class="tree" /> -->
+                所属部门
                 <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
               </li>
               <li class="list-group-item">
-                <svg-icon icon-class="peoples" />所属角色
+                <!-- <svg-icon icon-class="peoples" /> -->
+                所属角色
                 <div class="pull-right">{{ roleGroup }}</div>
               </li>
               <li class="list-group-item">
-                <svg-icon icon-class="date" />创建日期
+                <!-- <svg-icon icon-class="date" /> -->
+                创建日期
                 <div class="pull-right">{{ user.createTime }}</div>
               </li>
             </ul>