feat 支付订单和记录显示调整

2026-08-12 23:45:39 +08:00 · 2024-01-16 17:12:01 +08:00
parent e6e97ebc36
commit 201675e316
9 changed files with 40 additions and 25 deletions
--- a/src/views/payment/channel/config/ChannelPayConfigList.vue
+++ b/src/views/payment/channel/config/ChannelPayConfigList.vue
@@ -6,19 +6,24 @@
          <template #renderItem="{ item }">
            <a-card hoverable style="max-width: 200px; margin-bottom: 50px" @click="setting(item)">
              <template #cover>
-                <a-image :preview="false" :src="urlPrefix + String(item?.img)" :fallback="fallbackImg" />
+                <a-image
+                  style="width: 200px; height: 200px"
+                  :preview="false"
+                  :src="urlPrefix + String(item?.iconId)"
+                  :fallback="fallbackImg"
+                />
              </template>
              <a-card-meta :title="item.name">
-<!--                <template #description>-->
-<!--                  <template v-if="item.enable">-->
-<!--                    <a-badge dot color="green" />-->
-<!--                    <span style="color: green">已启用</span>-->
-<!--                  </template>-->
-<!--                  <template v-else>-->
-<!--                    <a-badge dot color="red" />-->
-<!--                    <span style="color: red">停用</span>-->
-<!--                  </template>-->
-<!--                </template>-->
+                <template #description>
+                  <template v-if="item.enable">
+                    <a-badge dot color="green" />
+                    <span style="color: green">已启用</span>
+                  </template>
+                  <template v-else>
+                    <a-badge dot color="red" />
+                    <span style="color: red">停用</span>
+                  </template>
+                </template>
              </a-card-meta>
            </a-card>
          </template>
--- a/src/views/payment/order/pay/PayOrderInfo.vue
+++ b/src/views/payment/order/pay/PayOrderInfo.vue
@@ -76,6 +76,9 @@
        <a-descriptions-item label="过期时间">
          {{ order.expiredTime }}
        </a-descriptions-item>
+        <a-descriptions-item label="创建时间">
+          {{ order.createTime }}
+        </a-descriptions-item>
      </a-descriptions>
    </a-spin>
    <template #footer>
--- a/src/views/payment/record/close/PayCloseRecordInfo.vue
+++ b/src/views/payment/record/close/PayCloseRecordInfo.vue
@@ -29,7 +29,7 @@
          {{ form.clientIp }}
        </a-descriptions-item>
        <a-descriptions-item label="关闭时间">
-          {{ form.createdTime }}
+          {{ form.createTime }}
        </a-descriptions-item>
      </a-descriptions>
    </a-spin>
--- a/src/views/payment/record/repair/PayRepairRecordInfo.vue
+++ b/src/views/payment/record/repair/PayRepairRecordInfo.vue
@@ -32,7 +32,7 @@
          {{ dictConvert('PayStatus', form.afterStatus) }}
        </a-descriptions-item>
        <a-descriptions-item label="修复时间">
-          {{ form.createdTime }}
+          {{ form.createTime }}
        </a-descriptions-item>
      </a-descriptions>
    </a-spin>
