From 9519540adb9ce5268cf07dcaf0c7ca14a5695dbc Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 10 六月 2025 10:57:01 +0800
Subject: [PATCH] Merge branch 'dev-ui' of http://120.26.58.240:8888/r/LifePaymentFront into dev-ui
---
packages/components/src/views/Mine/GeneratePromotionCodeView.vue | 4 ++--
packages/services/api/typings.d.ts | 7 +++++++
packages/core/src/lifeRechargeServices.ts | 9 ++++++++-
apps/taro/src/subpackages/my/applyResult/applyResult.vue | 3 ++-
packages/services/api/Promoter.ts | 2 +-
5 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/apps/taro/src/subpackages/my/applyResult/applyResult.vue b/apps/taro/src/subpackages/my/applyResult/applyResult.vue
index 214b331..3aa1492 100644
--- a/apps/taro/src/subpackages/my/applyResult/applyResult.vue
+++ b/apps/taro/src/subpackages/my/applyResult/applyResult.vue
@@ -73,10 +73,11 @@
if (promoterRes?.idNumber) {
idNumber = promoterRes.idNumber;
} else {
- idNumber = await createOrUpdatePromoter({
+ let createOrUpdatePromoterRes = await createOrUpdatePromoter({
name: res.name,
phoneNumber: res.phoneNumber,
});
+ idNumber = createOrUpdatePromoterRes.idNumber;
}
if (idNumber) {
if (res.phoneNumber === blLifeRecharge.accountModel.phoneNumber) {
diff --git a/packages/components/src/views/Mine/GeneratePromotionCodeView.vue b/packages/components/src/views/Mine/GeneratePromotionCodeView.vue
index 4d19904..9139f22 100644
--- a/packages/components/src/views/Mine/GeneratePromotionCodeView.vue
+++ b/packages/components/src/views/Mine/GeneratePromotionCodeView.vue
@@ -76,9 +76,9 @@
let res = await blLifeRecharge.services.createOrUpdatePromoter(params);
if (res) {
if (params.phoneNumber === blLifeRecharge.accountModel.phoneNumber) {
- blLifeRecharge.accountModel.setUserPromoterIdNumber(res);
+ blLifeRecharge.accountModel.setUserPromoterIdNumber(res.idNumber);
}
- emit('submit', res);
+ emit('submit', res.idNumber);
}
} catch (error) {}
}
diff --git a/packages/core/src/lifeRechargeServices.ts b/packages/core/src/lifeRechargeServices.ts
index 89a7ee2..df6f873 100644
--- a/packages/core/src/lifeRechargeServices.ts
+++ b/packages/core/src/lifeRechargeServices.ts
@@ -425,7 +425,7 @@
/** 鍒涘缓鎴栨洿鏂版帹骞垮憳 POST /api/Promoter/CreateOrUpdatePromoter */
async createOrUpdatePromoter(body: CreateOrUpdatePromoterInput, options?: RequestConfig) {
- return this.request<string>('/api/Promoter/CreateOrUpdatePromoter', {
+ return this.request<CreateOrUpdatePromoterOutput>('/api/Promoter/CreateOrUpdatePromoter', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
@@ -1060,3 +1060,10 @@
/** 澶囨敞 */
remark?: string;
}
+
+export interface CreateOrUpdatePromoterOutput {
+ /** Id */
+ id?: string;
+ /** IdNumber */
+ idNumber?: string;
+}
diff --git a/packages/services/api/Promoter.ts b/packages/services/api/Promoter.ts
index 357048a..cc5febb 100644
--- a/packages/services/api/Promoter.ts
+++ b/packages/services/api/Promoter.ts
@@ -37,7 +37,7 @@
body: API.CreateOrUpdatePromoterInput,
options?: API.RequestConfig
) {
- return request<string>('/api/Promoter/CreateOrUpdatePromoter', {
+ return request<API.CreateOrUpdatePromoterOutput>('/api/Promoter/CreateOrUpdatePromoter', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
diff --git a/packages/services/api/typings.d.ts b/packages/services/api/typings.d.ts
index c55257c..4225410 100644
--- a/packages/services/api/typings.d.ts
+++ b/packages/services/api/typings.d.ts
@@ -762,6 +762,13 @@
remark?: string;
}
+ interface CreateOrUpdatePromoterOutput {
+ /** Id */
+ id?: string;
+ /** IdNumber */
+ idNumber?: string;
+ }
+
interface CreateOrUpdateRoleInput {
/** 鍚嶇О */
name?: string;
--
Gitblit v1.9.1