From 2007ac8b95033bccbc7bc1e048e896757611e8f7 Mon Sep 17 00:00:00 2001
From: zzzz <690498789@qq.com>
Date: Wed, 24 Apr 2024 13:27:53 +0800
Subject: [PATCH] 1
---
src/page/list/favoriteslist/data.list.vue | 2
src/page/user/yeb.vue | 18 +-
src/locales/jp.json | 3
src/page/kline/index.vue | 19 +-
src/page/user/Warehouse/data.list.vue | 14 +-
src/page/trading/buy.vue | 12 +
src/page/user/yebs.vue | 12 +-
src/locales/cht.json | 3
src/locales/en.json | 9
src/page/user/compontents/recharge-list.vue | 22 ++-
src/page/newUser/index.vue | 6
src/page/user/favorites.vue | 4
src/page/kline/components/kLine.vue | 51 --------
src/locales/fra.json | 3
src/page/user/compontents/cash-list.vue | 8 +
src/page/login/register.vue | 2
src/utils/allocation.js | 21 +++
src/locales/zh.json | 1
src/page/user/Warehouse/item.card.vue | 17 +-
src/page/list/tradingList/data.list.vue | 41 ++++--
src/page/user/recharge-sure.vue | 2
src/locales/de.json | 3
src/utils/filter.js | 40 +++---
src/page/list/favorites/data.list.vue | 8 +
src/components/showHide.vue | 2
src/axios/api.url.js | 4
src/locales/kor.json | 3
src/locales/hi.json | 3
src/locales/th.json | 3
29 files changed, 180 insertions(+), 156 deletions(-)
diff --git a/src/axios/api.url.js b/src/axios/api.url.js
index e918d4f..37751ab 100644
--- a/src/axios/api.url.js
+++ b/src/axios/api.url.js
@@ -7,9 +7,9 @@
// baseURL: '/',
// baseURL: 'http://www.jumptalk.net:8091',
// 0311
- baseURL: "https://api.essencefunds.com/",
+ // baseURL: "https://api.essencefunds.com/",
// 本地
- // baseURL: "http://192.168.0.105:8091/",
+ baseURL: "http://192.168.0.105:8091/",
util: {
image: "/util/image.html" // 图片上传
}
diff --git a/src/components/showHide.vue b/src/components/showHide.vue
index 910af0d..0b2e927 100644
--- a/src/components/showHide.vue
+++ b/src/components/showHide.vue
@@ -1,6 +1,6 @@
<template>
<span>
- <span v-if="flg">{{ text | _toString }}</span>
+ <span v-if="flg">{{ text | _toLocaleString(false) }}</span>
<span v-else>****</span>
</span>
</template>
diff --git a/src/locales/cht.json b/src/locales/cht.json
index 944743f..fb2fce5 100644
--- a/src/locales/cht.json
+++ b/src/locales/cht.json
@@ -567,5 +567,6 @@
"yeb": "基金",
"yebjl": "基金記錄",
"周期": "週期",
- "天": "天"
+ "天": "天",
+ "市场": "市場"
}
\ No newline at end of file
diff --git a/src/locales/de.json b/src/locales/de.json
index a876728..fb2b0f0 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -562,5 +562,6 @@
"yebjl": "Fondsregister",
"subdk": "Beantragung eines Darlehens",
"周期": "Zyklus",
- "天": "Tag"
+ "天": "Tag",
+ "市场": "Markt"
}
\ No newline at end of file
diff --git a/src/locales/en.json b/src/locales/en.json
index 4ea9779..c23bb47 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -567,12 +567,13 @@
"申请杠杠成功，请联系客服！": "Successfully applied for leverage, please contact customer service!",
"订单号": "Order number",
"时间": "time",
- "hj90": "1 minute",
- "hj91": "5 minute",
- "hj92": "30 minute",
+ "hj90": "1 min",
+ "hj91": "5 min",
+ "hj92": "30 min",
"yebjl": "Fund records",
"hj315": "Rise and fall rate",
"周期": "cycle",
"yeb": "fund",
- "天": "day"
+ "天": "day",
+ "市场": "market"
}
\ No newline at end of file
diff --git a/src/locales/fra.json b/src/locales/fra.json
index 660fd57..fe6b56f 100644
--- a/src/locales/fra.json
+++ b/src/locales/fra.json
@@ -562,5 +562,6 @@
"yeb": "Le Fonds",
"yebjl": "Enregistrement du Fonds",
"周期": "Le cycle",
- "天": "Jours"
+ "天": "Jours",
+ "市场": "Le marché"
}
\ No newline at end of file
diff --git a/src/locales/hi.json b/src/locales/hi.json
index f8dc6cc..2337e0d 100644
--- a/src/locales/hi.json
+++ b/src/locales/hi.json
@@ -573,5 +573,6 @@
"yeb": "धन",
"yebjl": "फंड रिकॉर्ड्स",
"周期": "चक्र",
- "天": "आसमान"
+ "天": "आसमान",
+ "市场": "बाज़ार"
}
\ No newline at end of file
diff --git a/src/locales/jp.json b/src/locales/jp.json
index 626566f..ef75596 100644
--- a/src/locales/jp.json
+++ b/src/locales/jp.json
@@ -563,5 +563,6 @@
"yeb": "基金",
"yebjl": "基金レコード",
"周期": "サイクル",
- "天": "日"
+ "天": "日",
+ "市场": "市場"
}
\ No newline at end of file
diff --git a/src/locales/kor.json b/src/locales/kor.json
index fc1b52e..d40cd4a 100644
--- a/src/locales/kor.json
+++ b/src/locales/kor.json
@@ -563,5 +563,6 @@
"yeb": "펀드",
"yebjl": "기금 기록",
"周期": "주기",
- "天": "일"
+ "天": "일",
+ "市场": "시장"
}
\ No newline at end of file
diff --git a/src/locales/th.json b/src/locales/th.json
index 5d4c1cf..f3872c3 100644
--- a/src/locales/th.json
+++ b/src/locales/th.json
@@ -563,5 +563,6 @@
"yeb": "กองทุน",
"yebjl": "บันทึกกองทุน",
"周期": "ระยะเวลา",
- "天": "วัน"
+ "天": "วัน",
+ "市场": "ตลาด"
}
\ No newline at end of file
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 61bf261..222462e 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -562,5 +562,6 @@
"配售开启时间": "配售开启时间",
"申购结束时间": "申购结束时间",
"周期": "周期",
+ "市场": "市场",
"配售结束时间": "配售结束时间"
}
\ No newline at end of file
diff --git a/src/page/kline/components/kLine.vue b/src/page/kline/components/kLine.vue
index e6e8a61..13d6477 100644
--- a/src/page/kline/components/kLine.vue
+++ b/src/page/kline/components/kLine.vue
@@ -1,33 +1,6 @@
<template>
<div class="box">
- <!-- <div class="left">
- <el-menu
- default-active="AAPL.usa"
- class="el-menu-vertical-demo"
- background-color="#191919"
- text-color="#dee4eb"
- active-text-color="#ff6900"
- :unique-opened="true"
- @select='handleSelect'
- @open="handleOpen"
- @close="handleClose">
- <el-submenu v-for="item in NavMenuAry" :key="item.Title" :index="item.Title">
- <template slot="title">
- <i class="el-icon-menu"></i>
- <span>{{item.Title}}</span>
- </template>
- <el-menu-item v-for="subItem in item.Sub" :key='subItem.Code' :index="subItem.Code">{{subItem.Name}}</el-menu-item>
- </el-submenu>
- </el-menu>
- </div> -->
-
<div class="right" ref="right">
- <!-- <div class="rightTab" ref="rightTab">
- <div class="btn showMinute" :class="{ active: chartType == 'minute' }"
- @click="changeRightContent('minute')">分时图</div>
- <div class="btn showKline" :class="{ active: chartType == 'kline' }" @click="changeRightContent('kline')">
- K线图</div>
- </div>-->
<div class="rightContent" ref="rightContent">
<div class="contentBox">
<div class="periodWrap kline_periodWrap" ref="kline_periodWrap">
@@ -42,15 +15,7 @@
>
<span>{{ item.Name }}</span>
</div>
- <div
- class="btn2"
- @click="isShow ? (isShow = false) : (isShow = true)"
- >
- <div class="btn2">
- <!-- :class="KLinePeriodIndex === index ? 'active' : ''" -->
- <img src="../../../assets/img/options.png" alt />
- </div>
- </div>
+
<div
style="position: absolute; right: 0; top: 25px; z-index: 99"
v-if="isShow == true"
@@ -95,17 +60,9 @@
ref="kline2"
v-show="chartType == 'kline'"
></div>
-
- <!-- <div class="statementWrap" ref="kline_statementWrap">
- 郑重声明：本页面所有数据来自互联网或自动生成的测试数据,仅用于学习HQChart图形库使用,不构成任何投资价值信息。如使用者依据本网站提供的信息、资料及图表进行金融、证券等投资所造成的盈亏与本网站无关。
- </div>-->
</div>
</div>
</div>
-
- <!-- <div class="right" ref="kline_right" >
-
- </div>-->
</div>
</template>
@@ -116,11 +73,7 @@
import "hqchart/src/jscommon/umychart.resource/font/iconfont.css";
import EastMoney from "../../../eastmoney/HQData.js";
import i18n from "@/locales/index.js";
-// 源码调试用
-// import Chart from '../jscommon/umychart.vue/umychart.vue.js'
-// import '../jscommon/umychart.resource/css/tools.css'
-// import '../jscommon/umychart.resource/font/iconfont.css'
-// var HQChart={ Chart:Chart };
+
HQChart.Chart.MARKET_SUFFIX_NAME.GetMarketStatus = function (symbol) {
return 2;
}; // 一直交易
diff --git a/src/page/kline/index.vue b/src/page/kline/index.vue
index 0dfc04c..7827f89 100644
--- a/src/page/kline/index.vue
+++ b/src/page/kline/index.vue
@@ -9,7 +9,7 @@
</div>
<div class="right_title">
<div class="t_t" style="white-space: nowrap">
- <span>{{ singDetails.name }}</span>
+ <span>{{ singDetails.name }}({{ singDetails.gid }})</span>
</div>
<div class="b_t">
<span>{{ singDetails.spell }}</span>
@@ -82,7 +82,7 @@
}}</span> -->
<span
:class="singDetails.hcrate > 0 ? 'price green' : 'price red'"
- >{{ singDetails.nowPrice | _toString }}</span
+ >{{ singDetails.nowPrice | _toLocaleString }}</span
>
</div>
<div class="bottom_now">
@@ -93,7 +93,7 @@
}}{{ (singDetails.nowPrice - singDetails.preclose_px).toFixed(2) }}</span> -->
<span v-else>
{{
- (singDetails.nowPrice - singDetails.preclose_px) | _toString
+ (singDetails.nowPrice - singDetails.preclose_px) | _toLocaleString
}}</span
>
</div>
@@ -121,7 +121,7 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.open_px | _toString }}</span
+ >{{ singDetails.open_px | _toLocaleString }}</span
>
</div>
<div class="rights topes">
@@ -133,7 +133,7 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.today_max | _toString }}</span
+ >{{ singDetails.today_max | _toLocaleString }}</span
>
</div>
</div>
@@ -147,7 +147,7 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.preclose_px | _toString }}</span
+ >{{ singDetails.preclose_px | _toLocaleString }}</span
>
</div>
<div class="rights bots">
@@ -159,7 +159,7 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.today_min | _toString }}</span
+ >{{ singDetails.today_min | _toLocaleString }}</span
>
</div>
</div>
@@ -433,7 +433,7 @@
<span>{{ $t("hj84") }}</span>
</div>
<div class="bottom_buy">
- <span>{{ singDetails.nowPrice | _toString }}</span>
+ <span>{{ singDetails.nowPrice | _toLocaleString }}</span>
</div>
</div>
<div class="sell_btn" @click="goBuy(1)">
@@ -441,7 +441,7 @@
<span>{{ $t("hj85") }}</span>
</div>
<div class="bottom_sell">
- <span>{{ singDetails.nowPrice | _toString }}</span>
+ <span>{{ singDetails.nowPrice | _toLocaleString }}</span>
</div>
</div>
</div>
@@ -677,6 +677,7 @@
spell: this.singDetails.spell,
if_us: this.kLineDetails.if_us,
bayType: this.bayType,
+ gid: this.singDetails.gid,
},
});
if (navigator.vibrate) {
diff --git a/src/page/list/favorites/data.list.vue b/src/page/list/favorites/data.list.vue
index 1780ca0..4196ab9 100644
--- a/src/page/list/favorites/data.list.vue
+++ b/src/page/list/favorites/data.list.vue
@@ -63,7 +63,9 @@
<van-col span="9">
<div style="text-align: left">
<div class="tp">
- <span class="price_color">{{ item.price }}</span>
+ <span class="price_color">{{
+ item.price | _toLocaleString(false)
+ }}</span>
</div>
<div class="bt">
<span>Max: {{ item.orderNumber }}</span>
@@ -142,7 +144,9 @@
</div>
<div class="xgsj">
<div class="sjtlt">{{ $t("hj120") }}:</div>
- <div class="xgTime">{{ shengouObj.price }}</div>
+ <div class="xgTime">
+ {{ shengouObj.price | _toLocaleString(false) }}
+ </div>
</div>
<!-- <div class="xgsj">
<div class="sjtlt">上市時間:</div>
diff --git a/src/page/list/favoriteslist/data.list.vue b/src/page/list/favoriteslist/data.list.vue
index 8cdb4ec..6cda785 100644
--- a/src/page/list/favoriteslist/data.list.vue
+++ b/src/page/list/favoriteslist/data.list.vue
@@ -32,7 +32,7 @@
<div style="width: 100%">
<div class="bottom_price_title">
<div class="start_price">
- <span>{{ item.buyPrice }} </span>
+ <span>{{ item.buyPrice | _toLocaleString(false) }} </span>
</div>
<div class="new_price" v-if="item.status <= 3">
<span>
diff --git a/src/page/list/tradingList/data.list.vue b/src/page/list/tradingList/data.list.vue
index e3e45d2..7281e50 100644
--- a/src/page/list/tradingList/data.list.vue
+++ b/src/page/list/tradingList/data.list.vue
@@ -7,7 +7,12 @@
{{ $t("hj313") }}
</div>
</van-col>
- <van-col span="10">
+ <van-col span="3">
+ <div style="text-align: right">
+ {{ $t("市场") }}
+ </div>
+ </van-col>
+ <van-col span="7">
<div style="text-align: right">
{{ $t("hj314") }}
</div>
@@ -39,34 +44,42 @@
<van-col span="8">
<div>
<div class="tp">
- <span class="collection" @click="optionszx(item)">
- <span
+ <div class="collection" @click="optionszx(item)">
+ <div
class="shu"
:class="item.isOption == '1' ? 'shublue' : ''"
- ></span>
- </span>
- <span
+ ></div>
+ </div>
+ <div
class="title_color"
style="
+ width: 100%;
overflow: hidden;
- -webkit-line-clamp: 1;
text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-box-orient: vertical;
+ white-space: nowrap;
"
- >{{ item.name }}</span
>
+ {{ item.name }}
+ </div>
</div>
<div class="bt">
<span>{{ item.spell }}</span>
</div>
- </div></van-col
- >
+ </div>
+ </van-col>
- <van-col span="10">
+ <van-col span="3">
+ <div style="text-align: right">
+ {{ item.gid }}
+ </div>
+ </van-col>
+
+ <van-col span="7">
<div style="text-align: right">
<div class="tp">
- <span class="price_color">{{ item.nowPrice | _toString }}</span>
+ <span class="price_color">
+ {{ item.nowPrice | _toLocaleString(false) }}
+ </span>
</div>
<div class="bt">
<span>{{ item.addTime }}</span>
diff --git a/src/page/login/register.vue b/src/page/login/register.vue
index 6ff323b..ac3015b 100644
--- a/src/page/login/register.vue
+++ b/src/page/login/register.vue
@@ -123,7 +123,7 @@
},
async gook() {
- if (this.phone.length !== 10) {
+ if (this.phone.length == 0) {
Notify({ type: "warning", message: this.$t("hj28") });
} else if (isNull(this.userPassword)) {
Notify({ type: "warning", message: this.$t("hj30") });
diff --git a/src/page/newUser/index.vue b/src/page/newUser/index.vue
index 7ab19ff..87c8849 100644
--- a/src/page/newUser/index.vue
+++ b/src/page/newUser/index.vue
@@ -128,7 +128,8 @@
</div>
<div class="li-USDT">
<div class="DINPro">
- {{ item.symbol }} {{ item.availableBalance | _toString }}
+ {{ item.symbol }}
+ {{ item.availableBalance | _toLocaleString }}
</div>
<!-- <div class="DINPro">
≈ $ {{ item.availableBalanceUSD || "0.00" }}
@@ -141,7 +142,8 @@
</div>
<div class="li-USDT">
<div class="DINPro">
- {{ item.symbol }} {{ item.freezeMoney | _toString }}
+ {{ item.symbol }}
+ {{ item.freezeMoney | _toLocaleString }}
</div>
<!-- <div class="DINPro">≈ $ {{ item.freezeMoney || "0.00" }}</div> -->
</div>
diff --git a/src/page/trading/buy.vue b/src/page/trading/buy.vue
index 22faf37..4bab248 100644
--- a/src/page/trading/buy.vue
+++ b/src/page/trading/buy.vue
@@ -8,7 +8,7 @@
</div>
<div class="right_title">
<div class="t_t" style="white-space: nowrap">
- <span>{{ name }}</span>
+ <span>{{ name }}({{ gid }})</span>
</div>
<div class="b_t">
<span>{{ spell }}</span>
@@ -19,7 +19,7 @@
<div class="cot">
<div class="lefts">
<div class="top_new">
- <span>{{ nowPrice | _toString }}</span>
+ <span>{{ nowPrice | _toLocaleString }}</span>
</div>
<div class="bottom_es">
<span>{{ $t("hj98") }}</span>
@@ -130,11 +130,11 @@
</div>
<div class="bottom_bzz">
- <span>{{ ((nowPrice / selectCycle) * num) | _toString }}</span>
+ <span>{{ ((nowPrice / selectCycle) * num) | _toLocaleString }}</span>
<span style="white-space: nowarp">
<!-- moneyData.symbol + " " + -->
- {{ moneyData.availableBalance | _toString }}
+ {{ moneyData.availableBalance | _toLocaleString }}
</span>
</div>
</div>
@@ -306,10 +306,12 @@
},
],
moneyData: {},
+ gid: "",
};
},
mounted() {
this.bayType = this.$route.query.bayType;
+ this.gid = this.$route.query.gid;
if (this.bayType == "in") {
this.priceTabs = [this.$t("hj108"), this.$t("hj109")];
} else if (this.bayType == "qh") {
@@ -475,7 +477,7 @@
},
// 买卖
setBuy() {
- if (!this.$store.state.userInfo.idCard) {
+ if (this.$store.state.userInfo.isActive !== 2) {
this.$store.commit("elAlertShow", {
elAlertShow: true,
elAlertText: this.$t("hj111"),
diff --git a/src/page/user/Warehouse/data.list.vue b/src/page/user/Warehouse/data.list.vue
index 4a21710..fc8b3a4 100644
--- a/src/page/user/Warehouse/data.list.vue
+++ b/src/page/user/Warehouse/data.list.vue
@@ -44,7 +44,7 @@
{{ $t("盈虧") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text" style="color: #d04b64">
- {{ item.profitAndLose | _toString }}
+ {{ item.profitAndLose | _toLocaleString }}
</div>
</div>
</van-col>
@@ -72,7 +72,7 @@
{{ $t("hj40") }}({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- {{ item.now_price | _toString }}
+ {{ item.now_price | _toLocaleString }}
</div>
</div>
</van-col>
@@ -82,7 +82,7 @@
{{ $t("持倉價") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- {{ item.buyOrderPrice | _toString }}
+ {{ item.buyOrderPrice | _toLocaleString }}
</div>
</div>
</van-col>
@@ -92,7 +92,7 @@
{{ $t("訂單金額") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- {{ item.orderTotalPrice | _toString }}
+ {{ item.orderTotalPrice | _toLocaleString }}
</div>
</div>
</van-col>
@@ -104,7 +104,7 @@
{{ $t("hj44") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- {{ item.orderFee | _toString }}
+ {{ item.orderFee | _toLocaleString }}
</div>
</div>
</van-col>
@@ -114,7 +114,7 @@
{{ $t("止損價") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- {{ item.profitTargetPrice | _toString }}
+ {{ item.profitTargetPrice | _toLocaleString }}
</div>
</div>
</van-col>
@@ -124,7 +124,7 @@
{{ $t("止盈價") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- {{ item.stopTargetPrice | _toString }}
+ {{ item.stopTargetPrice | _toLocaleString }}
</div>
</div>
</van-col>
diff --git a/src/page/user/Warehouse/item.card.vue b/src/page/user/Warehouse/item.card.vue
index f8a7454..850fb3b 100644
--- a/src/page/user/Warehouse/item.card.vue
+++ b/src/page/user/Warehouse/item.card.vue
@@ -5,14 +5,17 @@
<div class="total-name">
{{ activeObj.assname }} ({{ activeObj.symbolCode }})
</div>
- <div class="total-data">{{ activeObj.totalMoney | _toString }}</div>
+ <div class="total-data">
+ {{ activeObj.totalMoney | _toLocaleString }}
+ <!-- {{ 10000000000000 | _toLocaleString }} -->
+ </div>
</div>
</div>
<div class="item-card-itembox">
<div class="item">
<div class="itembox-data">
- {{ activeObj.profitAndLoss | _toString }}
+ {{ activeObj.profitAndLoss | _toLocaleString }}
</div>
<div class="itembox-name">
@@ -21,7 +24,7 @@
</div>
<div class="item">
<div class="itembox-data">
- {{ activeObj.availableBalance | _toString }}
+ {{ activeObj.availableBalance | _toLocaleString }}
</div>
<div class="itembox-name">
@@ -30,7 +33,7 @@
</div>
<div class="item">
<div class="itembox-data">
- {{ activeObj.cumulativeProfitAndLoss | _toString }}
+ {{ activeObj.cumulativeProfitAndLoss | _toLocaleString }}
</div>
<div class="itembox-name">
@@ -38,7 +41,9 @@
</div>
</div>
<div class="item">
- <div class="itembox-data">{{ activeObj.freezeMoney | _toString }}</div>
+ <div class="itembox-data">
+ {{ activeObj.freezeMoney | _toLocaleString }}
+ </div>
<div class="itembox-name">
{{ $t("凍結資產") }} ({{ activeObj.symbolCode }})
@@ -46,7 +51,7 @@
</div>
<div class="item">
<div class="itembox-data">
- {{ activeObj.handlingCharge | _toString }}
+ {{ activeObj.handlingCharge | _toLocaleString }}
</div>
<div class="itembox-name">
diff --git a/src/page/user/compontents/cash-list.vue b/src/page/user/compontents/cash-list.vue
index 8e5217e..5fa6051 100644
--- a/src/page/user/compontents/cash-list.vue
+++ b/src/page/user/compontents/cash-list.vue
@@ -14,7 +14,9 @@
<div class="order-info-box">
<div class="order-title">
<span class="main"> {{ $t("hjtxyhk") }} </span>
- <span class="payNumber">{{ $USD }}{{ item.withAmt }}</span>
+ <span class="payNumber"
+ >{{ $USD }}{{ item.withAmt | _toLocaleString }}</span
+ >
<span class="red pull-right">
{{
item.withStatus == 1
@@ -48,7 +50,9 @@
<p class="clearfix">
<span class="col-xs-6">
{{ $t("hj44") }}:
- <b class="space"> {{ $USD }} {{ item.withFee }} </b>
+ <b class="space">
+ {{ $USD }} {{ item.withFee | _toLocaleString }}
+ </b>
</span>
<!-- <span class="col-xs-6">实际到账金额:<b class="space" style="font-size:0.26rem">{{item.withAmt - item.withFee}}</b>元</span> -->
</p>
diff --git a/src/page/user/compontents/recharge-list.vue b/src/page/user/compontents/recharge-list.vue
index 3836934..4c5b33c 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 }}
+ {{ item.channelName }} {{ item.payAmt | _toLocaleString }}
</span>
</span>
<span
@@ -36,19 +36,23 @@
<i
v-if="item.orderStatus == 1"
class="iconfont icon-tongguo4 animated bounceIn"
- ></i>
+ >
+ </i>
<i
v-if="item.orderStatus == 0"
class="iconfont icon-dengdai animated bounceInDown"
- ></i>
+ >
+ </i>
<i
v-if="item.orderStatus == 2"
class="iconfont icon-failure animated bounceInDown"
- ></i>
+ >
+ </i>
<i
v-if="item.orderStatus == 3"
class="iconfont icon-iconfontweitongguo animated bounceInDown"
- ></i>
+ >
+ </i>
<!-- 1 => 成功 2 失败 3取消 4 等待 -->
{{
item.orderStatus == 1
@@ -68,10 +72,10 @@
>
<span class="info-item"
>{{ $t("时间") }}:
- <b v-if="item.addTime">{{
- new Date(item.addTime) | timeFormat
- }}</b>
- <b v-else></b>
+ <b v-if="item.addTime"
+ >{{ new Date(item.addTime) | timeFormat }}
+ </b>
+ <b v-else> </b>
</span>
</div>
</div>
diff --git a/src/page/user/favorites.vue b/src/page/user/favorites.vue
index 543b81b..50ee551 100644
--- a/src/page/user/favorites.vue
+++ b/src/page/user/favorites.vue
@@ -110,7 +110,9 @@
<div class="item_box_left_top">{{ item.spell }}</div>
<div class="item_box_left_bottom">{{ item.name }}</div>
</div>
- <div class="item_box_zj">{{ item.nowPrice }}</div>
+ <div class="item_box_zj">
+ {{ item.nowPrice | _toLocaleString(false) }}
+ </div>
<div
:class="
diff --git a/src/page/user/recharge-sure.vue b/src/page/user/recharge-sure.vue
index 894ce3f..5a2fc72 100644
--- a/src/page/user/recharge-sure.vue
+++ b/src/page/user/recharge-sure.vue
@@ -58,7 +58,7 @@
<div class="dz-title" v-if="rechargeAccountData.key !== undefined">
<div>{{ $t("可用餘額") }}</div>
<div class="balance-text">
- {{ availableBalanceUSD | _toString }} {{ symbolCode }}
+ {{ availableBalanceUSD | _toLocaleString }} {{ symbolCode }}
<!-- {{ symbolCode }} -->
</div>
</div>
diff --git a/src/page/user/yeb.vue b/src/page/user/yeb.vue
index 3b91c14..0d9ebb7 100644
--- a/src/page/user/yeb.vue
+++ b/src/page/user/yeb.vue
@@ -71,7 +71,7 @@
<script>
import * as api from "@/axios/api";
-import { Toast } from "mint-ui";
+import { Notify } from "vant";
export default {
components: {},
@@ -117,6 +117,10 @@
let obj = res.data.filter((item) => item.accectType == "IN")[0];
obj.availableBalance = Number(obj.availableBalance).toFixed(2);
// console.log(Number(obj.availableBalance).toFixed(2));
+ obj.availableBalance = this.$toLocaleString(
+ obj.availableBalance,
+ false
+ );
this.activeObj = obj;
// console.log(obj, "0000000", this.tabsArr);
}
@@ -167,7 +171,7 @@
},
async tosubmit(id, money) {
if (!this.isInteger(money)) {
- Toast("请输入整数");
+ Notify({ type: "warning", message: this.$t("regpInt") });
return;
}
// 融资转指数
@@ -178,12 +182,12 @@
money: money,
};
let data1 = await api.BuyYeb(opt);
-
+ console.log(data1, "====");
if (data1.status === 0) {
- Toast(data1.data);
+ Notify({ type: "success", message: data1.data });
this.$router.push("/yebs");
} else {
- Toast(data1.data);
+ Notify({ type: "warning", message: data1.data });
}
},
async getUserInfo() {
@@ -192,7 +196,7 @@
if (data.status === 0) {
this.$store.state.userInfo = data.data;
} else {
- Toast(data.msg);
+ Notify({ type: "warning", message: data.data });
}
},
async getYebInfo() {
@@ -203,7 +207,7 @@
this.yebinfo = data.data;
this.$store.state.yebinfo = data.data;
} else {
- Toast(data.msg);
+ Notify({ type: "warning", message: data.data });
}
},
},
diff --git a/src/page/user/yebs.vue b/src/page/user/yebs.vue
index f001cb0..f07dd72 100644
--- a/src/page/user/yebs.vue
+++ b/src/page/user/yebs.vue
@@ -44,9 +44,9 @@
<div class="li-cont">
<div class="li-info li-1">
<span class="li-label">{{ $t("周期") + "：" }}</span>
- <span class="li-value"
- >{{ item.returnTime }} {{ $t("天") }}</span
- >
+ <span class="li-value">
+ {{ item.returnTime }} {{ $t("天") }}
+ </span>
</div>
<div class="li-info">
<span class="li-label">{{ $t("syl") + "：" }}</span>
@@ -56,9 +56,9 @@
<span class="li-label">{{
$t("gm") + $t("je") + "："
}}</span>
- <span class="li-value"
- >{{ item.money }} {{ $t("yuan") }}</span
- >
+ <span class="li-value">{{
+ item.money | _toLocaleString(false)
+ }}</span>
</div>
</div>
<div class="li-cont">
diff --git a/src/utils/allocation.js b/src/utils/allocation.js
index 996b86b..0880674 100644
--- a/src/utils/allocation.js
+++ b/src/utils/allocation.js
@@ -1,2 +1,23 @@
export const $USD = "₹";
export const $USDT = "INR";
+
+export function $toLocaleString(
+ number,
+ showCurrencySymbol = true, // 是否显示货币符号，默认为 true
+ locale = "en-IN", // 默认使用印度英语的语言环境
+ options = {
+ // style：可选值为 decimal（小数）、currency（货币）或 percent（百分比）；
+ // currency：设置为货币样式时使用的符号，支持列表在这里；
+ // useGrouping：布尔值，是否显示数字分位。
+ style: "currency",
+ currency: "INR",
+ minimumFractionDigits: 2 //如果不想要显示末尾的小数「.00」，只要设置一下最小分位 minimumFractionDigits 即可（默认是 2）：
+ }
+) {
+ number = number || 0;
+ let str = Number(number).toLocaleString(locale, options);
+ if (showCurrencySymbol) {
+ str = str.replace("₹", "");
+ }
+ return str;
+}
diff --git a/src/utils/filter.js b/src/utils/filter.js
index b0731c1..66edcb5 100644
--- a/src/utils/filter.js
+++ b/src/utils/filter.js
@@ -1,23 +1,23 @@
-// export function customToLocaleString(
-// number,
-// showCurrencySymbol = true, // 是否显示货币符号，默认为 true
-// locale = "en-IN", // 默认使用印度英语的语言环境
-// options = {
-// // style：可选值为 decimal（小数）、currency（货币）或 percent（百分比）；
-// // currency：设置为货币样式时使用的符号，支持列表在这里；
-// // useGrouping：布尔值，是否显示数字分位。
-// style: "currency",
-// currency: "INR",
-// minimumFractionDigits: 2 //如果不想要显示末尾的小数「.00」，只要设置一下最小分位 minimumFractionDigits 即可（默认是 2）：
-// }
-// ) {
-// // if (!showCurrencySymbol) {
-// // // 如果不需要显示货币符号，将 style 设置为 "decimal"，并且将 currency 设置为空字符串
-// // options.style = "decimal";
-// // options.currency = "INR";
-// // }
-// return Number(number).toLocaleString(locale, options);
-// }
+export function _toLocaleString(
+ number,
+ showCurrencySymbol = true, // 是否显示货币符号，默认为 true
+ locale = "en-IN", // 默认使用印度英语的语言环境
+ options = {
+ // style：可选值为 decimal（小数）、currency（货币）或 percent（百分比）；
+ // currency：设置为货币样式时使用的符号，支持列表在这里；
+ // useGrouping：布尔值，是否显示数字分位。
+ style: "currency",
+ currency: "INR",
+ minimumFractionDigits: 2 //如果不想要显示末尾的小数「.00」，只要设置一下最小分位 minimumFractionDigits 即可（默认是 2）：
+ }
+) {
+ number = number || 0;
+ let str = Number(number).toLocaleString(locale, options);
+ if (showCurrencySymbol) {
+ str = str.replace("₹", "");
+ }
+ return str;
+}
export function _toString(u) {
u = u || 0;
u = Number(u);
--
Gitblit v1.9.3