Merge remote-tracking branch 'origin/master' into yueyixin

src/components/common/Header.vue

@@ -8,6 +8,7 @@
         :key="btn.key || index"
         :type="btn.type || 'default'"
         :icon="btn.icon"
+        v-auth="btn.auth"
         @click="handleButtonClick(btn)"
         :disabled="btn.disabled"
       >
@@ -28,6 +29,7 @@ interface HeaderButton {
   icon?: Component
   disabled?: boolean
   key?: string | number // 可选的唯一标识
+  auth?: string // 权限
 }
 
 // 定义组件属性接口

src/views/capital/currency/options.ts

@@ -2,9 +2,9 @@
  * @description: 搜索配置
  */
 export const buttons = [
-  { label: '添加', type: 'primary', key: 'add' },
+  { label: '添加', type: 'primary', key: 'add', auth: 'currency_createCurrency' },
-  { label: '编辑', type: 'primary', key: 'edit' },
+  { label: '编辑', type: 'primary', key: 'edit', auth: 'currency_editCurrency' },
-  { label: '删除', type: 'danger', key: 'delete' },
+  { label: '删除', type: 'danger', key: 'delete', auth: 'currency_delCurrency' },
 ]
 export const tableColumns = [
   { prop: 'name', label: '币名' },

src/views/capital/fundFlow/options.ts

@@ -56,6 +56,7 @@ export const tableColumns = [
   { prop: 'username', label: '用户名' },
   //单号
   { prop: 'orderNo', label: '单号' },
+  { prop: 'account_id', label: '子账号' },
   //操作类型
   { prop: 'type', label: '操作类型' },
   //资金流向

src/views/capital/rechangeChanl/index.vue

@@ -47,6 +47,7 @@ import {
   editChannel,
   delChannel,
 } from '@/api/modules/capital/rechangeChanl.ts'
+import { getCurrencyList } from '@/api/modules/capital/currency.ts'
 import { ElMessageBox } from 'element-plus'
 
 type ChannelType = {
@@ -60,10 +61,6 @@ type ChannelType = {
   status: number
 }
 
-const getTypeText = (type: number | string) => {
-  return ['', '法币', '数字货币'][type]
-}
-
 const getStatusText = (status: number | string) => {
   return ['', '正常', '禁用'][status]
 }
@@ -73,7 +70,6 @@ const initData = async () => {
   console.log(res)
   tableData.value = res.map((item: ChannelType) => ({
     ...item,
-    typeStr: getTypeText(item.type),
     statusStr: getStatusText(item.status),
   })) as ChannelType[]
   clearSelection()
@@ -93,6 +89,11 @@ const formData = ref({
   api_url: '',
   api_appid: '',
   api_key: '',
+  beneficiary_name: '',
+  beneficiary_bank_name: '',
+  swift_bic_code: '',
+  beneficiary_bank_address: '',
+  channel_code: '',
   status: 1,
 })
 const formItems = ref(formItemsData)
@@ -124,6 +125,11 @@ const resetFormData = () => {
     api_appid: '',
     api_key: '',
     status: 1,
+    beneficiary_name: '',
+    beneficiary_bank_name: '',
+    swift_bic_code: '',
+    beneficiary_bank_address: '',
+    channel_code: '',
   }
 }
 
@@ -138,20 +144,12 @@ const handleEdit = () => {
 
   dialogVisible.value = true
   dialogTitleType.value = 2
-  formData.value = {
+  formData.value = currentRow
-    id: currentRow.id,
-    name: currentRow.name,
-    channel_fee: currentRow.channel_fee,
-    type: currentRow.type,
-    api_url: currentRow.api_url,
-    api_appid: currentRow.api_appid,
-    api_key: currentRow.api_key,
-    status: currentRow.status,
-  }
 }
 
 const handleDelete = () => {
   console.log('handleDisable')
+  if (!currentRow.id) return ElMessage.warning('请先选择要删除的记录')
   ElMessageBox.confirm('确认删除吗？', '提示', {
     type: 'warning',
     confirmButtonText: '确定',
@@ -175,6 +173,13 @@ const clearSelection = () => {
 
 onMounted(() => {
   initData()
+  getCurrencyList().then((data) => {
+    console.log(data)
+    optionsMap.value.type = (data || []).map((item: any) => ({
+      value: item.id,
+      label: item.symbol,
+    }))
+  })
 })
 </script>
 <style scoped>

src/views/capital/rechangeChanl/options.ts

@@ -6,7 +6,7 @@ export const tableColumns = [
   //存款渠道费用
   { label: '渠道费用', prop: 'channel_fee' },
   //存款渠道类型
-  { label: '类型', prop: 'typeStr' },
+  { label: '入金货币', prop: 'currency.symbol' },
   // 接口地址
   { label: '接口地址', prop: 'api_url' },
   // 接口appid
@@ -24,10 +24,9 @@ export const formItemsData = [
     max: 999999,
     controls: false,
     placeholder: '请输入渠道费用',
-
   },
   {
-    label: '类型',
+    label: '入金货币',
     prop: 'type',
     type: 'select',
     placeholder: '请选择类型',
@@ -35,6 +34,31 @@ export const formItemsData = [
   { label: '接口地址', prop: 'api_url', type: 'input', placeholder: '请输入接口地址' },
   { label: '接口appid', prop: 'api_appid', type: 'input', placeholder: '请输入接口appid' },
   { label: '接口密钥', prop: 'api_key', type: 'input', placeholder: '请输入接口密钥' },
+  {
+    label: '账户持有人姓名',
+    prop: 'beneficiary_name',
+    type: 'input',
+    placeholder: '请输入账户持有人姓名',
+  },
+  {
+    label: '银行名称',
+    prop: 'beneficiary_bank_name',
+    type: 'input',
+    placeholder: '请输入银行名称',
+  },
+  {
+    label: '银行识别代码',
+    prop: 'swift_bic_code',
+    type: 'input',
+    placeholder: '请输入银行识别代码',
+  },
+  {
+    label: '银行地址',
+    prop: 'beneficiary_bank_address',
+    type: 'input',
+    placeholder: '请输入银行地址',
+  },
+  { label: '渠道编码', prop: 'channel_code', type: 'input', placeholder: '请输入渠道编码' },
   { label: '状态', prop: 'status', type: 'radio' },
 ]
 
@@ -46,13 +70,15 @@ export const formRulesData = {
   api_appid: [{ required: true, message: '请输入接口appid', trigger: ['change'] }],
   api_key: [{ required: true, message: '请输入接口密钥', trigger: ['change'] }],
   status: [{ required: true, message: '请选择状态', trigger: ['change'] }],
+  beneficiary_name: [{ required: true, message: '请输入账户持有人姓名', trigger: ['change'] }],
+  beneficiary_bank_name: [{ required: true, message: '请输入银行名称', trigger: ['change'] }],
+  swift_bic_code: [{ required: true, message: '请输入银行识别代码', trigger: ['change'] }],
+  beneficiary_bank_address: [{ required: true, message: '请输入银行地址', trigger: ['change'] }],
+  channel_code: [{ required: true, message: '请输入渠道编码', trigger: ['change'] }],
 }
 
 export const optionsMapData = {
-  type: [
+  type: [],
-    { label: '法币', value: 1 },
-    { label: '数字货币', value: 2 },
-  ],
   status: [
     { label: '启用', value: 1 },
     { label: '禁用', value: 2 },

src/views/profile/business/index.vue

@@ -245,6 +245,7 @@ const selectedRow = ref<any>(null)
  */
 //映射表格数据
 const mapMarketTree = (data: any) => {
+  console.log('mapMarketTree', data)
   return data.map((item: any) => ({
     ...item,
     id: item.id, //id
@@ -265,7 +266,8 @@ const mapMarketTree = (data: any) => {
     serviceFee: item.wallet_capital.service, //服务费
     flag: item.role_id * 1 === 5 ? (item.type! === 1 ? 1 : 2) : null,
     //使用这个字段来判断是否是做市商
-    roleId: item.role_id,
+    mobile: item.mobile || '--',
+    email: item.email || "--",
   }))
 }
 
@@ -288,8 +290,16 @@ const handleMarketFormLinkage = async (type: 'level' | 'parentAccountName', valu
 
       // 调用获取上级账户列表接口
       let flag = null
-      if (selectedRow.value.role_id * 1 === 5 && selectedRow.value.type * 1 === 1) flag = 1
+      if (
-      if (selectedRow.value.role_id * 1 === 6 && selectedRow.value.type * 1 === 2) flag = 2
+        (selectedRow.value?.role_id * 1 === 5 || marketForm.value?.level * 1 === 5) &&
+        selectedRow.value?.type * 1 === 1
+      )
+        flag = 1
+      if (
+        (selectedRow.value?.role_id * 1 === 6 || marketForm.value?.level * 1 === 6) &&
+        selectedRow.value?.type * 1 === 2
+      )
+        flag = 2
       const data = await getParAgentListApi({ role_id: value, flag: flag })
       console.log('datasssssssssssss', data)
       // 格式化下拉选项

src/views/profile/business/options.ts

@@ -13,6 +13,9 @@ export const marketTableColumns = [
   { label: '账户名', prop: 'accountName', align: 'center' as const, width: '120px' },
   //级别
   { label: '级别', prop: 'level', align: 'center' as const, width: '120px' },
+  { label: '邮箱', prop: 'email', align: 'center' as const, width: '160px' },
+  { label: '手机号', prop: 'mobile', align: 'center' as const, width: '120px' },
+  { label: '风险率', prop: 'ratio', align: 'center' as const, width: '120px' },
   //基本账户
   { label: '基本账户', prop: 'basicAccount', align: 'center' as const, width: '200px' },
   //保证金

src/views/trade/holidays/index.vue

@@ -1,8 +1,20 @@
 <template>
   <div class="trade-group">
     <el-form-item label="交易节假日时间设置">
-      <el-button style="margin-left: 18px" type="primary" @click="handleAdd">添加</el-button>
+      <el-button
-      <el-button style="margin-left: 18px" type="danger" @click="handleDel">删除</el-button>
+        style="margin-left: 18px"
+        type="primary"
+        v-auth="'contractVariety_addHoliday'"
+        @click="handleAdd"
+        >添加</el-button
+      >
+      <el-button
+        style="margin-left: 18px"
+        type="danger"
+        v-auth="'contractVariety_addHoliday'"
+        @click="handleDel"
+        >删除</el-button
+      >
     </el-form-item>
     <!-- 表格 -->
     <div class="table-box">
@@ -53,10 +65,12 @@
                 />
               </el-select>
               <span>{{
-                (item?.groupId || []).map(
+                (item?.groupId || [])
+                  .map(
                     (item: any) =>
                       (marketList || []).find((item2: any) => item2.value === item)?.label || '',
-                  ).join(',')
+                  )
+                  .join(',')
               }}</span>
             </td>
             <td>
@@ -64,16 +78,32 @@
               <span v-else>{{ item.description }}</span>
             </td>
             <td>
-              <el-button type="primary" v-if="!item.editStatus" @click="item.editStatus = true"
+              <el-button
+                type="primary"
+                v-if="!item.editStatus"
+                @click="item.editStatus = true"
+                v-auth="'contractVariety_addHoliday'"
                 >编辑</el-button
               >
-              <el-button type="danger" v-if="!item.editStatus" @click="handleDel(item.id, index)"
+              <el-button
+                type="danger"
+                v-if="!item.editStatus"
+                @click="handleDel(item.id, index)"
+                v-auth="'contractVariety_addHoliday'"
                 >删除</el-button
               >
-              <el-button type="primary" v-if="item.editStatus" @click="submitItem(index)"
+              <el-button
+                type="primary"
+                v-if="item.editStatus"
+                @click="submitItem(index)"
+                v-auth="'contractVariety_addHoliday'"
                 >确认</el-button
               >
-              <el-button type="danger" v-if="item.editStatus" @click="item.editStatus = false"
+              <el-button
+                type="danger"
+                v-if="item.editStatus"
+                @click="item.editStatus = false"
+                v-auth="'contractVariety_addHoliday'"
                 >取消</el-button
               >
             </td>

src/views/user/Login.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="user-card" >
+  <div class="user-card">
     <UserHeader />
     <UserText :user-text="userText" @back="handleBack" />
     <UserTabs v-model="activeTab" :hide-tab="hideTab" :tab-list="tabList" />
@@ -10,9 +10,25 @@
           <el-input v-model="loginForm.email" placeholder="请输入邮箱" clearable size="large" />
         </el-form-item>
 
-        <el-form-item class="phone-item" prop="phone" v-else-if="activeTab === 'phone'" key="form-phone-item">
+        <el-form-item
-          <el-select v-model="loginForm.countryCode" :teleported="false" value-key="code" placeholder="国家" size="large">
+          class="phone-item"
-            <el-option v-for="item in countryOptions" :key="item.code" :label="item.code" :value="item.code">
+          prop="phone"
+          v-else-if="activeTab === 'phone'"
+          key="form-phone-item"
+        >
+          <el-select
+            v-model="loginForm.countryCode"
+            :teleported="false"
+            value-key="code"
+            placeholder="国家"
+            size="large"
+          >
+            <el-option
+              v-for="item in countryOptions"
+              :key="item.code"
+              :label="item.code"
+              :value="item.code"
+            >
               <div class="country-option">
                 <span class="country-name">{{ item.name }}</span>
                 <span class="country-code">{{ item.code }}</span>
@@ -23,13 +39,21 @@
         </el-form-item>
 
         <el-form-item v-else-if="activeTab === 'password'" key="form-password-item" prop="password">
-          <el-input v-model="loginForm.password" placeholder="请输入密码" type="password" show-password clearable
+          <el-input
-            size="large" />
+            v-model="loginForm.password"
+            placeholder="请输入密码"
+            type="password"
+            show-password
+            clearable
+            size="large"
+          />
           <router-link to="/user/forgot-password" class="forgot-password">忘记密码？</router-link>
         </el-form-item>
       </Transition>
       <el-form-item class="form-submit">
-        <el-button type="primary" @click="handleLogin">{{ activeTab === 'password' ? '登录' : '注册/登录' }}</el-button>
+        <el-button type="primary" @click="handleLogin">{{
+          activeTab === 'password' ? '登录' : '注册/登录'
+        }}</el-button>
       </el-form-item>
     </el-form>
   </div>
@@ -62,7 +86,6 @@ const userText = ref({
   title: '',
   text: '初次登录时，您的电子邮箱或手机号码将被用于注册。',
   account: '',
-
 })
 
 //tabs 实例
@@ -74,7 +97,7 @@ const activeTab = ref<string>('email')
 const hideTab = ref<boolean>(false)
 
 // login form 实例
-const userStore = useUserStore();
+const userStore = useUserStore()
 const loginFormRef = ref<FormInstance>()
 const loginForm = ref({
   email: '',
@@ -98,39 +121,44 @@ const loginRules = ref<FormRules>({
  */
 function generateTimestampWithRandomNum() {
   // 1. 获取当前时间戳（毫秒级）
-  const timestamp = Date.now();
+  const timestamp = Date.now()
-  
+
   // 2. 生成6位随机数字（范围：000000 ~ 999999）
   // Math.random()生成0~1的随机数，乘以1000000后取整，不足6位补0
-  const random6Num = Math.floor(Math.random() * 1000000).toString().padStart(6, '0');
+  const random6Num = Math.floor(Math.random() * 1000000)
-  
+    .toString()
+    .padStart(6, '0')
+
   // 3. 拼接并返回
-  return timestamp + random6Num;
+  return timestamp + random6Num
 }
 
 // 登录
 const handleLogin = async () => {
-  if (!loginFormRef.value) return;
+  if (!loginFormRef.value) return
 
   try {
-    const currentTab = activeTab.value;
+    const currentTab = activeTab.value
     //验证邮箱/手机号 → 切换到密码页
     if (currentTab === 'email' || currentTab === 'phone') {
       //校验当前账号字段（email/phone）
-      await loginFormRef.value.validateField(currentTab);
+      await loginFormRef.value.validateField(currentTab)
       //存储账号类型和账号值（方便后续登录取值）
-      const loginValue = loginForm.value[currentTab];
+      const loginValue =
-      setStorage('loginType', currentTab, 'session'); // 存储账号类型（email/phone）
+        currentTab === 'phone'
-      setStorage('login', loginValue, 'session'); // 存储账号值
+          ? loginForm.value.countryCode + loginForm.value[currentTab]
+          : loginForm.value[currentTab]
+      setStorage('loginType', currentTab, 'session') // 存储账号类型（email/phone）
+      setStorage('login', loginValue, 'session') // 存储账号值
       //切换到密码页，更新提示
-      hideTab.value = true;
+      hideTab.value = true
       userText.value = {
         backText: '返回',
         title: '欢迎回来！',
         text: '请输入您的登录密码',
-        account: loginValue
+        account: loginValue,
-      };
+      }
-      activeTab.value = 'password';
+      activeTab.value = 'password'
 
       if (currentTab === 'phone' && loginForm.value.email !== '') {
         loginForm.value.email = ''
@@ -139,32 +167,33 @@ const handleLogin = async () => {
     // 验证密码+验证码 → 执行登录
     else if (currentTab === 'password') {
       // 校验密码+验证码
-      await loginFormRef.value.validateField(['password', 'code']);
+      await loginFormRef.value.validateField(['password', 'code'])
-       // 生成device_no并保存到变量（关键修改1）
+      // 生成device_no并保存到变量（关键修改1）
-      const deviceNo = generateTimestampWithRandomNum();
+      const deviceNo = generateTimestampWithRandomNum()
       // 登录参数
       const loginParams = {
         email: loginForm.value.email,
-        mobile: loginForm.value.phone,
+        mobile: loginForm.value.countryCode + loginForm.value.phone,
         login_type: getStorage('loginType', 'session') === 'email' ? 1 : 2,
         code: loginForm.value.code,
         password: loginForm.value.password,
-        device_no: deviceNo
+        device_no: deviceNo,
-      };
+      }
-      await userStore.login(loginParams);
+      await userStore.login(loginParams)
-       setStorage('device_no', deviceNo);
+      setStorage('device_no', deviceNo)
-      activeTab.value = 'email'; // 重置tab
+      activeTab.value = 'email' // 重置tab
-      hideTab.value = false;
+      hideTab.value = false
-      loginForm.value = { // 清空表单
+      loginForm.value = {
+        // 清空表单
         email: '',
         countryCode: '+86',
         phone: '',
         password: '',
-        code: ''
+        code: '',
-      };
+      }
     }
   } catch (error) {
-    console.error('表单校验失败：', error);
+    console.error('表单校验失败：', error)
   }
 }
 
@@ -172,30 +201,30 @@ const handleLogin = async () => {
 const handleBack = () => {
   if (activeTab.value === 'password') {
     // 从sessionStorage取账号类型（而非用password作为key）
-    const loginType = getStorage('loginType', 'session') || 'email';
+    const loginType = getStorage('loginType', 'session') || 'email'
     // 清空密码、验证码字段，避免残留
-    loginForm.value.password = '';
+    loginForm.value.password = ''
-    loginForm.value.code = '';
+    loginForm.value.code = ''
     // 清空表单校验提示
-    loginFormRef.value?.clearValidate(['password', 'code']);
+    loginFormRef.value?.clearValidate(['password', 'code'])
     // 重置文本和tab状态
-    hideTab.value = false;
+    hideTab.value = false
     userText.value = {
       backText: '',
       title: '',
       text: '初次登录时，您的电子邮箱或手机号码将被用于注册。',
-      account: ''
+      account: '',
-    };
+    }
-    activeTab.value = loginType as string;
+    activeTab.value = loginType as string
   } else {
     // 非password页：仅重置为email（可选，也可保留当前tab）
-    activeTab.value = 'email';
+    activeTab.value = 'email'
     // 清空当前账号字段和校验提示
-    loginForm.value.email = '';
+    loginForm.value.email = ''
-    loginForm.value.phone = '';
+    loginForm.value.phone = ''
-    loginFormRef.value?.clearValidate(['email', 'phone']);
+    loginFormRef.value?.clearValidate(['email', 'phone'])
   }
-};
+}
 </script>
 
 <style scoped lang="scss">

src/views/user/Register.vue

@@ -174,7 +174,8 @@ const sendCodeApi = async () => {
   // 发送验证码参数
   const sendParams = {
     email: registerForm.value.email,
-    mobile: registerForm.value.phone,
+    mobile: registerForm.value.countryCode + registerForm.value.phone,
+    mobile_area: registerForm.value.countryCode,
     reg_type: activeTab.value === 'email' ? 1 : 2,
     type: 'reg_code',
   }
@@ -192,10 +193,13 @@ const handleSendCode = async () => {
 
   // 确定类型、接收方、对应的倒计时状态和发送函数
   const type: string = activeTab.value === 'phone' ? 'phone' : 'email'
-  const receiver = type === 'phone' ? registerForm.value.phone : registerForm.value.email
+  const receiver =
+    type === 'phone'
+      ? registerForm.value.countryCode + registerForm.value.phone
+      : registerForm.value.email
   const currentCaptchaState = type === 'phone' ? phoneCaptchaState : emailCaptchaState
   const sendFunc = type === 'phone' ? 'sendPhoneCaptcha' : 'sendEmailCaptcha'
-
+  console.log('registerForm.countryCode', registerForm.value.countryCode)
   // 调用封装的发送函数（传正确的函数，而非字符串）
   await sendCaptcha(
     type,
@@ -215,7 +219,7 @@ const handleRegister = async () => {
     // 注册参数
     const registerParams = {
       email: registerForm.value.email,
-      mobile: registerForm.value.phone,
+      mobile: registerForm.value.countryCode + registerForm.value.phone,
       reg_type: activeTab.value === 'email' ? 1 : 2,
       invite_code: registerForm.value.inviteCode,
       code: registerForm.value.code,
@@ -234,8 +238,8 @@ onUnmounted(() => {
   clearCaptchaTimer(phoneCaptchaState)
 })
 
-onMounted(()=>{
+onMounted(() => {
-    registerForm.value.inviteCode = route.query.invite_code
+  registerForm.value.inviteCode = route.query.invite_code
 })
 </script>