k线

src/views/capital/transfer/index.vue

@@ -295,9 +295,9 @@ const sendCodeApi = async (receiver: string) => {
     params.email = receiver
   } else {
     params.mobile = receiver
-    // 从手机号中提取区号
-    const match = receiver.match(/^\+(\d{1,4})/)
-    params.mobile_area = match ? '+' + match[1] : '+86'
+    // 手机区号取缓存 foreign_userInfo 的 mobile_area
+    const foreignUserInfo = getStorage<any>('foreign_userInfo')
+    params.mobile_area = foreignUserInfo?.mobile_area || '+86'
   }
   return userStore.sendCode(params)
 }

src/views/profile/business/index.vue

@@ -36,9 +36,9 @@
       <template #floatProfitLoss="{ row }">
         <span>{{ getMarketFloatProfit(row.id) }}</span>
       </template>
-      <template #closeProfitLoss="{ row }">
+      <!-- <template #closeProfitLoss="{ row }">
         <span>{{ getMarketCloseProfit(row.id) }}</span>
-      </template>
+      </template> -->
       <template #pointSpread="{ row }">
         <el-button type="primary" size="small" @click="handleViewPointDiff(row)"> 查看 </el-button>
       </template>

src/views/profile/business/options.ts

@@ -51,7 +51,7 @@ export const marketTableColumns = [
   //浮动盈亏
   { label: '浮动盈亏', slotName: 'floatProfitLoss', align: 'center' as const, width: '100px', isNumber: true },
   //平仓盈亏
-  { label: '平仓盈亏', slotName: 'closeProfitLoss', align: 'center' as const, width: '150px', isNumber: true },
+  { label: '平仓盈亏', prop: 'closeProfitLoss', align: 'center' as const, width: '150px', isNumber: true },
   //风险金
   { label: '风险金', prop: 'riskMargin', align: 'center' as const, width: '150px', isNumber: true },
   //服务费

src/views/profile/personalCenter/index.vue

@@ -536,10 +536,10 @@ const handlePasswordConfirm = async () => {
     };
 
     // 如果是手机验证，添加 mobile_area 参数
-    if (passwordForm.verifyType === 'mobile' && userInfo.mobile) {
-      const match = userInfo.mobile.match(/^\+(\d{1,4})/);
-      params.mobile_area = match ? '+' + match[1] : '+86';
-    }
+    // if (passwordForm.verifyType === 'mobile' && userInfo.mobile) {
+    //   // 手机区号取缓存 userInfo 的 mobile_area
+    //   params.mobile_area = userInfo.mobile_area || '+86';
+    // }
 
     await updatePwdByCaptchaApi(params);
     passwordDialogVisible.value = false;

src/views/user/Register.vue

@@ -71,7 +71,7 @@
 
 <script setup lang="ts">
 import mammoth from 'mammoth'
-import { ref, onUnmounted, onMounted } from 'vue'
+import { ref, onUnmounted, onMounted, watch } from 'vue'
 import termFile from '@/assets/file/服务条款.docx?url'
 import privacyFile from '@/assets/file/隐私协议.docx?url'
 import riskFile from '@/assets/file/风险提示.docx?url'
@@ -136,6 +136,17 @@ const registerForm = ref<any>({
   inviteCode: '',
   agreeAgreement: false,
 })
+
+// 切换注册方式时，清空上次输入的数据与校验状态
+watch(activeTab, () => {
+  registerForm.value.email = ''
+  registerForm.value.countryCode = '+86'
+  registerForm.value.phone = ''
+  registerForm.value.code = ''
+  // 清除表单校验提示，避免上一次的错误一直显示
+  registerFormRef.value?.clearValidate()
+})
+
 const registerRules = ref<FormRules>({
   email: emailRules().email,
   phone: phoneRules(registerForm.value).phone,