--- a/src/views/payment/record/sync/PaySyncRecord.api.ts
+++ b/src/views/payment/record/sync/PaySyncRecord.api.ts
@@ -45,7 +45,7 @@ export interface SyncRecord extends BaseEntity {
  // 错误消息
  errorMsg?: string
  // 同步时间
-  syncTime?: string
+  createTime?: string
  // 终端ip
  clientIp?: string
  // 请求链路ID
--- a/src/views/payment/record/sync/PaySyncRecordInfo.vue
+++ b/src/views/payment/record/sync/PaySyncRecordInfo.vue
@@ -1,6 +1,6 @@
 <template>
  <basic-modal
-    title="查看"
+    title="查看同步信息"
    v-bind="$attrs"
    :loading="confirmLoading"
    :width="750"
@@ -9,8 +9,8 @@
    @cancel="handleCancel"
  >
    <a-spin :spinning="confirmLoading">
-      <a-descriptions bordered title="" :column="{ md: 1, sm: 1, xs: 1 }">
-        <a-descriptions-item label="支付记录id">
+      <a-descriptions title="" :column="{ md: 1, sm: 1, xs: 1 }">
+        <a-descriptions-item label="支付号">
          {{ form.paymentId }}
        </a-descriptions-item>
        <a-descriptions-item label="业务号">
@@ -23,7 +23,7 @@
          <json-preview :data="XEUtils.toStringJSON(form.syncInfo || '{}')" />
        </a-descriptions-item>
        <a-descriptions-item label="同步结果">
-          {{ dictConvert('PaySyncResult', form.gatewayStatus) }}
+          {{ dictConvert('PaySyncStatus', form.gatewayStatus) }}
        </a-descriptions-item>
        <a-descriptions-item label="是否修复">
          <a-tag>{{ form.repairOrder ? '是' : '否' }}</a-tag>
@@ -32,7 +32,7 @@
          {{ dictConvert('PayStatus', form.afterStatus) }}
        </a-descriptions-item>
        <a-descriptions-item label="同步时间">
-          {{ form.syncTime }}
+          {{ form.createTime }}
        </a-descriptions-item>

        <a-descriptions-item label="错误信息" v-if="form.errorMsg">
--- a/src/views/payment/record/sync/PaySyncRecordList.vue
+++ b/src/views/payment/record/sync/PaySyncRecordList.vue
@@ -39,7 +39,7 @@
          </template>
        </vxe-column>
        <vxe-column field="errorMsg" title="错误消息" />
-        <vxe-column field="syncTime" title="同步时间" />
+        <vxe-column field="createTime" title="同步时间" />
        <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
          <template #default="{ row }">
            <span>
--- a/src/views/payment/system/payinfo/channel/PayChannelInfoEdit.vue
+++ b/src/views/payment/system/payinfo/channel/PayChannelInfoEdit.vue
@@ -26,7 +26,10 @@
        <a-form-item label="通道名称" name="name">
          <span>{{ form.name }}</span>
        </a-form-item>
-        <a-form-item label="logo图" name="iconId">
+        <a-form-item name="iconId">
+          <template #label>
+            <basic-title helpMessage="推荐使用200*200等比例的图片">logo图</basic-title>
+          </template>
          <a-input v-model:value="form.iconId" v-show="false" />
          <a-form-item-rest>
            <a-upload
@@ -40,6 +43,9 @@
            >
              <a-button preIcon="ant-design:cloud-upload-outlined" type="primary"> 上传图片 </a-button>
            </a-upload>
+            <template v-if="showable && !form.iconId">
+              <a-button disabled preIcon="ant-design:cloud-upload-outlined" type="primary"> 上传图片 </a-button>
+            </template>
          </a-form-item-rest>
          <a-form-item-rest v-if="form.iconId">
            <div style="margin-top: 15px">
@@ -47,9 +53,9 @@
            </div>
          </a-form-item-rest>
        </a-form-item>
-        <a-form-item label="背景颜色" name="bgColor">
-          <a-input placeholder="请输入描述" v-model:value="form.bgColor" />
-        </a-form-item>
+<!--        <a-form-item label="背景颜色" name="bgColor">-->
+<!--          <a-input placeholder="请输入描述" v-model:value="form.bgColor" />-->
+<!--        </a-form-item>-->
        <a-form-item label="备注" name="remark">
          <a-textarea :disable="showable" placeholder="请输入备注" v-model:value="form.remark" />
        </a-form-item>
@@ -75,6 +81,7 @@
  import { FormEditType } from '/@/enums/formTypeEnum'
  import { getFilePreviewUrlPrefix } from '/@/api/common/FileUpload'
  import { BasicModal } from '/@/components/Modal'
+  import BasicTitle from "/@/components/Basic/src/BasicTitle.vue";

  const {
    initFormEditType,
--- a/types/web.d.ts
+++ b/types/web.d.ts
@@ -27,7 +27,7 @@ export interface TablePageModel<T = any> {
 */
 export interface BaseEntity {
  id?: number | string | null
-  createdTime?: string | null
+  createTime?: string | null
 }

 /**