From 3dc3e616092694a0e300c8089593236f2cc7a6d1 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 19 三月 2025 09:39:45 +0800
Subject: [PATCH] fix: 三期需求
---
packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue | 7 ++
packages/services/api/typings.d.ts | 66 ++++++++++++++++++++++
packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeBaseForm.vue | 12 +---
packages/services/api/OperateHistory.ts | 36 ++++++++++++
packages/services/api/index.ts | 2
packages/services/api/LifePay.ts | 12 ++++
6 files changed, 125 insertions(+), 10 deletions(-)
diff --git a/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeBaseForm.vue b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeBaseForm.vue
index 361678e..46b9117 100644
--- a/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeBaseForm.vue
+++ b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeBaseForm.vue
@@ -24,17 +24,11 @@
type="text"
/>
</NutFormItem>
- <NutFormItem
- label="濮撳悕"
- class="bole-form-item"
- prop="name"
- required
- v-if="form.ispCode === BlLifeRecharge.constants.IspCode.dianxin"
- >
+ <NutFormItem label="鏈轰富濮撳悕" class="bole-form-item" prop="name" required>
<NutInput
v-model.trim="form.name"
class="bole-input-text"
- placeholder="璇峰～鍐欐偍鐨勫鍚�"
+ placeholder="璇峰～鍐欏厖鍊兼墜鏈哄彿瀵瑰簲鐨勬埛涓诲鍚�"
type="text"
/>
</NutFormItem>
@@ -77,7 +71,7 @@
{ required: true, message: '璇疯緭鍏ュ厖鍊兼墜鏈哄彿' },
{ validator: FormValidator.validatorPhoneNumber, message: '璇疯緭鍏ユ纭殑鎵嬫満鍙�' },
],
- name: [{ required: true, message: '璇疯緭鍏ュ鍚�' }],
+ name: [{ required: true, message: '璇峰～鍐欏厖鍊兼墜鏈哄彿瀵瑰簲鐨勬埛涓诲鍚�' }],
});
const dialogVisible = ref(false);
diff --git a/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue
index c9b26ed..c79c7f8 100644
--- a/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue
+++ b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue
@@ -254,7 +254,12 @@
useGetPayStatusByOrderNo({
orderNo: currentOrderNo,
- enabled: computed(() => props.isFocus && !!currentOrderNo.value),
+ enabled: computed(
+ () =>
+ form.lifePayType === LifeRechargeConstants.LifePayTypeEnum.WxPay &&
+ props.isFocus &&
+ !!currentOrderNo.value
+ ),
onPaySuccess: (orderNo) => {
emit('paySuccess', orderNo);
currentOrderNo.value = '';
diff --git a/packages/services/api/LifePay.ts b/packages/services/api/LifePay.ts
index bf9f909..315aa96 100644
--- a/packages/services/api/LifePay.ts
+++ b/packages/services/api/LifePay.ts
@@ -2,6 +2,18 @@
// @ts-ignore
import { request } from '@/utils/request';
+/** 娣诲姞鏃ュ織 POST /api/LifePay/AddLogger */
+export async function addLogger(body: API.LogErrorInput, options?: API.RequestConfig) {
+ return request<number>('/api/LifePay/AddLogger', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 娣诲姞鎴栦慨鏀规垜鐨勬埛鍙� POST /api/LifePay/AddUpdateUserAccount */
export async function addUpdateUserAccount(
body: API.AddUpdateUserAccountInput,
diff --git a/packages/services/api/OperateHistory.ts b/packages/services/api/OperateHistory.ts
new file mode 100644
index 0000000..3576844
--- /dev/null
+++ b/packages/services/api/OperateHistory.ts
@@ -0,0 +1,36 @@
+/* eslint-disable */
+// @ts-ignore
+import { request } from '@/utils/request';
+
+/** 鏌ヨ鏃ュ織 POST /api/OperateHistory/GetOperateHistoryByRelationId */
+export async function getOperateHistoryByRelationId(
+ body: API.GetOperateHistoryInput,
+ options?: API.RequestConfig
+) {
+ return request<API.OperateHistoryDtoPageOutput>(
+ '/api/OperateHistory/GetOperateHistoryByRelationId',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 鏍规嵁type鏌ヨ鏃ュ織 POST /api/OperateHistory/GetOperateHistoryByType */
+export async function getOperateHistoryByType(
+ body: API.QueryOperateHistoryByTypeInput,
+ options?: API.RequestConfig
+) {
+ return request<API.OperateHistoryDtoPageOutput>('/api/OperateHistory/GetOperateHistoryByType', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
diff --git a/packages/services/api/index.ts b/packages/services/api/index.ts
index 1bd5275..1c47d7b 100644
--- a/packages/services/api/index.ts
+++ b/packages/services/api/index.ts
@@ -14,6 +14,7 @@
import * as IdentityUser from './IdentityUser';
import * as IdentityUserLookup from './IdentityUserLookup';
import * as LifePay from './LifePay';
+import * as OperateHistory from './OperateHistory';
import * as Permissions from './Permissions';
import * as PhoneMessage from './PhoneMessage';
import * as Profile from './Profile';
@@ -34,6 +35,7 @@
IdentityUser,
IdentityUserLookup,
LifePay,
+ OperateHistory,
Permissions,
PhoneMessage,
Profile,
diff --git a/packages/services/api/typings.d.ts b/packages/services/api/typings.d.ts
index 7bdd2c6..6e05af1 100644
--- a/packages/services/api/typings.d.ts
+++ b/packages/services/api/typings.d.ts
@@ -755,6 +755,12 @@
groups?: FeatureGroupDto[];
}
+ interface GetOperateHistoryInput {
+ pageModel?: Pagination;
+ relationId?: string;
+ operateName?: string;
+ }
+
interface GetPayOrderForJsAPIInput {
pageModel?: Pagination;
checkChannelId?: string;
@@ -1095,6 +1101,10 @@
resource?: string;
}
+ interface LogErrorInput {
+ error?: string;
+ }
+
interface MethodParameterApiDescriptionModel {
name?: string;
typeAsString?: string;
@@ -1208,6 +1218,56 @@
modules?: Record<string, any>;
enums?: Record<string, any>;
}
+
+ interface OperateHistoryDto {
+ /** 鍏宠仈鍏崇郴ID */
+ relationId?: string;
+ /** 琛ㄥ悕 */
+ tableType?: number;
+ /** 鎿嶄綔 */
+ operateName?: string;
+ /** 鎿嶄綔鍐呭 */
+ operateContent?: string;
+ /** 鎿嶄綔浜� */
+ creatorName?: string;
+ /** 鎿嶄綔鏃堕棿 */
+ creationTime?: string;
+ /** 鎿嶄綔缁嗚妭 */
+ operateDetail?: string;
+ }
+
+ interface OperateHistoryDtoPageOutput {
+ pageModel?: Pagination;
+ objectData?: any;
+ data?: OperateHistoryDto[];
+ }
+
+ type OperateHistoryTypeEnum =
+ | 10
+ | 11
+ | 12
+ | 13
+ | 14
+ | 15
+ | 16
+ | 17
+ | 18
+ | 19
+ | 20
+ | 21
+ | 22
+ | 23
+ | 24
+ | 25
+ | 26
+ | 27
+ | 28
+ | 29
+ | 30
+ | 31
+ | 32
+ | 40
+ | 42;
interface OrderInput {
property?: string;
@@ -1345,6 +1405,12 @@
keyWords?: string;
}
+ interface QueryOperateHistoryByTypeInput {
+ pageModel?: Pagination;
+ typeId?: string;
+ operateHistoryType?: OperateHistoryTypeEnum;
+ }
+
interface QueryUserAccountAllListInput {
pageModel?: Pagination;
checkChannelId?: string;
--
Gitblit v1.9.1