Parcourir la source

修改显示大小

Seven il y a 5 mois
Parent
commit
b894d5400c

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

@@ -6,7 +6,7 @@ import type { FormInstance } from "element-plus";
 import { cloneDeep } from "@pureadmin/utils";
 
 const title = "";
-defineOptions({ name: "templateEdit" });
+defineOptions({ name: "orderEdit" });
 const isDetail = ref(false);
 const formRef = ref<FormInstance>();
 // 初始化数据

+ 62 - 66
merchant-ui/src/views/order/index.vue

@@ -5,9 +5,8 @@ import Edit from "./edit.vue";
 import { PureTable } from "@pureadmin/table";
 import { computed, onBeforeMount, onMounted, reactive, ref, watch } from "vue";
 import * as $api from "@/api/order/index";
-import { hasAuth } from "@/router/utils";
 import message from "@/utils/message";
-import {enableOptions, payStatusOptions} from "@/constants/constants";
+import { payStatusOptions } from "@/constants/constants";
 import { cloneDeep } from "@pureadmin/utils";
 
 const editRef = ref();
@@ -77,9 +76,7 @@ const pageData: any = reactive({
   },
   /*按钮 */
   btnOpts: {
-    size: "small",
     leftBtns: [
-
     ],
     rightBtns: [
       {
@@ -144,7 +141,7 @@ const pageData: any = reactive({
     ],
     loading: false,
     pagination: {
-      small: true,
+      small: false,
       pageSize: 10,
       defaultPageSize: 10,
       currentPage: 1,
@@ -323,67 +320,66 @@ onMounted(() => {
 
 <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>
+      <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" />
+        <template #ellipsis="{ row, column }">
+          <el-tooltip placement="top-start" :content="row[column.property]"
+          >{{ row[column.property] }}
+          </el-tooltip>
+        </template>
+        <template #enableOptions="scope">
+          <el-tag type="danger" v-if="scope.row.status==-1">支付失败</el-tag>
+          <el-tag v-if="scope.row.status==0">待支付</el-tag>
+          <el-tag type="success" v-if="scope.row.status==1">支付成功</el-tag>
+          <el-tag type="warning" v-if="scope.row.status==2">退款</el-tag>
+        </template>
+        <template #operation="{ row }">
+          <div class="flex justify-center items-center">
+            <el-link
+              type="primary"
+              v-if="row.status!=1"
+              @click="handlePayStatus(row)"
+            >查询支付状态
+            </el-link>
+            <el-link
+              type="primary"
+              v-if="row.status==1"
+              @click="handleCallback(row)"
+            >回调
+            </el-link>
+          </div>
+        </template>
+      </pure-table>
+      <edit ref="editRef" @ok="_loadData" />
+    </el-card>
   </div>
 </template>

+ 3 - 5
merchant-ui/src/views/paytest/index.vue

@@ -91,7 +91,7 @@ onMounted(() => {
 </script>
 <template>
   <div>
-    <el-card style="width: 700px; border-radius: 8px" shadow="hover">
+    <el-card class="min-w-[800px]" style="border-radius: 8px" shadow="hover">
       <template #header>
         <el-text class="mx-1" type="primary" size="large">支付信息</el-text>
       </template>
@@ -99,7 +99,7 @@ onMounted(() => {
         <el-form
             ref="formRef"
             :model="pageData.formData"
-            style="width: 90%; margin: 20px auto 0"
+            style="margin: 20px 0"
             label-width="auto"
         >
           <el-form-item label="通道" prop="status">
@@ -121,16 +121,14 @@ onMounted(() => {
                       v-model="pageData.formData.bizOrderNo"
                       clearable
                       placeholder="请输入业务单号"
-                      size="small"
             />
-            <el-button type="primary" style="height: 25px" @click="genbizOrderNoeNo">生成</el-button>
+            <el-button type="primary" class="ml-3" style="height: 25px" @click="genbizOrderNoeNo">生成</el-button>
           </el-form-item>
           <el-form-item label="支付标题">
             <el-input
                 v-model="pageData.formData.title"
                 clearable
                 placeholder="请输入支付标题"
-                size="small"
             />
           </el-form-item>
           <el-form-item label="支付金额(元):">

+ 1 - 1
merchant-ui/src/views/welcome/index.vue

@@ -34,7 +34,7 @@ const pageData: any = reactive({
 <template>
   <div>
     <div class="max-w-full">
-      <el-card style="width: 480px; border-radius: 8px" shadow="hover">
+      <el-card style="border-radius: 8px" shadow="hover">
         <template #default v-if="merchantKeyInfo">
           <el-form :model="pageData.formData">
             <el-form-item label="appId:">