Browse Source

修改显示大小

Seven 5 months ago
parent
commit
7274d78b8b
31 changed files with 119 additions and 128 deletions
  1. 1 1
      admin-ui/src/components/ReIcon/src/Select.vue
  2. 1 1
      admin-ui/src/layout/components/notice/noticeItem.vue
  3. 1 1
      admin-ui/src/layout/components/setting/index.vue
  4. 3 3
      admin-ui/src/views/agent/modules/edit.vue
  5. 2 2
      admin-ui/src/views/agent/modules/list.vue
  6. 1 1
      admin-ui/src/views/business/template/hook/template-edit.vue
  7. 2 2
      admin-ui/src/views/business/template/hook/template-list.vue
  8. 2 2
      admin-ui/src/views/merchant/modules/edit.vue
  9. 2 2
      admin-ui/src/views/merchant/modules/list.vue
  10. 2 2
      admin-ui/src/views/order/edit.vue
  11. 2 2
      admin-ui/src/views/order/index.vue
  12. 2 2
      admin-ui/src/views/paytest/modules/edit.vue
  13. 3 3
      admin-ui/src/views/platform/index.vue
  14. 2 2
      admin-ui/src/views/platform/modules/list.vue
  15. 1 1
      agent-ui/src/components/ReIcon/src/Select.vue
  16. 1 1
      agent-ui/src/layout/components/notice/noticeItem.vue
  17. 1 1
      agent-ui/src/layout/components/setting/index.vue
  18. 1 1
      agent-ui/src/views/business/template/hook/template-edit.vue
  19. 2 2
      agent-ui/src/views/business/template/hook/template-list.vue
  20. 2 2
      agent-ui/src/views/channel/modules/edit.vue
  21. 5 14
      agent-ui/src/views/channel/modules/list.vue
  22. 3 3
      agent-ui/src/views/merchant/modules/edit.vue
  23. 2 2
      agent-ui/src/views/merchant/modules/list.vue
  24. 2 2
      agent-ui/src/views/order/edit.vue
  25. 65 65
      agent-ui/src/views/order/index.vue
  26. 1 1
      merchant-ui/src/components/ReIcon/src/Select.vue
  27. 1 1
      merchant-ui/src/layout/components/notice/noticeItem.vue
  28. 1 1
      merchant-ui/src/layout/components/setting/index.vue
  29. 1 1
      merchant-ui/src/views/business/template/hook/template-edit.vue
  30. 2 2
      merchant-ui/src/views/business/template/hook/template-list.vue
  31. 2 2
      merchant-ui/src/views/order/edit.vue

+ 1 - 1
admin-ui/src/components/ReIcon/src/Select.vue

