style 样式优化

src/views/daxpay/common/notice/callback/CallbackRecordList.vue

@@ -8,41 +8,44 @@
     @close="visible = false"
   >
     <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
-    <vxe-table
-      row-id="id"
-      ref="xTable"
-      :data="pagination.records"
-      :loading="loading"
-      :sort-config="{ remote: true, trigger: 'cell' }"
-      @sort-change="sortChange"
-    >
-      <vxe-column type="seq" width="60" />
-      <vxe-column field="reqCount" title="请求次数">
-        <template #default="{ row }">
-          <a-tag color="green">{{ row.reqCount || '空' }}</a-tag>
-        </template>
-      </vxe-column>
-      <vxe-column field="channel" title="是否成功">
-        <template #default="{ row }">
-          <a-tag v-if="row.success" color="green">成功</a-tag>
-          <a-tag v-else color="red">失败</a-tag>
-        </template>
-      </vxe-column>
-      <vxe-column field="sendType" title="发送类型">
-        <template #default="{ row }">
-          <a-tag>{{ dictConvert('notice_send_type', row.sendType) }}</a-tag>
-        </template>
-      </vxe-column>
-      <vxe-column field="errorMsg" title="错误信息" max-width="200" />
-      <vxe-column field="createTime" title="发送时间" />
-      <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
-        <template #default="{ row }">
-          <span>
-            <a href="javascript:" @click="show(row)">查看</a>
-          </span>
-        </template>
-      </vxe-column>
-    </vxe-table>
+    <div class="h-75vh">
+      <vxe-table
+        row-id="id"
+        height="auto"
+        ref="xTable"
+        :data="pagination.records"
+        :loading="loading"
+        :sort-config="{ remote: true, trigger: 'cell' }"
+        @sort-change="sortChange"
+      >
+        <vxe-column type="seq" width="60" />
+        <vxe-column field="reqCount" title="请求次数">
+          <template #default="{ row }">
+            <a-tag color="green">{{ row.reqCount || '空' }}</a-tag>
+          </template>
+        </vxe-column>
+        <vxe-column field="channel" title="是否成功">
+          <template #default="{ row }">
+            <a-tag v-if="row.success" color="green">成功</a-tag>
+            <a-tag v-else color="red">失败</a-tag>
+          </template>
+        </vxe-column>
+        <vxe-column field="sendType" title="发送类型">
+          <template #default="{ row }">
+            <a-tag>{{ dictConvert('notice_send_type', row.sendType) }}</a-tag>
+          </template>
+        </vxe-column>
+        <vxe-column field="errorMsg" title="错误信息" max-width="200" />
+        <vxe-column field="createTime" title="发送时间" />
+        <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
+          <template #default="{ row }">
+            <span>
+              <a href="javascript:" @click="show(row)">查看</a>
+            </span>
+          </template>
+        </vxe-column>
+      </vxe-table>
+    </div>
     <vxe-pager
       size="medium"
       :loading="loading"
@@ -65,8 +68,15 @@
   import CallbackRecordInfo from './CallbackRecordInfo.vue'
 
   // 使用hooks
-  const { handleTableChange, pageQueryResHandel, sortChange, pagination, sortParam, loading } =
-    useTablePage(queryPage)
+  const {
+    handleTableChange,
+    pageQueryResHandel,
+    sortChange,
+    pages,
+    pagination,
+    sortParam,
+    loading,
+  } = useTablePage(queryPage)
   const { dictConvert } = useDict()
 
   let visible = ref(false)
