From b6d88ca4a4b0d74c007fb4c574b1baee4aae062e Mon Sep 17 00:00:00 2001
From: zzzz <690498789@qq.com>
Date: Tue, 23 Apr 2024 18:58:50 +0800
Subject: [PATCH] first
---
src/page/user/yeb.vue | 304 +++++++++----------------
src/page/list/tradingList/dazy.vue | 9
src/locales/jp.json | 8
src/page/kline/index.vue | 18
src/page/user/Warehouse/data.list.vue | 22 +
src/page/trading/buy.vue | 45 +--
src/page/user/yebs.vue | 28 +-
src/locales/cht.json | 8
src/locales/en.json | 22 +
src/page/newUser/index.vue | 4
src/page/kline/components/kLine.vue | 3
src/locales/fra.json | 8
src/locales/zh.json | 11
src/page/home/home.vue | 86 ++----
src/page/user/Warehouse/item.card.vue | 20 +
src/page/list/tradingList/data.list.vue | 2
src/page/user/recharge-sure.vue | 2
src/locales/de.json | 10
src/utils/filter.js | 49 ++++
src/components/showHide.vue | 2
src/assets/img/max.jpg | 0
src/page/user/Warehouse/Stockdetail.vue | 10
src/page/kline/index copy.vue | 2
src/main.js | 4
src/axios/api.url.js | 2
src/locales/kor.json | 8
src/locales/hi.json | 8
src/locales/th.json | 8
28 files changed, 337 insertions(+), 366 deletions(-)
diff --git a/src/assets/img/max.jpg b/src/assets/img/max.jpg
new file mode 100644
index 0000000..bcf5ab7
--- /dev/null
+++ b/src/assets/img/max.jpg
Binary files differ
diff --git a/src/axios/api.url.js b/src/axios/api.url.js
index 7d36807..37751ab 100644
--- a/src/axios/api.url.js
+++ b/src/axios/api.url.js
@@ -9,7 +9,7 @@
// 0311
// baseURL: "https://api.essencefunds.com/",
// 本地
- baseURL: "http://192.168.0.110: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 c839e0c..910af0d 100644
--- a/src/components/showHide.vue
+++ b/src/components/showHide.vue
@@ -1,6 +1,6 @@
<template>
<span>
- <span v-if="flg">{{ text ? text : "--" }}</span>
+ <span v-if="flg">{{ text | _toString }}</span>
<span v-else>****</span>
</span>
</template>
diff --git a/src/locales/cht.json b/src/locales/cht.json
index 24758cf..944743f 100644
--- a/src/locales/cht.json
+++ b/src/locales/cht.json
@@ -73,10 +73,8 @@
"regpInt": "請輸入整數",
"MingCheng": "名稱",
"hj1": "行情",
- "yeb": "餘額寶",
"subdk": "申請貸款",
"subdka": "提現",
- "yebjl": "餘額寶記錄",
"dkjl": "貸款記錄",
"gm": "購買",
"jl": "記錄",
@@ -565,5 +563,9 @@
"hj300": "內幕交易",
"hj268": "內幕交易記錄",
"确认": "確認",
- "申请杠杠": "申請框框"
+ "申请杠杠": "申請框框",
+ "yeb": "基金",
+ "yebjl": "基金記錄",
+ "周期": "週期",
+ "天": "天"
}
\ No newline at end of file
diff --git a/src/locales/de.json b/src/locales/de.json
index a75a60b..a876728 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -76,9 +76,6 @@
"regpInt": "Bitte geben Sie eine ganze Zahl ein",
"MingCheng": "Name",
"hj1": "Markt",
- "yeb": "Yu Ebao.",
- "yebjl": "Yu'ebao Records",
- "subdk": "Beantragung eines Darlehens",
"subdka": "Rücknahme",
"dkjl": "Kreditunterlagen",
"gm": "kaufen",
@@ -560,5 +557,10 @@
"申请杠杠": "Hebelwirkung beantragen",
"申请杠杠成功，请联系客服！": "Wenn Sie sich erfolgreich für Hebel beworben haben, wenden Sie sich bitte an den Kundenservice!",
"订单号": "Bestellnummer",
- "时间": "Zeit"
+ "时间": "Zeit",
+ "yeb": "Fonds",
+ "yebjl": "Fondsregister",
+ "subdk": "Beantragung eines Darlehens",
+ "周期": "Zyklus",
+ "天": "Tag"
}
\ No newline at end of file
diff --git a/src/locales/en.json b/src/locales/en.json
index e6c7760..4ea9779 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -75,7 +75,6 @@
"MingCheng": "name",
"hj1": "Quotes",
"hj2": "position",
- "yeb": "Yu'E Bao",
"subdk": "apply for a loan",
"subdka": "withdraw",
"dkjl": "loan records",
@@ -206,12 +205,9 @@
"hj84": "sell",
"hj85": "buy",
"hj86": "time sharing",
- "hj87": "sky",
- "hj88": "week",
- "hj89": "moon",
- "hj90": "1 point",
- "hj91": "5 points",
- "hj92": "30 points",
+ "hj87": "Day",
+ "hj88": "Week",
+ "hj89": "Month",
"hj93": "Not regaining power",
"hj94": "Former restoration of rights",
"hj95": "regain power later",
@@ -416,8 +412,6 @@
"hj311": "Continue",
"hj312": "Journalism",
"hj313": "Stocks",
- "hj315": "Change Percentage",
- "yebjl": "Yu’e Bao records",
"hj49": "Total assets",
"hj141": "Profit and loss ratio",
"hj168": "Recharge record",
@@ -572,5 +566,13 @@
"申请杠杠": "Apply for leverage",
"申请杠杠成功，请联系客服！": "Successfully applied for leverage, please contact customer service!",
"订单号": "Order number",
- "时间": "time"
+ "时间": "time",
+ "hj90": "1 minute",
+ "hj91": "5 minute",
+ "hj92": "30 minute",
+ "yebjl": "Fund records",
+ "hj315": "Rise and fall rate",
+ "周期": "cycle",
+ "yeb": "fund",
+ "天": "day"
}
\ No newline at end of file
diff --git a/src/locales/fra.json b/src/locales/fra.json
index 3e0269f..660fd57 100644
--- a/src/locales/fra.json
+++ b/src/locales/fra.json
@@ -76,8 +76,6 @@
"regpInt": "Veuillez entrer un nombre entier",
"MingCheng": "Le nom",
"hj1": "Le comportement",
- "yeb": "Le Trésor du reste",
- "yebjl": "Balance trésor record",
"subdk": "Demander un prêt",
"subdka": "Présente",
"dkjl": "Enregistrement des prêts",
@@ -560,5 +558,9 @@
"申请杠杠": "Appliquer barre",
"申请杠杠成功，请联系客服！": "Demande de barre de barre réussie, s'il vous plaît contacter le service à la clientèle!",
"订单号": "Numéro de commande",
- "时间": "Le temps"
+ "时间": "Le temps",
+ "yeb": "Le Fonds",
+ "yebjl": "Enregistrement du Fonds",
+ "周期": "Le cycle",
+ "天": "Jours"
}
\ No newline at end of file
diff --git a/src/locales/hi.json b/src/locales/hi.json
index 25ab024..f8dc6cc 100644
--- a/src/locales/hi.json
+++ b/src/locales/hi.json
@@ -74,10 +74,8 @@
"regpInt": "कृपया एक पूर्णांक दर्ज करें",
"MingCheng": "नाम",
"hj1": "उद्धरण",
- "yeb": "यू'ई बाओ",
"subdk": "एक ऋण के लिए आवेदन",
"subdka": "निकालना",
- "yebjl": "यू बाओ रिकॉर्ड",
"dkjl": "ऋण रिकॉर्ड",
"gm": "खरीदना",
"jl": "अभिलेख",
@@ -571,5 +569,9 @@
"申请杠杠": "लीवरेज के लिए आवेदन करें",
"申请杠杠成功，请联系客服！": "यदि आवेदन सफल होता है, तो कृपया ग्राहक सेवा से संपर्क करें!",
"订单号": "आदेश संख्या",
- "时间": "समय"
+ "时间": "समय",
+ "yeb": "धन",
+ "yebjl": "फंड रिकॉर्ड्स",
+ "周期": "चक्र",
+ "天": "आसमान"
}
\ No newline at end of file
diff --git a/src/locales/jp.json b/src/locales/jp.json
index be0473e..626566f 100644
--- a/src/locales/jp.json
+++ b/src/locales/jp.json
@@ -76,8 +76,6 @@
"regpInt": "整数を入力してください。",
"MingCheng": "名前",
"hj1": "引用",
- "yeb": "岳宝",
- "yebjl": "岳宝の記録",
"subdk": "ローンを申請し",
"subdka": "撤回する",
"dkjl": "融資記録",
@@ -561,5 +559,9 @@
"申请杠杠": "鉄棒を申請する",
"申请杠杠成功，请联系客服！": "鉄棒の申し込みに成功しました。カスタマーサービスに連絡してください。",
"订单号": "注文番号",
- "时间": "時間"
+ "时间": "時間",
+ "yeb": "基金",
+ "yebjl": "基金レコード",
+ "周期": "サイクル",
+ "天": "日"
}
\ No newline at end of file
diff --git a/src/locales/kor.json b/src/locales/kor.json
index 4933142..fc1b52e 100644
--- a/src/locales/kor.json
+++ b/src/locales/kor.json
@@ -76,8 +76,6 @@
"regpInt": "정수를 입력하세요",
"MingCheng": "이름",
"hj1": "인용 부호",
- "yeb": "유에 바오",
- "yebjl": "Yu'e Bao의 기록",
"subdk": "대출을 신청하고",
"subdka": "철회하다",
"dkjl": "대출 기록",
@@ -561,5 +559,9 @@
"hj300": "내부거래",
"hj268": "내부자 거래 기록",
"确认": "확인",
- "申请杠杠": "막대기 를 신청하다"
+ "申请杠杠": "막대기 를 신청하다",
+ "yeb": "펀드",
+ "yebjl": "기금 기록",
+ "周期": "주기",
+ "天": "일"
}
\ No newline at end of file
diff --git a/src/locales/th.json b/src/locales/th.json
index ef20673..5d4c1cf 100644
--- a/src/locales/th.json
+++ b/src/locales/th.json
@@ -76,8 +76,6 @@
"regpInt": "กรุณากรอกจำนวนเต็ม",
"MingCheng": "ชื่อ",
"hj1": "คำคม",
- "yeb": "หยู่เอ๋อเปา",
- "yebjl": "บันทึก Yu'e Bao",
"subdk": "สมัครสินเชื่อ",
"subdka": "ถอน",
"dkjl": "บันทึกการกู้ยืม",
@@ -561,5 +559,9 @@
"hj300": "การซื้อขายหลักทรัพย์โดยใช้ข้อมูลภายใน",
"hj268": "บันทึกการซื้อขายหลักทรัพย์โดยใช้ข้อมูลภายใน",
"确认": "ยืนยัน",
- "申请杠杠": "ใบสมัคร บาร์"
+ "申请杠杠": "ใบสมัคร บาร์",
+ "yeb": "กองทุน",
+ "yebjl": "บันทึกกองทุน",
+ "周期": "ระยะเวลา",
+ "天": "วัน"
}
\ No newline at end of file
diff --git a/src/locales/zh.json b/src/locales/zh.json
index ffdc569..61bf261 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -79,8 +79,8 @@
"regpInt": "请输入整数",
"MingCheng": "名称",
"hj1": "行情",
- "yeb": "余额宝",
- "yebjl": "余额宝记录",
+ "yeb": "基金",
+ "yebjl": "基金记录",
"subdk": "申请贷款",
"subdka": "提现",
"dkjl": "贷款记录",
@@ -215,6 +215,7 @@
"hj85": "买入",
"hj86": "分时",
"hj87": "天",
+ "天": "天",
"hj88": "周",
"hj89": "月",
"hj90": "1分",
@@ -496,7 +497,7 @@
"打新日曆": "打新日历",
"立即登录": "立即登录",
"記住帳戶密碼": "記住帳戶密碼",
- "還沒賬號？": "還沒账号？",
+ "還沒賬號？": "还沒账号？",
"已有賬號？": "已有账号？",
"免費註冊": "免费注册",
"馬上登錄": "马上登录",
@@ -560,6 +561,6 @@
"申购开启时间": "申购开启时间",
"配售开启时间": "配售开启时间",
"申购结束时间": "申购结束时间",
- "配售结束时间": "配售结束时间",
- "申请杠杠": "申请杠杠"
+ "周期": "周期",
+ "配售结束时间": "配售结束时间"
}
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index b1b15de..59231ea 100644
--- a/src/main.js
+++ b/src/main.js
@@ -33,6 +33,7 @@
import "lib-flexible";
// import md5 from 'js-md5'
import * as filters from "@/utils/utils";
+import * as filter from "@/utils/filter";
import * as allocation from "@/utils/allocation";
import animated from "animate.css"; // npm install animate.css --save安装，在引入
@@ -71,6 +72,9 @@
Object.keys(filters).forEach(key => {
Vue.filter(key, filters[key]);
});
+Object.keys(filter).forEach(key => {
+ Vue.filter(key, filter[key]);
+});
Object.keys(allocation).forEach(key => {
Vue.prototype[key] = allocation[key];
});
diff --git a/src/page/home/home.vue b/src/page/home/home.vue
index a1aafdc..2656d87 100644
--- a/src/page/home/home.vue
+++ b/src/page/home/home.vue
@@ -77,7 +77,7 @@
<div class="name">{{ $t("安全") }}</div>
</div>
</li>
- <!-- <li @click="$router.push('/trading-list')">
+ <li @click="$router.push('/yeb')">
<div class="link">
<div class="icon">
<img
@@ -85,9 +85,9 @@
alt=""
/>
</div>
- <div class="name">{{ $t("hj225") }}</div>
+ <div class="name">{{ $t("yeb") }}</div>
</div>
- </li> -->
+ </li>
<!-- <li @click="$router.push('/warehouse')">
<div class="link">
<div class="icon">
@@ -133,20 +133,12 @@
<div class="title">{{ $t("hj45") }}</div>
<div class="list">
<div class="item" @click="$router.push('/favorites')">
- <div class="icon">
- <svg
- xmlns="http://www.w3.org/2000/svg"
- width="16"
- height="16"
- viewBox="0 0 16 16"
- fill="none"
- >
- <path
- d="M11.3333 1.99935H14C14.3682 1.99935 14.6666 2.29783 14.6666 2.66602V13.3327C14.6666 13.7009 14.3682 13.9993 14 13.9993H1.99998C1.63179 13.9993 1.33331 13.7009 1.33331 13.3327V2.66602C1.33331 2.29783 1.63179 1.99935 1.99998 1.99935H4.66665V0.666016H5.99998V1.99935H9.99998V0.666016H11.3333V1.99935ZM2.66665 5.99935V12.666H13.3333V5.99935H2.66665ZM3.99998 7.33268H5.33331V8.66602H3.99998V7.33268ZM7.33331 7.33268H8.66665V8.66602H7.33331V7.33268ZM10.6666 7.33268H12V8.66602H10.6666V7.33268Z"
- fill="#061540"
- ></path>
- </svg>
- </div>
+ <img
+ src="data:image/png;base64,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"
+ alt=""
+ srcset=""
+ />
+
<div class="i-title">{{ $t("打新日曆") }}</div>
</div>
<div
@@ -154,20 +146,12 @@
style="margin-left: 10px"
@click="$router.push('/favoritesList')"
>
- <div class="icon">
- <svg
- xmlns="http://www.w3.org/2000/svg"
- width="16"
- height="16"
- viewBox="0 0 16 16"
- fill="none"
- >
- <path
- d="M12 1.33398C12.3682 1.33398 12.6667 1.63246 12.6667 2.00065L12.6673 7.68638C11.9595 7.05265 11.0247 6.66732 10 6.66732C7.79088 6.66732 6.00001 8.45818 6.00001 10.6673C6.00001 12.8263 7.84001 14.6673 10 14.6673H4.00001C3.63182 14.6673 3.33334 14.3689 3.33334 14.0007V2.00065C3.33334 1.63246 3.63182 1.33398 4.00001 1.33398H12ZM10 8.00065C11.4727 8.00065 12.6667 9.19458 12.6667 10.6673C12.6667 11.1619 12.5321 11.625 12.2975 12.022L13.7713 13.4957L12.8284 14.4386L11.3547 12.9648C10.9577 13.1994 10.4945 13.334 10 13.334C8.52728 13.334 7.33334 12.14 7.33334 10.6673C7.33334 9.19458 8.52728 8.00065 10 8.00065ZM10 9.33398C9.26361 9.33398 8.66668 9.93092 8.66668 10.6673C8.66668 11.4037 9.26361 12.0007 10 12.0007C10.7364 12.0007 11.3333 11.4037 11.3333 10.6673C11.3333 9.93092 10.7364 9.33398 10 9.33398Z"
- fill="#B73D48"
- ></path>
- </svg>
- </div>
+ <img
+ src="https://essenceinvestment.net/png/icon-investment-market-btn-ipo.Lic6_V6W.png"
+ alt=""
+ srcset=""
+ />
+
<div class="i-title">{{ $t("申購記錄") }}</div>
</div>
</div>
@@ -286,7 +270,7 @@
currentIndex: 0,
bannerImgsArr: [
{
- img: "https://api.trowegroup.com/bs/image/20240305/06eb4602ba7b3e570ccd70c0415884ec.png",
+ img: require("@/assets/img/max.jpg"),
},
{
img: "https://api.trowegroup.com/bs/image/20240305/b923c7645712aeaeb93d660ce846f448.png",
@@ -1243,42 +1227,34 @@
display: flex;
padding-top: 0.26667rem;
.item {
+ background: linear-gradient(rgb(94, 248, 196) 0%, rgb(72, 205, 105) 100%);
+ flex: 1;
+ border-radius: 0.4rem;
+ width: 50%;
+ height: 4.2rem;
display: flex;
+ flex-direction: column;
align-items: center;
- border-radius: 0.10667rem;
- background: linear-gradient(270deg, #e6ecfb 0%, #f6f7ff 100%);
- height: 1.06667rem;
- width: 49%;
- .icon {
- width: 0.69333rem;
- height: 0.69333rem;
- flex-shrink: 0;
- border-radius: 1.06667rem;
- background: linear-gradient(0deg, #fefffe 0%, #fefffe 100%),
- url(<path-to-image>), lightgray 50% / cover no-repeat;
- box-shadow: 0 0 #1227591a, 0 0.02667rem 0.05333rem #1227591a,
- 0 0.08rem 0.08rem #12275917, 0 0.21333rem 0.13333rem #1227590d,
- 0 0.37333rem 0.16rem #12275903, 0 0.58667rem 0.16rem #12275900;
- display: flex;
- align-items: center;
- justify-content: center;
- margin-left: 0.53333rem;
+ justify-content: center;
+ color: #fff;
+ font-size: 0.4rem;
+ font-weight: 500;
+ > img {
+ width: 30%;
}
+
.i-title {
- color: #061540;
font-family: PingFang SC;
- font-size: 0.4rem;
+ margin: 15px 0;
font-style: normal;
font-weight: 500;
line-height: 0.42667rem;
- margin-left: 0.48rem;
}
}
}
}
.list .item:nth-child(2) {
- border-radius: 0.10667rem;
- background: linear-gradient(270deg, #fbe9e9 0%, #fff8f8 100%);
+ background: linear-gradient(rgb(85, 108, 137) 0%, rgb(49, 62, 79) 100%);
}
.title-box {
diff --git a/src/page/kline/components/kLine.vue b/src/page/kline/components/kLine.vue
index 8ea56b0..e6e8a61 100644
--- a/src/page/kline/components/kLine.vue
+++ b/src/page/kline/components/kLine.vue
@@ -1155,7 +1155,8 @@
HQChart.Chart.STYLE_TYPE_ID.WHITE_ID
); // 读取黑色风格配置
- // blackStyle.UpBarColor = "rgba(0,0,0,1)";
+ blackStyle.UpBarColor = "#449b54"; //上涨
+ blackStyle.DownBarColor = "#e13b45";
HQChart.Chart.JSChart.SetStyle(blackStyle);
},
diff --git a/src/page/kline/index copy.vue b/src/page/kline/index copy.vue
index d706905..a5e5405 100644
--- a/src/page/kline/index copy.vue
+++ b/src/page/kline/index copy.vue
@@ -94,7 +94,7 @@
? 'price green'
: 'price red'
"
- >{{ singDetails.nowPrice }}</span
+ >{{ singDetails.nowPrice | _toString }}</span
>
</div>
<div class="bottom_now">
diff --git a/src/page/kline/index.vue b/src/page/kline/index.vue
index 068f95d..0dfc04c 100644
--- a/src/page/kline/index.vue
+++ b/src/page/kline/index.vue
@@ -82,7 +82,7 @@
}}</span> -->
<span
:class="singDetails.hcrate > 0 ? 'price green' : 'price red'"
- >{{ singDetails.nowPrice }}</span
+ >{{ singDetails.nowPrice | _toString }}</span
>
</div>
<div class="bottom_now">
@@ -93,9 +93,7 @@
}}{{ (singDetails.nowPrice - singDetails.preclose_px).toFixed(2) }}</span> -->
<span v-else>
{{
- (singDetails.nowPrice - singDetails.preclose_px).toFixed(
- 2
- ) || 0
+ (singDetails.nowPrice - singDetails.preclose_px) | _toString
}}</span
>
</div>
@@ -123,7 +121,7 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.open_px }}</span
+ >{{ singDetails.open_px | _toString }}</span
>
</div>
<div class="rights topes">
@@ -135,7 +133,7 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.today_max }}</span
+ >{{ singDetails.today_max | _toString }}</span
>
</div>
</div>
@@ -149,7 +147,7 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.preclose_px }}</span
+ >{{ singDetails.preclose_px | _toString }}</span
>
</div>
<div class="rights bots">
@@ -161,7 +159,7 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.today_min }}</span
+ >{{ singDetails.today_min | _toString }}</span
>
</div>
</div>
@@ -435,7 +433,7 @@
<span>{{ $t("hj84") }}</span>
</div>
<div class="bottom_buy">
- <span>{{ singDetails.nowPrice }}</span>
+ <span>{{ singDetails.nowPrice | _toString }}</span>
</div>
</div>
<div class="sell_btn" @click="goBuy(1)">
@@ -443,7 +441,7 @@
<span>{{ $t("hj85") }}</span>
</div>
<div class="bottom_sell">
- <span>{{ singDetails.nowPrice }}</span>
+ <span>{{ singDetails.nowPrice | _toString }}</span>
</div>
</div>
</div>
diff --git a/src/page/list/tradingList/data.list.vue b/src/page/list/tradingList/data.list.vue
index 36db29f..e3e45d2 100644
--- a/src/page/list/tradingList/data.list.vue
+++ b/src/page/list/tradingList/data.list.vue
@@ -66,7 +66,7 @@
<van-col span="10">
<div style="text-align: right">
<div class="tp">
- <span class="price_color">{{ item.nowPrice }}</span>
+ <span class="price_color">{{ item.nowPrice | _toString }}</span>
</div>
<div class="bt">
<span>{{ item.addTime }}</span>
diff --git a/src/page/list/tradingList/dazy.vue b/src/page/list/tradingList/dazy.vue
index ca30e06..eff8166 100644
--- a/src/page/list/tradingList/dazy.vue
+++ b/src/page/list/tradingList/dazy.vue
@@ -4,11 +4,10 @@
<div class="boxd">
<div class="boxh">
{{ $t("hj261") }}
-
<span @click="show = false"></span>
</div>
<h5>{{ $t("hj130") }}</h5>
- <h6>{{ currentItem.nowPrice ? currentItem.nowPrice : "" }}</h6>
+ <h6>{{ currentItem.nowPrice | _toString }}</h6>
<div class="erty tghj">
<input
:placeholder="$t('hj262')"
@@ -21,7 +20,7 @@
</div>
<p class="plm">
<span>{{ $t("hj263") }}</span>
- <a>{{ currentItem.nowPrice }}</a>
+ <a>{{ currentItem.nowPrice | _toString }}</a>
</p>
<div class="erty">
<input
@@ -31,13 +30,11 @@
v-model="password"
/>
</div>
-
<p class="plm">
<span>
{{ $t("hj54") }}
</span>
-
- <a>{{ enableAmt }}</a>
+ <a>{{ enableAmt | _toString }}</a>
</p>
<div class="maik" @click="getxiadan">{{ $t("hj85") }}</div>
</div>
diff --git a/src/page/newUser/index.vue b/src/page/newUser/index.vue
index d608227..7ab19ff 100644
--- a/src/page/newUser/index.vue
+++ b/src/page/newUser/index.vue
@@ -128,7 +128,7 @@
</div>
<div class="li-USDT">
<div class="DINPro">
- {{ item.symbol }} {{ item.availableBalance || "0.00" }}
+ {{ item.symbol }} {{ item.availableBalance | _toString }}
</div>
<!-- <div class="DINPro">
≈ $ {{ item.availableBalanceUSD || "0.00" }}
@@ -141,7 +141,7 @@
</div>
<div class="li-USDT">
<div class="DINPro">
- {{ item.symbol }} {{ item.freezeMoney || "0.00" }}
+ {{ item.symbol }} {{ item.freezeMoney | _toString }}
</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 243e4f8..22faf37 100644
--- a/src/page/trading/buy.vue
+++ b/src/page/trading/buy.vue
@@ -19,7 +19,7 @@
<div class="cot">
<div class="lefts">
<div class="top_new">
- <span>{{ nowPrice }}</span>
+ <span>{{ nowPrice | _toString }}</span>
</div>
<div class="bottom_es">
<span>{{ $t("hj98") }}</span>
@@ -116,7 +116,7 @@
<div class="tr_rs gg" @click="showGg = true">
<div class="top_bzz">
<span>{{ $t("hj101") }}</span>
- <span>{{ selectCycle + "X" }}</span>
+ <span>{{ selectCycle }}</span>
</div>
</div>
<div class="tr_rs">
@@ -130,11 +130,11 @@
</div>
<div class="bottom_bzz">
- <span>{{ ((nowPrice / selectCycle) * num).toFixed(2) }}</span>
+ <span>{{ ((nowPrice / selectCycle) * num) | _toString }}</span>
<span style="white-space: nowarp">
<!-- moneyData.symbol + " " + -->
- {{ moneyData.availableBalance || "0.00" }}
+ {{ moneyData.availableBalance | _toString }}
</span>
</div>
</div>
@@ -274,7 +274,8 @@
name: "",
spell: "",
settingInfo: [],
- selectCycle: 1,
+ selectCycle: "1X",
+ selectLever: 1,
siteLeverList: [],
checkedZy: false,
checkedZs: false,
@@ -415,7 +416,8 @@
}
},
onSelect(val) {
- this.selectCycle = val.gg;
+ this.selectCycle = val.name;
+ this.selectLever = val.label;
},
gdOrSetBuy() {
if (this.priceTabsCurrentIndex == 0) {
@@ -437,9 +439,11 @@
let opts = {
stockId: this.code,
buyNum: this.num,
- lever: this.selectCycle ? this.selectCycle : 0,
+ lever: this.selectLever,
targetPrice: this.nums,
};
+ console.log(this.selectLever, "this.selectLever ");
+
if (this.tabsCurrentIndex == 0) {
opts.buyType = 1;
} else {
@@ -495,8 +499,9 @@
// 买入是买涨buyType:0, 卖出是买跌buyType:1,卖出的状态是0，买入的状态是1
buyNum: this.num, // 单位为手
// buyNum: (this.num.match(/\d+/g))[0] * 100, // 单位为手
- lever: this.selectCycle ? this.selectCycle : 0,
+ lever: this.selectLever,
};
+ console.log(this.selectLever, "this.selectLever ");
if (this.tabsCurrentIndex == 0) {
opts.buyType = 1;
} else {
@@ -599,14 +604,14 @@
// data.data.siteLever根据/分割成数组
// this.siteLeverList = data.data.siteLever.split('/')
- this.selectCycle = data.data.siteLever;
if (
this.$store.state.userInfo !== undefined &&
this.$store.state.userInfo !== null &&
- this.$store.state.userInfo.phone !== "" &&
this.$store.state.userInfo.siteLever != null
) {
- this.selectCycle = this.$store.state.userInfo.siteLever.split("/")[0];
+ this.selectCycle =
+ this.$store.state.userInfo.siteLever.split("/")[0] + "X";
+
this.siteLeverList = [];
for (
let i = 0;
@@ -614,24 +619,10 @@
i++
) {
let val = this.$store.state.userInfo.siteLever.split("/")[i];
- let item = { label: val + this.$t("hj112"), value: val };
+ let item = { label: val, name: val + "X" };
this.siteLeverList.push(item);
}
- } else {
- this.selectCycle = data.data.siteLever.split("/")[0];
- this.siteLeverList = [];
- for (let i = 0; i < data.data.siteLever.split("/").length; i++) {
- let val = data.data.siteLever.split("/")[i];
- var ccet = (Number(this.nowPrice) / Number(val)).toFixed(2);
- // let item = { label: val + '倍', value: val ,bzj:ccet}
- let item = {
- name: val + "X",
- subname: this.$t("hj102") + "：" + (ccet * 100).toFixed(2),
- gg: val,
- bzj: ccet,
- };
- this.siteLeverList.push(item);
- }
+ console.log(this.siteLeverList, " this.selectCycle");
}
} else {
this.$store.commit("elAlertShow", {
diff --git a/src/page/user/Warehouse/Stockdetail.vue b/src/page/user/Warehouse/Stockdetail.vue
index c9c70a5..370f989 100644
--- a/src/page/user/Warehouse/Stockdetail.vue
+++ b/src/page/user/Warehouse/Stockdetail.vue
@@ -14,7 +14,7 @@
<div class="bottomIfr">
<div class="pagebox">
<div class="pagebox_left">{{ $t("盈虧") }} ({{ pages.stockGid }})</div>
- <div class="pagebox_right">{{ pages.profitAndLose }}</div>
+ <div class="pagebox_right">{{ pages.profitAndLose | _toString }}</div>
</div>
<div class="pagebox">
<div class="pagebox_left">{{ $t("hj141") }} ({{ pages.stockGid }})</div>
@@ -26,23 +26,23 @@
</div>
<div class="pagebox" v-if="pages.now_price">
<div class="pagebox_left">{{ $t("hj40") }}({{ pages.stockGid }})</div>
- <div class="pagebox_right">{{ pages.now_price }}</div>
+ <div class="pagebox_right">{{ pages.now_price | _toString }}</div>
</div>
<div class="pagebox">
<div class="pagebox_left">
{{ $t("持倉價") }} ({{ pages.stockGid }})
</div>
- <div class="pagebox_right">{{ pages.buyOrderPrice }}</div>
+ <div class="pagebox_right">{{ pages.buyOrderPrice | _toString }}</div>
</div>
<div class="pagebox">
<div class="pagebox_left">
{{ $t("訂單金額") }} ({{ pages.stockGid }})
</div>
- <div class="pagebox_right">{{ pages.orderTotalPrice }}</div>
+ <div class="pagebox_right">{{ pages.orderTotalPrice | _toString }}</div>
</div>
<div class="pagebox">
<div class="pagebox_left">{{ $t("hj44") }} ({{ pages.stockGid }})</div>
- <div class="pagebox_right">{{ pages.orderFee }}</div>
+ <div class="pagebox_right">{{ pages.orderFee | _toString }}</div>
</div>
<div class="pagebox">
<div class="pagebox_left">
diff --git a/src/page/user/Warehouse/data.list.vue b/src/page/user/Warehouse/data.list.vue
index 73502c1..4a21710 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 }}
+ {{ item.profitAndLose | _toString }}
</div>
</div>
</van-col>
@@ -71,7 +71,9 @@
<div class="sport-content-title2">
{{ $t("hj40") }}({{ activeObj.symbolCode }})
</div>
- <div class="sport-content-text2">{{ item.now_price }}</div>
+ <div class="sport-content-text2">
+ {{ item.now_price | _toString }}
+ </div>
</div>
</van-col>
<van-col span="8">
@@ -79,7 +81,9 @@
<div class="sport-content-title2">
{{ $t("持倉價") }} ({{ activeObj.symbolCode }})
</div>
- <div class="sport-content-text2">{{ item.buyOrderPrice }}</div>
+ <div class="sport-content-text2">
+ {{ item.buyOrderPrice | _toString }}
+ </div>
</div>
</van-col>
<van-col span="8">
@@ -87,7 +91,9 @@
<div class="sport-content-title2">
{{ $t("訂單金額") }} ({{ activeObj.symbolCode }})
</div>
- <div class="sport-content-text2">{{ item.orderTotalPrice }}</div>
+ <div class="sport-content-text2">
+ {{ item.orderTotalPrice | _toString }}
+ </div>
</div>
</van-col>
</van-row>
@@ -97,7 +103,9 @@
<div class="sport-content-title2">
{{ $t("hj44") }} ({{ activeObj.symbolCode }})
</div>
- <div class="sport-content-text2">{{ item.orderFee }}</div>
+ <div class="sport-content-text2">
+ {{ item.orderFee | _toString }}
+ </div>
</div>
</van-col>
<van-col span="8">
@@ -106,7 +114,7 @@
{{ $t("止損價") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- -{{ item.profitTargetPrice || "--" }}
+ {{ item.profitTargetPrice | _toString }}
</div>
</div>
</van-col>
@@ -116,7 +124,7 @@
{{ $t("止盈價") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- -{{ item.stopTargetPrice || "--" }}
+ {{ item.stopTargetPrice | _toString }}
</div>
</div>
</van-col>
diff --git a/src/page/user/Warehouse/item.card.vue b/src/page/user/Warehouse/item.card.vue
index 9c15f41..f8a7454 100644
--- a/src/page/user/Warehouse/item.card.vue
+++ b/src/page/user/Warehouse/item.card.vue
@@ -5,41 +5,49 @@
<div class="total-name">
{{ activeObj.assname }} ({{ activeObj.symbolCode }})
</div>
- <div class="total-data">{{ activeObj.totalMoney || "0.0000" }}</div>
+ <div class="total-data">{{ activeObj.totalMoney | _toString }}</div>
</div>
</div>
<div class="item-card-itembox">
<div class="item">
- <div class="itembox-data">{{ activeObj.profitAndLoss }}</div>
+ <div class="itembox-data">
+ {{ activeObj.profitAndLoss | _toString }}
+ </div>
<div class="itembox-name">
{{ $t("浮動盈虧") }} ({{ activeObj.symbolCode }})
</div>
</div>
<div class="item">
- <div class="itembox-data">{{ activeObj.availableBalance }}</div>
+ <div class="itembox-data">
+ {{ activeObj.availableBalance | _toString }}
+ </div>
<div class="itembox-name">
{{ $t("可用資產") }} ({{ activeObj.symbolCode }})
</div>
</div>
<div class="item">
- <div class="itembox-data">{{ activeObj.cumulativeProfitAndLoss }}</div>
+ <div class="itembox-data">
+ {{ activeObj.cumulativeProfitAndLoss | _toString }}
+ </div>
<div class="itembox-name">
{{ $t("累計盈虧") }} ({{ activeObj.symbolCode }})
</div>
</div>
<div class="item">
- <div class="itembox-data">{{ activeObj.freezeMoney }}</div>
+ <div class="itembox-data">{{ activeObj.freezeMoney | _toString }}</div>
<div class="itembox-name">
{{ $t("凍結資產") }} ({{ activeObj.symbolCode }})
</div>
</div>
<div class="item">
- <div class="itembox-data">{{ activeObj.handlingCharge }}</div>
+ <div class="itembox-data">
+ {{ activeObj.handlingCharge | _toString }}
+ </div>
<div class="itembox-name">
{{ $t("總手續費") }} ({{ activeObj.symbolCode }})
diff --git a/src/page/user/recharge-sure.vue b/src/page/user/recharge-sure.vue
index 95989a9..894ce3f 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 }} {{ symbolCode }}
+ {{ availableBalanceUSD | _toString }} {{ symbolCode }}
<!-- {{ symbolCode }} -->
</div>
</div>
diff --git a/src/page/user/yeb.vue b/src/page/user/yeb.vue
index bd4e47a..3b91c14 100644
--- a/src/page/user/yeb.vue
+++ b/src/page/user/yeb.vue
@@ -1,31 +1,35 @@
<template>
<div class="wrapper">
<van-nav-bar
- :title="($t('yeb'))"
- :right-text="($t('jl'))"
+ :title="$t('yeb')"
+ :right-text="$t('jl')"
left-arrow
fixed
@click-left="handleBackClick"
@click-right="go_yebs"
/>
<div class="main">
- <div class="ul" v-for="(item, i) in $store.state.yebinfo" :key="i + '_' + item.id">
+ <div class="ul" v-for="(item, i) in yebinfo" :key="i + '_' + item.id">
<div class="li">
<div class="li-left">
<h3>{{ item.title }}</h3>
<div class="li-cont">
<div class="li-info li-1">
- <span class="li-label">{{ $t('zq') + '：' }}</span>
- <span class="li-value">{{ item.returnTime }} {{ $t('day') }}</span>
+ <span class="li-label">{{ $t("周期") + "：" }}</span>
+ <span class="li-value"
+ >{{ item.returnTime }} {{ $t("天") }}</span
+ >
</div>
<div class="li-info">
- <span class="li-label">{{ $t('ll') + '：' }}</span>
+ <span class="li-label">{{ $t("ll") + "：" }}</span>
<span class="li-value">{{ item.returnOfRate }}%</span>
</div>
</div>
</div>
<div class="li-btn-box">
- <div class="btn" @click="handlePurchase(i)">{{ $t('gm') }}</div>
+ <div class="btn" @click="handlePurchase(i, item)">
+ {{ $t("gm") }}
+ </div>
</div>
</div>
</div>
@@ -33,14 +37,15 @@
<van-dialog
width="90%"
v-model="showPurchase"
- :title="$t('yeb') + $t('gm')" show-cancel-button
+ :title="$t('yeb') + $t('gm')"
+ show-cancel-button
:confirmButtonText="$t('qr')"
:cancelButtonText="$t('qx')"
- @confirm="tosubmit(1,form.account1)"
+ @confirm="tosubmit(1, form.account1)"
>
<div class="dialog-box">
<van-field
- v-model="$store.state.userInfo.enableAmt"
+ v-model="activeObj.availableBalance"
type="text"
:label="$t('ky') + $t('ye')"
:placeholder="$t('ky') + $t('ye')"
@@ -56,241 +61,153 @@
:border="false"
>
<template #button>
- <span @click="selectAll1">{{ $t('hj160') }}</span>
+ <span @click="selectAll1">{{ $t("hj160") }}</span>
</template>
</van-field>
- <!-- <mt-field :label="'可用余额'" :placeholder="'可用余额'" type="text" disabled v-model="this.$store.state.userInfo.enableAmt" /> -->
- <!-- <mt-field :label="'购买数量'" name="amt" v-model="form.account1" :placeholder="'购买数量'" type="number">
- <span @click="selectAll1">{{ $t('hj160') }}</span>
- </mt-field> -->
</div>
</van-dialog>
- <!-- <mt-navbar v-model="selected" class="custom-navbar" >
- <mt-tab-item id="1" class="warehouse_card" >
- 周期：{{ this.$store.state.yebinfo[0].returnTime }}<br>
- 利率：{{ this.$store.state.yebinfo[0].returnOfRate }}%
-
- </mt-tab-item>
- <hr>
- <mt-tab-item id="2" class="warehouse_card">
- 周期：{{ this.$store.state.yebinfo[1].returnTime }}<br>
- 利率：{{ this.$store.state.yebinfo[1].returnOfRate }}%
- </mt-tab-item>
- <mt-tab-item id="3" class="warehouse_card">
- 周期：{{ this.$store.state.yebinfo[2].returnTime }}<br>
- 利率：{{ this.$store.state.yebinfo[2].returnOfRate }}%
- </mt-tab-item>
- <mt-tab-item id="4" class="warehouse_card">
- 周期：{{ this.$store.state.yebinfo[3].returnTime }}<br>
- 利率：{{ this.$store.state.yebinfo[3].returnOfRate }}%
- </mt-tab-item>
- </mt-navbar> -->
- <!-- <mt-tab-container class="order-list" v-model="selected">
- <mt-tab-container-item id="1">
- <div class="form-block">
- <mt-field :label="'可用余额'" :placeholder="'可用余额'" type="text" disabled
- v-model="this.$store.state.userInfo.enableAmt">
- </mt-field>
- </div>
- <div class="form-block">
- <mt-field :label="'购买数量'" name="amt" v-model="form.account1" :placeholder="'购买数量'" type="number">
- <span @click="selectAll1">{{ $t('hj160') }}</span>
- </mt-field>
- </div> -->
- <!-- <div class="form-block">
- <mt-field label="资金密码" placeholder="资金密码" type="password" v-model="form.password"></mt-field>
- </div>
- <p class="prompt">资金密码默认为登录密码</p> -->
- <!-- <div class="btnbox">
- <span class="text-center btnok loginout" @click="tosubmit(1,form.account1)">购买余额宝</span>
- </div>
- </mt-tab-container-item>
- <mt-tab-container-item id="2">
- <div class="form-block">
- <mt-field :label="'可用余额'" :placeholder="'可用余额'" type="text" disabled
- v-model="this.$store.state.userInfo.enableAmt">
- </mt-field>
- </div>
- <div class="form-block">
- <mt-field :label="'购买数量'" name="amt" v-model="form.account1" :placeholder="'购买数量'" type="number">
- <span @click="selectAll1">{{ $t('hj160') }}</span>
- </mt-field>
- </div> -->
- <!-- <div class="form-block">
- <mt-field label="资金密码" placeholder="资金密码" type="password" v-model="form.password"></mt-field>
- </div>
- <p class="prompt">资金密码默认为登录密码</p> -->
- <!-- <div class="btnbox">
- <span class="text-center btnok loginout" @click="tosubmit(2,form.account1)">购买余额宝</span>
- </div>
- </mt-tab-container-item>
- <mt-tab-container-item id="3">
- <div class="form-block">
- <mt-field :label="'可用余额'" :placeholder="'可用余额'" type="text" disabled
- v-model="this.$store.state.userInfo.enableAmt">
- </mt-field>
- </div>
- <div class="form-block">
- <mt-field :label="'购买数量'" name="amt" v-model="form.account1" :placeholder="'购买数量'" type="number">
- <span @click="selectAll1">{{ $t('hj160') }}</span>
- </mt-field>
- </div> -->
- <!-- <div class="form-block">
- <mt-field label="资金密码" placeholder="资金密码" type="password" v-model="form.password"></mt-field>
- </div>
- <p class="prompt">资金密码默认为登录密码</p> -->
- <!-- <div class="btnbox">
- <span class="text-center btnok loginout" @click="tosubmit(3,form.account1)">购买余额宝</span>
- </div>
- </mt-tab-container-item>
- <mt-tab-container-item id="4">
- <div class="form-block">
- <mt-field :label="'可用余额'" :placeholder="'可用余额'" type="text" disabled
- v-model="this.$store.state.userInfo.enableAmt">
- </mt-field>
- </div>
- <div class="form-block">
- <mt-field :label="'购买数量'" name="amt" v-model="form.account1" :placeholder="'购买数量'" type="number">
- <span @click="selectAll1">{{ $t('hj160') }}</span>
- </mt-field>
- </div> -->
- <!-- <div class="form-block">
- <mt-field label="资金密码" placeholder="资金密码" type="password" v-model="form.password"></mt-field>
- </div>
- <p class="prompt">资金密码默认为登录密码</p> -->
- <!-- <div class="btnbox">
- <span class="text-center btnok loginout" @click="tosubmit(4)">购买余额宝</span>
- </div>
- </mt-tab-container-item>
- </mt-tab-container> -->
</div>
</template>
<script>
-// import '@/assets/style/common.less'
-import * as api from '@/axios/api'
-import { Toast } from 'mint-ui'
-// import { getYebs } from '@/axios/api'
+import * as api from "@/axios/api";
+import { Toast } from "mint-ui";
export default {
- components: {
- },
- data () {
+ components: {},
+ data() {
return {
- selected: '1', // 选中
- typeindex:'',
+ selected: "1", // 选中
+ typeindex: "",
form: {
- account1: '',
- account2: '',
- account3: '',
- account4: '',
- password: ''
+ account1: "",
+ account2: "",
+ account3: "",
+ account4: "",
+ password: "",
},
userInfo: {
- realName: ''
+ realName: "",
},
yebinfo: [],
- showPurchase: false
- }
+ showPurchase: false,
+ activeObj: {},
+ gmObj: {},
+ };
},
watch: {},
computed: {},
- created () {
- this.getProductSetting()
+ created() {
+ this.getProductSetting();
},
- mounted () {
+ mounted() {
if (this.$route.query.type) {
- this.selected = this.$route.query.type + ''
+ this.selected = this.$route.query.type + "";
}
- this.getUserInfo()
- this.getYebInfo()
+ this.getUserInfo();
+ this.getYebInfo();
+ this.getMoneys();
},
methods: {
- // 购买弹窗控制
- handlePurchase (e) {
- console.log(e);
- this.typeindex = e+1
- this.showPurchase = true
- },
- go_yebs () {
- this.$router.push('/yebs')
- },
- async getProductSetting () {
- let data = await api.getProductSetting()
- console.log(data)
- if (data.status === 0) {
- this.$store.state.settingForm = data.data
- if (!this.$store.state.settingForm.indexDisplay) {
- this.selected = '3'
- }
- } else {
- this.$message.error(data.msg)
+ // 获取帐户资产
+ async getMoneys() {
+ const res = await api.getMoney();
+ if (res.status === 0) {
+ console.log(res.data);
+ let obj = res.data.filter((item) => item.accectType == "IN")[0];
+ obj.availableBalance = Number(obj.availableBalance).toFixed(2);
+ // console.log(Number(obj.availableBalance).toFixed(2));
+ this.activeObj = obj;
+ // console.log(obj, "0000000", this.tabsArr);
}
},
- handleBackClick () {
- this.$router.go(-1)
+ // 购买弹窗控制
+ handlePurchase(e, item) {
+ console.log(e);
+ this.typeindex = e + 1;
+ this.gmObj = item;
+ this.showPurchase = true;
},
- selectAll1 () {
+ go_yebs() {
+ this.$router.push("/yebs");
+ },
+ async getProductSetting() {
+ let data = await api.getProductSetting();
+ console.log(data);
+ if (data.status === 0) {
+ this.$store.state.settingForm = data.data;
+ if (!this.$store.state.settingForm.indexDisplay) {
+ this.selected = "3";
+ }
+ } else {
+ this.$message.error(data.msg);
+ }
+ },
+ handleBackClick() {
+ this.$router.go(-1);
+ },
+ selectAll1() {
// 选择全部
- this.form.account1 = this.$store.state.userInfo.enableAmt
+ this.form.account1 = this.$store.state.userInfo.enableAmt;
},
- selectAll2 () {
+ selectAll2() {
// 选择全部
- this.form.account2 = this.$store.state.userInfo.enableIndexAmt
+ this.form.account2 = this.$store.state.userInfo.enableIndexAmt;
},
- selectAll3 () {
+ selectAll3() {
// 选择全部
- this.form.account3 = this.$store.state.userInfo.enableAmt
+ this.form.account3 = this.$store.state.userInfo.enableAmt;
},
- selectAll4 () {
+ selectAll4() {
// 选择全部
- this.form.account4 = this.$store.state.userInfo.enableFuturesAmt
+ this.form.account4 = this.$store.state.userInfo.enableFuturesAmt;
},
- isInteger (obj) {
- return obj % 1 === 0
+ isInteger(obj) {
+ return obj % 1 === 0;
},
- async tosubmit (id, money) {
+ async tosubmit(id, money) {
if (!this.isInteger(money)) {
- Toast('请输入整数')
- return
+ Toast("请输入整数");
+ return;
}
// 融资转指数
let opt = {
// amt: this.selected === '1' ? this.form.account1 : this.selected === '2' ? this.form.account2 : this.selected === '3' ? this.form.account3 : this.form.account4,
// type: this.selected // 1 融资转指数 2 指数转融资
- eId: this.typeindex,
- money: money
- }
- let data1 = await api.BuyYeb(opt)
+ eId: this.gmObj.id,
+ money: money,
+ };
+ let data1 = await api.BuyYeb(opt);
if (data1.status === 0) {
- Toast(data1.data)
- this.$router.push('/yebs')
+ Toast(data1.data);
+ this.$router.push("/yebs");
} else {
- Toast(data1.data)
+ Toast(data1.data);
}
},
- async getUserInfo () {
+ async getUserInfo() {
// 获取用户信息
- let data = await api.getUserInfo()
+ let data = await api.getUserInfo();
if (data.status === 0) {
- this.$store.state.userInfo = data.data
+ this.$store.state.userInfo = data.data;
} else {
- Toast(data.msg)
+ Toast(data.msg);
}
},
- async getYebInfo () {
+ async getYebInfo() {
// 获取用户信息
- let data = await api.getYebInfo()
+ let data = await api.getYebInfo();
if (data.status === 0) {
- this.$store.state.yebinfo = data.data
+ this.yebinfo = data.data;
+ this.$store.state.yebinfo = data.data;
} else {
- Toast(data.msg)
+ Toast(data.msg);
}
- }
- }
-}
+ },
+ },
+};
</script>
<style lang="less" scoped>
/deep/ .van-nav-bar {
@@ -299,12 +216,13 @@
.van-nav-bar__content {
height: 64px !important;
}
- .van-nav-bar__title, .van-nav-bar__text {
- color: #FFFFFF;
+ .van-nav-bar__title,
+ .van-nav-bar__text {
+ color: #ffffff;
font-size: 24px;
}
.van-icon {
- color: #FFFFFF;
+ color: #ffffff;
font-size: 24px;
}
}
@@ -319,8 +237,8 @@
.ul {
margin: 15px;
padding: 20px;
- border: 1px solid #EEEEEE;
- background: #FFFFFF;
+ border: 1px solid #eeeeee;
+ background: #ffffff;
border-radius: 8px;
.li {
font-size: 18px;
diff --git a/src/page/user/yebs.vue b/src/page/user/yebs.vue
index 6b817a9..f001cb0 100644
--- a/src/page/user/yebs.vue
+++ b/src/page/user/yebs.vue
@@ -10,6 +10,9 @@
<van-pull-refresh
v-model="refreshing"
:success-text="$t('sxcg')"
+ :loading-text="$t('hj430')"
+ :loosing-text="$t('hj430')"
+ :pulling-text="$t('hj430')"
@refresh="onRefresh"
>
<van-empty
@@ -29,12 +32,20 @@
<div class="ul" v-for="item in yebsList" :key="item.id">
<div class="li">
<div class="li-left">
- <h3>{{ item.title }}</h3>
+ <div style="display: flex; justify-content: space-between">
+ <h3>{{ item.title }}</h3>
+ <div class="li-btn-box">
+ <div :class="['account', item.state === '2' ? 'a1' : 'a2']">
+ {{ ["", $t("wjs"), $t("yjs")][item.state] }}
+ </div>
+ </div>
+ </div>
+
<div class="li-cont">
<div class="li-info li-1">
- <span class="li-label">{{ $t("zq") + "：" }}</span>
+ <span class="li-label">{{ $t("周期") + "：" }}</span>
<span class="li-value"
- >{{ item.returnTime }} {{ $t("day") }}</span
+ >{{ item.returnTime }} {{ $t("天") }}</span
>
</div>
<div class="li-info">
@@ -69,11 +80,6 @@
</div>
</div>
</div>
- <div class="li-btn-box">
- <div :class="['account', item.state === '1' ? 'a1' : 'a2']">
- {{ ["", $t("yjs"), $t("wjs")][item.state] }}
- </div>
- </div>
</div>
</div>
</van-list>
@@ -85,12 +91,10 @@
<script>
import { Toast } from "vant";
import moment from "moment";
-// import { MessageBox } from 'mint-ui'
import * as api from "@/axios/api";
export default {
data() {
return {
- tabsArr: ["余额宝"],
tabsCurrentIndex: 0,
titleName: this.$t("hj114"),
indexSettingInfo: {},
@@ -312,7 +316,7 @@
.ul {
margin: 15px;
padding: 20px;
- padding-right: 0px;
+ // padding-right: 0px;
border-radius: 8px;
background: #ffffff;
.li {
@@ -343,7 +347,7 @@
width: 120px;
display: flex;
// align-items: center;
- justify-content: center;
+ justify-content: flex-end;
.account {
font-size: 18px;
}
diff --git a/src/utils/filter.js b/src/utils/filter.js
new file mode 100644
index 0000000..b0731c1
--- /dev/null
+++ b/src/utils/filter.js
@@ -0,0 +1,49 @@
+// 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 _toString(u) {
+ u = u || 0;
+ u = Number(u);
+ return u.toFixed(2);
+}
+export function customToLocaleString(amount) {
+ amount = amount || 0;
+ amount = Number(amount);
+ // 将金额转换为字符串
+ amount = amount.toString();
+
+ // 检查是否存在小数点
+ var decimalIndex = amount.indexOf(".");
+ var decimalPart = "";
+ if (decimalIndex !== -1) {
+ decimalPart = amount.substring(decimalIndex);
+ amount = amount.substring(0, decimalIndex);
+ }
+
+ // 添加千分符号
+ var thousandSeparator = ",";
+ var regex = /(\d+)(\d{3})/;
+ while (regex.test(amount)) {
+ amount = amount.replace(regex, "$1" + thousandSeparator + "$2");
+ }
+
+ // 重新组合金额和小数部分
+ return amount + decimalPart;
+}
--
Gitblit v1.9.3