From ef341b7695a62249399fe63fb77bbb887ab71734 Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Mon, 04 Aug 2025 13:46:12 +0800
Subject: [PATCH] 1111
---
src/page/list/favoriteslist/data.list.vue | 6
src/page/user/compontents/cash-list.vue | 20 ++
src/locales/zh.json | 17 ++
src/page/home/smart_list.vue | 15 +
src/page/home/home.vue | 11
config/index.js | 3
src/page/list/tradingList/data.list.vue | 38 +++-
src/locales/jp.json | 36 +++-
src/page/user/Warehouse/data.list.vue | 20 ++
src/page/user/recharge.vue | 129 ++++++++++++---
src/page/bankCard/index.vue | 3
src/page/list/favorites/data.list.vue | 52 ++---
src/page/trading/buy.vue | 2
src/page/user/yebs.vue | 2
src/page/home/Record.vue | 18 +
src/page/user/Warehouse/Stockdetail.vue | 18 ++
src/locales/en.json | 17 ++
src/page/user/compontents/recharge-list.vue | 2
src/page/newUser/index.vue | 7
src/page/home/smart_intraday.vue | 4
src/page/user/favorites.vue | 2
21 files changed, 309 insertions(+), 113 deletions(-)
diff --git a/config/index.js b/config/index.js
index 2ba7612..fd0a667 100644
--- a/config/index.js
+++ b/config/index.js
@@ -60,7 +60,8 @@
*/
// https://webpack.js.org/configuration/devtool/#development
- devtool: "cheap-module-eval-source-map",
+ // devtool: "cheap-module-eval-source-map",source-map
+ devtool: "source-map",
// If you have problems debugging vue-files in devtools,
// set this to false - it *may* help
diff --git a/src/locales/en.json b/src/locales/en.json
index aab9f32..ba70587 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,5 +1,20 @@
{
- "sgjj":"Carlyle (JP) is the world's largest asset management group and one of the risk management and consulting service companies. ",
+ "tips333":"Precautions",
+ "tips222":"2. To ensure that the charge amount is reflected, please contact the charger when charging.",
+ "tips111":"1. Please check that the amount you entered matches the amount you actually want to charge.;",
+ "如遇到入金问题请联系在线客服":"If you encounter any deposit problems, please contact online customer service",
+ "联系客服":"Contact customer service",
+ "请联系客服进行充值服务":"Please contact customer service for recharge service",
+ "线上充值":"Online recharge",
+ "月":"Month",
+ "日":"Day",
+ "年":"Year",
+ "实际购买金额":"Actual purchase amount",
+ "提交时间":"Submission time",
+ "参与金额":"Participation amount",
+ "效益":"benefit",
+ "请输入参与金额":"Please enter the participation amount",
+ "sgjj":"CARLYLEJPY (JP) is the world's largest asset management group and one of the risk management and consulting service companies. ",
"sgjj2":"The company has diversified investments, and its main businesses include corporate private equity funds, hedge fund of funds, etc. ",
"sgjj3":" It works closely with various institutions and financial advisors around the world, has offices on all continents, and is committed to creating long-term value for our investors and achieving financial goals.",
"kyc":"KYC",
diff --git a/src/locales/jp.json b/src/locales/jp.json
index 8e19de6..0a9011a 100644
--- a/src/locales/jp.json
+++ b/src/locales/jp.json
@@ -1,7 +1,21 @@
{
- "sgjj":"Carlyle（JP）は、世界最大規模の資産運用グループの一つであり、リスク管理およびコンサルティングサービスを提供する企業でもあります。",
- "sgjj2":"同社は多角的な投資を展開しており、主な事業には企業向けプライベート・エクイティ・ファンドやヘッジファンドのポートフォリオ運用などが含まれます。",
- "sgjj3":"また、世界中のさまざまな機関投資家や財務アドバイザーと緊密に連携し、各大陸に拠点を構え、投資家のために長期的な価値を創出し、財務目標の達成を目指しています。",
+ "tips333":"注意事項",
+ "tips222":"2. チャージ金額の反映を確実にするため、チャージの際はチャージ担当者にご連絡ください。",
+ "tips111":"1. 入力された金額と実際にチャージする金額が一致しているかご確認ください;",
+ "联系客服":"カスタマーサービスに連絡",
+ "请联系客服进行充值服务":"入金サ-ビスを行うにはカスタマ-サ-ビスに連絡してください!",
+ "线上充值":"オンラインチャ-ジ",
+ "月":"月",
+ "日":"日",
+ "年":"年",
+ "实际购买金额":"実際受取金额",
+ "提交时间":"提出日時",
+ "参与金额":"参加金額",
+ "效益":"利点",
+ "请输入参与金额":"金額を入カしてください",
+ "sgjj":"当社は、世界最大規模の資産運用・リスク管理・コンサルティングサービスを提供する企業の一つです。",
+ "sgjj2":"多様な投資を行っており、主な事業には企業向けプライベート・エクイティ・ファンドやヘッジファンドのポートフォリオなどが含まれます。",
+ "sgjj3":"世界中のさまざまな機関やファイナンシャルアドバイザーと緊密に連携し、各大陸に拠点を構えて、投資家の皆様に長期的な価値を創出し、財務目標の達成を支援しています。",
"电话号码":"電話番号",
"kyc":"KYC(本人確認)",
"请联系客服":"カスタマーサービスまでご連絡ください！",
@@ -101,10 +115,10 @@
"qhmg": "米国株口座を切り替え",
"qhlb": "ルピー口座を切り替えて",
"yg": "インド株",
- "hjtxcg": "引き出しが成功し",
- "hjtxsb": "引き出しに失敗しました",
+ "hjtxcg": "出金処理が完了しました",
+ "hjtxsb": "出金処理に失敗しました",
"hjddqx": "注文を取り消す",
- "hjshz": "検討中",
+ "hjshz": "審査中",
"hjtxyhk": "銀行口座へ出金",
"hjqxyy": "キャンセル理由",
"hjkh": "カード番号",
@@ -286,7 +300,7 @@
"hj128": "閉店時間",
"hj129": "現在購読はありませんが",
"hj130": "申込価格",
- "hj131": "すでに購読されている",
+ "hj131": "申し込み済み",
"hj132": "宝くじに当たらなかったり",
"hj133": "宝くじに当選して",
"hj134": "支払われた",
@@ -296,7 +310,7 @@
"hj138": "まだ本名認証がされていませんので、ご注文前に必ず本名認証を行ってください。",
"hj139": "ポジションを閉じてもよろしいですか?",
"hj140": "取引時間内ではなく、ポジションを決済できませんでした。",
- "hj141": "スプレッド損益",
+ "hj141": "損益率",
"hj142": "インデックスアカウントを切り替え",
"hj143": "上海と深センのアカウントを切り替えます。",
"hj144": "パスワード変更",
@@ -325,7 +339,7 @@
"hj165": "ヒント",
"hj166": "受取銀行",
"hj167": "支払い口座番号",
- "hj168": "充電記録",
+ "hj168": "入金履歴",
"hj169": "チェック",
"hj170": "チャージ金額",
"hj170a": "充電方法",
@@ -390,7 +404,7 @@
"hj228": "まだリチャージ情報はありません!",
"hj229": "アリペイ",
"hj230": "法人譲渡",
- "hj231": "リチャージ成功",
+ "hj231": "入金済み",
"hj232": "充電に失敗しました",
"hj233": "リチャージをキャンセルし",
"hj234": "注文番号",
@@ -580,7 +594,7 @@
"认购成功": "購入に成功しました",
"待补金额": "未払金額",
"待上市": "上場待ち",
- "新股配售": "新株配給",
+ "新股配售": "新株割当",
"配售数量": "配給数量",
"立即配售": "即時配給",
"配售时间": "配給時間",
diff --git a/src/locales/zh.json b/src/locales/zh.json
index fe7181c..80f22c7 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -1,5 +1,20 @@
{
- "sgjj":"Carlyle(JP)是全球规模最大的资产管理集团，也是风险管理及顾问服务公司之一。",
+ "tips333":" 注意事項",
+ "tips222":"2,為了確保充值及時到眼,充值時請聯系充值專員",
+ "tips111":"1,請認准您输入的金額和提交的充值金额一致;",
+ "如遇到入金问题请联系在线客服":"如遇到入金问题请联系在线客服",
+ "联系客服":"联系客服",
+ "请联系客服进行充值服务":"请联系客服进行充值服务",
+ "线上充值":"线上充值",
+ "月":"月",
+ "日":"日",
+ "年":"年",
+ "实际购买金额":"实际购买金额",
+ "提交时间":"提交时间",
+ "参与金额":"参与金额",
+ "效益":"效益",
+ "请输入参与金额":"请输入参与金额",
+ "sgjj":"CarlylejPy(JP)是全球规模最大的资产管理集团，也是风险管理及顾问服务公司之一。",
"sgjj2":"公司多元化投资，主要业务有企业私募股权基金，对冲组合基金等。",
"sgjj3":"与全球各类机构及财务顾问紧密合作，在全球各大洲设有办事处，致力于为我们的投资者创造长期的价值，实现财务目标。",
"kyc":"KYC",
diff --git a/src/page/bankCard/index.vue b/src/page/bankCard/index.vue
index fd2a9bf..a083edf 100644
--- a/src/page/bankCard/index.vue
+++ b/src/page/bankCard/index.vue
@@ -291,6 +291,7 @@
</script>
<style scoped lang="less">
+
.bank_card_page {
width: 100%;
height: 100%;
@@ -390,7 +391,7 @@
align-items: center;
font-style: normal;
font-weight: 500;
- font-size: 0.48rem;
+ font-size: 0.35rem;
color: #14181f;
}
</style>
diff --git a/src/page/home/Record.vue b/src/page/home/Record.vue
index c83d716..658d3d6 100644
--- a/src/page/home/Record.vue
+++ b/src/page/home/Record.vue
@@ -33,9 +33,7 @@
<div class="pages_box_after">¥{{item.amount }}</div>
<!-- <div class="pages_box_after">¥{{item.beFore}}</div> -->
<div class="pages_box_after">{{
- $moment(item.createTime).format(
- "DD-MM-YYYY hh:mm:ss A"
- )
+ formatTimestamp(item.createTime)
}}</div>
<div class="pages_box_after">{{item.descs}}</div>
</div>
@@ -75,6 +73,20 @@
this.getpagelist();
},
methods: {
+ formatTimestamp(timestamp) {
+ const date = new Date(timestamp); // 将时间戳转换为 Date 对象
+
+ const day = date.getDate(); // 日期
+ const month = date.getMonth() + 1; // 月份（从 0 开始，所以下标要加 1）
+ const year = date.getFullYear(); // 年份
+ const hours = date.getHours(); // 小时
+ const minutes = date.getMinutes(); // 分钟
+ const seconds = date.getSeconds(); // 秒钟
+
+ // 格式化为 "日月年/时分秒" 格式
+ return `${year}${this.$t('年')}${month}${this.$t('月')}${day}${this.$t('日')}/${hours}:${minutes}:${seconds}`;
+ // return `${month}`;
+ },
rechargeAccountSelect(e) {
this.rechargeAccountData = e;
this.type = e.key
diff --git a/src/page/home/home.vue b/src/page/home/home.vue
index 85e98d7..a5ac11f 100644
--- a/src/page/home/home.vue
+++ b/src/page/home/home.vue
@@ -1,7 +1,7 @@
<template>
<div class="wrapper">
<div class="page_content">
- <div style="padding: 0 0.264rem;font-size: 24px;font-weight: 500;">CARLYLEJP</div>
+ <div style="padding: 0 0.264rem;font-size: 24px;font-weight: 500;">CARLYLEJPY</div>
<div class="center_tabs">
<div class="banner_top">
<van-swipe class="my-swipe" :autoplay="5000" indicator-color="white">
@@ -542,10 +542,10 @@
};
this.bannerList.push(ajson);
} else {
- this.$store.commit("elAlertShow", {
- elAlertShow: true,
- elAlertText: result.msg
- });
+ // this.$store.commit("elAlertShow", {
+ // elAlertShow: true,
+ // elAlertText: result.msg
+ // });
}
},
goOnline() {
@@ -609,6 +609,7 @@
mounted() {
this.startPolling();
this.getUserInfo();
+ this.getrglist();
// this.getrglist()
this.getInfoSite();
this.getNewsList(1);
diff --git a/src/page/home/smart_intraday.vue b/src/page/home/smart_intraday.vue
index 37fc3eb..7c882ca 100644
--- a/src/page/home/smart_intraday.vue
+++ b/src/page/home/smart_intraday.vue
@@ -17,11 +17,11 @@
<div class="body_price">
<div class="body_price_price">{{$t('hj48')}} <span style="font-weight: bold;">{{price}} JPY </span></div>
<div class="body_price_input">
- <input class="body_price_input_ipt" v-model="values[item.id]" placeholder="请输入参与金额" type="number"/>
+ <input class="body_price_input_ipt" v-model="values[item.id]" :placeholder="$t('请输入参与金额')" type="number"/>
</div>
<div class="body_price_tips">
<div class="body_price_tips_left">{{$t('je')}}: {{item.minAmount}}JPY-{{item.maxAmount}}JPY </div>
- <div class="body_price_tips_rigth">效益:{{item.profit}}</div>
+ <div class="body_price_tips_rigth">{{$t('hj141')}}:{{item.profit}}</div>
</div>
</div>
<div class="btn">
diff --git a/src/page/home/smart_list.vue b/src/page/home/smart_list.vue
index 71c9fad..0892332 100644
--- a/src/page/home/smart_list.vue
+++ b/src/page/home/smart_list.vue
@@ -17,17 +17,18 @@
</div>
<div class="body_price_tips">
<div class="body_price_tips_left">{{$t('参与金额')}}</div>
- <div class="body_price_tips_rigth">{{item.orderAmount}}</div>
+ <div class="body_price_tips_rigth">￥{{item.orderAmount}}</div>
</div>
<div class="body_price_tips" v-if="typeindex==2">
<div class="body_price_tips_left">{{$t('实际购买金额')}}</div>
- <div class="body_price_tips_rigth">{{item.purchaseAmount}}</div>
+ <div class="body_price_tips_rigth">￥{{item.purchaseAmount}}</div>
</div>
<div class="body_price_tips">
<div class="body_price_tips_left">{{$t('提交时间')}}</div>
- <div class="body_price_tips_rigth">{{formatTimestamp(item.orderTime)}}</div>
+ <div class="body_price_tips_rigth">{{formatTimestamp(item.createdAt)}}</div>
</div>
</div>
+ <div v-if="pagelist.length==0" class="buttom_tips">{{$t('zwsj')}}</div>
</div>
</template>
@@ -73,7 +74,8 @@
const seconds = date.getSeconds(); // 秒钟
// 格式化为 "日月年/时分秒" 格式
- return `${month}.${day}.${year}/${hours}:${minutes}:${seconds}`;
+ return `${year}${this.$t('年')}${month}${this.$t('月')}${day}${this.$t('日')}/${hours}:${minutes}:${seconds}`;
+ // return `${month}`;
},
typeclick(e,i){
this.typeindex = i
@@ -97,6 +99,11 @@
</script>
<style scoped lang="less">
+ .buttom_tips{
+ margin-top: 60px;
+ color: #8c8c8c;
+ text-align: center;
+ }
.body_titles_name{
margin-left: 15px;
color: #8c8c8c;
diff --git a/src/page/list/favorites/data.list.vue b/src/page/list/favorites/data.list.vue
index ed64f04..f75f76a 100644
--- a/src/page/list/favorites/data.list.vue
+++ b/src/page/list/favorites/data.list.vue
@@ -64,7 +64,7 @@
<div style="text-align: left" v-show="false">
<div class="tp">
<span class="price_color">{{
- item.price | _toLocaleString(false)
+ item.price
}}</span>
</div>
<div class="bt">
@@ -82,24 +82,12 @@
</div>
</van-col>
<div style="width: 100%;display: flex;justify-content: space-between;align-items: center;margin-top: 10px;font-size: 10px;;">
- <div>{{$t('hj59')}}：{{
- $moment(item.subscriptionTime).format(
- "DD-MM-YYYY hh:mm:ss A"
- )
- }}</div>
- <div>{{$t('申购结束时间')}}：{{
- $moment(item.subscribeTime).format(
- "DD-MM-YYYY hh:mm:ss A"
- )
- }}</div>
+ <div>{{$t('hj59')}}：{{formatTimestamp(item.subscriptionTime)}}</div>
+ <div>{{$t('申购结束时间')}}：{{formatTimestamp(item.subscribeTime)}}</div>
</div>
<div style="width: 100%;display: flex;justify-content: space-between;align-items: center;margin-top: 10px;font-size: 10px;;">
- <div>{{$t('上市时间')}}：{{
- $moment(item.listDate).format(
- "DD-MM-YYYY hh:mm:ss A"
- )
- }}</div>
- <div>{{$t('hj314')}}：{{item.price | _toLocaleString(false)}}</div>
+ <div>{{$t('上市时间')}}：{{formatTimestamp(item.listDate)}}</div>
+ <div>{{$t('hj314')}}：¥{{item.price}}</div>
</div>
</van-row>
@@ -138,11 +126,7 @@
}}:
</div>
<div class="xgTime">
- {{
- $moment(shengouObj.subscriptionTime).format(
- "DD-MM-YYYY hh:mm:ss A"
- )
- }}
+ {{formatTimestamp(shengouObj.subscriptionTime)}}
</div>
</div>
<div class="xgsj">
@@ -153,17 +137,13 @@
<!-- {{ $t("hj60") }}: -->
</div>
<div class="xgTime">
- {{
- $moment(shengouObj.subscribeTime).format(
- "DD-MM-YYYY hh:mm:ss A"
- )
- }}
+ {{formatTimestamp(shengouObj.subscribeTime)}}
</div>
</div>
<div class="xgsj">
<div class="sjtlt">{{ $t("上市时间") }}:</div>
<div class="xgTime">
- {{ $moment(shengouObj.listDate).format("DD-MM-YYYY hh:mm:ss A") }}
+ {{formatTimestamp(shengouObj.listDate)}}
</div>
</div>
<div class="xgsj">
@@ -177,7 +157,7 @@
<div class="xgsj">
<div class="sjtlt">{{ $t("hj120") }}:</div>
<div class="xgTime">
- {{ shengouObj.price | _toLocaleString(false) }}
+ ¥{{ shengouObj.price }}
</div>
</div>
<!-- <div class="xgsj">
@@ -252,6 +232,20 @@
this.getStock(this.active, this.zxactive);
},
methods: {
+ formatTimestamp(timestamp) {
+ const date = new Date(timestamp); // 将时间戳转换为 Date 对象
+
+ const day = date.getDate(); // 日期
+ const month = date.getMonth() + 1; // 月份（从 0 开始，所以下标要加 1）
+ const year = date.getFullYear(); // 年份
+ const hours = date.getHours(); // 小时
+ const minutes = date.getMinutes(); // 分钟
+ const seconds = date.getSeconds(); // 秒钟
+
+ // 格式化为 "日月年/时分秒" 格式
+ return `${year}${this.$t('年')}${month}${this.$t('月')}${day}${this.$t('日')}/${hours}:${minutes}:${seconds}`;
+ // return `${month}`;
+ },
fromDatavalue(e) {
this.fromData.value = this.fromData.value.replace(/^(0+)|[^\d]+/g, '')
},
diff --git a/src/page/list/favoriteslist/data.list.vue b/src/page/list/favoriteslist/data.list.vue
index f09bc20..86be550 100644
--- a/src/page/list/favoriteslist/data.list.vue
+++ b/src/page/list/favoriteslist/data.list.vue
@@ -31,7 +31,7 @@
<div style="width: 100%">
<div class="bottom_price_title">
<div class="start_price">
- <span>{{ item.buyPrice | _toLocaleString(false) }} </span>
+ <span>{{ item.buyPrice }} </span>
</div>
<div class="new_price" v-if="item.status <= 3">
<span>
@@ -49,7 +49,7 @@
</span>
</div>
<div class="start_price">
- <span>{{ item.bond | _toLocaleString(false) }} </span>
+ <span>{{ item.bond }} </span>
</div>
</div>
<div class="bottom_price_title">
@@ -99,7 +99,7 @@
{{ $t("hj250") }}</van-button
> -->
</div>
- <div v-if="item.status != 5" class="right_btn pink" style="padding: 0px 0.2rem;">
+ <div v-if="item.status != 5" class="right_btn pink" style="padding: 0px 0.2rem;width: 135px;">
<span>
{{
item.status == 1
diff --git a/src/page/list/tradingList/data.list.vue b/src/page/list/tradingList/data.list.vue
index 7dc27cc..a73ec09 100644
--- a/src/page/list/tradingList/data.list.vue
+++ b/src/page/list/tradingList/data.list.vue
@@ -126,12 +126,12 @@
<div class="box-a" v-if="active == 'DZ'">
<div class="box_a_left">
{{ $t("kpsj") }}：{{
- $moment(item.startTime).format("DD-MM-YYYY hh:mm:ss A")
+ formatTimestamp(item.startTime)
}}
</div>
<div class="box_a_right">
{{ $t("gbsj") }}：{{
- $moment(item.endTime).format("DD-MM-YYYY hh:mm:ss A")
+ formatTimestamp(item.endTime)
}}
</div>
</div>
@@ -189,9 +189,11 @@
this.getStock(this.active, e, 1);
},
sousuo(e) {
+ // if (this.loadings) return; // 避免重复触发
this.finished = false;
this.listArr = [];
this.pageNumVal = 1;
+ this.num = 1
this.loadings = true;
this.getStock(this.active, this.zxactive, 1);
},
@@ -223,6 +225,20 @@
// }, 5000);
},
methods: {
+ formatTimestamp(timestamp) {
+ const date = new Date(timestamp); // 将时间戳转换为 Date 对象
+
+ const day = date.getDate(); // 日期
+ const month = date.getMonth() + 1; // 月份（从 0 开始，所以下标要加 1）
+ const year = date.getFullYear(); // 年份
+ const hours = date.getHours(); // 小时
+ const minutes = date.getMinutes(); // 分钟
+ const seconds = date.getSeconds(); // 秒钟
+
+ // 格式化为 "日月年/时分秒" 格式
+ return `${year}${this.$t('年')}${month}${this.$t('月')}${day}${this.$t('日')}/${hours}:${minutes}:${seconds}`;
+ // return `${month}`;
+ },
filterSH(val) {
if (val === "sh") {
return 1;
@@ -266,6 +282,7 @@
// 获取列表
getStock: handleDt.debounce(async function (a, b, c) {
+ console.log(a,b,c);
a = this.active;
let stockType = "";
if (a !== "") {
@@ -276,22 +293,18 @@
stockType = array[0].name;
}
let pageNumVal = c || this.pageNumVal;
- // console.log(this.zxtabsList, b);
let opt = {
pageNum: pageNumVal,
- pageSize: 20 * this.num,
+ pageSize: 15 * this.num,
stockPlate: "",
keyWords: this.sousuo,
stockType: stockType,
orderBy: "",
};
-
- // console.log();
- // api.positionzx;
let data;
if (a !== "") {
if (a == "JP") {
- //印股
+ //日股
opt.stockType = "JP";
data = await api.getStockByType(opt);
} else {
@@ -378,8 +391,13 @@
onLoads() {
console.log("onLoads");
// this.pageNumVal++;
- this.loadings = true;
- this.num += 1;
+ this.loadings = false;
+ this.finished = true;
+ if(this.listArr.length==0){
+ this.num = 1
+ }else{
+ this.num += 1;
+ }
this.getStock();
},
optionszx() {},
diff --git a/src/page/newUser/index.vue b/src/page/newUser/index.vue
index d935ef0..0d63378 100644
--- a/src/page/newUser/index.vue
+++ b/src/page/newUser/index.vue
@@ -450,9 +450,10 @@
this.$router.push("/login");
},
gotorush(e){
- if(e=='/recharge'){
- Toast(this.$t('请联系客服'));
- }else if(e==''){
+ // if(e=='/recharge'){
+ // Toast(this.$t('请联系客服'));
+ // }else
+ if(e==''){
window.open('https://lin.ee/7I7cvGD', '_blank');
}else{
this.$router.push(e);
diff --git a/src/page/trading/buy.vue b/src/page/trading/buy.vue
index 94b2789..2a7f5c9 100644
--- a/src/page/trading/buy.vue
+++ b/src/page/trading/buy.vue
@@ -185,7 +185,7 @@
<div class="btn_buy" @click="gdOrSetBuy()">
<!-- <div :class="tabsCurrentIndex == 0 ? 'maichu' : ''">#3b82f6 -->
<div class="maichu" style="background-color:#3b82f6">
- <span>{{ tabsCurrentIndex == 0 ? $t("hj84") : $t("gm") }}</span>
+ <span>{{ $t("gm") }}</span>
</div>
</div>
</div>
diff --git a/src/page/user/Warehouse/Stockdetail.vue b/src/page/user/Warehouse/Stockdetail.vue
index ae53db7..d4993e4 100644
--- a/src/page/user/Warehouse/Stockdetail.vue
+++ b/src/page/user/Warehouse/Stockdetail.vue
@@ -52,13 +52,13 @@
<div class="pagebox" v-if="pages.buyOrderTime">
<div class="pagebox_left">{{ $t("持倉時間") }}</div>
<div class="pagebox_right">
- {{ $moment(pages.buyOrderTime).format("DD-MM-YYYY hh:mm:ss A") }}
+ {{ formatTimestamp(pages.buyOrderTime) }}
</div>
</div>
<div class="pagebox" v-if="pages.sellOrderTime">
<div class="pagebox_left">{{ $t("hj128") }}</div>
<div class="pagebox_right">
- {{ $moment(pages.sellOrderTime).format("DD-MM-YYYY hh:mm:ss A") }}
+ {{ formatTimestamp(pages.sellOrderTime) }}
</div>
</div>
</div>
@@ -80,6 +80,20 @@
// 生命周期 - 挂载完成（访问DOM元素）
mounted() {},
methods: {
+ formatTimestamp(timestamp) {
+ const date = new Date(timestamp); // 将时间戳转换为 Date 对象
+
+ const day = date.getDate(); // 日期
+ const month = date.getMonth() + 1; // 月份（从 0 开始，所以下标要加 1）
+ const year = date.getFullYear(); // 年份
+ const hours = date.getHours(); // 小时
+ const minutes = date.getMinutes(); // 分钟
+ const seconds = date.getSeconds(); // 秒钟
+
+ // 格式化为 "日月年/时分秒" 格式
+ return `${year}${this.$t('年')}${month}${this.$t('月')}${day}${this.$t('日')}/${hours}:${minutes}:${seconds}`;
+ // return `${month}`;
+ },
handleBack() {
// 点击返回/
this.$router.go(-1);
diff --git a/src/page/user/Warehouse/data.list.vue b/src/page/user/Warehouse/data.list.vue
index f6e9f72..b62b889 100644
--- a/src/page/user/Warehouse/data.list.vue
+++ b/src/page/user/Warehouse/data.list.vue
@@ -44,8 +44,8 @@
<van-row>
<van-col span="18">
<div style="text-align: left">
- <div class="sport-content-title2">{{ $t("持倉時間") }}{{ $moment(item.buyOrderTime).format("DD-MM-YYYY hh:mm:ss A") }}</div>
- <!-- <div class="sport-content-title2">{{ $t("訂單編號") }}</div> -->
+ <!-- <div class="sport-content-title2">{{ $t("持倉時間") }}{{ $moment(item.buyOrderTime).format("DD-MM-YYYY hh:mm:ss A") }}</div> -->
+ <div class="sport-content-title2">{{ $t("hj141") }}</div>
</div>
</van-col>
<van-col span="6">
@@ -251,7 +251,7 @@
<van-row>
<van-col span="18">
<div style="text-align: left">
- <div class="sport-content-title2">{{ $t("持倉時間") }}{{ $moment(item.buyOrderTime).format("DD-MM-YYYY hh:mm:ss A") }}</div>
+ <div class="sport-content-title2">{{ $t("持倉時間") }}{{ formatTimestamp(item.buyOrderTime) }}</div>
<!-- <div class="sport-content-title2">{{ $t("訂單編號") }}</div> -->
</div>
</van-col>
@@ -531,6 +531,20 @@
clearInterval(this.timer); // 在组件销毁前清除定时器
},
methods: {
+ formatTimestamp(timestamp) {
+ const date = new Date(timestamp); // 将时间戳转换为 Date 对象
+
+ const day = date.getDate(); // 日期
+ const month = date.getMonth() + 1; // 月份（从 0 开始，所以下标要加 1）
+ const year = date.getFullYear(); // 年份
+ const hours = date.getHours(); // 小时
+ const minutes = date.getMinutes(); // 分钟
+ const seconds = date.getSeconds(); // 秒钟
+
+ // 格式化为 "日月年/时分秒" 格式
+ return `${year}${this.$t('年')}${month}${this.$t('月')}${day}${this.$t('日')}/${hours}:${minutes}:${seconds}`;
+ // return `${month}`;
+ },
dsq(){
// this.dataList = [];
this.timer = setInterval(() => {
diff --git a/src/page/user/compontents/cash-list.vue b/src/page/user/compontents/cash-list.vue
index 0fc00a1..87d6576 100644
--- a/src/page/user/compontents/cash-list.vue
+++ b/src/page/user/compontents/cash-list.vue
@@ -15,7 +15,7 @@
<div class="order-title">
<span class="main"> {{ $t("hjtxyhk") }} </span>
<span class="payNumber"
- >{{ $USD }}{{ item.withAmt | _toLocaleString }}</span
+ >{{ $USD }}{{ item.withAmt }}</span
>
<span v-if="item.withStatus!=1" class="red pull-right">
{{
@@ -78,7 +78,7 @@
<span class="col-xs-6">
{{ $t("hj44") }}:
<b class="space">
- {{ $USD }} {{ item.withFee | _toLocaleString }}
+ {{ $USD }} {{ item.withFee }}
</b>
</span>
<!-- <span class="col-xs-6">实际到账金额:<b class="space" style="font-size:0.26rem">{{item.withAmt - item.withFee}}</b>元</span> -->
@@ -112,7 +112,7 @@
<p class="clearfix">
<span class="secondary col-xs-6"
>{{ $t("sj") }}:
- <b v-if="item.applyTime">{{ $moment(item.applyTime).format("DD-MM-YYYY hh:mm:ss A") }}</b>
+ <b v-if="item.applyTime">{{ formatTimestamp(item.applyTime) }}</b>
<b v-else></b>
</span>
</p>
@@ -170,6 +170,20 @@
this.getListDetail();
},
methods: {
+ formatTimestamp(timestamp) {
+ const date = new Date(timestamp); // 将时间戳转换为 Date 对象
+
+ const day = date.getDate(); // 日期
+ const month = date.getMonth() + 1; // 月份（从 0 开始，所以下标要加 1）
+ const year = date.getFullYear(); // 年份
+ const hours = date.getHours(); // 小时
+ const minutes = date.getMinutes(); // 分钟
+ const seconds = date.getSeconds(); // 秒钟
+
+ // 格式化为 "日月年/时分秒" 格式
+ return `${year}${this.$t('年')}${month}${this.$t('月')}${day}${this.$t('日')}/${hours}:${minutes}:${seconds}`;
+ // return `${month}`;
+ },
async getListDetail() {
let opt = {
withStatus: "", // 提现状态 0已提交，1转账成功，2转账失败
diff --git a/src/page/user/compontents/recharge-list.vue b/src/page/user/compontents/recharge-list.vue
index 3a0038e..6aea040 100644
--- a/src/page/user/compontents/recharge-list.vue
+++ b/src/page/user/compontents/recharge-list.vue
@@ -21,7 +21,7 @@
<span
:style="{ color: $state.theme == 'red' ? '#BB1815' : '' }"
>
- {{ item.channelName }} {{ item.payAmt | _toLocaleString }}
+ {{ item.channelName }} ￥{{ item.payAmt }}
</span>
</span>
<span
diff --git a/src/page/user/favorites.vue b/src/page/user/favorites.vue
index 8371df3..2e74911 100644
--- a/src/page/user/favorites.vue
+++ b/src/page/user/favorites.vue
@@ -111,7 +111,7 @@
<div class="item_box_left_bottom">{{ item.name }}</div>
</div>
<div class="item_box_zj">
- {{ item.nowPrice | _toLocaleString(false) }}
+ {{ item.nowPrice }}
</div>
<div
diff --git a/src/page/user/recharge.vue b/src/page/user/recharge.vue
index f545591..85cad86 100644
--- a/src/page/user/recharge.vue
+++ b/src/page/user/recharge.vue
@@ -16,6 +16,13 @@
<!-- close-on-click-action -->
<!-- @select="rechargeAccountSelect" -->
+ <div class="list_title">
+ <div class="list_top">{{$t('线上充值')}}</div>
+ <div class="list_xx">
+ <div class="list_xx_box" v-for="(item,index) in czlist" :key="index" @click="clicktype(item)">{{item}}
+ </div>
+ </div>
+ </div>
<div class="main-title">{{ $t("請選擇充值金額") }}</div>
<div class="white-input">
<input type="number" :value="value" @input="inputValue" />
@@ -28,22 +35,31 @@
<div class="balance-text" style="margin-bottom: 0px">
<!-- {{ paymentSelectData.channelMinLimit }}
{{ rechargeAccountData.symbolCode }} -->
- 1000
+ 100000
</div>
</div>
<div class="division"></div>
</div>
<!-- :disabled="butFlg" -->
- <div style="font-size: 12px;">
- If you encounter any deposit problems, please contact online customer service
+ <div style="font-size: 12px;margin-top: 20px;color: #939298;">
+ {{$t('tips333')}}
</div>
- <div style="display: flex;justify-content: space-between;align-items: center;margin-top: 20px;">
+ <div style="font-size: 12px;margin-top: 10px;color: #939298;line-height: 16px;">
+ {{$t('tips111')}}
+ </div>
+ <div style="font-size: 12px;margin-top: 10px;color: #939298;line-height: 16px;">
+ {{$t('tips222')}}
+ </div>
+ <!-- <div style="display: flex;justify-content: space-between;align-items: center;margin-top: 20px;">
<div class="payclass" @click="paytype=1" :style="paytype==1?'border: 1px solid #185546;':'border: 1px solid #e5e8ed;'">Pay 1</div>
<div class="payclass" @click="paytype=2" :style="paytype==2?'border: 1px solid #185546;':'border: 1px solid #e5e8ed;'">Pay 2</div>
- </div>
+ </div> -->
<van-button class="but" type="primary" style="margin-top: 1.04rem; margin-bottom: 1.04rem"
@click="selCzFns">{{ $t("hj172") }}</van-button>
+ <van-dialog v-model="dialogVisible" :title="$t('请联系客服进行充值服务')" show-cancel-button :confirm-button-text="$t('联系客服')"
+ :cancel-button-text="$t('qx')" @confirm="onConfirm" @cancel="onCancel">
+ </van-dialog>
</template>
</div>
</main>
@@ -79,6 +95,7 @@
// getPayInfo
data() {
return {
+ dialogVisible: false,
loading: false,
butFlg: true,
admin: apiUrl.baseURL,
@@ -101,9 +118,13 @@
form: {
img1key: "",
},
+ czlist: ['500000', '1000000', '1500000', '2000000', '2500000', '3000000']
};
},
methods: {
+ clicktype(e) {
+ this.value = e
+ },
judgeValue() {
console.log(this.form.img1key, this.value);
if (this.form.img1key && this.value) {
@@ -117,34 +138,53 @@
this.judgeValue();
},
async selCzFns() {
- const res = await thirdPartyRecharge({
- tradeAmoun: this.value,
- type:this.paytype
- });
- console.log(res);
- if (res.status == 0) {
- window.open(res.data);
- }else{
- Notify(res.msg);
- }
+ // const res = await thirdPartyRecharge({
+ // tradeAmoun: this.value,
+ // type:this.paytype
+ // });
+ // console.log(res);
+ // if (res.status == 0) {
+ // window.open(res.data);
+ // }else{
+ // Notify(res.msg);
+ // }
// if (!this.value) {
// return Notify(this.$t("hj171"));
// }
// if (!this.form.img1key) {
// return Notify(this.$t("请上传文件"));
// }
- // const res = await selCzFn({
- // payTypeId: this.paymentSelectData.id,
- // payAmt: this.value,
- // img: this.form.img1key,
- // });
- // if (res.status === 0) {
- // Notify({ type: "success", message: this.$t("hj182") });
- // setTimeout(() => {
- // this.$router.push("/rechargelist");
- // }, 500);
- // }
- // Notify("请上传文件");
+ if(this.value<100000){
+ return Notify(this.$t("最小充值金額")+100000);
+ }
+ const res = await selCzFn({
+ // payTypeId: this.paymentSelectData.id,
+ payAmt: this.value,
+ // img: this.form.img1key,
+ });
+ if (res.status === 0) {
+ // Notify({
+ // type: "success",
+ // message: this.$t("请联系客服")
+ // });
+ this.dialogVisible = !this.dialogVisible
+ // setTimeout(() => {
+ // this.$router.push("/rechargelist");
+ // }, 500);
+ }
+ // Notify("请上传文件");
+ // return Notify(this.$t("请上传文件"));
+ },
+ // 点击确认按钮时的事件
+ onConfirm() {
+ this.dialogVisible = false;
+ window.open('https://lin.ee/7I7cvGD', '_blank');
+ console.log("已确认操作");
+ },
+ // 点击取消按钮时的事件
+ onCancel() {
+ this.dialogVisible = false;
+ console.log("已取消操作");
},
async getPayInfos() {
const res = await siteGetPayInfo();
@@ -214,6 +254,41 @@
</script>
<style lang="less" scoped>
+ /deep/.van-dialog__header--isolated{
+ padding: 0.444444rem;
+ }
+ .list_xx_box {
+ padding: 10px 20px;
+ border: 1px solid #d4d4d4;
+ border-radius: 8px;
+ font-size: 20px;
+ width: 160px;
+ text-align: center;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-bottom: 10px;
+ font-weight: 500;
+ }
+
+ .list_xx {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ }
+
+ .list_top {
+ font-size: 24px;
+ margin-bottom: 20px;
+ font-weight: bold;
+ }
+
+ .list_title {
+ display: flex;
+ flex-direction: column;
+ margin-top: 20px;
+ }
+
.payclass {
width: 150px;
height: 40px;
diff --git a/src/page/user/yebs.vue b/src/page/user/yebs.vue
index f922991..6bb7cbc 100644
--- a/src/page/user/yebs.vue
+++ b/src/page/user/yebs.vue
@@ -57,7 +57,7 @@
$t("gm") + $t("je") + "："
}}</span>
<span class="li-value">{{
- item.money | _toLocaleString(false)
+ item.money
}}</span>
</div>
</div>
--
Gitblit v1.9.3