合并请求

api/modules/user.ts

@@ -4,10 +4,10 @@ import { paymentClient } from '@/api/clients/payment'
 import type { IApiResponse } from '@/api/types'
 import type { 
   IUserInfo, 
-  IVipInfo, 
-  IOrder, 
-  IVipPackage, 
-  ITransaction, 
+  IVipInfo,
+  IOrder,
+  IVipPackage,
+  ITransaction,
   IFeedbackForm,
   IPageData
 } from '@/types/user'
@@ -159,7 +159,7 @@ export function uploadImage(filePath: string): Promise<string> {
       url: `${SERVICE_MAP.MAIN}oss/fileoss`,
       filePath,
       name: 'file',
-      success: (res) => {
+      success: (res: any) => {
         try {
           const data = JSON.parse(res.data)
           if (data.url) {
@@ -304,9 +304,10 @@ export async function getPointsData(current : number, limit : number, userId : s
  * 迁移用户数据
  * @param tel 旧账号
  * @param code 迁移验证码
+ * @param type 未迁移数据类型
  * @return 
  */ 
-export async function migrateUserData(data: { tel: string, code: string }) {
+export async function migrateUserData(data: { tel: string, code: string, type: string }) {
 	const res = await mainClient.request<IApiResponse>({
 		url: 'common/user/migrationWumenData',
 		method: 'POST',
@@ -315,6 +316,21 @@ export async function migrateUserData(data: { tel: string, code: string }) {
 	return res
 }
 
+/**
+ * 获取用户迁移信息
+ * @return {
+ * 	alreadyMigration: 已迁移用户数
+ * 	notMigration: 未迁移用户数
+ * }
+ */ 
+export async function getUserMigrateInfo() {
+	const res = await mainClient.request<IApiResponse>({
+		url: 'common/user/getMigrationList',
+		method: 'POST',
+	})
+	return res
+}
+
 /**
  * 我的湖分
  * @return