update

src/packages/pc/assets/themes/default/default.less

@@ -31,6 +31,9 @@
     --sidebar-menu-item-hover: #3a87f7;
     --sidebar-menu-item-active: #3a87f7;
 
+    --el-button-text-color: #fff;
+    --el-button-bg-color: #7a8a94;
+
     --el-color-primary: #26487c;
     --el-color-primary-light-3: #29538c;
     --el-color-primary-light-5: #70abd8;
@@ -39,8 +42,17 @@
     --el-color-primary-light-9: #ecf5ff;
     --el-color-primary-dark-2: var(--el-color-primary);
 
-    .el-form {
+    --el-color-info: #405066;
+    --el-color-info-light-3: #455773;
+    --el-color-info-dark-2: var(--el-color-info);
+
+    --el-color-danger: #db5050;
+    --el-color-danger-light-3: #e56060;
+    --el-color-danger-dark-2: var(--el-color-danger);
 
+    //--el-bg-color-overlay: #424E59;
+
+    .el-form {
         &-item {
             &__label {
                 color: #7a8a94;
@@ -53,6 +65,24 @@
             }
         }
 
+        &--filter {
+
+            .el-input,
+            .el-select,
+            .el-date-editor {
+                --el-input-bg-color: #252d34;
+                --el-input-border-color: var(--el-input-bg-color);
+                --el-input-hover-border-color: #35434f;
+                --el-input-focus-border-color: var(--el-input-hover-border-color);
+                --el-select-border-color-hover: var(--el-input-hover-border-color);
+                --el-select-input-focus-border-color: var(--el-input-hover-border-color);
+                --el-input-text-color: var(--color-default);
+                --el-text-color-primary: #fff;
+                --el-text-color-placeholder: #4f5f6c;
+                --el-text-color-regular: var(--el-text-color-primary);
+            }
+        }
+
         &--vertical,
         &--horizontal {
             .el-form-item {
@@ -296,6 +326,10 @@
 
             .buttonbar {
                 margin-left: auto;
+
+                .el-button {
+                    min-width: 88px;
+                }
             }
         }
     }

src/packages/pc/components/base/table-filter/index.less

@@ -1,7 +1,7 @@
 .app-table-filter {
-    display  : flex;
+    display: flex;
     flex-wrap: wrap;
-    gap      : 12px;
+    gap: 12px;
 
     .el-form-item {
         margin: 0;
@@ -16,4 +16,12 @@
     .el-input {
         width: 160px;
     }
+
+    .el-button {
+        min-width: 80px;
+    }
+
+    .el-date-editor.el-input__wrapper {
+        width: 300px;
+    }
 }

src/packages/pc/components/base/table-filter/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-form class="app-table-filter">
+  <el-form class="el-form--filter app-table-filter">
     <el-form-item v-if="$slots.before">
       <slot name="before"></slot>
     </el-form-item>

src/packages/pc/components/layouts/header/index.less

@@ -49,6 +49,7 @@
         }
 
         .user-dropdown {
+            color: #7a8a94;
             margin-left: 20px;
 
             &__link {
@@ -59,8 +60,8 @@
             }
 
             .g-image--avatar {
-                width: 32px;
-                height: 32px;
+                width: 24px;
+                height: 24px;
                 border-radius: 50%;
                 font-size: 0;
                 margin-right: 4px;

src/packages/pc/components/layouts/header/index.vue

@@ -29,7 +29,7 @@
 
 <script lang="ts" setup>
 import { ref, onMounted, computed } from 'vue'
-import { ArrowRight, SwitchButton } from '@element-plus/icons-vue'
+import { SwitchButton } from '@element-plus/icons-vue'
 import { getFileUrl } from '@/filters'
 import { useUserStore, useGlobalStore } from '@/stores'
 import eventBus from '@/services/bus'

src/packages/pc/views/account/address/index.vue

@@ -1,8 +1,9 @@
 <!-- 账户管理-收货地址管理 -->
 <template>
-    <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading" :row-key="rowKey" :expand-row-keys="expandKeys"  @row-click="rowClick">
+    <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading" :row-key="rowKey"
+        :expand-row-keys="expandKeys" @row-click="rowClick">
         <template #header>
-            <el-button type="danger" size="small" @click="openComponent('edit')">新增收货地址</el-button>
+            <app-filter :options="filterOptons" />
         </template>
         <!-- 证件类型 -->
         <template #cardtypeid="{ value }">
@@ -14,7 +15,7 @@
         </template>
         <!-- 是否默认 -->
         <template #isdefault="{ value }">
-            {{ value? '是': '否' }}
+            {{ value ? '是' : '否' }}
         </template>
         <!-- 操作 -->
         <template #expand>
@@ -26,7 +27,7 @@
         </template>
     </app-table>
     <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)" @closed="closeComponent"
-            v-if="componentId" />
+        v-if="componentId" />
 </template>
 
 <script lang="ts" setup>
@@ -35,8 +36,10 @@ import { useRequest } from '@/hooks/request'
 import { queryUserReceiveInfo } from '@/services/api/user'
 import { getCertificateTypeName } from '@/constants/certificate'
 import { useComponent } from '@/hooks/component'
+import { useDataFilter } from '@/hooks/datatable'
 import { useComposeTable } from '@pc/components/base/table'
 import AppTable from '@pc/components/base/table/index.vue'
+import AppFilter from '@pc/components/base/table-filter/index.vue'
 
 const componentMap = new Map<string, unknown>([
     ['edit', defineAsyncComponent(() => import('./components/edit/index.vue'))],
@@ -45,8 +48,8 @@ const componentMap = new Map<string, unknown>([
 ])
 
 const { rowKey, expandKeys, selectedRow, rowClick } = useComposeTable<Model.UserReceiveInfoRsp>({ rowKey: 'autoid' })
-
-const { loading, dataList, run } = useRequest(queryUserReceiveInfo, {})
+const { filterOptons } = useDataFilter<Model.UserReceiveInfoReq>()
+const { loading, dataList, run } = useRequest(queryUserReceiveInfo)
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
     run()
@@ -61,4 +64,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'isdefault', label: '是否默认' },
 ])
 
+filterOptons.buttonList = [
+    { lable: '新增地址', className: 'el-button--primary', onClick: () => openComponent('edit') },
+]
 </script>

src/packages/pc/views/account/receipt/index.vue

@@ -1,8 +1,9 @@
 <!-- 账户管理-发票信息管理 -->
 <template>
-    <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading" :row-key="rowKey" :expand-row-keys="expandKeys"  @row-click="rowClick">
+    <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading" :row-key="rowKey"
+        :expand-row-keys="expandKeys" @row-click="rowClick">
         <template #header>
-            <el-button type="danger" size="small" @click="openComponent('edit')">新增收货地址</el-button>
+            <app-filter :options="filterOptons" />
         </template>
         <!-- 发票类型 -->
         <template #receipttype="{ value }">
@@ -24,10 +25,12 @@
 import { shallowRef, defineAsyncComponent } from 'vue'
 import { getReceiptTypeName } from '@/constants/receipt'
 import { useComponent } from '@/hooks/component'
+import { useDataFilter } from '@/hooks/datatable'
 import { useComposeTable } from '@pc/components/base/table'
 import { useRequest } from '@/hooks/request'
 import { queryWrUserReceiptInfo } from '@/services/api/user'
 import AppTable from '@pc/components/base/table/index.vue'
+import AppFilter from '@pc/components/base/table-filter/index.vue'
 
 const componentMap = new Map<string, unknown>([
     ['edit', defineAsyncComponent(() => import('./components/edit/index.vue'))],
@@ -35,12 +38,8 @@ const componentMap = new Map<string, unknown>([
 ])
 
 const { rowKey, expandKeys, rowClick, selectedRow } = useComposeTable<Model.WrUserReceiptInfoRsp>({ rowKey: 'autoid' })
-
-defineProps({
-    code: String
-})
-
-const { loading, dataList, run } = useRequest(queryWrUserReceiptInfo, {})
+const { filterOptons } = useDataFilter<Model.WrUserReceiptInfoReq>()
+const { loading, dataList, run } = useRequest(queryWrUserReceiptInfo)
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
     run()
@@ -54,4 +53,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'information', label: '企业信息' },
 ])
 
+filterOptons.buttonList = [
+    { lable: '新增发票', className: 'el-button--primary', onClick: () => openComponent('edit') },
+]
 </script>

src/packages/pc/views/market/trade/spot/index.vue

@@ -51,8 +51,8 @@ filterOptons.selectList = [
 ]
 
 filterOptons.buttonList = [
-    { lable: '重置', onClick: () => onSearch(true) },
-    { lable: '查询', className: 'el-button--primary', onClick: () => onSearch() }
+    { lable: '查询', className: 'el-button--info', onClick: () => onSearch() },
+    { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) }
 ]
 
 const onSearch = (clear = false) => {

src/packages/pc/views/market/trade/spot/order/listing/index.vue

@@ -23,7 +23,7 @@
         </el-form>
         <template #footer>
             <el-button type="primary" @click="onSubmit">提交</el-button>
-            <el-button @click="onCancel(false)" plain>取消</el-button>
+            <el-button type="info" @click="onCancel(false)">取消</el-button>
         </template>
     </app-drawer>
 </template>

src/packages/pc/views/query/capital/history/index.vue

@@ -39,8 +39,8 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
 ])
 
 filterOptons.buttonList = [
-    { lable: '重置', onClick: () => onSearch(true) },
-    { lable: '查询', className: 'el-button--primary', onClick: () => onSearch() }
+    { lable: '查询', className: 'el-button--info', onClick: () => onSearch() },
+    { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) }
 ]
 
 const onSearch = (clear = false) => {

src/packages/pc/views/query/order/goods/history/index.vue

@@ -55,8 +55,8 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
 ])
 
 filterOptons.buttonList = [
-    { lable: '重置', onClick: () => onSearch(true) },
-    { lable: '查询', className: 'el-button--primary', onClick: () => onSearch() }
+    { lable: '查询', className: 'el-button--info', onClick: () => onSearch() },
+    { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) }
 ]
 
 const onSearch = (clear = false) => {

src/packages/pc/views/query/order/spot/history/index.vue

@@ -69,8 +69,8 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
 ])
 
 filterOptons.buttonList = [
-    { lable: '重置', onClick: () => onSearch(true) },
-    { lable: '查询', className: 'el-button--primary', onClick: () => onSearch() }
+    { lable: '查询', className: 'el-button--info', onClick: () => onSearch() },
+    { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) }
 ]
 
 const onSearch = (clear = false) => {

src/packages/pc/views/query/trade/goods/history/index.vue

@@ -56,8 +56,8 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
 ])
 
 filterOptons.buttonList = [
-    { lable: '重置', onClick: () => onSearch(true) },
-    { lable: '查询', className: 'el-button--primary', onClick: () => onSearch() }
+    { lable: '查询', className: 'el-button--info', onClick: () => onSearch() },
+    { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) }
 ]
 
 const onSearch = (clear = false) => {

src/packages/pc/views/query/trade/spot/history/index.vue

@@ -58,8 +58,8 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
 ])
 
 filterOptons.buttonList = [
-    { lable: '重置', onClick: () => onSearch(true) },
-    { lable: '查询', className: 'el-button--primary', onClick: () => onSearch() }
+    { lable: '查询', className: 'el-button--info', onClick: () => onSearch() },
+    { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) }
 ]
 
 const onSearch = (clear = false) => {