@@ -95,6 +105,7 @@
     loading.value = true
     pageRecord({
       taskId: task.value.id,
+      ...pages,
       ...sortParam,
     }).then(({ data }) => {
       pageQueryResHandel(data)

src/views/daxpay/common/notice/callback/CallbackTaskList.vue

@@ -10,56 +10,59 @@
     </div>
     <div class="m-3 p-3 bg-white">
       <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
-      <vxe-table
-        row-id="id"
-        ref="xTable"
-        :data="pagination.records"
-        :loading="loading"
-        :sort-config="{ remote: true, trigger: 'cell' }"
-        @sort-change="sortChange"
-      >
-        <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="orderId" title="平台交易号" :min-width="230">
-          <template #default="{ row }">
-            <a-link @click="showOrder(row)">
-              {{ row.tradeNo }}
-            </a-link>
-          </template>
-        </vxe-column>
-        <vxe-column field="tradeType" title="交易类型" :min-width="120" align="center">
-          <template #default="{ row }">
-            <a-tag>{{ dictConvert('trade_type', row.tradeType) }}</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column field="success" title="发送成功" sortable :min-width="120" align="center">
-          <template #default="{ row }">
-            <a-tag v-if="row.success" color="green">成功</a-tag>
-            <a-tag v-else color="red">失败</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column field="sendCount" title="发送次数" sortable :min-width="110" align="center" />
-        <vxe-column field="nextTime" title="下次发送时间" sortable :min-width="170" />
-        <vxe-column
-          field="delayCount"
-          title="延迟重试次数"
-          sortable
-          :min-width="130"
-          align="center"
-        />
-        <vxe-column field="latestTime" title="最后发送时间" sortable :min-width="170" />
-        <vxe-column field="createTime" title="创建时间" sortable :min-width="170" />
-        <vxe-column field="mchNo" title="商户号" :min-width="150" />
-        <vxe-column field="appId" title="应用号" :min-width="150" />
-        <vxe-column fixed="right" width="180" :showOverflow="false" title="操作">
-          <template #default="{ row }">
-            <a-link @click="show(row)">查看</a-link>
-            <a-divider type="vertical" />
-            <a-link @click="showRecord(row)">记录列表</a-link>
-            <a-divider type="vertical" />
-            <a-link @click="resetSend(row)">重发</a-link>
-          </template>
-        </vxe-column>
-      </vxe-table>
+      <div class="h-65vh">
+        <vxe-table
+          row-id="id"
+          height="auto"
+          ref="xTable"
+          :data="pagination.records"
+          :loading="loading"
+          :sort-config="{ remote: true, trigger: 'cell' }"
+          @sort-change="sortChange"
+        >
+          <vxe-column type="seq" title="序号" width="60" />
+          <vxe-column field="orderId" title="平台交易号" :min-width="230">
+            <template #default="{ row }">
+              <a-link @click="showOrder(row)">
+                {{ row.tradeNo }}
+              </a-link>
+            </template>
+          </vxe-column>
+          <vxe-column field="tradeType" title="交易类型" :min-width="120" align="center">
+            <template #default="{ row }">
+              <a-tag>{{ dictConvert('trade_type', row.tradeType) }}</a-tag>
+            </template>
+          </vxe-column>
+          <vxe-column field="success" title="发送成功" sortable :min-width="120" align="center">
+            <template #default="{ row }">
+              <a-tag v-if="row.success" color="green">成功</a-tag>
+              <a-tag v-else color="red">失败</a-tag>
+            </template>
+          </vxe-column>
+          <vxe-column field="sendCount" title="发送次数" sortable :min-width="110" align="center" />
+          <vxe-column field="nextTime" title="下次发送时间" sortable :min-width="170" />
+          <vxe-column
+            field="delayCount"
+            title="延迟重试次数"
+            sortable
+            :min-width="130"
+            align="center"
+          />
+          <vxe-column field="latestTime" title="最后发送时间" sortable :min-width="170" />
+          <vxe-column field="createTime" title="创建时间" sortable :min-width="170" />
+          <vxe-column field="mchNo" title="商户号" :min-width="150" />
+          <vxe-column field="appId" title="应用号" :min-width="150" />
+          <vxe-column fixed="right" width="180" :showOverflow="false" title="操作">
+            <template #default="{ row }">
+              <a-link @click="show(row)">查看</a-link>
+              <a-divider type="vertical" />
+              <a-link @click="showRecord(row)">记录列表</a-link>
+              <a-divider type="vertical" />
+              <a-link @click="resetSend(row)">重发</a-link>
+            </template>
+          </vxe-column>
+        </vxe-table>
+      </div>
       <vxe-pager
         size="medium"
         :loading="loading"

src/views/daxpay/common/notice/notify/NotifyRecordList.vue

@@ -8,7 +8,7 @@
     @close="visible = false"
   >
     <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
-    <div class="h-70vh">
+    <div class="h-75vh">
       <vxe-table
         row-id="id"
         ref="xTable"
@@ -68,7 +68,7 @@
   import NotifyRecordInfo from './NotifyRecordInfo.vue'
 
   // 使用hooks
-  const { handleTableChange, pageQueryResHandel, sortChange, pagination, sortParam, loading } =
+  const { handleTableChange, pageQueryResHandel, sortChange, pages, pagination, sortParam, loading } =
     useTablePage(queryPage)
   const { dictConvert } = useDict()
 
@@ -98,6 +98,7 @@
     loading.value = true
     pageRecord({
       taskId: task.value.id,
+      ...pages,
       ...sortParam,
     }).then(({ data }) => {
       pageQueryResHandel(data)

src/views/daxpay/common/order/pay/PayOrderList.vue

@@ -11,7 +11,7 @@
     <div class="m-3 p-3 bg-white">
       <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
         <template #buttons>
-          <span style="font-size: 18px">收款金额: {{ totalAmount ? totalAmount : 0 }}元</span>
+          <span style="font-size: 18px">收款金额: {{ totalAmount || 0 }}元</span>
         </template>
       </vxe-toolbar>
       <div class="h-65vh">

src/views/daxpay/common/order/refund/RefundOrderList.vue

@@ -14,7 +14,7 @@
     <div class="m-3 p-3 bg-white">
       <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
         <template #buttons>
-          <span style="font-size: 18px">退款金额: {{ totalAmount ? totalAmount : 0 }}元</span>
+          <span style="font-size: 18px">退款金额: {{ totalAmount || 0 }} 元</span>
         </template>
       </vxe-toolbar>
       <div class="h-65vh">

src/views/daxpay/common/order/transfer/TransferOrderList.vue

@@ -14,7 +14,7 @@
     <div class="m-3 p-3 bg-white">
       <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
         <template #buttons>
-          <span style="font-size: 18px">转账金额: {{ totalAmount }}元</span>
+          <span style="font-size: 18px">转账金额: {{ totalAmount || 0 }} 元</span>
         </template>
       </vxe-toolbar>
       <div class="h-64vh">
@@ -149,7 +149,7 @@
   const mchAppOptions = ref<LabeledValue[]>([])
   let channelList = ref<LabeledValue[]>([])
   let transferStatusList = ref<LabeledValue[]>([])
-  let totalAmount = ref<number>(0.0)
+  let totalAmount = ref<number>(0)
 
   // 查询条件
   const fields = computed(() => {

src/views/daxpay/common/record/flow/TradeFlowRecordList.vue

@@ -12,12 +12,12 @@
     <div class="m-3 p-3 bg-white">
       <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
         <template #buttons>
-          <span style="font-size: 18px">收入金额: {{ totalAmount.incomeAmount }}元</span>
+          <span style="font-size: 18px">收入金额: {{ totalAmount.incomeAmount || 0 }} 元</span>
           <span style="font-size: 18px; margin-left: 50px"
-            >退款金额: {{ totalAmount.refundAmount }}元</span
+            >退款金额: {{ totalAmount.refundAmount || 0 }} 元</span
           >
           <span style="font-size: 18px; margin-left: 50px"
-            >转账金额: {{ totalAmount.transferAmount }}元</span
+            >转账金额: {{ totalAmount.transferAmount || 0 }} 元</span
           >
         </template>
       </vxe-toolbar>