From cbc0c07421dea612d811825c8d6c61f75667b2f0 Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Tue, 16 Jul 2024 10:20:25 +0800
Subject: [PATCH] 123
---
src/page/list/favoriteslist/data.list.vue | 4
package-lock.json | 9
src/page/list/tradingList/dazy.vue | 20
src/locales/jp.json | 6
src/page/kline/index.vue | 18
src/page/user/Warehouse/data.list.vue | 194 +++++
src/axios/api.js | 7
src/page/trading/buy.vue | 49 +
src/assets/img/usericon.png | 0
src/locales/cht.json | 6
src/page/home/listcomponents/dazongjiaoyi.vue | 4
src/locales/en.json | 30
src/page/user/compontents/recharge-list.vue | 2
src/locales/ens.json | 12
src/page/authentication/index.vue | 47 +
src/page/newUser/index.vue | 230 ++++++
src/page/user/favorites.vue | 4
src/page/bankCard1/index.vue | 30
src/locales/fra.json | 6
src/assets/img/20240518-225348.jpg | 0
src/page/user/compontents/cash-list.vue | 5
src/assets/img/20240711-160804.jpg | 0
src/locales/zh.json | 10
src/page/bankCard/banklist.vue | 244 +++++++
src/page/home/home.vue | 36
config/index.js | 2
src/store/index.js | 2
src/page/user/Warehouse/item.card.vue | 14
src/page/list/tradingList/data.list.vue | 124 ++-
src/page/user/recharge-sure.vue | 31
src/locales/de.json | 6
src/page/bankCard/index.vue | 67 +
src/page/list/favorites/data.list.vue | 34 +
src/page/home/Record.vue | 176 +++++
src/router/index.js | 39 +
src/assets/img/img_log_home.png | 0
src/assets/img/max.jpg | 0
src/page/bankCard/updatabank.vue | 315 +++++++++
src/page/user/Warehouse/Stockdetail.vue | 14
src/assets/img/ADFASDF.jpg | 0
src/page/service/service.vue | 2
src/page/user/rechargelist.vue | 6
src/page/newUser/setting.vue | 34
src/axios/api.url.js | 4
src/locales/kor.json | 6
src/locales/hi.json | 10
src/App.vue | 1
src/locales/th.json | 6
48 files changed, 1,681 insertions(+), 185 deletions(-)
diff --git a/config/index.js b/config/index.js
index c3fafa2..4ba5636 100644
--- a/config/index.js
+++ b/config/index.js
@@ -39,7 +39,7 @@
}
},
// Various Dev Server settings
- host: "192.168.10.8", // can be overwritten by process.env.HOST
+ host: "localhost", // can be overwritten by process.env.HOST
port: 80, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
diff --git a/package-lock.json b/package-lock.json
index 77ee046..06d296b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2917,6 +2917,7 @@
"version": "1.0.5",
"resolved": "https://registry.npmmirror.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+ "deprecated": "This package is no longer supported.",
"dev": true,
"dependencies": {
"aproba": "^1.1.1",
@@ -5959,6 +5960,7 @@
"version": "2.6.3",
"resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-2.6.3.tgz",
"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+ "deprecated": "Rimraf versions prior to v4 are no longer supported",
"dev": true,
"dependencies": {
"glob": "^7.1.3"
@@ -6154,6 +6156,7 @@
"version": "1.0.10",
"resolved": "https://registry.npmmirror.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
"integrity": "sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA==",
+ "deprecated": "This package is no longer supported.",
"dev": true,
"dependencies": {
"graceful-fs": "^4.1.2",
@@ -6280,6 +6283,7 @@
"version": "7.2.3",
"resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz",
"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+ "deprecated": "Glob versions prior to v9 are no longer supported",
"dependencies": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -7017,6 +7021,7 @@
"version": "1.0.6",
"resolved": "https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+ "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
"dependencies": {
"once": "^1.3.0",
"wrappy": "1"
@@ -8562,6 +8567,7 @@
"version": "1.0.1",
"resolved": "https://registry.npmmirror.com/move-concurrently/-/move-concurrently-1.0.1.tgz",
"integrity": "sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ==",
+ "deprecated": "This package is no longer supported.",
"dev": true,
"dependencies": {
"aproba": "^1.1.1",
@@ -12962,6 +12968,7 @@
"version": "1.5.1",
"resolved": "https://registry.npmmirror.com/q/-/q-1.5.1.tgz",
"integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
+ "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)",
"engines": {
"node": ">=0.6.0",
"teleport": ">=0.2.0"
@@ -13646,6 +13653,7 @@
"version": "2.7.1",
"resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz",
"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+ "deprecated": "Rimraf versions prior to v4 are no longer supported",
"dependencies": {
"glob": "^7.1.3"
},
@@ -15863,6 +15871,7 @@
"version": "8.1.0",
"resolved": "https://registry.npmmirror.com/glob/-/glob-8.1.0.tgz",
"integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+ "deprecated": "Glob versions prior to v9 are no longer supported",
"dependencies": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
diff --git a/src/App.vue b/src/App.vue
index 59ed5fe..22579bb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -160,6 +160,7 @@
height: 100%;
// height: calc(100% - 1rem);
box-sizing: border-box;
+ background: #fff;
overflow-y: auto;
}
diff --git a/src/assets/img/20240518-225348.jpg b/src/assets/img/20240518-225348.jpg
index 1b7adac..6334bd8 100644
--- a/src/assets/img/20240518-225348.jpg
+++ b/src/assets/img/20240518-225348.jpg
Binary files differ
diff --git a/src/assets/img/20240711-160804.jpg b/src/assets/img/20240711-160804.jpg
new file mode 100644
index 0000000..e71c7f4
--- /dev/null
+++ b/src/assets/img/20240711-160804.jpg
Binary files differ
diff --git a/src/assets/img/ADFASDF.jpg b/src/assets/img/ADFASDF.jpg
new file mode 100644
index 0000000..a8cf137
--- /dev/null
+++ b/src/assets/img/ADFASDF.jpg
Binary files differ
diff --git a/src/assets/img/img_log_home.png b/src/assets/img/img_log_home.png
index f328d09..38c9aba 100644
--- a/src/assets/img/img_log_home.png
+++ b/src/assets/img/img_log_home.png
Binary files differ
diff --git a/src/assets/img/max.jpg b/src/assets/img/max.jpg
index bcf5ab7..722f851 100644
--- a/src/assets/img/max.jpg
+++ b/src/assets/img/max.jpg
Binary files differ
diff --git a/src/assets/img/usericon.png b/src/assets/img/usericon.png
new file mode 100644
index 0000000..da8c1b7
--- /dev/null
+++ b/src/assets/img/usericon.png
Binary files differ
diff --git a/src/axios/api.js b/src/axios/api.js
index 0f99dcb..1df5cfa 100644
--- a/src/axios/api.js
+++ b/src/axios/api.js
@@ -3,6 +3,12 @@
// var img_url = APIUrl.util.image // 这个就是图片上传的api url
+export function moneylogAll(options) {
+ return post("/api/user/moneylogAll.do", options);
+}
+export function queryStockConfig(options) {
+ return post("/api/user/queryStockConfig.do", options);
+}
export function getchicang(options) {
return post("user/position/list.do", options);
}
@@ -140,6 +146,7 @@
export function getStockByType(options) {
return get("/api/stock/getStockByType.do", options);
}
+
// 单只股票行情数据
export function getSingleStock(options) {
return post("/api/stock/getSingleStock.do", options);
diff --git a/src/axios/api.url.js b/src/axios/api.url.js
index 53c3e13..6c7c8ee 100644
--- a/src/axios/api.url.js
+++ b/src/axios/api.url.js
@@ -1,13 +1,13 @@
// const ENV = process.env.NODE_ENV
export default {
- DOMAIN: "https://api.essencefunds.com/",
+ DOMAIN: "https://api.pentagon-member.com/",
// baseURL: ENV == 'development'?'https://api.guosen.org/':'https://api.guosen.org/',
// baseURL: 'http://localhost:8070',
/* Util API */
// baseURL: '/',
// baseURL: 'http://www.jumptalk.net:8091',
// 0311
- baseURL: "https://api.dfddgj346.xyz/",
+ baseURL: "https://api.pentagon-member.com/",
// 本地
// baseURL: "http://192.168.10.7:8091/",
util: {
diff --git a/src/locales/cht.json b/src/locales/cht.json
index 1939727..d2b02f7 100644
--- a/src/locales/cht.json
+++ b/src/locales/cht.json
@@ -1,4 +1,10 @@
{
+ "秘钥":"秘鑰",
+ "描述":"描述",
+ "操作时间":"操作時間",
+ "请输入电子邮箱":"請輸入電子郵件信箱",
+ "银行卡户主名称":"銀行卡戶主名稱",
+ "请输入银行卡户主名称":"請輸入銀行卡戶主名稱",
"tips_sb": "美股帳戶",
"top_s": "如果您有任何問題，請透過電子郵件與我們聯繫",
"zc": "支持",
diff --git a/src/locales/de.json b/src/locales/de.json
index 365f106..277a692 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -1,4 +1,10 @@
{
+ "秘钥":"Geheimer Schlüssel",
+ "描述":"beschreiben",
+ "操作时间":"Betriebszeit",
+ "请输入电子邮箱":"Geben Sie bitte Ihre Email-Adresse ein",
+ "银行卡户主名称":"Name des Inhabers der Bankkarte",
+ "请输入银行卡户主名称":"Bitte geben Sie den Namen des Bankkarteninhabers ein",
"tips_sb": "Wenn Sie Fragen haben, kontaktieren Sie uns bitte über Telegram",
"top_s": "Wenn Sie Fragen haben, kontaktieren Sie uns bitte per E-Mail",
"zc": "Unterstützung",
diff --git a/src/locales/en.json b/src/locales/en.json
index 681a009..e1cae91 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,4 +1,10 @@
{
+ "秘钥":"Secret key",
+ "描述":"Describe",
+ "操作时间":"Operating time",
+ "请输入电子邮箱":"Please enter your email address",
+ "银行卡户主名称":"Bank card owner name",
+ "请输入银行卡户主名称":"Please enter the name of the bank card owner",
"tips_sb": "US stock account",
"top_s": "If you have any questions please contact us via email",
"zc": "Support",
@@ -78,7 +84,7 @@
"subdk": "Apply for a loan",
"subdka": "Withdraw",
"dkjl": "Loan records",
- "gm": "Buy",
+ "gm": "Buy long",
"ky": "Available",
"jl": "Record",
"ye": "Balance",
@@ -202,8 +208,8 @@
"hj81": "Price",
"hj82": "Trading volume",
"hj83": "Introduction",
- "hj84": "Sell",
- "hj85": "Buy",
+ "hj84": "Buy short",
+ "hj85": "Buy long",
"hj86": "Time sharing",
"hj87": "Day",
"hj88": "Week",
@@ -311,10 +317,10 @@
"hj193": "Confirm the transfer to the index account",
"hj194": "Confirm the transfer to the financing account",
"hj195": "Real Name",
- "hj196": "ID number",
- "hj197": "Front of ID card",
+ "hj196": "Aadhaar card",
+ "hj197": "Front of Aadhaar card",
"hj198": "Uploading...",
- "hj199": "Back of ID card",
+ "hj199": "Back of Aadhaar card",
"hj200": "Authentication failed, please re-authenticate.",
"hj201": "Failure reason",
"hj202": "Under review",
@@ -353,7 +359,7 @@
"hj234": "Order number",
"hj235": "Loading...",
"hj236": "All loaded",
- "hj237": "Buy",
+ "hj237": "Buy long",
"hj238": "Details",
"hj2381": "News",
"hj2382": "Economy",
@@ -380,7 +386,7 @@
"hj260": "North",
"hj262": "Please enter the quantity",
"hj263": "Purchasing price",
- "hj264": "Please enter the secret key",
+ "hj264": "enter the secret key",
"hj265": "The purchase was successful",
"hj266": "VIP fundraising key",
"hj267": "Confirm",
@@ -577,6 +583,8 @@
"市场": "Market",
"请选择提现金额": "Please select the Withdraw amount",
"hj100": "Trading quantity (shares)",
- "关于我们": "about Us",
- "贷款": "loan"
-}
+ "关于我们": "About Us",
+ "贷款": "loan",
+ "有效號碼": "Valid number",
+ "当前充值渠道已关闭请选择在线客服进行充值。": "The current recharge channel has been closed Please choose online customer service to recharge."
+ }
diff --git a/src/locales/ens.json b/src/locales/ens.json
index b9e02b1..7014dc5 100644
--- a/src/locales/ens.json
+++ b/src/locales/ens.json
@@ -1,4 +1,12 @@
{
+ "秘钥":"Secret key",
+ "描述":"Describe",
+ "操作时间":"Operating time",
+ "描述":"describe",
+ "操作时间":"Operating time",
+ "请输入电子邮箱":"Please enter your email address",
+ "银行卡户主名称":"Bank card owner name",
+ "请输入银行卡户主名称":"Please enter the name of the bank card owner",
"tips_sb": "US stock account",
"top_s": "If you have any questions please contact us via email",
"zc": "Support",
@@ -312,9 +320,9 @@
"hj194": "Confirm the transfer to the financing account",
"hj195": "Real Name",
"hj196": "ID number",
- "hj197": "The front of the ID card",
+ "hj197": "The front of the Aadhaar card",
"hj198": "Uploading...",
- "hj199": "The back of the ID card",
+ "hj199": "The back of the Aadhaar card",
"hj200": "Authentication failed, please re-authenticate.",
"hj201": "Failure reason",
"hj202": "Under review",
diff --git a/src/locales/fra.json b/src/locales/fra.json
index 4f9bc42..007c954 100644
--- a/src/locales/fra.json
+++ b/src/locales/fra.json
@@ -1,4 +1,10 @@
{
+ "秘钥":"clé",
+ "描述":"décrire",
+ "操作时间":"Temps de fonctionnement",
+ "请输入电子邮箱":"Veuillez entrer votre email",
+ "银行卡户主名称":"nom du titulaire de la carte bancaire",
+ "请输入银行卡户主名称":"Veuillez saisir le nom du propriétaire de la carte bancaire",
"tips_sb": "Pour toute question, contactez - nous via Telegram",
"top_s": "Si vous avez des questions, veuillez nous contacter par e - mail",
"zc": "Soutien",
diff --git a/src/locales/hi.json b/src/locales/hi.json
index 5ec5acc..d189642 100644
--- a/src/locales/hi.json
+++ b/src/locales/hi.json
@@ -1,4 +1,10 @@
{
+ "秘钥":"गुप्त की",
+ "描述":"वर्णन करणे",
+ "操作时间":"ऑपरेटिंग वेळ",
+ "请输入电子邮箱":"आयातित इलेक्ट्रॉनिक बॉक्स",
+ "银行卡户主名称":"बैंक कार्ड वाहक का नाम",
+ "请输入银行卡户主名称":"शिपिंग वाहक का नाम",
"tips_sb": "यूएस स्टॉक खाता",
"top_s": "यदि आपके कोई प्रश्न हैं तो कृपया हमें ईमेल के माध्यम से संपर्क करें",
"zc": "सहायता",
@@ -577,5 +583,7 @@
"请选择提现金额": "कृपया निकासी राशि का चयन करें",
"hj100": "लेन-देन की संख्या (शेयर)",
"关于我们": "हमारे बारे में",
- "贷款": "ऋृण"
+ "贷款": "ऋृण",
+ "有效號碼": "मान्य संख्या",
+ "当前充值渠道已关闭请选择在线客服进行充值。": "वर्तमान रिचार्ज चैनल बंद कर दिया गया है कृपया रिचार्ज करने के लिए ऑनलाइन ग्राहक सेवा चुनें।"
}
diff --git a/src/locales/jp.json b/src/locales/jp.json
index 887131a..2a3cf1f 100644
--- a/src/locales/jp.json
+++ b/src/locales/jp.json
@@ -1,4 +1,10 @@
{
+ "秘钥":"鍵",
+ "描述":"説明する",
+ "操作时间":"稼働時間",
+ "请输入电子邮箱":"メールアドレスを入力してください",
+ "银行卡户主名称":"銀行カードの所有者名",
+ "请输入银行卡户主名称":"銀行カードの所有者の名前を入力してください",
"tips_sb": "米国株式口座",
"top_s": "ご質問がございましたら、メールでお問い合わせください。",
"zc": "サポート",
diff --git a/src/locales/kor.json b/src/locales/kor.json
index 4c0bf76..3185669 100644
--- a/src/locales/kor.json
+++ b/src/locales/kor.json
@@ -1,4 +1,10 @@
{
+ "秘钥":"밀폐",
+ "描述":"설명하다",
+ "操作时间":"운영 시간",
+ "请输入电子邮箱":"당신의 이메일 주소를 입력하십시오",
+ "银行卡户主名称":"은행 카드 소유자 이름",
+ "请输入银行卡户主名称":"은행 카드 소유자의 이름을 입력하세요.",
"tips_sb": "미국 주식 계좌",
"top_s": "질문이 있으시면 이메일로 문의해 주세요",
"zc": "지원하다",
diff --git a/src/locales/th.json b/src/locales/th.json
index f37af1d..d7810e7 100644
--- a/src/locales/th.json
+++ b/src/locales/th.json
@@ -1,4 +1,10 @@
{
+ "秘钥":"อาหาร",
+ "描述":"อธิบาย",
+ "操作时间":"เวลาทำการ",
+ "请输入电子邮箱":"กรุณากรอกอีเมลของคุณ",
+ "银行卡户主名称":"ชื่อเจ้าของบัตรธนาคาร",
+ "请输入银行卡户主名称":"กรุณากรอกชื่อเจ้าของบัตรธนาคาร",
"tips_sb": "บัญชีหุ้นสหรัฐฯ",
"top_s": "หากคุณมีคำถามใด ๆ โปรดติดต่อเราทางอีเมล",
"zc": "สนับสนุน",
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 534e77e..e402189 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -1,4 +1,10 @@
{
+ "秘钥":"秘钥",
+ "描述":"描述",
+ "操作时间":"操作时间",
+ "请输入电子邮箱":"请输入电子邮箱",
+ "银行卡户主名称":"银行卡户主名称",
+ "请输入银行卡户主名称":"请输入银行卡户主名称",
"tips_sb": "有问题请通过Telegram联系我们",
"top_s": "如果您有任何问题，请通过电子邮件与我们联系",
"zc": "支持",
@@ -567,5 +573,7 @@
"请选择提现金额": "请选择提现金额",
"关于我们": "关于我们",
"贷款": "贷款",
- "hj621": "大宗交易"
+ "hj621": "大宗交易",
+ "有效號碼": "有效號碼",
+ "当前充值渠道已关闭请选择在线客服进行充值。": "当前充值渠道已关闭请选择在线客服进行充值。"
}
diff --git a/src/page/authentication/index.vue b/src/page/authentication/index.vue
index 6c59666..114f4da 100644
--- a/src/page/authentication/index.vue
+++ b/src/page/authentication/index.vue
@@ -1,14 +1,22 @@
<template>
<div class="bank_card_page">
+ <van-nav-bar
+ :placeholder="true"
+ :safe-area-inset-top="true"
+ title="KYC"
+ left-arrow
+ @click-left="$router.go(-1)"
+ >
+ </van-nav-bar>
<div class="content">
- <div class="top_back">
+<!-- <div class="top_back">
<div class="left_back_icon" @click="$router.go(-1)">
<img src="../../assets/img/zuojiantou.png" alt />
</div>
- </div>
- <div class="titles">
+ </div> -->
+ <!-- <div class="titles">
<span>{{ $t("hj146") }}</span>
- </div>
+ </div> -->
<div class="bank_name">
<div class="lefts">
<span>{{ $t("hj195") + ":" }}</span>
@@ -32,21 +40,21 @@
<input
v-if="showBtn"
type="text"
- placeholder="Please enter your ID card"
+ placeholder="Please enter your Aadhaar card"
v-model="form.idCard"
/>
<input v-if="!showBtn" type="text" v-model="form.idCard" readonly />
</div>
</div>
- <!-- <div class="bank_name">
+ <div class="bank_name">
<div class="lefts">
- <span>{{ "Vaild Number" + ":" }}</span>
+ <span>{{ $t("有效號碼") + ":" }}</span>
</div>
<div class="rights">
<input
v-if="showBtn"
type="text"
- placeholder="Please enter your ID card"
+ placeholder="Please enter your Valid number"
v-model="form.vaildNumber"
/>
<input
@@ -56,7 +64,7 @@
readonly
/>
</div>
- </div> -->
+ </div>
<div class="uploads">
<div class="lefts">
<el-upload
@@ -317,15 +325,30 @@
</script>
<style scoped lang="less">
+ /deep/ .van-nav-bar__content {
+ height: 65px;
+ }
+ /deep/ .van-nav-bar__title {
+ font-family: "DINPro";
+ width: 100%;
+ height: 1.17333rem;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-style: normal;
+ font-weight: 500;
+ font-size: 0.48rem;
+ color: #14181f;
+ }
.bank_card_page {
width: 100%;
- // height: 100%;
+ height: 100%;
background: #fff;
position: relative;
.content {
width: 100%;
- height: 100%;
+ height: 100vh;
padding: 0 0.6rem;
.top_back {
@@ -422,7 +445,7 @@
/deep/ .el-upload--picture-card {
background: none;
width: 100%;
- height: 1.6rem;
+ height: 100PX;
line-height: 1.6rem;
}
diff --git a/src/page/bankCard/banklist.vue b/src/page/bankCard/banklist.vue
new file mode 100644
index 0000000..194b8c1
--- /dev/null
+++ b/src/page/bankCard/banklist.vue
@@ -0,0 +1,244 @@
+<template>
+ <div class="bank_card_page">
+ <van-nav-bar
+ :placeholder="true"
+ :safe-area-inset-top="true"
+ :title="$t('hj247')"
+ left-arrow
+ @click-left="$router.go(-1)"
+ >
+ </van-nav-bar>
+ <div class="content">
+ <div class="bank">
+ <!-- <div class="bank_list" v-for="(item,index) in banklist" :key="index" @click="$router.push('/updatabank')"> -->
+ <div class="bank_list" v-for="(item,index) in banklist" :key="index">
+ <div class="bank_name" >
+ <div class="lefts" >{{item.bankName}}</div>
+ <div class="rights">{{item.bankNo}}</div>
+ </div>
+ </div>
+ </div>
+ <div class="bank_name">
+ <div class="bank_box" @click="$router.push('/bankcard')">{{$t('hj220').substring(0,2)}}{{$t('hj247')}}</div>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+ import * as api from "@/axios/api";
+ import {
+ Toast
+ } from "mint-ui";
+ import {
+ isNull,
+ bankNoReg,
+ isName
+ } from '@/utils/utils'
+
+ export default {
+ name: "bankCard",
+ data() {
+ return {
+ showPicker: false,
+ bankName: "", //银行名称,
+ bankAddress: "", //需要精确到分行或者支行,
+ bankNo: "", // 印象卡号
+ banif: "",
+ bankun: "",
+ banklist:[],
+ array: [],
+ index: 0,
+ addBank: false,
+ id: '',
+ code: '',
+ name: '',
+ };
+ },
+ created() {
+ this.getCardDetail();
+ this.getbanklist()
+ },
+ methods: {
+ quxiao() {
+ this.showPicker = false
+ },
+ gotodaka() {
+ this.showPicker = true
+ },
+ onConfirm(item) {
+ console.log(item)
+ this.id = item.id
+ this.code = item.code
+ this.name = item.name
+ this.showPicker = !this.showPicker
+ // this.lever = item.value
+ },
+ async getbanklist() {
+ // 获取银行名称
+ let data = await api.getbank()
+ if (data.status === 0) {
+ console.log(data);
+ this.array = data.data
+ console.log(this.array);
+ } else {}
+ },
+ async toSure() {
+ // 添加银行卡
+ if (isNull(this.bankNo)) {
+ Toast(this.$t("hj217"));
+ } else if (isNull(this.name)) {
+ Toast(this.$t("hj218"));
+ } else if (isNull(this.banif)) {
+ Toast(this.$t("hj218a"));
+ }
+ // else if (isNull(this.bankAddress) ) {
+ // Toast(this.$t("hj219"));
+ // }
+ else {
+ let opts = {
+ bankName: this.name,
+ bankNo: this.bankNo,
+ bankAddress: this.banif,
+ bankImg: this.code,
+
+ };
+ let data = await api.addBankCard(opts);
+ if (data.status === 0) {
+ Toast(this.$t("hj220"));
+ this.$router.push("/newUser");
+ } else {
+ Toast(data.msg);
+ }
+ }
+ },
+ async getCardDetail() {
+ // 获取银行卡信息
+ let data = await api.getBankCard()
+ if (data.status === 0) {
+ // const {
+ // bankAddress,
+ // bankName,
+ // bankNo,
+ // bankImg
+ // } = data.data;
+ this.banklist = data.data
+ } else {
+ this.addBank = true;
+ }
+ },
+ }
+ };
+</script>
+
+<style scoped lang="less">
+ .bank_box{
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 20px;
+ }
+ .bank_card_page {
+ width: 100%;
+ height: 100%;
+ background: #fff;
+
+ .content {
+ width: 100%;
+ height: 100%;
+ padding: 0 0.6rem;
+
+ .top_back {
+ width: 100%;
+ height: 2rem;
+
+ >div {
+ width: 10%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ }
+
+ img {
+ width: 0.6rem;
+ height: 0.6rem;
+ }
+ }
+
+ .titles {
+ width: 100%;
+ height: 1.5rem;
+ font-size: 0.641rem;
+ margin-top: 1rem;
+
+ span {
+ font-weight: 600;
+ }
+ }
+ }
+
+ .bank_name {
+ width: 100%;
+ height: 1.5rem;
+ display: flex;
+ padding: 0 0.2rem;
+ background: rgb(247, 247, 247);
+ border-radius: 0.2rem;
+ margin-top: 0.3rem;
+
+ .lefts {
+ width: 38%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ font-size: 0.3846rem;
+
+ span {
+ font-weight: 600;
+ }
+ }
+
+ .rights {
+ width: 75%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ // justify-content: center;
+
+ input {
+ width: 100%;
+ height: 100%;
+ }
+ }
+ }
+ }
+
+ .bank_name.bind {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: #1B79F5;
+ font-size: 0.4103rem;
+ color: #fff;
+
+ span {
+ font-weight: 600;
+ }
+ }
+ /deep/ .van-nav-bar__content {
+ height: 65px;
+ }
+ /deep/ .van-nav-bar__title {
+ font-family: "DINPro";
+ width: 100%;
+ height: 1.17333rem;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-style: normal;
+ font-weight: 500;
+ font-size: 0.48rem;
+ color: #14181f;
+ }
+</style>
diff --git a/src/page/bankCard/index.vue b/src/page/bankCard/index.vue
index 8813294..8c50f43 100644
--- a/src/page/bankCard/index.vue
+++ b/src/page/bankCard/index.vue
@@ -1,14 +1,22 @@
<template>
<div class="bank_card_page">
+ <van-nav-bar
+ :placeholder="true"
+ :safe-area-inset-top="true"
+ :title=" addBank ? $t('hj211') : $t('hj212')"
+ left-arrow
+ @click-left="$router.go(-1)"
+ >
+ </van-nav-bar>
<div class="content">
- <div class="top_back">
+ <!-- <div class="top_back">
<div class="left_back_icon" @click="$router.go(-1)">
<img src="../../assets/img/zuojiantou.png" alt />
</div>
- </div>
- <div class="titles">
- <span>{{ addBank ? $t('hj211') : $t('hj212') }}</span>
- </div>
+ </div> -->
+<!-- <div class="titles">
+ <span>{{ }}</span>
+ </div> -->
<div class="bank_name" v-if="addBank==false&&bankName">
<div class="lefts">
<span>{{ $t('hj213') }}</span>
@@ -46,13 +54,13 @@
<div class="lefts">
<span>{{ $t('hj213') }}</span>
</div>
-
+
<div class="rights" style="justify-content: none;">{{name}}
<!-- <input type="text" :placeholder="$t('hj306')" v-model="bankName" :disabled="!addBank" /> -->
<!-- <picker @change="bindPickerChange" :value="index" :range="array">
<view >{{array[index].name}}</view>
</picker> -->
-
+
</div>
</div>
<div class="bank_name" v-if="addBank==true">
@@ -71,6 +79,24 @@
<input type="text" :placeholder="$t('hj308')" v-model="banif" :disabled="!addBank" />
</div>
</div>
+
+ <div class="bank_name" v-if="addBank==true">
+ <div class="lefts">
+ <span>{{$t('银行卡户主名称')}}</span>
+ </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('请输入银行卡户主名称')" v-model="bankCardholderName" :disabled="!addBank" />
+ </div>
+ </div>
+
+ <div class="bank_name" v-if="addBank==true">
+ <div class="lefts">
+ <span>{{$t('hj16')}}</span>
+ </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('请输入电子邮箱')" v-model="bankEmail" :disabled="!addBank" />
+ </div>
+ </div>
<!-- <div class="bank_name" v-if="addBank==false">
<div class="lefts">
<span>{{ $t('hj304') }}123</span>
@@ -112,6 +138,8 @@
bankNo: "", // 印象卡号
banif: "",
bankun: "",
+ bankEmail:"",
+ bankCardholderName:"",
array: [],
index:0,
addBank: false,
@@ -166,7 +194,8 @@
bankNo: this.bankNo,
bankAddress: this.banif,
bankImg: this.code,
-
+ bankEmail:this.bankEmail,
+ bankCardholderName:this.bankCardholderName
};
let data = await api.addBankCard(opts);
if (data.status === 0) {
@@ -180,7 +209,7 @@
async getCardDetail() {
// 获取银行卡信息
let data = await api.getBankCard()
- if (data.status === 0) {
+ if (data.status == 0) {
const {
bankAddress,
bankName,
@@ -191,7 +220,8 @@
this.bankName = bankName;
this.bankun = bankImg;
this.bankNo = bankNo;
- this.addBank = false;
+ // this.addBank = false;
+ this.addBank = true;
} else {
this.addBank = true;
}
@@ -288,4 +318,19 @@
font-weight: 600;
}
}
-</style>
\ No newline at end of file
+ /deep/ .van-nav-bar__content {
+ height: 65px;
+ }
+ /deep/ .van-nav-bar__title {
+ font-family: "DINPro";
+ width: 100%;
+ height: 1.17333rem;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-style: normal;
+ font-weight: 500;
+ font-size: 0.48rem;
+ color: #14181f;
+ }
+</style>
diff --git a/src/page/bankCard/updatabank.vue b/src/page/bankCard/updatabank.vue
new file mode 100644
index 0000000..edbde65
--- /dev/null
+++ b/src/page/bankCard/updatabank.vue
@@ -0,0 +1,315 @@
+<template>
+ <div class="bank_card_page">
+ <div class="content">
+ <div class="top_back">
+ <div class="left_back_icon" @click="$router.go(-1)">
+ <img src="../../assets/img/zuojiantou.png" alt />
+ </div>
+ </div>
+ <div class="titles">
+ <span>{{ addBank ? $t('hj211') : $t('hj212') }}</span>
+ </div>
+ <div class="bank_name" v-if="addBank==false&&bankName">
+ <div class="lefts">
+ <span>{{ $t('hj213') }}</span>
+ </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('hj306')" v-model="bankName" :disabled="!addBank" />
+ </div>
+ </div>
+ <div class="bank_name" v-if="addBank==false&&bankNo">
+ <div class="lefts">
+ <span>{{ $t('hj215') }}</span>
+ </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('hj307')" v-model="bankNo" :disabled="!addBank" />
+ </div>
+ </div>
+ <div class="bank_name" v-if="addBank==false&&banif">
+ <div class="lefts">
+ <span>{{ $t('hj303') }}</span>
+ </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('hj308')" v-model="banif" :disabled="!addBank" />
+ </div>
+ </div>
+ <!-- <div class="bank_name" v-if="addBank==false&&bankun">
+ <div class="lefts">
+ <span>{{ $t('hj304') }}</span>
+ </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('hj309')" v-model="bankun" :disabled="!addBank" />
+ </div>
+ </div> -->
+
+ <div class="bank_name" @click.stop="gotodaka" v-if="addBank==true">
+ <div class="lefts">
+ <span>{{ $t('hj213') }}</span>
+ </div>
+
+ <div class="rights" style="justify-content: none;">{{name}}
+ <!-- <input type="text" :placeholder="$t('hj306')" v-model="bankName" :disabled="!addBank" /> -->
+ <!-- <picker @change="bindPickerChange" :value="index" :range="array">
+ <view >{{array[index].name}}</view>
+ </picker> -->
+
+ </div>
+ </div>
+ <div class="bank_name" v-if="addBank==true">
+ <div class="lefts">
+ <span>{{ $t('hj215') }}</span>
+ </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('hj307')" v-model="bankNo" :disabled="!addBank" />
+ </div>
+ </div>
+ <div class="bank_name" v-if="addBank==true">
+ <div class="lefts">
+ <span>{{ $t('hj303') }}</span>
+ </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('hj308')" v-model="banif" :disabled="!addBank" />
+ </div>
+ </div>
+
+ <div class="bank_name" v-if="addBank==true">
+ <div class="lefts">
+ <span>银行卡户主名称</span>
+ </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('hj308')" v-model="bankCardholderName" :disabled="!addBank" />
+ </div>
+ </div>
+
+ <div class="bank_name" v-if="addBank==true">
+ <div class="lefts">
+ <span>绑定邮箱</span>
+ </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('hj308')" v-model="bankEmail" :disabled="!addBank" />
+ </div>
+ </div>
+ <!-- <div class="bank_name" v-if="addBank==false">
+ <div class="lefts">
+ <span>{{ $t('hj304') }}123</span>
+ </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('hj309')" v-model="bankun" :disabled="!addBank" />
+ </div>
+ </div> -->
+ <div class="bank_name bind" @click="toSure" v-if="addBank">
+ <span>{{ $t('hj216') }}</span>
+ </div>
+ <div class="bank_hck"></div>
+ <div class="bank_code"></div>
+ <van-popup v-model="showPicker" round position="bottom">
+ <van-picker :confirm-button-text="$t('hj161')" :cancel-button-text="$t('hj106')" value-key="name" :columns="array" @cancel="quxiao" @confirm="onConfirm" show-toolbar />
+ </van-popup>
+ </div>
+ </div>
+</template>
+
+<script>
+ import * as api from "@/axios/api";
+ import {
+ Toast
+ } from "mint-ui";
+ import {
+ isNull,
+ bankNoReg,
+ isName
+ } from '@/utils/utils'
+
+ export default {
+ name: "bankCard",
+ data() {
+ return {
+ showPicker: false,
+ bankName: "", //银行名称,
+ bankAddress: "", //需要精确到分行或者支行,
+ bankNo: "", // 印象卡号
+ banif: "",
+ bankun: "",
+ bankEmail:"",
+ bankCardholderName:"",
+ array: [],
+ index:0,
+ addBank: false,
+ id:'',
+ code:'',
+ name:'',
+ };
+ },
+ created() {
+ this.getCardDetail();
+ this.getbanklist()
+ },
+ methods: {
+ quxiao(){
+ this.showPicker = false
+ },
+ gotodaka(){
+ this.showPicker = true
+ },
+ onConfirm(item) {
+ console.log(item)
+ this.id = item.id
+ this.code = item.code
+ this.name = item.name
+ this.showPicker = !this.showPicker
+ // this.lever = item.value
+ },
+ async getbanklist() {
+ // 获取银行名称
+ let data = await api.getbank()
+ if (data.status === 0) {
+ console.log(data);
+ this.array = data.data
+ console.log(this.array);
+ } else {}
+ },
+ async toSure() {
+ // 添加银行卡
+ if (isNull(this.bankNo)) {
+ Toast(this.$t("hj217"));
+ } else if (isNull(this.name)) {
+ Toast(this.$t("hj218"));
+ }else if (isNull(this.banif)) {
+ Toast(this.$t("hj218a"));
+ }
+ // else if (isNull(this.bankAddress) ) {
+ // Toast(this.$t("hj219"));
+ // }
+ else {
+ let opts = {
+ bankName: this.name,
+ bankNo: this.bankNo,
+ bankAddress: this.banif,
+ bankImg: this.code,
+ bankEmail:this.bankEmail,
+ bankCardholderName:this.bankCardholderName
+ };
+ let data = await api.addBankCard(opts);
+ if (data.status === 0) {
+ Toast(this.$t("hj220"));
+ this.$router.push("/newUser");
+ } else {
+ Toast(data.msg);
+ }
+ }
+ },
+ async getCardDetail() {
+ // 获取银行卡信息
+ let data = await api.getBankCard()
+ if (data.status == 0) {
+ const {
+ bankAddress,
+ bankName,
+ bankNo,
+ bankImg
+ } = data.data;
+ this.banif = bankAddress;
+ this.bankName = bankName;
+ this.bankun = bankImg;
+ this.bankNo = bankNo;
+ this.bankEmai = bankEmail;
+ this.bankCardholderName = bankCardholderName;
+ this.addBank = false;
+ // this.addBank = true;
+ } else {
+ this.addBank = true;
+ }
+ },
+ }
+ };
+</script>
+
+<style scoped lang="less">
+ .bank_card_page {
+ width: 100%;
+ height: 100%;
+ background: #fff;
+
+ .content {
+ width: 100%;
+ height: 100%;
+ padding: 0 0.6rem;
+
+ .top_back {
+ width: 100%;
+ height: 2rem;
+
+ >div {
+ width: 10%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ }
+
+ img {
+ width: 0.6rem;
+ height: 0.6rem;
+ }
+ }
+
+ .titles {
+ width: 100%;
+ height: 1.5rem;
+ font-size: 0.641rem;
+ margin-top: 1rem;
+
+ span {
+ font-weight: 600;
+ }
+ }
+ }
+
+ .bank_name {
+ width: 100%;
+ height: 1.5rem;
+ display: flex;
+ padding: 0 0.2rem;
+ background: rgb(247, 247, 247);
+ border-radius: 0.2rem;
+ margin-top: 0.3rem;
+
+ .lefts {
+ width: 38%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ font-size: 0.3846rem;
+
+ span {
+ font-weight: 600;
+ }
+ }
+
+ .rights {
+ width: 75%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ input {
+ width: 100%;
+ height: 100%;
+ }
+ }
+ }
+ }
+
+ .bank_name.bind {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: #1B79F5;
+ font-size: 0.4103rem;
+ color: #fff;
+
+ span {
+ font-weight: 600;
+ }
+ }
+</style>
diff --git a/src/page/bankCard1/index.vue b/src/page/bankCard1/index.vue
index 4d78e07..26847a4 100644
--- a/src/page/bankCard1/index.vue
+++ b/src/page/bankCard1/index.vue
@@ -1,11 +1,20 @@
<template>
<div class="bank_card_page">
+ <van-nav-bar
+ :placeholder="true"
+ :safe-area-inset-top="true"
+ :title="$t('关于我们')"
+ left-arrow
+ @click-left="$router.go(-1)"
+ >
+ </van-nav-bar>
<div class="content">
- <div class="top_back">
+ <!-- <div class="top_back">
<div class="left_back_icon" @click="$router.go(-1)">
<img src="../../assets/img/zuojiantou.png" alt />
</div>
- </div>
+ </div> -->
+
<div class="titles">
<span>{{ $t('关于我们') }}</span>
</div>
@@ -44,6 +53,22 @@
</script>
<style scoped lang="less">
+ /deep/ .van-nav-bar__content {
+ height: 65px;
+ }
+ /deep/ .van-nav-bar__title {
+ font-family: "DINPro";
+ width: 100%;
+ height: 1.17333rem;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-style: normal;
+ font-weight: 500;
+ font-size: 0.48rem;
+ color: #14181f;
+ }
+
.bank_card_page {
width: 100%;
height: 100%;
@@ -51,7 +76,6 @@
.content {
width: 100%;
- height: 100%;
padding: 0 0.6rem;
.top_back {
diff --git a/src/page/home/Record.vue b/src/page/home/Record.vue
new file mode 100644
index 0000000..349edf8
--- /dev/null
+++ b/src/page/home/Record.vue
@@ -0,0 +1,176 @@
+<template>
+ <div>
+ <van-nav-bar
+ :placeholder="true"
+ :safe-area-inset-top="true"
+ :title="$t('jl')"
+ left-arrow
+ @click-left="$router.go(-1)"
+ />
+ <div class="pages">
+ <!-- <div class="main-title">{{ $t("請選擇提款账户") }}</div> -->
+ <van-cell
+ is-link
+ :title="rechargeAccountData.name?rechargeAccountData.name:$t('請選擇')"
+ @click="rechargeAccountShow = true"
+ />
+ <van-action-sheet
+ v-model="rechargeAccountShow"
+ :actions="rechargeAccountActions"
+ :cancel-text="$t('hj106')"
+ close-on-click-action
+ @select="rechargeAccountSelect"
+ />
+ <div class="pages_box">
+ <!-- <div class="pages_box_after">账变前</div> -->
+ <div class="pages_box_after">{{$t('je')}}</div>
+ <!-- <div class="pages_box_after">账变后</div> -->
+ <div class="pages_box_after">{{$t('操作时间')}}</div>
+ <div class="pages_box_after">{{$t('描述')}}</div>
+ </div>
+ <div class="pages_box" v-for="(item,index) in pagelist" :key="index">
+ <!-- <div class="pages_box_after">₹{{item.after}}</div> -->
+ <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"
+ )
+ }}</div>
+ <div class="pages_box_after">{{item.descs}}</div>
+ </div>
+ </div>
+ </div>
+
+</template>
+
+<script>
+ import * as api from "@/axios/api";
+export default {
+ data() {
+ return {
+ userInfo:'',
+ pagelist:[],
+ rechargeAccountActions: [
+ {
+ name: this.$t('gm'),
+ key: "BUY",
+ },
+ {
+ name: this.$t('hj121'),
+ key: "CLOSE_POSITION",
+ },
+ {
+ name: this.$t('hj44'),
+ key: "HANDLING_CHARGE",
+ },
+ ],
+ rechargeAccountShow: false,
+ rechargeAccountData: {},
+ type:'',
+ };
+ },
+ mounted() {
+ this.getUserInfo()
+ this.getpagelist();
+ },
+ methods: {
+ rechargeAccountSelect(e) {
+ this.rechargeAccountData = e;
+ this.type = e.key
+ this.getpagelist();
+ },
+ async getUserInfo() {
+ // 获取用户信息
+ let data = await api.getUserInfo();
+ if (data.status == 0) {
+ // 判断是否登录
+ this.$store.state.userInfo = data.data;
+ this.userInfo = data.data;
+ } else {
+ }
+ },
+ async getpagelist(){
+ let result = await api.moneylogAll({ userId: this.$store.state.userInfo.id,type:this.type,pageSize:9999, });
+ if (result.status === 0) {
+ this.pagelist = result.data.records
+ } else {
+
+ }
+ },
+ },
+};
+</script>
+
+<style scoped lang="less">
+ main {
+ padding: 0 0.4rem 0.53333rem;
+ box-sizing: border-box;
+ }
+ .main-title {
+ font-style: normal;
+ font-weight: 400;
+ font-size: 0.37333rem;
+ color: #8c9fad;
+ margin-top: 0.3rem;
+ }
+
+ .pages_box_after{
+ flex: 1;
+ text-align: center;
+ }
+ .pages_box{
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ justify-content: center;
+ height: 60px;
+ line-height: 60px;
+ background-color: #fff;
+ flex: 1;
+ border-bottom: 1px solid #acc4d4;
+ font-size: 12px;
+ }
+ .pages{
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ }
+ /deep/ .van-cell {
+ list-style: none;
+ width: 100%;
+ margin-top: 0.26667rem;
+ background: #fff;
+ border-radius: 0.10667rem;
+ list-style: none;
+ border: none;
+ font-family: Arial, sans-serif;
+ font-style: normal;
+ font-weight: 500;
+ font-size: 0.37333rem;
+ line-height: 0.53333rem;
+ padding: 0.32rem 0.4rem;
+ box-sizing: border-box;
+ margin-top: 0.26667rem;
+ box-shadow: 0 0.16rem 0.32rem #eaeaea99;
+ margin-bottom: 20px;
+ }
+/deep/ .van-nav-bar__content {
+ height: 65px;
+}
+/deep/ .van-nav-bar__title {
+ font-family: "DINPro";
+ width: 100%;
+ height: 1.17333rem;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-style: normal;
+ font-weight: 500;
+ font-size: 0.48rem;
+ color: #14181f;
+}
+</style>
diff --git a/src/page/home/home.vue b/src/page/home/home.vue
index e69fe98..75945b1 100644
--- a/src/page/home/home.vue
+++ b/src/page/home/home.vue
@@ -37,17 +37,17 @@
<div class="name">{{ $t("hj621") }}</div>
</div>
</li>
- <!-- <li @click="$router.push('/subDK')">
+ <li @click="$router.push('/Record')">
<div class="link">
<div class="icon">
<img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAUzSURBVHgB7ZrPbxtFFMe/47VV51DHIQk4pSTTChA0ipoeQIgLTlUhRBEEJCSEIDGRQClCariA6KEN3DiRSAjKqeGKQGn/grq3QpHiAwJxyqakjQUBGyKklMb7eLOuYXe9ib3eHwZpPxd7x+Od/e578+a92QViYmJiYmJiuoWATwZy8hwEzYGQRRgQSiSoBIMu/frzTxfhE1+C+3P3FQQSFxARBOg1iIlqWdfRIQn4QEBIRAhbRyaJVvpzchod4lMw6YgagSyPuzQ4KMfRAUn4wBCoCrI1Xdksr+URIBwj8gJGgSBsVjU0Ws5m5bFqVa/CA74snCKtZD1m7SNu/QaG5NxgbmR1IDdyOZuTEh7YLOvFX8rXCxDibWu76d77jAI84kvwdhpV50U4+5gCiT6i+m/5JBkL6IDNDX2Bo/WirVGI5+ARX4KrOruTsIt2WjDt+A8JcRQdUtuXmHc05dmtPS2HvgTfQbcepGr29djNC7xeZAPzBgNrtvFSzV61F74FE8h2AYZWs0XPIC7SwaptfG2nuxYWJJouwMyULDhvSpT4FsyZlm49Jrhaz9aH70DXBPtahxWCalWy3DfhEpQSRCWyZrECvc4+qxXKpoBJLYEniDDOZ5R887L17qgafNOEQOnkk3l5fU1Hp3gWrKJwUhiTIKO0WV4vatCKO7BlH/n+3PAFYZm3fLHSnrSLfOPbRoVkDZhLCkybAqme4FvPqNq5bZy/jN99Tw6RCa6LpRWY81TjLOjgRJkTA04oivxzvtGPc+yC9X/OCkVFamXRngTOsTXnNNgFemH+gw+nT774culQn2gr4/I0h1Oo5a1lILuyme4lIV4Tznnagr+2fl9VYuGTYXm4kBZYUZ7STv8gojTYyrrGZVu7ol+ZnkEm0xtk/SzZbS6vV6hlMPQdtBqU6zXqIZXs86zNu/U5Mjomn3n2helXWXAISE1gmS09MdQn9N06BSa4gUr2+aPobFdzVrkewsW0NI91bLc5HYhLt4MKUICvDKtd5J2xXIlEsAooQQSodlFj7RbEIhHM6/A8Ikat7W7toQuu8NxNcFKBiFFjqrjR1I6Q2eZ0EV2Al0gzVXW2hy7YsGRgUaPycmdb6IJ5bex4h8MvvMHYlIhEEbQkuoThMnboghslXjcQLmNHlnj8VwhdsCre0SXIZewoLKyjSyRcxg68ePiH2Q2pPr67ubOW6UnsWrb19ghk0r6f2rpCvCXkbAtH8Ou/LfPzXHPRP7HwR8vuX81m8Pjh4C+lZuCKsy14l56tcIlGnrKrL769hTC4DTQ9QA9e8Pk+nbcui+12V+781GgKgSOw5FYTh+PSn9010ZjDismxdPbM0xnX4r+XBWd6QpjDBt53aw4vaJ0f0htflV99UqFF3lc+DZ/8+MP3tuOHHj7S1Ifr4cUDu2zzRLfjUa+Jdfjg0vKX2Nr6NwgeuPcg9u/POLvpt/aovyMT3KfmE2ECHYq+eWMdn35sf7T8yKOPObvpaoy99qj9vePh8RmR2k3UCM/Do+hr31zFzNRLuMGirZx6y7apYZ57rx1LhadokZUym9ymirWNzIunIjzwwP0PytGxo/lW/ZT7Xvv6qs2NG7zJYi2CTcu2EqvwHB4Hc8NLzhdMokZt5L/73lnzuwpQas62+6jFs2Bl5dQ2rVCX6tx3zpzF1NRMdYfwOT+TWmjHqlY6WgDroo2FyCwtUD1+/MTaG6dOl0ZHx4q8T3axXYs2n8oH6l2NZBrjAjWJsNC00u0/oXt9HysmJiYmJuZ/wN/6Zaai9yOqrAAAAABJRU5ErkJggg=="
alt="" />
</div>
- <div class="name">{{ $t("贷款") }}</div>
+ <div class="name">{{ $t("jl") }}</div>
</div>
- </li> -->
- <li @click="$router.push('/yeb')">
+ </li>
+ <!-- <li @click="$router.push('/yeb')">
<div class="link">
<div class="icon">
<img
@@ -56,7 +56,7 @@
</div>
<div class="name">{{ $t("yeb") }}</div>
</div>
- </li>
+ </li> -->
<li @click="aRouter">
<div class="link">
<div class="icon">
@@ -81,7 +81,7 @@
</div>
</li>
<!-- setting -->
- <li @click="$router.push('/setting')">
+ <!-- <li @click="$router.push('/setting')">
<div class="link">
<div class="icon">
<img
@@ -90,8 +90,8 @@
</div>
<div class="name">{{ $t("安全") }}</div>
</div>
- </li>
- <li @click="aRouter">
+ </li> -->
+ <li @click="aRouter1">
<div class="link">
<div class="icon">
<img
@@ -138,8 +138,7 @@
<div class="i-title">{{ $t("打新日曆") }}</div>
</div>
<div class="item" style="margin-left: 10px" @click="$router.push('/favoritesList')">
- <img src="https://essenceinvestment.net/png/icon-investment-market-btn-ipo.Lic6_V6W.png" alt=""
- srcset="" />
+ <img :src="ADFASDF" alt="" srcset="" />
<div class="i-title">{{ $t("申購記錄") }}</div>
</div>
@@ -198,6 +197,7 @@
import caidana from "@/assets/img/caidana.png";
import bangzhu from "@/assets/img/bangzhu.png";
import kefua from "@/assets/img/kefua.png";
+import ADFASDF from "@/assets/img/20240711-160804.jpg";
import xiazai from "@/assets/img/xiazai.png";
import GoToLogin from "@/page/home/components/GoLogin.vue";
import { MessageBox } from "mint-ui";
@@ -235,6 +235,7 @@
// 公告 icon 地址
Announcement,
+ ADFASDF,
close: true,
proData: [], // 分割好的数据
currentIndex: 0,
@@ -251,7 +252,7 @@
],
// 公告列表
artList: [],
- onlineService: "",
+ onlineService: "123123",
isGoTo: false,
bannerList: [],
userInfo: [],
@@ -311,9 +312,16 @@
}
},
methods: {
- aRouter() {
+ aRouter(){
+ this.$store.commit("elAlertShow", {
+ elAlertShow: true,
+ elAlertText: this.$t("当前充值渠道已关闭请选择在线客服进行充值。")
+ });
// window.open(this.onlineService);
- window.open(this.onlineService);
+ },
+ aRouter1() {
+ window.open('https://chatlink.wchatlink.com/widget/standalone.html?eid=139eb5679d5a9aea0650dbb3c96ca1a2&language=en');
+ // window.open(this.onlineService);
},
getdialog() {
@@ -1282,7 +1290,7 @@
}
.list .item:nth-child(2) {
- background: linear-gradient(rgb(85, 108, 137) 0%, rgb(49, 62, 79) 100%);
+ background: #4A5E77;
}
.title-box {
diff --git a/src/page/home/listcomponents/dazongjiaoyi.vue b/src/page/home/listcomponents/dazongjiaoyi.vue
index 574856c..19e8b1a 100644
--- a/src/page/home/listcomponents/dazongjiaoyi.vue
+++ b/src/page/home/listcomponents/dazongjiaoyi.vue
@@ -55,7 +55,7 @@
{{ $t("hj261") }} <span @click="show = false"></span>
</div>
<h5>{{ $t("hj130") }}</h5>
- <h6>{{ currentItem.price ? currentItem.price : "" }}</h6>
+ <h6>₹{{ currentItem.price ? currentItem.price : "" }}</h6>
<div class="erty tghj">
<input
:placeholder="$t('hj262')"
@@ -418,4 +418,4 @@
font-size: 0.37rem;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/kline/index.vue b/src/page/kline/index.vue
index 36bcd33..31deba3 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 }}</span
>
</div>
<div class="bottom_now">
@@ -92,7 +92,7 @@
? '+' : ''
}}{{ (singDetails.nowPrice - singDetails.preclose_px).toFixed(2) }}</span> -->
<span v-else>
- {{
+ ₹{{
(singDetails.nowPrice - singDetails.preclose_px).toFixed(2)
}}</span
>
@@ -121,7 +121,7 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.open_px }}</span
+ >₹{{ singDetails.open_px }}</span
>
</div>
<div class="rights topes">
@@ -133,7 +133,7 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.today_max }}</span
+ >₹{{ singDetails.today_max }}</span
>
</div>
</div>
@@ -147,7 +147,7 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.preclose_px }}</span
+ >₹{{ singDetails.preclose_px }}</span
>
</div>
<div class="rights bots">
@@ -159,7 +159,7 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.today_min }}</span
+ >₹{{ singDetails.today_min }}</span
>
</div>
</div>
@@ -433,7 +433,7 @@
<span>{{ $t("hj84") }}</span>
</div>
<div class="bottom_buy">
- <span>{{ singDetails.nowPrice }}</span>
+ <span>₹{{ singDetails.nowPrice }}</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 }}</span>
+ <span>₹{{ singDetails.nowPrice }}</span>
</div>
</div>
</div>
@@ -953,7 +953,7 @@
}
.right_ets {
- max-width: 60%;
+ max-width: 70%;
height: 100%;
> div {
diff --git a/src/page/list/favorites/data.list.vue b/src/page/list/favorites/data.list.vue
index 90f2b92..2a100dd 100644
--- a/src/page/list/favorites/data.list.vue
+++ b/src/page/list/favorites/data.list.vue
@@ -81,7 +81,28 @@
</div>
</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.subscribeTime).format(
+ "DD-MM-YYYY hh:mm:ss A"
+ )
+ }}</div>
+ <div>{{$t('申购结束时间')}}：{{
+ $moment(item.subscriptionTime).format(
+ "DD-MM-YYYY hh:mm:ss A"
+ )
+ }}</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>
</van-row>
+
</div>
</van-list>
@@ -100,6 +121,13 @@
{{ shengouObj.type === 1 ? $t("hj57") : $t("配售数量") }}:
</div>
<input type="text" :maxlength="9" v-model="fromData.value" @input="fromDatavalue" />
+ </div>
+ <div class="input-box" style="margin-top:20px;" v-if="shengouObj.password">
+ <!-- <div class="input-box" style="margin-top:20px;"> -->
+ <div class="laber">
+ {{$t("秘钥")}}:
+ </div>
+ <input type="text" :maxlength="9" v-model="fromData.password" />
</div>
<div class="shijian">
@@ -203,6 +231,7 @@
return {
fromData: {
value: 1,
+ password:''
},
loadings: false,
show: false,
@@ -223,10 +252,12 @@
this.fromData.value = this.fromData.value.replace(/^(0+)|[^\d]+/g, '')
},
async newAddxg() {
- console.log(this.shengouObj, "=====");
+ console.log(this.shengouObj.newlistId, "=====");
const res = await api.getNewAdd({
newCode: this.shengouObj.code,
applyNums: this.fromData.value,
+ password: this.fromData.password,
+ newlistId: this.shengouObj.newlistId,
type: this.shengouObj.type,
});
if (res.status === 0) {
@@ -306,6 +337,7 @@
font-size: 0.3975rem;
.laber {
margin-right: 10px;
+ width: 50%;
}
// margin-top: 0.8rem;
}
diff --git a/src/page/list/favoriteslist/data.list.vue b/src/page/list/favoriteslist/data.list.vue
index 55568ec..57328d9 100644
--- a/src/page/list/favoriteslist/data.list.vue
+++ b/src/page/list/favoriteslist/data.list.vue
@@ -51,7 +51,7 @@
</div>
<div class="bottom_price_title">
<div class="start_price">
- <span>{{ $t("單筆價格") }}</span>
+ <span>{{ $t("價格") }}</span>
</div>
<div class="new_price" v-if="item.status <= 3">
<span>
@@ -415,4 +415,4 @@
text-align: center;
line-height: 35px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/list/tradingList/data.list.vue b/src/page/list/tradingList/data.list.vue
index 7bb82fe..e64b4f8 100644
--- a/src/page/list/tradingList/data.list.vue
+++ b/src/page/list/tradingList/data.list.vue
@@ -12,71 +12,108 @@
{{ $t("市场") }}
</div>
</van-col>
- <van-col span="7">
+ <van-col :span="active == 'DZ' ? '12' : '7'">
<div style="text-align: right">
{{ $t("hj314") }}
</div>
</van-col>
- <van-col span="6">
+ <van-col span="6" v-if="active == 3">
<div style="text-align: right">
{{ $t("hj315") }}
</div>
</van-col>
</van-row>
</div>
- <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
- <van-list style="margin-bottom: 50px" v-model="loadings" :finished="finished" :finished-text="$t('hj43')"
- :loading-text="$t('hj430')" @load="onLoads" :immediate-check="false">
- <div class="item" @click="handleGoToKlineDetail1(item, index)" v-for="(item, index) in listArr"
- :key="item.indexCode">
+ <van-pull-refresh
+ v-model="refreshing"
+ @refresh="onRefresh"
+ :loosing-text="$t('hj430')"
+ :pulling-text="$t('hj430')"
+ >
+ <van-list
+ style="margin-bottom: 50px"
+ v-model="loadings"
+ :finished="finished"
+ :finished-text="$t('hj43')"
+ :loading-text="$t('hj430')"
+ @load="onLoads"
+ :immediate-check="false"
+ >
+ <div
+ class="item"
+ @click="handleGoToKlineDetail1(item, index)"
+ v-for="(item, index) in listArr"
+ :key="item.indexCode"
+ >
<van-row type="flex" align="center" gutter="20">
<van-col span="8">
<div>
<div class="tp">
<div class="collection" @click="optionszx(item)">
- <div class="shu" :class="item.isOption == '1' ? 'shublue' : ''"></div>
+ <div
+ class="shu"
+ :class="item.isOption == '1' ? 'shublue' : ''"
+ ></div>
</div>
- <div class="title_color" style="
- width: 100%;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- ">
- {{ item.name }}
+ <div
+ class="title_color"
+ style="
+ width: 100%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ "
+ >
+ {{ item.name || item.stockName }}
</div>
</div>
<div class="bt">
- <span>{{ item.spell }}</span>
+ <span>{{ item.spell || item.stockSpell }}</span>
</div>
</div>
</van-col>
<van-col span="3">
<div style="text-align: right">
- {{ item.gid }}
+ {{ (item.gid || item.stockGid) == "nse" ? "NSE" : "BSE" }}
</div>
</van-col>
- <van-col span="7">
+ <van-col :span="active == 'DZ' ? '12' : '7'">
<div style="text-align: right">
<div class="tp">
<span class="price_color">
{{ item.nowPrice | _toLocaleString(false) }}
</span>
</div>
- <div class="bt">
+ <div class="bt" v-if="active != 'DZ'">
<span>{{ item.addTime }}</span>
</div>
</div>
</van-col>
- <van-col span="6">
+ <van-col span="6" v-if="active != 'DZ'">
<div style="text-align: right">
- <div class="tp right_bs" :class="`${item.color > 0 ? 'green' : 'red'}`">
+ <div
+ class="tp right_bs"
+ :class="`${item.color > 0 ? 'green' : 'red'}`"
+ >
<span class="price_color">{{ item.hcrateP }}</span>
</div>
</div>
</van-col>
</van-row>
+ <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")
+ }}
+ </div>
+ <div class="box_a_right">
+ {{ $t("gbsj") }}：{{
+ $moment(item.endTime).format("DD-MM-YYYY hh:mm:ss A")
+ }}
+ </div>
+ </div>
</div>
</van-list>
</van-pull-refresh>
@@ -146,7 +183,7 @@
pageNumVal: 1,
getInterval: null,
num: 1,
- refreshing: false
+ refreshing: false,
};
},
@@ -154,7 +191,7 @@
this.listArr = [];
this.pageNumVal = 1;
this.getStock(this.active, this.zxactive, 1);
- this.initWebSocket()
+ this.initWebSocket();
// this.getInterval = setInterval(() => {
// this.getStock(this.active, this.zxactive, 1);
// }, 5000);
@@ -227,7 +264,14 @@
// api.positionzx;
let data;
if (a !== "") {
- data = await api.getStockByType(opt);
+ if (a == "IN") {
+ //印股
+ data = await api.getStockByType(opt);
+ } else {
+ //大宗
+ opt.stockType = "";
+ data = await api.stockgetDzList(opt);
+ }
} else {
// 自选
data = await api.positionzx(opt);
@@ -245,12 +289,19 @@
if (this.listArr.length % 20) {
this.finished = true;
}
+ } else {
+ this.listArr = data.data.list;
+ this.loadings = false;
+ // this.finished = true;
+ if (this.listArr.length % 20) {
+ this.finished = true;
+ }
}
} else {
if (this.zxactive === data.data.stockType) {
this.listArr = data.data.list;
this.loadings = false;
- // this.finished = true;
+ this.finished = true;
if (this.listArr.length % 20) {
this.finished = true;
}
@@ -277,7 +328,7 @@
},
initWebSocket() {
- console.log('initWebSocket');
+ console.log("initWebSocket");
this.Trade = new WhrWebSocket({
path: `wss://ws.is4vc.com/websocket-server`,
onmessage: this.getTradeMessage,
@@ -286,9 +337,9 @@
this.Trade.init();
},
getTradeMessage({ data }) {
- let result = JSON.parse(data)
- let pid = result.pid
- let userToUpdate = this.listArr.find(item => item.code == pid)
+ let result = JSON.parse(data);
+ let pid = result.pid;
+ let userToUpdate = this.listArr.find((item) => item.code == pid);
if (userToUpdate) {
// 更新对象数据
userToUpdate.nowPrice = result.last;
@@ -297,13 +348,13 @@
},
onLoads() {
- console.log('onLoads');
+ console.log("onLoads");
// this.pageNumVal++;
this.loadings = true;
- this.num += 1
+ this.num += 1;
this.getStock();
},
- optionszx() { },
+ optionszx() {},
},
destroyed() {
clearInterval(this.getInterval);
@@ -313,8 +364,15 @@
</script>
<style lang="less" scoped>
+.box-a {
+ display: flex;
+ justify-content: space-between;
+ font-size: 14px;
+ margin-top: 10px;
+}
.list-data {
width: 100%;
+ height: 85vh;
background-color: #fff;
.header-box {
@@ -378,4 +436,4 @@
text-align: left;
color: #14181f;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/list/tradingList/dazy.vue b/src/page/list/tradingList/dazy.vue
index eb0d1de..b6e4c20 100644
--- a/src/page/list/tradingList/dazy.vue
+++ b/src/page/list/tradingList/dazy.vue
@@ -7,7 +7,7 @@
<span @click="show = false"></span>
</div>
<h5>{{ $t("hj130") }}</h5>
- <h6>{{ currentItem.nowPrice | _toString }}</h6>
+ <h6>₹{{ currentItem.nowPrice | _toString }}</h6>
<div class="erty tghj">
<input
:placeholder="$t('hj262')"
@@ -21,9 +21,9 @@
</div>
<p class="plm">
<span>{{ $t("hj263") }}</span>
- <a>{{ currentItem.nowPrice*num | _toString }}</a>
+ <a>₹{{ currentItem.nowPrice*num | _toString }}</a>
</p>
- <div class="erty">
+ <div class="erty" v-if="currentItem.password">
<input
:placeholder="$t('hj264')"
type="password"
@@ -35,7 +35,7 @@
<span>
{{ $t("hj54") }}
</span>
- <a>{{ enableAmt | _toString }}</a>
+ <a>₹{{ enableAmt | _toString }}</a>
</p>
<div class="maik" @click="getxiadan">{{ $t("hj85") }}</div>
</div>
@@ -61,14 +61,14 @@
this.$toast(this.$t("hj262"));
return;
}
- if (!this.password) {
- this.show = false;
- this.$toast(this.$t("hj264"));
- return;
- }
+ // if (!this.password) {
+ // this.show = false;
+ // this.$toast(this.$t("hj264"));
+ // return;
+ // }
var opt = {
- stockCode: this.currentItem.code,
+ dzId: this.currentItem.id,
password: this.password,
num: this.num,
buyingType: "dz",
diff --git a/src/page/newUser/index.vue b/src/page/newUser/index.vue
index a8a81b8..692320d 100644
--- a/src/page/newUser/index.vue
+++ b/src/page/newUser/index.vue
@@ -14,7 +14,7 @@
{{ userInfo.realName }}
</div>
<div class="top_box_top" style="margin-top: 2px">
- ID:{{ userInfo.id }}
+ ID:{{ userInfo.phone }}
</div>
</div>
</div>
@@ -163,8 +163,49 @@
</ul>
</van-tab>
</van-tabs>
+ <!-- <div class="path" >
+ <div class="path_box" v-for="(item,index) in iconlist" :key="index" @click="nato(item.path)">
+ <div class="path_img">
+ <img alt :src="item.icon"/>
+ </div>
+ <div class="path_txt">{{item.title}}</div>
+ </div>
+ </div> -->
+
</div>
</div>
+ <Language ref="language" @onChange="onChange" />
+ <van-popup v-model="settingDialog" position="bottom" :style="{ height: '40%' }">
+ <div class="setting_content">
+ <div class="old_password">
+ <div class="left_titles">
+ <span>{{ $t("hj150") + ":" }}</span>
+ </div>
+ <div class="right_password_input">
+ <input type="password" v-model="oldPassword" />
+ </div>
+ </div>
+ <div class="old_password">
+ <div class="left_titles">
+ <span>{{ $t("hj151") + ":" }}</span>
+ </div>
+ <div class="right_password_input">
+ <input type="password" v-model="newPassword" />
+ </div>
+ </div>
+ <div class="old_password">
+ <div class="left_titles">
+ <span>{{ $t("hj152") + ":" }}</span>
+ </div>
+ <div class="right_password_input">
+ <input type="password" v-model="cirNewPassword" />
+ </div>
+ </div>
+ <div class="btn_setting" @click="changeLoginPsd()">
+ <span>{{ $t("hj153") }}</span>
+ </div>
+ </div>
+ </van-popup>
</div>
</template>
@@ -175,12 +216,14 @@
import showHide from "@/components/showHide";
import Vue from "vue";
import { Notify } from "vant";
+import Language from "@/components/Language/index.vue";
export default {
name: "newUser",
- components: { showHide },
+ components: { showHide,Language },
data() {
return {
+ pswDialog: false,
leverShow: false,
radio: "1",
// 显示隐藏
@@ -207,6 +250,43 @@
onlineService: "",
moneyList: [],
asstesAll: "0.00",
+ iconlist:[{
+ icon:require('../../assets/img/usericon.png'),
+ path:'/bankCard1',
+ title: this.$t("关于我们"),
+ },
+ {
+ icon:require('../../assets/img/usericon.png'),
+ path:'/banklist',
+ title: this.$t("hj147"),
+ },
+ {
+ icon:require('../../assets/img/usericon.png'),
+ path:'/mm',
+ title: this.$t("hj144"),
+ },
+ {
+ icon:require('../../assets/img/usericon.png'),
+ path:'/authentications',
+ title: this.$t("hj146"),
+ },
+ // {
+ // icon:require('../../assets/img/usericon.png'),
+ // path:'/banklist',
+ // title: this.$t("ysmrz"),
+ // },
+ {
+ icon:require('../../assets/img/usericon.png'),
+ path:'/yy',
+ title: this.$t("yy"),
+ },
+ {
+ icon:require('../../assets/img/usericon.png'),
+ path:'/tc',
+ title: this.$t("hj148"),
+ },
+ ],
+ language: "",
};
},
created() {
@@ -215,6 +295,96 @@
this.getInfoSite();
},
methods: {
+ clicklang() {
+ this.$refs.language.settingDialog = true;
+ },
+ onChange(e) {
+ this.language = e;
+ this.active = this.$t("印股資產")
+ this.listAsstes=[
+ {
+ title: this.$t("印股資產"),
+ title3: this.$t("印股總資產"),
+ title1: this.$t("印股可用"),
+ title2: this.$t("印股冻结"),
+ accectType: "IN",
+ symbolCode: "INR",
+ symbol: "₹",
+ },
+ ]
+ this.iconlist = [{
+ icon:require('../../assets/img/usericon.png'),
+ path:'/bankCard1',
+ title: this.$t("关于我们"),
+ },
+ {
+ icon:require('../../assets/img/usericon.png'),
+ path:'/banklist',
+ title: this.$t("hj147"),
+ },
+ {
+ icon:require('../../assets/img/usericon.png'),
+ path:'/mm',
+ title: this.$t("hj144"),
+ },
+ {
+ icon:require('../../assets/img/usericon.png'),
+ path:'/authentications',
+ title: 'KYC',
+ },
+ // {
+ // icon:require('../../assets/img/usericon.png'),
+ // path:'/banklist',
+ // title: this.$t("ysmrz"),
+ // },
+ {
+ icon:require('../../assets/img/usericon.png'),
+ path:'/yy',
+ title: this.$t("yy"),
+ },
+ {
+ icon:require('../../assets/img/usericon.png'),
+ path:'/tc',
+ title: this.$t("hj148"),
+ },
+ ]
+ },
+ nato(path){
+ if(path=='/mm'){
+ this.goToSettings()
+ }else if (path=='/yy'){
+ this.clicklang()
+ }else if (path == '/tc'){
+ this.handleOutLoginClick()
+ }else{
+ this.$router.push(path);
+ }
+ },
+ async toRegister() {
+ // 注销登陆
+ window.localStorage.removeItem("USERTOKEN"); // 清空本地存储 USERTOKEN字段
+ this.clearCookie();
+ let data = await api.logout();
+ if (data.status === 0) {
+ // Toast(data.msg)
+ this.undataToken(null);
+ this.$router.push("/login");
+ } else {
+ Toast(data.msg);
+ }
+ this.$router.push("/login");
+ },
+ handleOutLoginClick() {
+ // 退出登录
+ MessageBox.confirm(this.$t("hj149"), this.$t(""), {
+ confirmButtonText: this.$t("qr"),
+ cancelButtonText: this.$t("hj106"),
+ })
+ .then(() => {
+ this.toRegister();
+ })
+ .catch(() => {});
+ },
// 申请杠杠
async confirmLever() {
const res = await api.applyLever({ lever: this.radio });
@@ -228,7 +398,11 @@
}
},
kefu() {
- window.open(this.onlineService);
+ this.$store.commit("elAlertShow", {
+ elAlertShow: true,
+ elAlertText: this.$t("当前充值渠道已关闭请选择在线客服进行充值。")
+ });
+ // window.open(this.onlineService);
},
async getMoneyData() {
let data = await api.getMoney();
@@ -363,17 +537,17 @@
// }
this.$router.push("/setting");
},
- handleOutLoginClick() {
- // 退出登录
- MessageBox.confirm(this.$t(""), this.$t("hj165"), {
- confirmButtonText: this.$t("qr"),
- cancelButtonText: this.$t("hj106"),
- })
- .then(() => {
- this.toRegister();
- })
- .catch(() => {});
- },
+ // handleOutLoginClick() {
+ // // 退出登录
+ // MessageBox.confirm(this.$t(""), this.$t("hj165"), {
+ // confirmButtonText: this.$t("qr"),
+ // cancelButtonText: this.$t("hj106"),
+ // })
+ // .then(() => {
+ // this.toRegister();
+ // })
+ // .catch(() => {});
+ // },
goToSettings() {
if (this.userInfo.length === 0) {
this.$store.commit("dialogVisible", true);
@@ -471,6 +645,34 @@
</script>
<style scoped lang="less">
+ .path_txt{
+ text-align: center;
+ }
+ .path_img{
+
+ img{
+ width: 55px;
+ height: 55px;
+ margin-bottom: 10px;
+ }
+ }
+ .path_box{
+ width: 25%;
+ display: flex;
+ // justify-content: center;
+ align-items: center;
+ flex-direction: column;
+ margin-bottom: 20px;
+ }
+ .path{
+ margin: 0 20px;
+ margin-top: 20px;
+ padding: 20px 0;
+ display: flex;
+ flex-wrap: wrap;
+ border-radius: 12px;
+ box-shadow: 2px 2px 8px 2px rgba(0, 0, 0, 0.2);
+ }
/deep/ .van-button--primary {
background-color: #0066ed;
}
diff --git a/src/page/newUser/setting.vue b/src/page/newUser/setting.vue
index 456c4a1..8b5022e 100644
--- a/src/page/newUser/setting.vue
+++ b/src/page/newUser/setting.vue
@@ -1,13 +1,21 @@
<template>
<div class="content">
- <div class="top_back">
+ <van-nav-bar
+ :placeholder="true"
+ :safe-area-inset-top="true"
+ :title="$t('setting')"
+ left-arrow
+ @click-left="$router.go(-1)"
+ >
+ </van-nav-bar>
+ <!-- <div class="top_back">
<div class="left_back_icon" @click="$router.go(-1)">
<img src="../../assets/img/zuojiantou.png" alt />
</div>
<div class="titles">
<span>{{ $t("setting") }}</span>
</div>
- </div>
+ </div> -->
<div style="width: 100%; height: 10px; background-color: #f8f8f8"></div>
<div class="jy" @click="handleGoToBankCard1()">
@@ -56,7 +64,8 @@
<!-- <img src="../../assets/img/yeb.png" alt /> -->
</div>
<div class="r_title">
- <span>{{ $t("hj146") }}</span>
+ <span>KYC</span>
+ <!-- <span>{{ $t("hj146") }}</span> -->
</div>
</div>
<div class="right_gos">
@@ -281,7 +290,8 @@
this.$router.push("/download");
},
handleGoToBankCard() {
- this.$router.push("/bankCard");
+ // this.$router.push("/bankCard");
+ this.$router.push("/banklist");
},
handleGoToBankCard1() {
this.$router.push("/bankCard1");
@@ -349,6 +359,22 @@
</script>
<style scoped lang="less">
+ /deep/ .van-nav-bar__content {
+ height: 65px;
+ }
+ /deep/ .van-nav-bar__title {
+ font-family: "DINPro";
+ width: 100%;
+ height: 1.17333rem;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-style: normal;
+ font-weight: 500;
+ font-size: 0.48rem;
+ color: #14181f;
+ }
+
.right_gos_txt {
margin-right: 15px;
}
diff --git a/src/page/service/service.vue b/src/page/service/service.vue
index 0b32580..053e61a 100644
--- a/src/page/service/service.vue
+++ b/src/page/service/service.vue
@@ -6,7 +6,7 @@
<img src="@/assets/img/zuojiantou.png" alt />
</div>
<div class="right_icon">
-
+
</div>
</div>
<div class="bottomIfr" v-if="onlineShow">
diff --git a/src/page/trading/buy.vue b/src/page/trading/buy.vue
index c3cb513..303a151 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 | _toLocaleString }}</span>
+ <span>₹{{ nowPrice | _toLocaleString }}</span>
</div>
<div class="bottom_es">
<span>{{ $t("hj98") }}</span>
@@ -28,11 +28,11 @@
<div class="rights">
<div class="ese">
<div class="mc" @click="handleTradingClick(0)" :class="tabsCurrentIndex === 0 ? 'actives' : ''">
- <span>{{ $t("hj84") }}</span>
+ <span>Short</span>
</div>
<div class="mr" @click="handleTradingClick(1)" :class="tabsCurrentIndex === 1 ? 'active' : ''">
- <span>{{ $t("hj85") }}</span>
+ <span>Long</span>
</div>
</div>
</div>
@@ -95,22 +95,40 @@
<div class="tr_rs">
<div class="top_bzz" style="padding-bottom: 0.2rem">
<span style="text-align: left">
- {{ $t("交易总额") }}({{ moneyData.symbol || "$" }})
+ {{ $t("交易总额") }}(₹)
</span>
<span style="text-align: right">
- {{ $t("hj103") }}({{ moneyData.symbol || "$" }})
+ {{ $t("hj103") }}(₹)
</span>
</div>
<div class="bottom_bzz">
<span>
- {{
+ ₹{{
((nowPrice * selectCycle.replace("X", "")) * num)
| _toLocaleString
}}
</span>
<span style="white-space: nowarp">
- {{ moneyData.availableBalance | _toLocaleString }}
+ ₹{{ moneyData.availableBalance | _toLocaleString }}
+ </span>
+ </div>
+ </div>
+ <div class="tr_rs">
+ <div class="top_bzz" style="padding-bottom: 0.2rem">
+ <span style="text-align: left">
+ {{ $t("hj44") }}(₹)
+ </span>
+ <span style="text-align: right">
+ </span>
+ </div>
+
+ <div class="bottom_bzz">
+ <span>
+ ₹{{(
+ ((nowPrice * selectCycle.replace("X", "")) * num)*sxf).toFixed(2)}}
+ </span>
+ <span style="white-space: nowarp">
</span>
</div>
</div>
@@ -166,8 +184,9 @@
</div>
</div> -->
<div class="btn_buy" @click="gdOrSetBuy()">
- <div :class="tabsCurrentIndex == 0 ? 'maichu' : ''">
- <span>{{ tabsCurrentIndex == 0 ? $t("hj84") : $t("hj85") }}</span>
+ <!-- <div :class="tabsCurrentIndex == 0 ? 'maichu' : ''">#3b82f6 -->
+ <div class="maichu" style="background-color:#3b82f6">
+ <span>{{ tabsCurrentIndex == 0 ? $t("hj84") : $t("gm") }}</span>
</div>
</div>
</div>
@@ -241,6 +260,7 @@
profitTarget: 0,
if_us: 0,
bayType: "",
+ sxf:'',
id: "",
actions: [{
name: "100X",
@@ -284,6 +304,7 @@
this.setUseInfo();
this.getMoneyData();
this.getSettingInfo();
+ this.queryStockConfig()
},
watch: {
checkedZy(val) {
@@ -300,6 +321,12 @@
},
},
methods: {
+ async queryStockConfig(){
+ let data = await api.queryStockConfig();
+ if (data.status === 0) {
+ this.sxf=data.data.cValue
+ }
+ },
zSjian(){
var newzishu = (Number(this.zhisun)-1).toFixed(2)
if(Number(newzishu)<1){
@@ -978,7 +1005,7 @@
display: flex;
justify-content: center;
align-items: center;
- background: rgb(68, 155, 84);
+ // background: rgb(68, 155, 84);
color: #fff;
font-size: 0.3846rem;
border-radius: 0.15rem;
@@ -1036,7 +1063,7 @@
}
.maichu {
- background-color: rgb(225, 59, 69) !important;
+ // background-color: rgb(225, 59, 69) !important;
}
.mr {
diff --git a/src/page/user/Warehouse/Stockdetail.vue b/src/page/user/Warehouse/Stockdetail.vue
index 1731b48..4a23891 100644
--- a/src/page/user/Warehouse/Stockdetail.vue
+++ b/src/page/user/Warehouse/Stockdetail.vue
@@ -14,35 +14,35 @@
<div class="bottomIfr">
<div class="pagebox">
<div class="pagebox_left">{{ $t("盈虧") }} (INR)</div>
- <div class="pagebox_right">{{ pages.profitAndLose | _toString }}</div>
+ <div class="pagebox_right">₹{{ pages.profitAndLose | _toString }}</div>
</div>
<div class="pagebox">
<div class="pagebox_left">{{ $t("hj141") }} (INR)</div>
- <div class="pagebox_right">{{ pages.profitAndLoseParent }}</div>
+ <div class="pagebox_right">₹{{ pages.profitAndLoseParent }}</div>
</div>
<div class="pagebox">
<div class="pagebox_left">{{ $t("倉位(股)") }}</div>
- <div class="pagebox_right">{{ pages.orderNum }}</div>
+ <div class="pagebox_right">₹{{ pages.orderNum }}</div>
</div>
<div class="pagebox" v-if="pages.now_price">
<div class="pagebox_left">{{ $t("hj40") }}(INR)</div>
- <div class="pagebox_right">{{ pages.now_price | _toString }}</div>
+ <div class="pagebox_right">₹{{ pages.now_price | _toString }}</div>
</div>
<div class="pagebox">
<div class="pagebox_left">
{{ $t("持倉價") }} (INR)
</div>
- <div class="pagebox_right">{{ pages.buyOrderPrice | _toString }}</div>
+ <div class="pagebox_right">₹{{ pages.buyOrderPrice | _toString }}</div>
</div>
<div class="pagebox">
<div class="pagebox_left">
{{ $t("訂單金額") }} (INR)
</div>
- <div class="pagebox_right">{{ pages.orderTotalPrice | _toString }}</div>
+ <div class="pagebox_right">₹{{ pages.orderTotalPrice | _toString }}</div>
</div>
<div class="pagebox">
<div class="pagebox_left">{{ $t("hj44") }} (INR)</div>
- <div class="pagebox_right">{{ pages.orderFee | _toString }}</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 38952e3..9e2e759 100644
--- a/src/page/user/Warehouse/data.list.vue
+++ b/src/page/user/Warehouse/data.list.vue
@@ -17,15 +17,14 @@
:loading-text="$t('hj430')"
@load="onLoad"
>
- <div
+ <div v-if="actives === 0"
class="sport-content-li"
:style="actives === 1 ? 'height:5.52rem' : 'height:7.52rem'"
v-for="(item, index) in dataList"
:key="index"
- @click="$router.push(`/Stockdetail?codes=${item.positionSn}`)"
- >
+ @click="$router.push(`/Stockdetail?codes=${item.positionSn}`)" >
<div @click.stop="pushRouter(item)">
- <div class="title-box">
+ <div class="title-box" style="justify-content: space-between;">
<div class="span">{{ item.stockName }}</div>
<div
class="states"
@@ -36,7 +35,6 @@
</div>
{{ item.stockSpell }}
</div>
- <!-- <div @click="$router.push('/Stockdetail')"></div> -->
<van-row>
<van-col span="8">
<div style="text-align: left">
@@ -44,7 +42,7 @@
{{ $t("盈虧") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text" >
- {{ item.profitAndLose | _toLocaleString }}
+ ₹{{ item.profitAndLose | _toLocaleString }}
</div>
</div>
</van-col>
@@ -72,7 +70,7 @@
{{ $t("hj40") }}({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- {{ item.now_price | _toLocaleString }}
+ ₹{{ item.now_price | _toLocaleString }}
</div>
</div>
</van-col>
@@ -82,7 +80,7 @@
{{ $t("持倉價") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- {{ item.buyOrderPrice | _toLocaleString }}
+ ₹{{ item.buyOrderPrice | _toLocaleString }}
</div>
</div>
</van-col>
@@ -92,7 +90,7 @@
{{ $t("訂單金額") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- {{ item.orderTotalPrice | _toLocaleString }}
+ ₹{{ item.orderTotalPrice | _toLocaleString }}
</div>
</div>
</van-col>
@@ -104,7 +102,141 @@
{{ $t("hj44") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- {{ item.orderFee | _toLocaleString }}
+ ₹{{ item.orderFee | _toLocaleString }}
+ </div>
+ </div>
+ </van-col>
+ <!-- <van-col span="8">
+ <div style="text-align: center">
+ <div class="sport-content-title2">
+ {{ $t("止損價") }} ({{ activeObj.symbolCode }})
+ </div>
+ <div class="sport-content-text2">
+ {{ item.stopTargetPrice | _toLocaleString }}
+ </div>
+ </div>
+ </van-col>
+ <van-col span="8">
+ <div style="text-align: right">
+ <div class="sport-content-title2">
+ {{ $t("止盈價") }} ({{ activeObj.symbolCode }})
+ </div>
+ <div class="sport-content-text2">
+ {{ item.profitTargetPrice | _toLocaleString }}
+ </div>
+ </div>
+ </van-col> -->
+ </van-row>
+ <van-row>
+ <van-col span="12">
+ <div style="text-align: left">
+ <div class="sport-content-title2">{{ $t("持倉時間") }}</div>
+ <div class="sport-content-text2">
+ {{ $moment(item.buyOrderTime).format("DD-MM-YYYY hh:mm:ss A") }}
+ </div>
+ </div>
+ </van-col>
+ <van-col span="12">
+ <div style="text-align: right">
+ <div class="sport-content-title2">{{ $t("訂單編號") }}</div>
+ <div class="sport-content-text2">{{ item.buyOrderId }}</div>
+ </div>
+ </van-col>
+ </van-row>
+
+ <div class="but-box" v-if="actives === 0" @click.stop="close(item)">
+ <div class="but">{{ $t("平仓") }}</div>
+ <!-- <div class="but buts">止盈止损</div> -->
+ </div>
+ </div>
+
+
+ <div v-if="actives === 1"
+ class="sport-content-li"
+ :style="actives === 1 ? 'height:5.52rem' : 'height:7.52rem'"
+ v-for="(item, index) in newdataList"
+ :key="index"
+ @click="$router.push(`/Stockdetail?codes=${item.positionSn}`)" >
+ <div @click.stop="pushRouter(item)">
+ <div class="title-box" style="justify-content: space-between;">
+ <div class="span">{{ item.stockName }}</div>
+ <div
+ class="states"
+ :class="item.orderDirection === '买跌' ? 'states-red' : ''"
+ >
+ {{ $t(item.orderDirection) }}
+ </div>
+ </div>
+ {{ item.stockSpell }}
+ </div>
+ <van-row>
+ <van-col span="8">
+ <div style="text-align: left">
+ <div class="sport-content-title2">
+ {{ $t("盈虧") }} ({{ activeObj.symbolCode }})
+ </div>
+ <div class="sport-content-text" >
+ ₹{{ item.profitAndLose | _toLocaleString }}
+ </div>
+ </div>
+ </van-col>
+ <van-col span="8">
+ <div style="text-align: center">
+ <div class="sport-content-title2">
+ {{ $t("hj141") }} ({{ activeObj.symbolCode }})
+ </div>
+ <div class="sport-content-text2">
+ {{ item.profitAndLoseParent }}
+ </div>
+ </div>
+ </van-col>
+ <van-col span="8">
+ <div style="text-align: right">
+ <div class="sport-content-title2">{{ $t("倉位(股)") }}</div>
+ <div class="sport-content-text">{{ item.orderNum }}</div>
+ </div></van-col
+ >
+ </van-row>
+ <van-row>
+ <van-col span="8">
+ <div style="text-align: left">
+ <div class="sport-content-title2">
+ {{ $t("hj40") }}({{ activeObj.symbolCode }})
+ </div>
+ <div class="sport-content-text2">
+ ₹{{ item.now_price | _toLocaleString }}
+ </div>
+ </div>
+ </van-col>
+ <van-col span="8">
+ <div style="text-align: center">
+ <div class="sport-content-title2">
+ {{ $t("持倉價") }} ({{ activeObj.symbolCode }})
+ </div>
+ <div class="sport-content-text2">
+ ₹{{ item.buyOrderPrice | _toLocaleString }}
+ </div>
+ </div>
+ </van-col>
+ <van-col span="8">
+ <div style="text-align: right">
+ <div class="sport-content-title2">
+ {{ $t("訂單金額") }} ({{ activeObj.symbolCode }})
+ </div>
+ <div class="sport-content-text2">
+ ₹{{ item.orderTotalPrice | _toLocaleString }}
+ </div>
+ </div>
+ </van-col>
+ </van-row>
+ <van-row>
+ <van-col span="8">
+ <div style="text-align: left">
+ <div class="sport-content-title2">
+ {{ $t("hj44") }} ({{ activeObj.symbolCode }})
+ </div>
+ <div class="sport-content-text2">
+ ₹{{ item.orderFee | _toLocaleString }}
</div>
</div>
</van-col>
@@ -207,6 +339,7 @@
show: false,
actives: 0,
dataList: [],
+ newdataList:[],
timer: null,
tabsList: [
{
@@ -222,14 +355,18 @@
};
},
created(){
- this.timer = setInterval(() => {
- this.getList();
- }, 1000);
+ this.dsq()
},
beforeDestroy() {
clearInterval(this.timer); // 在组件销毁前清除定时器
},
methods: {
+ dsq(){
+ // this.dataList = [];
+ this.timer = setInterval(() => {
+ this.getList();
+ }, 3000);
+ },
pushRouter(item) {
const obj = {
pid: item.stockCode || "",
@@ -287,10 +424,18 @@
this.loading = false;
if (res.status === 0) {
- this.dataList = res.data.list;
+ if(this.actives == 0){
+ this.dataList = res.data.list;
+ }else{
+ this.newdataList = res.data.list;
+ }
this.$forceUpdate(); // 强制Vue重新渲染
// if (res.data.total <= this.dataList.length) {
this.finished = true;
+ // this.dsq()
+ // this.timer = setInterval(() => {
+ // this.getList();
+ // }, 3000);
// }
} else {
this.loading = false;
@@ -306,7 +451,26 @@
this.pageNum = 1;
this.finished = false;
this.actives = e.key;
- this.getList();
+ this.$forceUpdate(); // 强制Vue重新渲染
+ if(e.key==1){
+ clearTimeout(this.timer);
+ // setTimeout(()=>{
+ // clearInterval(this.timer); // 在组件销毁前清除定时器
+ // },3000)
+ this.getList()
+
+ }else{
+ this.dsq()
+ }
+
+ // this.getList()
+ // if(e.key !=this.actives){
+
+
+ // }else{
+ // this.actives = e.key;
+ // this.dsq()
+ // }
},
},
};
diff --git a/src/page/user/Warehouse/item.card.vue b/src/page/user/Warehouse/item.card.vue
index 66387c9..9c33ef2 100644
--- a/src/page/user/Warehouse/item.card.vue
+++ b/src/page/user/Warehouse/item.card.vue
@@ -6,7 +6,7 @@
{{ activeObj.assname }} ({{ activeObj.symbolCode }})
</div>
<div class="total-data">
- {{ activeObj.totalMoney | _toLocaleString }}
+ ₹{{ activeObj.totalMoney | _toLocaleString }}
<!-- {{ 10000000000000 | _toLocaleString }} -->
</div>
</div>
@@ -15,7 +15,7 @@
<div class="item-card-itembox">
<div class="item">
<div class="itembox-data">
- {{ activeObj.profitAndLoss | _toLocaleString }}
+ ₹{{ activeObj.profitAndLoss | _toLocaleString }}
</div>
<div class="itembox-name">
@@ -24,7 +24,7 @@
</div>
<div class="item">
<div class="itembox-data">
- {{ activeObj.availableBalance | _toLocaleString }}
+ ₹{{ activeObj.availableBalance | _toLocaleString }}
</div>
<div class="itembox-name">
@@ -34,7 +34,7 @@
<div class="item">
<div class="itembox-data">
{{ activeObj.isZf === 1 ? "-" : "" }}
- {{ activeObj.cumulativeProfitAndLoss | _toLocaleString }}
+ ₹{{ activeObj.cumulativeProfitAndLoss | _toLocaleString }}
</div>
<div class="itembox-name">
@@ -43,7 +43,7 @@
</div>
<div class="item">
<div class="itembox-data">
- {{ activeObj.freezeMoney | _toLocaleString }}
+ ₹{{ activeObj.freezeMoney | _toLocaleString }}
</div>
<div class="itembox-name">
@@ -52,7 +52,7 @@
</div>
<div class="item">
<div class="itembox-data">
- {{ activeObj.handlingCharge | _toLocaleString }}
+ ₹{{ activeObj.handlingCharge | _toLocaleString }}
</div>
<div class="itembox-name">
@@ -61,7 +61,7 @@
</div>
<div class="item">
<div class="itembox-data">
- {{ activeObj.amountToBeCovered | _toLocaleString }}
+ ₹{{ activeObj.amountToBeCovered | _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 bdeeb25..1a454f2 100644
--- a/src/page/user/compontents/cash-list.vue
+++ b/src/page/user/compontents/cash-list.vue
@@ -85,9 +85,7 @@
<p class="clearfix">
<span class="secondary col-xs-6"
>{{ $t("sj") }}:
- <b v-if="item.applyTime">{{
- item.applyTime
- }}</b>
+ <b v-if="item.applyTime">{{ $moment(item.applyTime).format("DD-MM-YYYY hh:mm:ss A") }}</b>
<b v-else></b>
</span>
</p>
@@ -192,6 +190,7 @@
<style lang="less" scoped>
.wrapper {
background-color: #fff !important;
+ height: 95vh;
}
.payNumber {
diff --git a/src/page/user/compontents/recharge-list.vue b/src/page/user/compontents/recharge-list.vue
index ef3d6bd..3a0038e 100644
--- a/src/page/user/compontents/recharge-list.vue
+++ b/src/page/user/compontents/recharge-list.vue
@@ -1,5 +1,5 @@
<template>
- <div style="padding-bottom: 100px">
+ <div style="padding-bottom: 100px;background-color: #fff;">
<div v-if="list.length <= 0" class="empty text-center">
{{ $t("hj168") }}
</div>
diff --git a/src/page/user/favorites.vue b/src/page/user/favorites.vue
index 50ee551..e2e4bc7 100644
--- a/src/page/user/favorites.vue
+++ b/src/page/user/favorites.vue
@@ -107,7 +107,7 @@
>
<div class="item_box">
<div class="item_box_left">
- <div class="item_box_left_top">{{ item.spell }}</div>
+ <div class="item_box_left_top">{{ item.spell }}1</div>
<div class="item_box_left_bottom">{{ item.name }}</div>
</div>
<div class="item_box_zj">
@@ -1925,4 +1925,4 @@
font-weight: 800;
padding: 0.6rem 0 0 0.5rem;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/user/recharge-sure.vue b/src/page/user/recharge-sure.vue
index ff44cb0..6ca9144 100644
--- a/src/page/user/recharge-sure.vue
+++ b/src/page/user/recharge-sure.vue
@@ -45,7 +45,19 @@
/>
<div v-if="rechargeSelect.key !== undefined">
<div class="main-title">{{ $t("請選擇銀行卡") }}</div>
- <van-cell is-link :title="bankCard.bankNo || $t('請選擇')" />
+ <!-- <van-cell is-link :title="bankCard.bankName || $t('請選擇')" /> -->
+ <van-cell
+ is-link
+ :title="yhkrechargeSelect.bankName || $t('請選擇')"
+ @click="yhkshow = true"
+ />
+ <van-action-sheet
+ v-model="yhkshow"
+ :actions="yhkactions"
+ :cancel-text="$t('hj106')"
+ close-on-click-action
+ @select="yhkselect"
+ />
</div>
<div class="main-title">{{ $t("请选择提现金额") }}</div>
<div class="white-input">
@@ -90,10 +102,12 @@
paymentSelectData: "IN",
show: false,
-
+ yhkshow:false,
// 提款聚到
rechargeSelect: {},
+ yhkrechargeSelect: {},
actions: [{ name: this.$t("hj215"), key: "YHK" }],
+ yhkactions: [],
paymentShow: false,
rechargeAccountShow: false,
@@ -114,11 +128,12 @@
// },
],
- bankCard: {},
+ bankCard: [],
availableBalanceUSD: "0.0000",
getMoneyList: [],
assetsType: "",
symbolCode: "",
+ yhkid:'',
};
},
mounted() {
@@ -130,6 +145,7 @@
const res = await outMoney({
amt: this.value,
assetsType: this.accectType,
+ bankId:this.yhkid
});
if (res.status === 0) {
Notify({ type: "success", message: this.$t("hj182") });
@@ -148,6 +164,10 @@
const res = await getBankCard();
if (res.status === 0) {
this.bankCard = res.data;
+ this.yhkactions = res.data
+ for(var i = 0;i<this.yhkactions.length;i++){
+ this.yhkactions[i].name = this.yhkactions[i].bankName
+ }
}
},
async getMoneys() {
@@ -182,6 +202,11 @@
onClickLeft() {
this.$router.push("/user");
},
+ yhkselect(e) {
+ this.yhkrechargeSelect = e;
+ this.yhkid = e.id
+ console.log(e);
+ },
select(e) {
this.rechargeSelect = e;
console.log(e);
diff --git a/src/page/user/rechargelist.vue b/src/page/user/rechargelist.vue
index b7fc020..b151b30 100644
--- a/src/page/user/rechargelist.vue
+++ b/src/page/user/rechargelist.vue
@@ -44,6 +44,9 @@
};
</script>
<style lang="less" scoped>
+ page{
+ background-color: #fff;
+ }
/deep/ .van-nav-bar__content {
height: 65px;
}
@@ -67,7 +70,8 @@
.wrapper {
// padding-top: 1.5rem;
- background-color: #16171d;
+ background-color: #fff !important;
+
}
.btn-group {
diff --git a/src/router/index.js b/src/router/index.js
index ab3efcd..50f269a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -45,6 +45,7 @@
import IndexList from "@/page/list/index-list";
import setting from "@/page/newUser/setting";
import indexBuy from "@/page/home/index-buy";
+import Record from "@/page/home/Record";
import TwoBuy from "@/page/home/two-buy";
import SubWarehouseBuy from "@/page/home/sub-warehouse-buy";
import futuresBuy from "@/page/home/futures-buy";
@@ -66,6 +67,8 @@
import Transfers from "@/page/transfer/index.vue";
import Authentications from "@/page/authentication/index.vue";
import BankCard from "@/page/bankCard/index.vue";
+import banklist from "@/page/bankCard/banklist.vue";
+import updatabank from "@/page/bankCard/updatabank.vue";
import BankCard1 from "@/page/bankCard1/index.vue";
import service from "@/page/service/service.vue";
import chongz from "@/page/service/chongz.vue";
@@ -916,6 +919,30 @@
component: BankCard1
},
{
+ path: "/banklist",
+ name: "banklist",
+ meta: {
+ title: i18n.t("hj247"),
+ requireAuth: false,
+ hasHeader: false,
+ index: 57,
+ show: true
+ },
+ component: banklist
+ },
+ {
+ path: "/updatabank",
+ name: "updatabank",
+ meta: {
+ title: i18n.t("hj247"),
+ requireAuth: false,
+ hasHeader: false,
+ index: 57,
+ show: true
+ },
+ component: updatabank
+ },
+ {
path: "/service",
name: "service",
meta: {
@@ -1024,6 +1051,18 @@
component: new_service
},
{
+ path: "/Record",
+ name: "Record",
+ meta: {
+ title: i18n.t("hj2"),
+ requireAuth: false,
+ hasHeader: false,
+ index: 62,
+ show: true
+ },
+ component: Record
+ },
+ {
// 会匹配所有路径
path: "*",
redirect: "/home"
diff --git a/src/store/index.js b/src/store/index.js
index cc6c409..5cb0b85 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -38,7 +38,7 @@
actions: {
async setUseInfo({ commit }) {
let data = await getUserInfodata();
- if (data.status === 0) {
+ if (data.status == 0) {
commit("SET_USE_INFO", data.data);
} else {
commit("elAlertShow", {
--
Gitblit v1.9.3