charles/frontend-app
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'dongjian' into develop

Browse Source
This commit is contained in:
money
2025-08-15 21:30:06 +08:00
parent 1bb5ff3ba4 a660d65d96
commit 3b42587c8d
9 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/finance.js
+7 -7
View File
@@ -112,7 +112,7 @@ export function getRechargeSupportPay(params) {
} }
/** /**
* 查询交易所账户【OK】 * 查询股东账户【OK】
* @param {Object} params * @param {Object} params
*/ */
export function getExchUsers(params) { export function getExchUsers(params) {
@@ -124,7 +124,7 @@ export function getExchUsers(params) {
} }
/** /**
* 查询交易所兑换记录 * 查询股东兑换记录
* @param {Object} params * @param {Object} params
*/ */
export function getExchTransferRecord(params) { export function getExchTransferRecord(params) {
@@ -136,7 +136,7 @@ export function getExchTransferRecord(params) {
} }
/** /**
* 查询兑换交易所规则 * 查询兑换股东规则
* @param {Object} params * @param {Object} params
*/ */
export function getExchRule(params) { export function getExchRule(params) {
@@ -147,7 +147,7 @@ export function getExchRule(params) {
}); });
} }
// 交易所兑换【OK】 // 股东兑换【OK】
export function exchTransfer(data) { export function exchTransfer(data) {
return request({ return request({
url: "/finance/exchTransfer", url: "/finance/exchTransfer",
@@ -155,7 +155,7 @@ export function exchTransfer(data) {
data, data,
}); });
} }
// 绑定交易所账户【OK】 // 绑定股东账户【OK】
export function bindExchUsers(data) { export function bindExchUsers(data) {
return request({ return request({
url: "/finance/bindExchUsers", url: "/finance/bindExchUsers",
@@ -163,7 +163,7 @@ export function bindExchUsers(data) {
data, data,
}); });
} }
// 注册交易所账户【OK】 // 注册股东账户【OK】
export function registerExchUser(data) { export function registerExchUser(data) {
return request({ return request({
url: "/finance/registerExchUser", url: "/finance/registerExchUser",
@@ -171,7 +171,7 @@ export function registerExchUser(data) {
data, data,
}); });
} }
// 获取注册交易所账户验证码【OK】 // 获取注册股东账户验证码【OK】
export function sentEmailCode(data) { export function sentEmailCode(data) {
return request({ return request({
url: "/finance/sentEmailCode", url: "/finance/sentEmailCode",
pages/mine/mine.vue
+1 -1
View File
@@ -222,7 +222,7 @@ export default {
}, },
{ {
id: 4, id: 4,
title: "我的团队", title: "我的推广",
url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/tool_team.png', url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/tool_team.png',
path: "/pages/mine_package/mine_my_team/mine_my_team" path: "/pages/mine_package/mine_my_team/mine_my_team"
}, },
pages/mine_package/mine_my_team/mine_my_team.vue
+3 -3
View File
@@ -5,7 +5,7 @@
<view style="margin-top: 10rpx;"> <view style="margin-top: 10rpx;">
<up-image src="/static/common/left_b.png" width="18" height="20" bgColor="#f1f6ff00" @click="jumpMine" /> <up-image src="/static/common/left_b.png" width="18" height="20" bgColor="#f1f6ff00" @click="jumpMine" />
</view> </view>
<view class="title_">我的团队</view> <view class="title_">我的推广</view>
</view> </view>
<!-- 我的信息 --> <!-- 我的信息 -->
<view class="my_info"> <view class="my_info">
@@ -28,7 +28,7 @@
<!-- 我的团队 --> <!-- 我的团队 -->
<view class="card_comm my_team" @click="jumpMyTeam"> <view class="card_comm my_team" @click="jumpMyTeam">
<view class="card_title_comm"> <view class="card_title_comm">
我的团队 我的推广
</view> </view>
<view class="my_team_count"> <view class="my_team_count">
<view style="margin-right: 10rpx;">{{ (performanceData && performanceData.teamCount) || 0 }}人</view> <view style="margin-right: 10rpx;">{{ (performanceData && performanceData.teamCount) || 0 }}人</view>
@@ -40,7 +40,7 @@
<!-- 团队业绩 --> <!-- 团队业绩 -->
<view class="card_comm"> <view class="card_comm">
<view class="card_title_comm card_title_comm2"> <view class="card_title_comm card_title_comm2">
<view>团队业绩</view> <view>推广业绩</view>
<up-image src="/static/common/tips.png" width="16" height="16" bgColor="#f1f6ff00" <up-image src="/static/common/tips.png" width="16" height="16" bgColor="#f1f6ff00"
@click="openTeamShow = true;" /> @click="openTeamShow = true;" />
</view> </view>
pages/mine_package/mine_my_team_list/mine_my_team_list.vue
+4 -4
View File
@@ -13,14 +13,14 @@
</view> </view>
<view class="comm_fg_s"></view> <view class="comm_fg_s"></view>
<view class="people_number_item"> <view class="people_number_item">
<view class="title_">直推人数</view> <view class="title_">推广人数</view>
<view class="value_">{{ (juniorSummaryData && juniorSummaryData.ztCount) || 0 }}</view> <view class="value_">{{ (juniorSummaryData && juniorSummaryData.ztCount) || 0 }}</view>
</view> </view>
<view class="comm_fg_s"></view> <!-- <view class="comm_fg_s"></view>
<view class="people_number_item"> <view class="people_number_item">
<view class="title_">间推人数</view> <view class="title_">间推人数</view>
<view class="value_">{{ (juniorSummaryData && juniorSummaryData.jtCount) || 0 }}</view> <view class="value_">{{ (juniorSummaryData && juniorSummaryData.jtCount) || 0 }}</view>
</view> </view> -->
</view> </view>
<view class="current_user_id" v-if="form.userId">当前用户ID：{{ form.userId }}</view> <view class="current_user_id" v-if="form.userId">当前用户ID：{{ form.userId }}</view>
<view class="current_user_tips"> <view class="current_user_tips">
@@ -84,7 +84,7 @@
<view v-else class="not_order_warp"> <view v-else class="not_order_warp">
<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/not_order.png" width="80" height="80" <up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/not_order.png" width="80" height="80"
bgColor="#f1f6ff00"></up-image> bgColor="#f1f6ff00"></up-image>
<view class="not_order_msg_warp">团队暂无数据</view> <view class="not_order_msg_warp">暂无数据</view>
</view> </view>
<view v-if="royaltyLoading" style="text-align: center;">加载中...</view> <view v-if="royaltyLoading" style="text-align: center;">加载中...</view>
</scroll-view> </scroll-view>
pages/rwa_package/rwa/rwa.vue
+3 -3
View File
@@ -9,7 +9,7 @@
<view></view> <view></view>
</view> </view>
<view class="amount_"> <view class="amount_">
<view class="amount_title">数字货币提现</view> <view class="amount_title">股东行权</view>
<view class="amount_num"> <view class="amount_num">
<text>{{ balanceObj.curAmount || 0 }}</text> <text>{{ balanceObj.curAmount || 0 }}</text>
<text class="amount_num_usdt">{{ balanceObj.name || USDT }}</text> <text class="amount_num_usdt">{{ balanceObj.name || USDT }}</text>
@@ -31,7 +31,7 @@
</view> </view>
</view> </view>
<view class="rwa_content"> <view class="rwa_content">
<view class="rwa_content_title">交易所账户</view> <view class="rwa_content_title">股东账户</view>
<view class="rwa_content_list"> <view class="rwa_content_list">
<scroll-view scroll-y="true" @scrolltolower="loadMore" style="height:calc(100vh - 800rpx)"> <scroll-view scroll-y="true" @scrolltolower="loadMore" style="height:calc(100vh - 800rpx)">
<view class="list-item-warp" v-for="item in amountList" :key="item.id" <view class="list-item-warp" v-for="item in amountList" :key="item.id"
@@ -53,7 +53,7 @@
<view class="rwa_content_add"> <view class="rwa_content_add">
<view class="rwa_content_add_but" @click="addRwa"> <view class="rwa_content_add_but" @click="addRwa">
<up-image src="/static/rwa/add.png" width="14" height="14" bgColor="#f1f6ff00" /> <up-image src="/static/rwa/add.png" width="14" height="14" bgColor="#f1f6ff00" />
<view style="margin-left: 10rpx;">添加交易所账户</view> <view style="margin-left: 10rpx;">添加股东账户</view>
</view> </view>
</view> </view>
</view> </view>
pages/rwa_package/rwa_add/rwa_add.vue
+3 -3
View File
@@ -1,11 +1,11 @@
<template> <template>
<view class="rwa_add_warp"> <view class="rwa_add_warp">
<Header leftTitle="注册交易所账户" left-path-type="navigateTo" left-path="/pages/rwa_package/rwa/rwa" /> <Header leftTitle="注册股东账户" left-path-type="navigateTo" left-path="/pages/rwa_package/rwa/rwa" />
<view class="rwa_add_content"> <view class="rwa_add_content">
<view class="rwa_add_form"> <view class="rwa_add_form">
<view class="rwa_add_item"> <view class="rwa_add_item">
<view class="rwa_add_item_title">交易所名称,示例值(ALPHACEX)</view> <view class="rwa_add_item_title">股东名称,示例值(ALPHACEX)</view>
<up-input placeholder="请输入交易所名称" border="surround" v-model="form.name" :customStyle="inputCss" <up-input placeholder="请输入股东名称" border="surround" v-model="form.name" :customStyle="inputCss"
disabled></up-input> disabled></up-input>
</view> </view>
<view class="rwa_add_item"> <view class="rwa_add_item">
pages/rwa_package/rwa_binding/rwa_binding.vue
+3 -3
View File
@@ -1,11 +1,11 @@
<template> <template>
<view class="rwa_add_warp"> <view class="rwa_add_warp">
<Header leftTitle="绑定交易所账户" left-path-type="navigateTo" left-path="/pages/rwa_package/rwa/rwa" /> <Header leftTitle="绑定股东账户" left-path-type="navigateTo" left-path="/pages/rwa_package/rwa/rwa" />
<view class="rwa_add_content"> <view class="rwa_add_content">
<view class="rwa_add_form"> <view class="rwa_add_form">
<view class="rwa_add_item"> <view class="rwa_add_item">
<view class="rwa_add_item_title">交易所名称,示例值(ALPHACEX)</view> <view class="rwa_add_item_title">股东名称,示例值(ALPHACEX)</view>
<up-input placeholder="请输入交易所名称" border="surround" v-model="form.name" :customStyle="inputCss" <up-input placeholder="请输入股东名称" border="surround" v-model="form.name" :customStyle="inputCss"
disabled></up-input> disabled></up-input>
</view> </view>
<view class="rwa_add_item"> <view class="rwa_add_item">
pages/rwa_package/rwa_withdrawal_log/rwa_withdrawal_log.vue
+1 -1
View File
@@ -9,7 +9,7 @@
<scroll-view scroll-y="true" @scrolltolower="loadMore" style="height:calc(100vh - 300rpx)"> <scroll-view scroll-y="true" @scrolltolower="loadMore" style="height:calc(100vh - 300rpx)">
<view class="_content_item" v-for="item in logList" :key="item.id" v-if="logList && logList.length !== 0"> <view class="_content_item" v-for="item in logList" :key="item.id" v-if="logList && logList.length !== 0">
<view class="_content_item_no _content_item_no_buto">NO.{{ item.tradeNo }}</view> <view class="_content_item_no _content_item_no_buto">NO.{{ item.tradeNo }}</view>
<!-- <view class="_content_item_no _content_item_no_buto" v-if="item.exchNo">交易所流水号：{{item.exchNo}}</view> --> <!-- <view class="_content_item_no _content_item_no_buto" v-if="item.exchNo">股东流水号：{{item.exchNo}}</view> -->
<view class="_content_item_but"> <view class="_content_item_but">
<view class="_content_item_left"> <view class="_content_item_left">
<up-image src="/static/rwa/account.png" width="40" height="40" bgColor="#f1f6ff00" /> <up-image src="/static/rwa/account.png" width="40" height="40" bgColor="#f1f6ff00" />
utils/enumUtils.js
+1 -1
View File
@@ -395,7 +395,7 @@ export const RWA_STATUS = [
value: "申请中" value: "申请中"
},{ },{
key: 1, key: 1,
value: "待交易所确认" value: "待股东确认"
},{ },{
key: 2, key: 2,
value: "交易成功" value: "交易成功"