diff --git a/src/views/payment/channel/config/ChannelPayConfigList.vue b/src/views/payment/channel/config/ChannelPayConfigList.vue
index 414c47cd0..9b316f846 100644
--- a/src/views/payment/channel/config/ChannelPayConfigList.vue
+++ b/src/views/payment/channel/config/ChannelPayConfigList.vue
@@ -6,19 +6,24 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 已启用
+
+
+
+ 停用
+
+
diff --git a/src/views/payment/order/pay/PayOrderInfo.vue b/src/views/payment/order/pay/PayOrderInfo.vue
index df6de5956..549b2f295 100644
--- a/src/views/payment/order/pay/PayOrderInfo.vue
+++ b/src/views/payment/order/pay/PayOrderInfo.vue
@@ -76,6 +76,9 @@
{{ order.expiredTime }}
+
+ {{ order.createTime }}
+
diff --git a/src/views/payment/record/close/PayCloseRecordInfo.vue b/src/views/payment/record/close/PayCloseRecordInfo.vue
index 48b18b735..4900c6d48 100644
--- a/src/views/payment/record/close/PayCloseRecordInfo.vue
+++ b/src/views/payment/record/close/PayCloseRecordInfo.vue
@@ -29,7 +29,7 @@
{{ form.clientIp }}
- {{ form.createdTime }}
+ {{ form.createTime }}
diff --git a/src/views/payment/record/repair/PayRepairRecordInfo.vue b/src/views/payment/record/repair/PayRepairRecordInfo.vue
index b5f04dfa1..8cb562304 100644
--- a/src/views/payment/record/repair/PayRepairRecordInfo.vue
+++ b/src/views/payment/record/repair/PayRepairRecordInfo.vue
@@ -32,7 +32,7 @@
{{ dictConvert('PayStatus', form.afterStatus) }}
- {{ form.createdTime }}
+ {{ form.createTime }}
diff --git a/src/views/payment/record/sync/PaySyncRecord.api.ts b/src/views/payment/record/sync/PaySyncRecord.api.ts
index 43341aae8..dff837721 100644
--- 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
diff --git a/src/views/payment/record/sync/PaySyncRecordInfo.vue b/src/views/payment/record/sync/PaySyncRecordInfo.vue
index 3702a7bf6..7643ed2e8 100644
--- a/src/views/payment/record/sync/PaySyncRecordInfo.vue
+++ b/src/views/payment/record/sync/PaySyncRecordInfo.vue
@@ -1,6 +1,6 @@
-
-
+
+
{{ form.paymentId }}
@@ -23,7 +23,7 @@
- {{ dictConvert('PaySyncResult', form.gatewayStatus) }}
+ {{ dictConvert('PaySyncStatus', form.gatewayStatus) }}
{{ form.repairOrder ? '是' : '否' }}
@@ -32,7 +32,7 @@
{{ dictConvert('PayStatus', form.afterStatus) }}
- {{ form.syncTime }}
+ {{ form.createTime }}
diff --git a/src/views/payment/record/sync/PaySyncRecordList.vue b/src/views/payment/record/sync/PaySyncRecordList.vue
index 22dd6e541..48b7c236c 100644
--- a/src/views/payment/record/sync/PaySyncRecordList.vue
+++ b/src/views/payment/record/sync/PaySyncRecordList.vue
@@ -39,7 +39,7 @@
-
+
diff --git a/src/views/payment/system/payinfo/channel/PayChannelInfoEdit.vue b/src/views/payment/system/payinfo/channel/PayChannelInfoEdit.vue
index 35276cf49..8738321fe 100644
--- a/src/views/payment/system/payinfo/channel/PayChannelInfoEdit.vue
+++ b/src/views/payment/system/payinfo/channel/PayChannelInfoEdit.vue
@@ -26,7 +26,10 @@
{{ form.name }}
-
+
+
+ logo图
+
上传图片
+
+ 上传图片
+
@@ -47,9 +53,9 @@
-
-
-
+
+
+
@@ -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,
diff --git a/types/web.d.ts b/types/web.d.ts
index 92754e974..1eefea2d8 100644
--- a/types/web.d.ts
+++ b/types/web.d.ts
@@ -27,7 +27,7 @@ export interface TablePageModel {
*/
export interface BaseEntity {
id?: number | string | null
- createdTime?: string | null
+ createTime?: string | null
}
/**