@@ -202,7 +202,7 @@ watch(
             <el-button
             <el-button
               class="justify-end mr-2 ml-2"
               class="justify-end mr-2 ml-2"
               type="danger"
               type="danger"
-              size="small"
+              size="default"
               text
               text
               bg
               bg
               @click="onClear"
               @click="onClear"

+ 1 - 1
admin-ui/src/layout/components/notice/noticeItem.vue

@@ -78,7 +78,7 @@ function hoverDescription(event, description) {
         <el-tag
         <el-tag
           v-if="props.noticeItem?.extra"
           v-if="props.noticeItem?.extra"
           :type="props.noticeItem?.status"
           :type="props.noticeItem?.status"
-          size="small"
+          size="default"
           class="notice-title-extra"
           class="notice-title-extra"
         >
         >
           {{ props.noticeItem?.extra }}
           {{ props.noticeItem?.extra }}

+ 1 - 1
admin-ui/src/layout/components/setting/index.vue

@@ -378,7 +378,7 @@ onBeforeMount(() => {
 
 
       <li>
       <li>
         <span class="dark:text-white">标签风格</span>
         <span class="dark:text-white">标签风格</span>
-        <el-radio-group v-model="markValue" size="small" @change="onChange">
+        <el-radio-group v-model="markValue" size="default" @change="onChange">
           <el-radio label="card">卡片</el-radio>
           <el-radio label="card">卡片</el-radio>
           <el-radio label="smart">灵动</el-radio>
           <el-radio label="smart">灵动</el-radio>
         </el-radio-group>
         </el-radio-group>

+ 3 - 3
admin-ui/src/views/agent/modules/edit.vue

@@ -134,7 +134,7 @@ defineExpose({open});
               v-model="pageData.formData.userName"
               v-model="pageData.formData.userName"
               clearable
               clearable
               placeholder="请输入名称"
               placeholder="请输入名称"
-              size="small"
+              size="default"
               :readonly="pageData.formData.id != null"
               :readonly="pageData.formData.id != null"
           />
           />
         </el-form-item>
         </el-form-item>
@@ -144,7 +144,7 @@ defineExpose({open});
               type="password"
               type="password"
               clearable
               clearable
               placeholder="请输入密码"
               placeholder="请输入密码"
-              size="small"
+              size="default"
               :readonly="isDetail"
               :readonly="isDetail"
           />
           />
         </el-form-item>
         </el-form-item>
@@ -153,7 +153,7 @@ defineExpose({open});
             v-model="pageData.formData.rate"
             v-model="pageData.formData.rate"
             clearable
             clearable
             placeholder="请输入费率"
             placeholder="请输入费率"
-            size="small"
+            size="default"
           />‰
           />‰
         </el-form-item>
         </el-form-item>
         <el-form-item label="状态" prop="password">
         <el-form-item label="状态" prop="password">

+ 2 - 2
admin-ui/src/views/agent/modules/list.vue

@@ -314,7 +314,7 @@ onMounted(() => {
 <template>
 <template>
   <div>
   <div>
     <form-search
     <form-search
-      size="small"
+      size="default"
       :show="pageData.searchParam.searchState"
       :show="pageData.searchParam.searchState"
       :form-field="searchFormFields"
       :form-field="searchFormFields"
       :data-source="pageData.dataSource"
       :data-source="pageData.dataSource"
@@ -335,7 +335,7 @@ onMounted(() => {
       :data="pageData.tableParam.list"
       :data="pageData.tableParam.list"
       :columns="pageData.tableParam.columns"
       :columns="pageData.tableParam.columns"
       row-key="id"
       row-key="id"
-      size="small"
+      size="default"
       border
       border
       stripe
       stripe
       :header-row-class-name="'table-header'"
       :header-row-class-name="'table-header'"

+ 1 - 1
admin-ui/src/views/business/template/hook/template-edit.vue

@@ -129,7 +129,7 @@ defineExpose({ open });
             v-model="pageData.formData.username"
             v-model="pageData.formData.username"
             clearable
             clearable
             placeholder="请输入名称"
             placeholder="请输入名称"
-            size="small"
+            size="default"
             :readonly="isDetail"
             :readonly="isDetail"
           />
           />
         </el-form-item>
         </el-form-item>

+ 2 - 2
admin-ui/src/views/business/template/hook/template-list.vue

@@ -290,7 +290,7 @@ onMounted(() => {
 <template>
 <template>
   <div>
   <div>
     <form-search
     <form-search
-      size="small"
+      size="default"
       :show="pageData.searchParam.searchState"
       :show="pageData.searchParam.searchState"
       :form-field="searchFormFields"
       :form-field="searchFormFields"
       :data-source="pageData.dataSource"
       :data-source="pageData.dataSource"
@@ -311,7 +311,7 @@ onMounted(() => {
       :data="pageData.tableParam.list"
       :data="pageData.tableParam.list"
       :columns="pageData.tableParam.columns"
       :columns="pageData.tableParam.columns"
       row-key="id"
       row-key="id"
-      size="small"
+      size="default"
       border
       border
       stripe
       stripe
       :header-row-class-name="'table-header'"
       :header-row-class-name="'table-header'"

+ 2 - 2
admin-ui/src/views/merchant/modules/edit.vue

@@ -129,7 +129,7 @@ defineExpose({ open });
             v-model="pageData.formData.userName"
             v-model="pageData.formData.userName"
             clearable
             clearable
             placeholder="请输入名称"
             placeholder="请输入名称"
-            size="small"
+            size="default"
             :readonly="isDetail"
             :readonly="isDetail"
           />
           />
         </el-form-item>
         </el-form-item>
@@ -139,7 +139,7 @@ defineExpose({ open });
             type="password"
             type="password"
             clearable
             clearable
             placeholder="请输入密码"
             placeholder="请输入密码"
-            size="small"
+            size="default"
             :readonly="isDetail"
             :readonly="isDetail"
           />
           />
         </el-form-item>
         </el-form-item>

+ 2 - 2
admin-ui/src/views/merchant/modules/list.vue

@@ -306,7 +306,7 @@ onMounted(() => {
 <template>
 <template>
   <div>
   <div>
     <form-search
     <form-search
-      size="small"
+      size="default"
       :show="pageData.searchParam.searchState"
       :show="pageData.searchParam.searchState"
       :form-field="searchFormFields"
       :form-field="searchFormFields"
       :data-source="pageData.dataSource"
       :data-source="pageData.dataSource"
@@ -327,7 +327,7 @@ onMounted(() => {
       :data="pageData.tableParam.list"
       :data="pageData.tableParam.list"
       :columns="pageData.tableParam.columns"
       :columns="pageData.tableParam.columns"
       row-key="id"
       row-key="id"
-      size="small"
+      size="default"
       border
       border
       stripe
       stripe
       :header-row-class-name="'table-header'"
       :header-row-class-name="'table-header'"

+ 2 - 2
admin-ui/src/views/order/edit.vue

@@ -129,7 +129,7 @@ defineExpose({ open });
             v-model="pageData.formData.userName"
             v-model="pageData.formData.userName"
             clearable
             clearable
             placeholder="请输入名称"
             placeholder="请输入名称"
-            size="small"
+            size="default"
             :readonly="isDetail"
             :readonly="isDetail"
           />
           />
         </el-form-item>
         </el-form-item>
@@ -139,7 +139,7 @@ defineExpose({ open });
             type="password"
             type="password"
             clearable
             clearable
             placeholder="请输入密码"
             placeholder="请输入密码"
-            size="small"
+            size="default"
             :readonly="isDetail"
             :readonly="isDetail"
           />
           />
         </el-form-item>
         </el-form-item>

+ 2 - 2
admin-ui/src/views/order/index.vue

@@ -338,7 +338,7 @@ onMounted(() => {
 <template>
 <template>
   <div>
   <div>
     <form-search
     <form-search
-      size="small"
+      size="default"
       :show="pageData.searchParam.searchState"
       :show="pageData.searchParam.searchState"
       :form-field="searchFormFields"
       :form-field="searchFormFields"
       :data-source="pageData.dataSource"
       :data-source="pageData.dataSource"
@@ -359,7 +359,7 @@ onMounted(() => {
       :data="pageData.tableParam.list"
       :data="pageData.tableParam.list"
       :columns="pageData.tableParam.columns"
       :columns="pageData.tableParam.columns"
       row-key="id"
       row-key="id"
-      size="small"
+      size="default"
       border
       border
       stripe
       stripe
       :header-row-class-name="'table-header'"
       :header-row-class-name="'table-header'"

+ 2 - 2
admin-ui/src/views/paytest/modules/edit.vue

@@ -129,7 +129,7 @@ defineExpose({ open });
             v-model="pageData.formData.userName"
             v-model="pageData.formData.userName"
             clearable
             clearable
             placeholder="请输入名称"
             placeholder="请输入名称"
-            size="small"
+            size="default"
             :readonly="isDetail"
             :readonly="isDetail"
           />
           />
         </el-form-item>
         </el-form-item>
@@ -139,7 +139,7 @@ defineExpose({ open });
             type="password"
             type="password"
             clearable
             clearable
             placeholder="请输入密码"
             placeholder="请输入密码"
-            size="small"
+            size="default"
             :readonly="isDetail"
             :readonly="isDetail"
           />
           />
         </el-form-item>
         </el-form-item>

+ 3 - 3
admin-ui/src/views/platform/index.vue

@@ -110,7 +110,7 @@ onMounted(() => {
           v-model="pageData.formData.appId"
           v-model="pageData.formData.appId"
           clearable
           clearable
           placeholder="请输入应用appId"
           placeholder="请输入应用appId"
-          size="small"
+          size="default"
           :readonly="isDetail"
           :readonly="isDetail"
         />
         />
       </el-form-item>
       </el-form-item>
@@ -121,7 +121,7 @@ onMounted(() => {
           v-model="pageData.formData.privateKey"
           v-model="pageData.formData.privateKey"
           clearable
           clearable
           placeholder="请输入应用密钥"
           placeholder="请输入应用密钥"
-          size="small"
+          size="default"
           :readonly="isDetail"
           :readonly="isDetail"
         />
         />
       </el-form-item>
       </el-form-item>
@@ -132,7 +132,7 @@ onMounted(() => {
           v-model="pageData.formData.publicKey"
           v-model="pageData.formData.publicKey"
           clearable
           clearable
           placeholder="请输入服务商公钥"
           placeholder="请输入服务商公钥"
-          size="small"
+          size="default"
           :readonly="isDetail"
           :readonly="isDetail"
         />
         />
       </el-form-item>
       </el-form-item>

+ 2 - 2
admin-ui/src/views/platform/modules/list.vue

@@ -297,7 +297,7 @@ onMounted(() => {
 <template>
 <template>
   <div>
   <div>
     <form-search
     <form-search
-      size="small"
+      size="default"
       :show="pageData.searchParam.searchState"
       :show="pageData.searchParam.searchState"
       :form-field="searchFormFields"
       :form-field="searchFormFields"
       :data-source="pageData.dataSource"
       :data-source="pageData.dataSource"
@@ -318,7 +318,7 @@ onMounted(() => {
       :data="pageData.tableParam.list"
       :data="pageData.tableParam.list"
       :columns="pageData.tableParam.columns"
       :columns="pageData.tableParam.columns"
       row-key="id"
       row-key="id"
-      size="small"
+      size="default"
       border
       border
       stripe
       stripe
       :header-row-class-name="'table-header'"
       :header-row-class-name="'table-header'"

+ 1 - 1
agent-ui/src/components/ReIcon/src/Select.vue

@@ -202,7 +202,7 @@ watch(
             <el-button
             <el-button
               class="justify-end mr-2 ml-2"
               class="justify-end mr-2 ml-2"
               type="danger"
               type="danger"
-              size="small"
+              size="default"
               text
               text
               bg
               bg
               @click="onClear"
               @click="onClear"

+ 1 - 1
agent-ui/src/layout/components/notice/noticeItem.vue

@@ -78,7 +78,7 @@ function hoverDescription(event, description) {
         <el-tag
         <el-tag
           v-if="props.noticeItem?.extra"
           v-if="props.noticeItem?.extra"
           :type="props.noticeItem?.status"
           :type="props.noticeItem?.status"
-          size="small"
+          size="default"
           class="notice-title-extra"
           class="notice-title-extra"
         >
         >
           {{ props.noticeItem?.extra }}
           {{ props.noticeItem?.extra }}

+ 1 - 1
agent-ui/src/layout/components/setting/index.vue

@@ -378,7 +378,7 @@ onBeforeMount(() => {
 
 
       <li>
       <li>
         <span class="dark:text-white">标签风格</span>
         <span class="dark:text-white">标签风格</span>
-        <el-radio-group v-model="markValue" size="small" @change="onChange">
+        <el-radio-group v-model="markValue" size="default" @change="onChange">
           <el-radio label="card">卡片</el-radio>
           <el-radio label="card">卡片</el-radio>
           <el-radio label="smart">灵动</el-radio>
           <el-radio label="smart">灵动</el-radio>
         </el-radio-group>
         </el-radio-group>

+ 1 - 1
agent-ui/src/views/business/template/hook/template-edit.vue

@@ -129,7 +129,7 @@ defineExpose({ open });
             v-model="pageData.formData.username"
             v-model="pageData.formData.username"
             clearable
             clearable
             placeholder="请输入名称"
             placeholder="请输入名称"
-            size="small"
+            size="default"
             :readonly="isDetail"
             :readonly="isDetail"
           />
           />
         </el-form-item>
         </el-form-item>

+ 2 - 2
agent-ui/src/views/business/template/hook/template-list.vue

@@ -290,7 +290,7 @@ onMounted(() => {
 <template>
 <template>
   <div>
   <div>
     <form-search
     <form-search
-      size="small"
+      size="default"
       :show="pageData.searchParam.searchState"
       :show="pageData.searchParam.searchState"
       :form-field="searchFormFields"
       :form-field="searchFormFields"
       :data-source="pageData.dataSource"
       :data-source="pageData.dataSource"
@@ -311,7 +311,7 @@ onMounted(() => {
       :data="pageData.tableParam.list"
       :data="pageData.tableParam.list"
       :columns="pageData.tableParam.columns"
       :columns="pageData.tableParam.columns"
       row-key="id"
       row-key="id"
-      size="small"
+      size="default"
       border
       border
       stripe
       stripe
       :header-row-class-name="'table-header'"
       :header-row-class-name="'table-header'"

+ 2 - 2
agent-ui/src/views/channel/modules/edit.vue

@@ -6,7 +6,7 @@ import type {FormInstance} from "element-plus";
 import {cloneDeep} from "@pureadmin/utils";
 import {cloneDeep} from "@pureadmin/utils";
 import {enableOptions, serviceTypeOptions} from "@/constants/constants";
 import {enableOptions, serviceTypeOptions} from "@/constants/constants";
 
 
-const title = "";
+const title = "通道管理";
 defineOptions({name: "templateEdit"});
 defineOptions({name: "templateEdit"});
 const isDetail = ref(false);
 const isDetail = ref(false);
 const formRef = ref<FormInstance>();
 const formRef = ref<FormInstance>();
@@ -238,7 +238,7 @@ defineExpose({open});
             clearable
             clearable
             placeholder="请输入统一费率"
             placeholder="请输入统一费率"
             :readonly="isDetail"
             :readonly="isDetail"
-          />()
+          />(%)
         </el-form-item>
         </el-form-item>
         <el-form-item label="状态" prop="status">
         <el-form-item label="状态" prop="status">
           <el-select
           <el-select

+ 5 - 14
agent-ui/src/views/channel/modules/list.vue

@@ -63,7 +63,6 @@ const pageData: any = reactive({
   },
   },
   /*按钮 */
   /*按钮 */
   btnOpts: {
   btnOpts: {
-    size: "small",
     leftBtns: [
     leftBtns: [
       {
       {
         key: "add",
         key: "add",
@@ -119,21 +118,16 @@ const pageData: any = reactive({
         prop: "appId",
         prop: "appId",
         slot: "serviceId"
         slot: "serviceId"
       },
       },
-      {
-        label: "服务商模式",
-        prop: "type",
-        slot: "serviceTypeOptions"
-      },
-      {
-        label: "状态",
-        prop: "status",
-        slot: "enableOptions"
-      },
       {
       {
         label: "商户号",
         label: "商户号",
         prop: "sellerId",
         prop: "sellerId",
         slot: "sellerId"
         slot: "sellerId"
       },
       },
+      {
+        label: "服务商模式",
+        prop: "type",
+        slot: "serviceTypeOptions"
+      },
       {
       {
         label: "每日限额",
         label: "每日限额",
         prop: "dayMaxPayAmount",
         prop: "dayMaxPayAmount",
@@ -177,7 +171,6 @@ const pageData: any = reactive({
     ],
     ],
     loading: false,
     loading: false,
     pagination: {
     pagination: {
-      small: true,
       pageSize: 10,
       pageSize: 10,
       defaultPageSize: 10,
       defaultPageSize: 10,
       currentPage: 1,
       currentPage: 1,
@@ -344,7 +337,6 @@ onMounted(() => {
 <template>
 <template>
   <div>
   <div>
     <form-search
     <form-search
-      size="small"
       :show="pageData.searchParam.searchState"
       :show="pageData.searchParam.searchState"
       :form-field="searchFormFields"
       :form-field="searchFormFields"
       :data-source="pageData.dataSource"
       :data-source="pageData.dataSource"
@@ -365,7 +357,6 @@ onMounted(() => {
       :data="pageData.tableParam.list"
       :data="pageData.tableParam.list"
       :columns="pageData.tableParam.columns"
       :columns="pageData.tableParam.columns"
       row-key="id"
       row-key="id"
-      size="small"
       border
       border
       stripe
       stripe
       :header-row-class-name="'table-header'"
       :header-row-class-name="'table-header'"

+ 3 - 3
agent-ui/src/views/merchant/modules/edit.vue

@@ -133,7 +133,7 @@ defineExpose({ open });
             v-model="pageData.formData.userName"
             v-model="pageData.formData.userName"
             clearable
             clearable
             placeholder="请输入商户账号"
             placeholder="请输入商户账号"
-            size="small"
+            size="default"
             :readonly="pageData.formData.id != null"
             :readonly="pageData.formData.id != null"
           />
           />
         </el-form-item>
         </el-form-item>
@@ -142,7 +142,7 @@ defineExpose({ open });
             v-model="pageData.formData.rate"
             v-model="pageData.formData.rate"
             clearable
             clearable
             placeholder="请输入费率"
             placeholder="请输入费率"
-            size="small"
+            size="default"
             :readonly="isDetail"
             :readonly="isDetail"
           />‰
           />‰
         </el-form-item>
         </el-form-item>
@@ -152,7 +152,7 @@ defineExpose({ open });
             type="password"
             type="password"
             clearable
             clearable
             placeholder="请输入密码"
             placeholder="请输入密码"
-            size="small"
+            size="default"
             :readonly="isDetail"
             :readonly="isDetail"
           />
           />
         </el-form-item>
         </el-form-item>

+ 2 - 2
agent-ui/src/views/merchant/modules/list.vue

@@ -314,7 +314,7 @@ onMounted(() => {
 <template>
 <template>
   <div>
   <div>
     <form-search
     <form-search
-      size="small"
+      size="default"
       :show="pageData.searchParam.searchState"
       :show="pageData.searchParam.searchState"
       :form-field="searchFormFields"
       :form-field="searchFormFields"
       :data-source="pageData.dataSource"
       :data-source="pageData.dataSource"
@@ -335,7 +335,7 @@ onMounted(() => {
       :data="pageData.tableParam.list"
       :data="pageData.tableParam.list"
       :columns="pageData.tableParam.columns"
       :columns="pageData.tableParam.columns"
       row-key="id"
       row-key="id"
-      size="small"
+      size="default"
       border
       border
       stripe
       stripe
       :header-row-class-name="'table-header'"
       :header-row-class-name="'table-header'"

+ 2 - 2
agent-ui/src/views/order/edit.vue

@@ -129,7 +129,7 @@ defineExpose({ open });
             v-model="pageData.formData.userName"
             v-model="pageData.formData.userName"
             clearable
             clearable
             placeholder="请输入名称"
             placeholder="请输入名称"
-            size="small"
+            size="default"
             :readonly="isDetail"
             :readonly="isDetail"
           />
           />
         </el-form-item>
         </el-form-item>
@@ -139,7 +139,7 @@ defineExpose({ open });
             type="password"
             type="password"
             clearable
             clearable
             placeholder="请输入密码"
             placeholder="请输入密码"
-            size="small"
+            size="default"
             :readonly="isDetail"
             :readonly="isDetail"
           />
           />
         </el-form-item>
         </el-form-item>

+ 65 - 65
agent-ui/src/views/order/index.vue

@@ -77,7 +77,6 @@ const pageData: any = reactive({
   },
   },
   /*按钮 */
   /*按钮 */
   btnOpts: {
   btnOpts: {
-    size: "small",
     leftBtns: [
     leftBtns: [
 
 
     ],
     ],
@@ -159,7 +158,6 @@ const pageData: any = reactive({
     ],
     ],
     loading: false,
     loading: false,
     pagination: {
     pagination: {
-      small: true,
       pageSize: 10,
       pageSize: 10,
       defaultPageSize: 10,
       defaultPageSize: 10,
       currentPage: 1,
       currentPage: 1,
@@ -337,68 +335,70 @@ onMounted(() => {
 </script>
 </script>
 
 
 <template>
 <template>
-  <div>
-    <form-search
-      size="small"
-      :show="pageData.searchParam.searchState"
-      :form-field="searchFormFields"
-      :data-source="pageData.dataSource"
-      :query-permission="pageData.permission.query"
-      @search-form="_updateSearchFormData"
-      @search="_searchForm"
-      @reset="_resetSearchForm"
-    />
-    <!--operate-->
-    <table-buttons
-      :size="pageData.btnOpts.size"
-      :left-btns="pageData.btnOpts.leftBtns"
-      :right-btns="pageData.btnOpts.rightBtns"
-      @click="btnClickHandle"
-    />
-    <!--table-->
-    <pure-table
-      :data="pageData.tableParam.list"
-      :columns="pageData.tableParam.columns"
-      row-key="id"
-      size="small"
-      border
-      stripe
-      :header-row-class-name="'table-header'"
-      :loading="pageData.tableParam.loading"
-      :pagination="pageData.tableParam.pagination"
-      @page-current-change="handleChangeCurrentPage"
-      @page-size-change="handleChangePageSize"
-    >
+  <el-card :shadow="'never'">
+    <template #default>
+      <div>
+        <form-search
+          :show="pageData.searchParam.searchState"
+          :form-field="searchFormFields"
+          :data-source="pageData.dataSource"
+          :query-permission="pageData.permission.query"
+          @search-form="_updateSearchFormData"
+          @search="_searchForm"
+          @reset="_resetSearchForm"
+        />
+        <!--operate-->
+        <table-buttons
+          :size="pageData.btnOpts.size"
+          :left-btns="pageData.btnOpts.leftBtns"
+          :right-btns="pageData.btnOpts.rightBtns"
+          @click="btnClickHandle"
+        />
+        <!--table-->
+        <pure-table
+          :data="pageData.tableParam.list"
+          :columns="pageData.tableParam.columns"
+          row-key="id"
+          border
+          stripe
+          :header-row-class-name="'table-header'"
+          :loading="pageData.tableParam.loading"
+          :pagination="pageData.tableParam.pagination"
+          @page-current-change="handleChangeCurrentPage"
+          @page-size-change="handleChangePageSize"
+        >
 
 
-      <template #ellipsis="{ row, column }">
-        <el-tooltip placement="top-start" :content="row[column.property]"
-        >{{ row[column.property] }}
-        </el-tooltip>
-      </template>
-      <template #enableOptions="scope">
-        <el-tag v-if="scope.row.status==-1">支付失败</el-tag>
-        <el-tag v-if="scope.row.status==0">待支付</el-tag>
-        <el-tag v-if="scope.row.status==1">支付成功</el-tag>
-        <el-tag v-if="scope.row.status==2">退款</el-tag>
-      </template>
-      <template #operation="{ row }">
-        <div class="flex justify-center items-center">
-          <el-link
-            type="primary"
-            @click="handlePayStatus(row)"
-          >查询支付状态
-          </el-link>
-          <el-divider
-            direction="vertical"
-          />
-          <el-link
-            type="primary"
-            @click="handleCallback(row)"
-          >回调
-          </el-link>
-        </div>
-      </template>
-    </pure-table>
-    <edit ref="editRef" @ok="_loadData" />
-  </div>
+          <template #ellipsis="{ row, column }">
+            <el-tooltip placement="top-start" :content="row[column.property]"
+            >{{ row[column.property] }}
+            </el-tooltip>
+          </template>
+          <template #enableOptions="scope">
+            <el-tag v-if="scope.row.status==-1">支付失败</el-tag>
+            <el-tag v-if="scope.row.status==0">待支付</el-tag>
+            <el-tag v-if="scope.row.status==1">支付成功</el-tag>
+            <el-tag v-if="scope.row.status==2">退款</el-tag>
+          </template>
+          <template #operation="{ row }">
+            <div class="flex justify-center items-center">
+              <el-link
+                type="primary"
+                @click="handlePayStatus(row)"
+              >查询支付状态
+              </el-link>
+              <el-divider
+                direction="vertical"
+              />
+              <el-link
+                type="primary"
+                @click="handleCallback(row)"
+              >回调
+              </el-link>
+            </div>
+          </template>
+        </pure-table>
+        <edit ref="editRef" @ok="_loadData" />
+      </div>
+    </template>
+  </el-card>
 </template>
 </template>

+ 1 - 1
merchant-ui/src/components/ReIcon/src/Select.vue

@@ -202,7 +202,7 @@ watch(
             <el-button
             <el-button
               class="justify-end mr-2 ml-2"
               class="justify-end mr-2 ml-2"
               type="danger"
               type="danger"
-              size="small"
+              size="default"
               text
               text
               bg
               bg
               @click="onClear"
               @click="onClear"

+ 1 - 1
merchant-ui/src/layout/components/notice/noticeItem.vue

@@ -78,7 +78,7 @@ function hoverDescription(event, description) {
         <el-tag
         <el-tag
           v-if="props.noticeItem?.extra"
           v-if="props.noticeItem?.extra"
           :type="props.noticeItem?.status"
           :type="props.noticeItem?.status"
-          size="small"
+          size="default"
           class="notice-title-extra"
           class="notice-title-extra"
         >
         >
           {{ props.noticeItem?.extra }}
           {{ props.noticeItem?.extra }}

+ 1 - 1
merchant-ui/src/layout/components/setting/index.vue

@@ -378,7 +378,7 @@ onBeforeMount(() => {
 
 
       <li>
       <li>
         <span class="dark:text-white">标签风格</span>
         <span class="dark:text-white">标签风格</span>
-        <el-radio-group v-model="markValue" size="small" @change="onChange">
+        <el-radio-group v-model="markValue" size="default" @change="onChange">
           <el-radio label="card">卡片</el-radio>
           <el-radio label="card">卡片</el-radio>
           <el-radio label="smart">灵动</el-radio>
           <el-radio label="smart">灵动</el-radio>
         </el-radio-group>
         </el-radio-group>

+ 1 - 1
merchant-ui/src/views/business/template/hook/template-edit.vue

@@ -129,7 +129,7 @@ defineExpose({ open });
             v-model="pageData.formData.username"
             v-model="pageData.formData.username"
             clearable
             clearable
             placeholder="请输入名称"
             placeholder="请输入名称"
-            size="small"
+            size="default"
             :readonly="isDetail"
             :readonly="isDetail"
           />
           />
         </el-form-item>
         </el-form-item>

+ 2 - 2
merchant-ui/src/views/business/template/hook/template-list.vue

@@ -290,7 +290,7 @@ onMounted(() => {
 <template>
 <template>
   <div>
   <div>
     <form-search
     <form-search
-      size="small"
+      size="default"
       :show="pageData.searchParam.searchState"
       :show="pageData.searchParam.searchState"
       :form-field="searchFormFields"
       :form-field="searchFormFields"
       :data-source="pageData.dataSource"
       :data-source="pageData.dataSource"
@@ -311,7 +311,7 @@ onMounted(() => {
       :data="pageData.tableParam.list"
       :data="pageData.tableParam.list"
       :columns="pageData.tableParam.columns"
       :columns="pageData.tableParam.columns"
       row-key="id"
       row-key="id"
-      size="small"
+      size="default"
       border
       border
       stripe
       stripe
       :header-row-class-name="'table-header'"
       :header-row-class-name="'table-header'"

+ 2 - 2
merchant-ui/src/views/order/edit.vue

@@ -129,7 +129,7 @@ defineExpose({ open });
             v-model="pageData.formData.userName"
             v-model="pageData.formData.userName"
             clearable
             clearable
             placeholder="请输入名称"
             placeholder="请输入名称"
-            size="small"
+            size="default"
             :readonly="isDetail"
             :readonly="isDetail"
           />
           />
         </el-form-item>
         </el-form-item>
@@ -139,7 +139,7 @@ defineExpose({ open });
             type="password"
             type="password"
             clearable
             clearable
             placeholder="请输入密码"
             placeholder="请输入密码"
-            size="small"
+            size="default"
             :readonly="isDetail"
             :readonly="isDetail"
           />
           />
         </el-form-item>
         </el-form-item>