From c57f75664da5f522e6824023af7e5c8fbe8ed38b Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Wed, 15 May 2024 17:54:50 +0800
Subject: [PATCH] 修改：客户反馈问题
---
.gitignore | 1
src/page/list/tradingList/dazy.vue | 13 +
src/locales/jp.json | 22 +-
src/page/kline/index.vue | 18 +-
src/page/user/Warehouse/data.list.vue | 25 ++-
src/page/trading/buy.vue | 11
src/page/user/yebs.vue | 4
src/locales/cht.json | 22 +-
src/page/home/newPage.vue | 14 -
src/locales/en.json | 8
src/page/user/compontents/recharge-list.vue | 2
src/locales/ens.json | 2
src/page/newUser/index.vue | 6
src/page/wallet/index.vue | 14 +-
src/page/user/authentication.vue | 1
src/locales/fra.json | 18 +-
src/page/user/compontents/cash-list.vue | 2
src/locales/zh.json | 24 +-
src/page/home/home.vue | 34 ++++
src/locales/de.json | 18 +-
src/page/home/nwe_cf.html | 13 +
src/page/list/favorites/data.list.vue | 10
src/router/index.js | 7
src/page/newUser/setting.vue | 1
src/axios/api.url.js | 4
src/locales/kor.json | 22 +-
src/locales/hi.json | 22 +-
src/App.vue | 2
src/locales/th.json | 22 +-
src/page/home/newGg.vue | 4
30 files changed, 215 insertions(+), 151 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2511000..c6bc270 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
*.sln
*.zip
cc_wap.rar
+dist.rar
diff --git a/src/App.vue b/src/App.vue
index c49c629..d67e27a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -99,7 +99,7 @@
},
data() {
return {
- title: "首页",
+ title: "Home",
hasHeader: false,
iconRight: "default",
transitionName: "",
diff --git a/src/axios/api.url.js b/src/axios/api.url.js
index f3543d4..a113ed4 100644
--- a/src/axios/api.url.js
+++ b/src/axios/api.url.js
@@ -9,9 +9,9 @@
// baseURL: '/',
// baseURL: 'http://www.jumptalk.net:8091',
// 0311
- // baseURL: "https://api.essencefunds.com/",
+ baseURL: "https://api.essencefunds.com/",
// 本地
- baseURL: "http://192.168.0.105:8091/",
+ // baseURL: "http://192.168.0.105:8091/",
util: {
image: "/util/image.html" // 图片上传
}
diff --git a/src/locales/cht.json b/src/locales/cht.json
index f962041..1939727 100644
--- a/src/locales/cht.json
+++ b/src/locales/cht.json
@@ -18,7 +18,7 @@
"whpb": "訂單金額(INR)",
"ldgl": "獲利價格/停損價格(INR)",
"ssdd": "倉位價格/最新價格(INR)",
- "yy": "語言",
+ "yy": "Language",
"tolaszasdf": "總手續費(USD)",
"accumbn": "累積P/L (USD)",
"djzjmg": "凍結資產(USD)",
@@ -27,7 +27,7 @@
"aym": "累計P/L(INR)",
"disana": "凍結資產(INR)",
"disan": "可用資產(INR)",
- "setting": "設定",
+ "setting": "Set up",
"caidan": "資質",
"bz": "幫助",
"kf": "客服",
@@ -261,11 +261,11 @@
"hj141": "盈虧率",
"hj142": "切換指數帳戶",
"hj143": "切換滬深帳戶",
- "hj144": "修改密碼",
+ "hj144": "Change Password",
"hj145": "資金劃轉",
- "hj146": "實名認證",
+ "hj146": "Verify",
"hj1461": "下載App",
- "hj147": "綁定銀行卡",
+ "hj147": "Bind Bank Card",
"hj148": "登出登入",
"hj149": "您確定要登出登入嗎?",
"hj150": "舊密碼",
@@ -332,7 +332,7 @@
"hj208": "請輸入您的正確的身分證號碼",
"hj209": "請上傳您的身分證照片",
"hj210": "提交成功!",
- "hj211": "綁定銀行卡",
+ "hj211": "Bind Bank Card",
"hj212": "銀行卡資訊",
"hj213": "銀行名稱",
"hj214": "開戶支行",
@@ -345,10 +345,10 @@
"hj221": "歡迎回來",
"hj222": "使用手機號碼登入",
"hj223": "還沒有帳號?去註冊!",
- "hj224": "首頁",
- "hj225": "交易",
- "hj226": "部位",
- "hj227": "我的",
+ "hj224": "Home",
+ "hj225": "Trade",
+ "hj226": "Position",
+ "hj227": "Me",
"hj228": "暫無儲值資訊!",
"hj229": "支付寶",
"hj230": "對公轉帳",
@@ -570,4 +570,4 @@
"市场": "市場",
"请选择提现金额": "請選擇提現金額",
"hj100": "交易數量（股）"
-}
\ No newline at end of file
+}
diff --git a/src/locales/de.json b/src/locales/de.json
index 76eb1c2..365f106 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -18,7 +18,7 @@
"whpb": "Bestellbetrag (INR)",
"ldgl": "Gewinnpreis/Stop Loss Preis (INR)",
"ssdd": "Positionspreis/aktueller Preis (INR)",
- "yy": "Sprache",
+ "yy": "Language",
"tolaszasdf": "Bearbeitungsgebühr insgesamt (USD)",
"accumbn": "Kumulierter P/L (USD)",
"djzjmg": "Einfrieren von Vermögenswerten (USD)",
@@ -28,7 +28,7 @@
"aym": "Kumuliertes P/L (INR)",
"disana": "Einfrieren von Vermögenswerten (INR)",
"disan": "Verfügbare Vermögenswerte (INR)",
- "setting": "einrichten",
+ "setting": "Set up",
"caidan": "Qualifikation",
"bz": "Hilfe",
"kf": "Kundenservice",
@@ -266,9 +266,9 @@
"hj143": "Wechsel von Shanghai und Shenzhen Konten",
"hj144": "Passwort ändern",
"hj145": "Mittelübertragung",
- "hj146": "Echtname Authentifizierung",
+ "hj146": "Verify",
"hj1461": "App herunterladen",
- "hj147": "Verbindliche Bankkarte",
+ "hj147": "Bind Bank Card",
"hj148": "Abmelden und einloggen",
"hj149": "Sind Sie sicher, dass Sie sich abmelden möchten?",
"hj150": "Altes Passwort",
@@ -335,7 +335,7 @@
"hj208": "Bitte geben Sie Ihre korrekte ID-Nummer ein",
"hj209": "Bitte laden Sie ein Foto Ihres Personalausweises hoch",
"hj210": "Erfolgreich eingereicht!",
- "hj211": "Verbindliche Bankkarte",
+ "hj211": "Bind Bank Card",
"hj212": "Bankkarteninformationen",
"hj213": "Name der Bank",
"hj214": "Eröffnung der Niederlassung",
@@ -348,10 +348,10 @@
"hj221": "Willkommen zurück",
"hj222": "Melden Sie sich mit Ihrer Telefonnummer an",
"hj223": "Haben Sie noch kein Konto? Melde dich an!",
- "hj224": "Startseite",
- "hj225": "Transaktion",
+ "hj224": "Home",
+ "hj225": "Trade",
"hj226": "Position",
- "hj227": "Meine",
+ "hj227": "Me",
"hj228": "Derzeit gibt es keine Informationen zum Aufladen!",
"hj229": "Alipay",
"hj230": "Unternehmensübertragung",
@@ -565,4 +565,4 @@
"市场": "Markt",
"请选择提现金额": "Bitte wählen Sie den Auszahlungsbetrag aus",
"hj100": "Handelsmenge (Aktien)"
-}
\ No newline at end of file
+}
diff --git a/src/locales/en.json b/src/locales/en.json
index eeeb7fe..8601fcf 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -312,9 +312,9 @@
"hj194": "Confirm the transfer to the financing account",
"hj195": "Real Name",
"hj196": "ID number",
- "hj197": "The front of the ID card",
+ "hj197": "Front of ID card",
"hj198": "Uploading...",
- "hj199": "The back of the ID card",
+ "hj199": "Back of ID card",
"hj200": "Authentication failed, please re-authenticate.",
"hj201": "Failure reason",
"hj202": "Under review",
@@ -537,7 +537,7 @@
"港股總資產": "Hong Kong Stock Total Assets",
"审核中": "Cancel recharge",
"一鍵平倉": "One click closing position",
- "印股": "Printing stocks",
+ "印股": "Printing Stocks",
"印股冻结": "Freezing of printing stocks",
"印度新闻": "Indian News",
"上市时间": "Listing time",
@@ -577,4 +577,4 @@
"市场": "Market",
"请选择提现金额": "Please select the Withdraw amount",
"hj100": "Trading quantity (shares)"
-}
\ No newline at end of file
+}
diff --git a/src/locales/ens.json b/src/locales/ens.json
index 61ebc72..b9e02b1 100644
--- a/src/locales/ens.json
+++ b/src/locales/ens.json
@@ -577,4 +577,4 @@
"市场": "Market",
"请选择提现金额": "Please select the Withdraw amount",
"hj100": "Trading quantity (shares)"
-}
\ No newline at end of file
+}
diff --git a/src/locales/fra.json b/src/locales/fra.json
index caa2437..4f9bc42 100644
--- a/src/locales/fra.json
+++ b/src/locales/fra.json
@@ -28,7 +28,7 @@
"aym": "P / l cumulé (INR)",
"disana": "Gel des avoirs (INR)",
"disan": "Actifs disponibles (INR)",
- "setting": "Paramètres",
+ "setting": "Set up",
"caidan": "Qualifications",
"bz": "Aide",
"kf": "Service à la clientèle",
@@ -265,11 +265,11 @@
"hj141": "Taux de rentabilité",
"hj142": "Changer de compte Index",
"hj143": "Changer de compte Shanghai deep",
- "hj144": "Modifier le mot de passe",
+ "hj144": "Change Password",
"hj145": "Transfert de fonds",
- "hj146": "Certification du vrai nom",
+ "hj146": "Verify",
"hj1461": "Télécharger l'app",
- "hj147": "Carte bancaire liée",
+ "hj147": "Bind Bank Card",
"hj148": "Se déconnecter du login",
"hj149": "Êtes - vous sûr de vouloir vous déconnecter",
"hj150": "Ancien mot de passe",
@@ -336,7 +336,7 @@
"hj208": "Veuillez entrer votre numéro d'identification correct",
"hj209": "Veuillez télécharger votre photo d'identité",
"hj210": "Soumission réussie!",
- "hj211": "Carte bancaire liée",
+ "hj211": "Bind Bank Card",
"hj212": "Informations sur la carte bancaire",
"hj213": "Nom de la Banque",
"hj214": "Ouvrir une succursale",
@@ -349,10 +349,10 @@
"hj221": "Bienvenue à revenir",
"hj222": "Connectez - vous avec votre numéro de téléphone mobile",
"hj223": "Pas encore de compte? Allez vous inscrire!",
- "hj224": "Accueil",
- "hj225": "Transactions",
+ "hj224": "Home",
+ "hj225": "Trade",
"hj226": "Position",
- "hj227": "Le mien",
+ "hj227": "Me",
"hj228": "Aucune information de recharge pour le moment!",
"hj229": "AliPay",
"hj230": "Transfert au public",
@@ -565,4 +565,4 @@
"市场": "Le marché",
"请选择提现金额": "Veuillez sélectionner un montant de retrait",
"hj100": "Nombre de transactions (actions)"
-}
\ No newline at end of file
+}
diff --git a/src/locales/hi.json b/src/locales/hi.json
index c5d6ce3..5d17805 100644
--- a/src/locales/hi.json
+++ b/src/locales/hi.json
@@ -18,7 +18,7 @@
"whpb": "ऑर्डर राशि (INR)",
"ldgl": "लाभ मूल्य/स्टॉप लॉस मूल्य (INR) लें",
"ssdd": "स्थिति मूल्य/नवीनतम मूल्य (INR)",
- "yy": "भाषा",
+ "yy": "Language",
"tolaszasdf": "कुल हैंडलिंग शुल्क (यूएसडी)",
"accumbn": "संचित पी/एल (यूएसडी)",
"djzjmg": "जमी हुई संपत्ति (यूएसडी)",
@@ -28,7 +28,7 @@
"aym": "संचित पी/एल(आईएनआर)",
"disana": "जमी हुई संपत्ति (INR)",
"disan": "उपलब्ध संपत्ति (INR)",
- "setting": "स्थापित करना",
+ "setting": "Set up",
"caidan": "योग्यता",
"bz": "मदद करना",
"kf": "ग्राहक सेवा",
@@ -261,11 +261,11 @@
"hj141": "प्रोफाइट और हराम",
"hj142": "सूचकांक खाता स्विच करें",
"hj143": "शंघाई और शेन्ज़ेन खातों के बीच स्विच करें",
- "hj144": "पासवर्ड बदलें",
+ "hj144": "Change Password",
"hj145": "पैसा भेजना",
- "hj146": "सत्यापित",
+ "hj146": "Verify",
"hj1461": "ऐप डाउनलोड करें",
- "hj147": "बैंक कार्ड बांधें",
+ "hj147": "Bind Bank Card",
"hj148": "साइन आउट",
"hj149": "क्या आप लॉग आउट करना चाहते हैं?",
"hj150": "पुराना पासवर्ड",
@@ -341,13 +341,13 @@
"hj218": "कृपया बैंक का नाम दर्ज करें",
"hj219": "कृपया वह शाखा दर्ज करें जहां खाता खोला गया है",
"hj220": "सफलतापूर्वक जोड़ा गया!",
- "hj221": "वापसी पर स्वागत है",
+ "hj221": "Bind Bank Card",
"hj222": "अपने मोबाइल फ़ोन नंबर का उपयोग करके लॉग इन करें",
"hj223": "अभी तक कोई खाता नहीं है? रजिस्टर करें!",
- "hj224": "मुखपृष्ठ",
- "hj225": "व्यापार",
- "hj226": "पद",
- "hj227": "मेरा",
+ "hj224": "Home",
+ "hj225": "Trade",
+ "hj226": "Position",
+ "hj227": "Me",
"hj228": "अभी तक कोई रिचार्ज जानकारी नहीं!",
"hj229": "अलीपे",
"hj230": "कॉर्पोरेट स्थानांतरण",
@@ -576,4 +576,4 @@
"市场": "बाज़ार",
"请选择提现金额": "कृपया निकासी राशि का चयन करें",
"hj100": "लेन-देन की संख्या (शेयर)"
-}
\ No newline at end of file
+}
diff --git a/src/locales/jp.json b/src/locales/jp.json
index bb49b07..887131a 100644
--- a/src/locales/jp.json
+++ b/src/locales/jp.json
@@ -18,7 +18,7 @@
"whpb": "注文金額 (INR)",
"ldgl": "テイクプロフィット価格/ストップロス価格 (INR)",
"ssdd": "ポジション価格/最新価格 (INR)",
- "yy": "言語",
+ "yy": "Language",
"tolaszasdf": "合計手数料 (USD)",
"accumbn": "累積損益 (USD)",
"djzjmg": "凍結資産 (USD)",
@@ -28,7 +28,7 @@
"aym": "累積損益(INR)",
"disana": "凍結資産 (INR)",
"disan": "利用可能な資産 (INR)",
- "setting": "設定",
+ "setting": "Set up",
"caidan": "資格",
"bz": "ヘルプ",
"kf": "顧客サービス",
@@ -260,11 +260,11 @@
"hj141": "損益率",
"hj142": "インデックスアカウントを切り替え",
"hj143": "上海と深センのアカウントを切り替えます。",
- "hj144": "パスワードを変更する",
+ "hj144": "Change Password",
"hj145": "資金移動",
- "hj146": "検証済み",
+ "hj146": "Verify",
"hj1461": "アプリをダウンロードする",
- "hj147": "銀行カードをバインドし",
+ "hj147": "Bind Bank Card",
"hj148": "サインアウト",
"hj149": "ログアウトしてもよろしいですか?",
"hj150": "以前のパスワード",
@@ -331,7 +331,7 @@
"hj208": "正しいID番号を入力してください。",
"hj209": "証明写真をアップロードしてください。",
"hj210": "正常に送信されました!",
- "hj211": "銀行カードをバインドし",
+ "hj211": "Bind Bank Card",
"hj212": "銀行カード情報",
"hj213": "銀行名",
"hj214": "口座開設支店",
@@ -344,10 +344,10 @@
"hj221": "おかえり",
"hj222": "携帯電話番号を使用してログインし",
"hj223": "まだアカウントをお持ちでない場合は、登録してください!",
- "hj224": "表紙",
- "hj225": "貿易",
- "hj226": "位置",
- "hj227": "私の",
+ "hj224": "Home",
+ "hj225": "Trade",
+ "hj226": "Position",
+ "hj227": "Me",
"hj228": "まだリチャージ情報はありません!",
"hj229": "アリペイ",
"hj230": "法人譲渡",
@@ -566,4 +566,4 @@
"市场": "市場",
"请选择提现金额": "現金引き出し金額を選択してください",
"hj100": "取引数量（株）"
-}
\ No newline at end of file
+}
diff --git a/src/locales/kor.json b/src/locales/kor.json
index 79db834..4c0bf76 100644
--- a/src/locales/kor.json
+++ b/src/locales/kor.json
@@ -18,7 +18,7 @@
"whpb": "주문 금액(INR)",
"ldgl": "이익 실현 가격/손실 중단 가격(INR)",
"ssdd": "포지션 가격/최신 가격(INR)",
- "yy": "언어",
+ "yy": "Language",
"tolaszasdf": "총 수수료(USD)",
"accumbn": "누적손익(USD)",
"djzjmg": "동결자산(USD)",
@@ -28,7 +28,7 @@
"aym": "누적손익(INR)",
"disana": "동결자산(INR)",
"disan": "사용 가능한 자산(INR)",
- "setting": "설정",
+ "setting": "Set up",
"caidan": "자격",
"bz": "돕다",
"kf": "고객 서비스",
@@ -260,11 +260,11 @@
"hj141": "손익률",
"hj142": "인덱스 계정 전환",
"hj143": "상하이 계정과 선전 계정 간 전환",
- "hj144": "비밀번호 변경",
+ "hj144": "Change Password",
"hj145": "송금",
- "hj146": "확인됨",
+ "hj146": "Verify",
"hj1461": "앱 다운로드",
- "hj147": "은행 카드 바인딩",
+ "hj147": "Bind Bank Card",
"hj148": "로그아웃",
"hj149": "정말로 로그아웃하시겠습니까?",
"hj150": "기존 비밀번호",
@@ -332,7 +332,7 @@
"hj208": "정확한 주민등록번호를 입력해주세요",
"hj209": "신분증 사진을 업로드해주세요",
"hj210": "성공적으로 제출되었습니다!",
- "hj211": "은행 카드 바인딩",
+ "hj211": "Bind Bank Card",
"hj212": "은행 카드 정보",
"hj213": "은행 이름",
"hj214": "계좌 개설 지점",
@@ -345,10 +345,10 @@
"hj221": "돌아온 것을 환영합니다",
"hj222": "휴대폰번호로 로그인하시고",
"hj223": "아직 계정이 없으신가요? 등록하세요!",
- "hj224": "첫 장",
- "hj225": "거래",
- "hj226": "위치",
- "hj227": "내 거",
+ "hj224": "Home",
+ "hj225": "Trade",
+ "hj226": "Position",
+ "hj227": "Me",
"hj228": "아직 충전정보가 없습니다!",
"hj229": "알리페이",
"hj230": "기업이전",
@@ -566,4 +566,4 @@
"市场": "시장",
"请选择提现金额": "현금 인출 금액을 선택하십시오.",
"hj100": "거래 수량(주)"
-}
\ No newline at end of file
+}
diff --git a/src/locales/th.json b/src/locales/th.json
index ae9110a..f37af1d 100644
--- a/src/locales/th.json
+++ b/src/locales/th.json
@@ -18,7 +18,7 @@
"whpb": "จำนวนการสั่งซื้อ (INR)",
"ldgl": "ราคาทำกำไร/ราคาหยุดขาดทุน (INR)",
"ssdd": "ราคาตำแหน่ง/ราคาล่าสุด (INR)",
- "yy": "ภาษา",
+ "yy": "Language",
"tolaszasdf": "ค่าธรรมเนียมการจัดการทั้งหมด (USD)",
"accumbn": "P/L สะสม (USD)",
"djzjmg": "สินทรัพย์ที่ถูกแช่แข็ง (USD)",
@@ -28,7 +28,7 @@
"aym": "P/L สะสม(INR)",
"disana": "สินทรัพย์ที่ถูกแช่แข็ง (INR)",
"disan": "สินทรัพย์ที่มีอยู่ (INR)",
- "setting": "ติดตั้ง",
+ "setting": "Set up",
"caidan": "คุณสมบัติ",
"bz": "ช่วย",
"kf": "บริการลูกค้า",
@@ -260,11 +260,11 @@
"hj141": "อัตรากำไรและขาดทุน",
"hj142": "สลับบัญชีดัชนี",
"hj143": "สลับระหว่างบัญชีเซี่ยงไฮ้และเซินเจิ้น",
- "hj144": "เปลี่ยนรหัสผ่าน",
+ "hj144": "Change Password",
"hj145": "การโอนเงิน",
- "hj146": "ยืนยันแล้ว",
+ "hj146": "Verify",
"hj1461": "ดาวน์โหลดแอป",
- "hj147": "ผูกบัตรธนาคาร",
+ "hj147": "Bind Bank Card",
"hj148": "ออกจากระบบ",
"hj149": "คุณแน่ใจว่าคุณต้องการที่จะออกจากระบบ?",
"hj150": "รหัสผ่านเก่า",
@@ -331,7 +331,7 @@
"hj208": "กรุณากรอกหมายเลข ID ที่ถูกต้องของคุณ",
"hj209": "กรุณาอัพโหลดรูปถ่ายประจำตัวของคุณ",
"hj210": "ส่งเรียบร้อยแล้ว!",
- "hj211": "ผูกบัตรธนาคาร",
+ "hj211": "Bind Bank Card",
"hj212": "ข้อมูลบัตรธนาคาร",
"hj213": "ชื่อธนาคาร",
"hj214": "สาขาเปิดบัญชี",
@@ -344,10 +344,10 @@
"hj221": "ยินดีต้อนรับกลับ",
"hj222": "เข้าสู่ระบบโดยใช้หมายเลขโทรศัพท์มือถือของคุณ",
"hj223": "ยังไม่มีบัญชีใช่ไหม ลงทะเบียน!",
- "hj224": "หน้าแรก",
- "hj225": "ซื้อขาย",
- "hj226": "ตำแหน่ง",
- "hj227": "ของฉัน",
+ "hj224": "Home",
+ "hj225": "Trade",
+ "hj226": "Position",
+ "hj227": "Me",
"hj228": "ยังไม่มีข้อมูลการเติมเงิน!",
"hj229": "อาลีเพย์",
"hj230": "โอนองค์กร",
@@ -566,4 +566,4 @@
"市场": "ตลาด",
"请选择提现金额": "กรุณาเลือกจำนวนเงินที่ถอน",
"hj100": "ปริมาณซื้อขาย (หุ้น)"
-}
\ No newline at end of file
+}
diff --git a/src/locales/zh.json b/src/locales/zh.json
index b22b86f..487b32d 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -21,7 +21,7 @@
"whpb": "订单金额(INR)",
"ldgl": "获利价格/止损价格(INR)",
"ssdd": "仓位价格/最新价格(INR)",
- "yy": "语言",
+ "yy": "Language",
"tolaszasdf": "总手续费(USD)",
"accumbn": "累积P/L (USD)",
"djzjmg": "冻结资产(USD)",
@@ -31,7 +31,7 @@
"aym": "累计P/L(INR)",
"disana": "冻结资产(INR)",
"disan": "可用资产(INR)",
- "setting": "设置",
+ "setting": "Set up",
"caidan": "资质",
"bz": "帮助",
"kf": "客服",
@@ -272,11 +272,11 @@
"hj141": "盈亏率",
"hj142": "切换指数账户",
"hj143": "切换沪深账户",
- "hj144": "修改密码",
+ "hj144": "Change Password",
"hj145": "资金划转",
- "hj146": "实名认证",
+ "hj146": "Verify",
"hj1461": "下载App",
- "hj147": "绑定银行卡",
+ "hj147": "Bind Bank Card",
"hj148": "退出登录",
"hj149": "您确定要退出登录吗?",
"hj150": "旧密码",
@@ -343,7 +343,7 @@
"hj208": "请输入您的正确的身份证号码",
"hj209": "请上传您的身份证照片",
"hj210": "提交成功!",
- "hj211": "绑定银行卡",
+ "hj211": "Bind Bank Card",
"hj212": "银行卡信息",
"hj213": "银行名称",
"hj214": "开户支行",
@@ -356,10 +356,10 @@
"hj221": "欢迎回来",
"hj222": "使用手机号登录",
"hj223": "还没有账号?去注册!",
- "hj224": "首页",
- "hj225": "交易",
- "hj226": "仓位",
- "hj227": "我的",
+ "hj224": "Home",
+ "hj225": "Trade",
+ "hj226": "Position",
+ "hj227": "Me",
"hj228": "暂无充值信息!",
"hj229": "支付宝",
"hj230": "对公转账",
@@ -371,7 +371,7 @@
"hj236": "已全部加载",
"hj237": "购买",
"hj238": "详情",
- "hj239": "公告详情",
+ "hj239": "Announcement details",
"hj240": "忘记密码",
"hj241": "开户",
"hj242": "行情",
@@ -565,4 +565,4 @@
"市场": "市场",
"配售结束时间": "配售结束时间",
"请选择提现金额": "请选择提现金额"
-}
\ No newline at end of file
+}
diff --git a/src/page/home/home.vue b/src/page/home/home.vue
index aa0d202..28ae97c 100644
--- a/src/page/home/home.vue
+++ b/src/page/home/home.vue
@@ -196,7 +196,7 @@
"
>
<div class="item-times">
- {{ $moment(item.addTime).format("DD-MM-YYYY hh:mm:ss A") }}
+ {{ item.showTime | gettime }}
</div>
<div
class="titContent"
@@ -309,8 +309,40 @@
];
},
},
+ filters: {
+ gettime (time) {
+ if (!time) {
+ return ''
+ }
+ var nd = new Date(time)
+ var y = nd.getFullYear()
+ var mm = nd.getMonth() + 1
+ var d = nd.getDate()
+ var h = nd.getHours()
+ var m = nd.getMinutes()
+ var c = nd.getSeconds()
+ if (mm < 10) {
+ mm = '0' + mm
+ }
+ if (d < 10) {
+ d = '0' + d
+ }
+ if (h < 10) {
+ h = '0' + h
+ }
+ if (m < 10) {
+ m = '0' + m
+ }
+ if (c < 10) {
+ c = '0' + c
+ }
+ // 17:35:2922-06-2022
+ return d + '-' + mm + '-' + y + ' ' + h + ':' + m + ':' + c
+ }
+ },
methods: {
aRouter() {
+ // window.open(this.onlineService);
window.open(this.onlineService);
},
diff --git a/src/page/home/newGg.vue b/src/page/home/newGg.vue
index 619b46b..9a7e1f5 100644
--- a/src/page/home/newGg.vue
+++ b/src/page/home/newGg.vue
@@ -1,6 +1,6 @@
<template>
<div :class="` ${$state.theme === 'red' ? 'red-theme' : 'black-theme'}`" class="">
-
+
<div class="newsTop">
<div class="newsTitle">{{list.artTitle}}</div>
<div class="newDetail-tits">{{ list.addTime| gettime}}</div>
@@ -36,7 +36,7 @@
let data = await api.getArtList();
this.list = data.data.list[0]
}
-
+
},
filters:{
gettime(time) {
diff --git a/src/page/home/newPage.vue b/src/page/home/newPage.vue
index e3879c3..0387656 100644
--- a/src/page/home/newPage.vue
+++ b/src/page/home/newPage.vue
@@ -1,16 +1,12 @@
<template>
<div :class="` ${$state.theme === 'red' ? 'red-theme' : 'black-theme'}`" class="new-page">
- <div class="head">
- <mt-header fixed :title="$t('hj238')">
- <router-link to="/home" slot="left">
- <mt-button icon="back"></mt-button>
- </router-link>
- </mt-header>
+ <!-- <div class="head"> -->
+
<!-- <view>{{ $t('hj238') }}</view> -->
- </div>
+ <!-- </div> -->
<div class="newsTop">
<div class="newsTitle">{{list.title}}</div>
- <div class="newDetail-tits">{{ list.addTime| gettime}}</div>
+ <div class="newDetail-tits">{{ list.showTime| gettime}}</div>
</div>
<div class="newsDetail">
<div>{{list.content}}</div>
@@ -74,7 +70,7 @@
c = '0' + c
}
// 17:35:2922-06-2022
- return y + '-' + mm + '-' + d + ' ' + h + ':' + m + ':' + c
+ return d + '-' + mm + '-' + y + ' ' + h + ':' + m + ':' + c
}
}
diff --git a/src/page/home/nwe_cf.html b/src/page/home/nwe_cf.html
new file mode 100644
index 0000000..d7ae336
--- /dev/null
+++ b/src/page/home/nwe_cf.html
@@ -0,0 +1,13 @@
+<!--Start of Tawk.to Script-->
+<script type="text/javascript">
+var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();
+(function(){
+var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];
+s1.async=true;
+s1.src='https://embed.tawk.to/66324b431ec1082f04e9d2eb/1hsq7c0nu';
+s1.charset='UTF-8';
+s1.setAttribute('crossorigin','*');
+s0.parentNode.insertBefore(s1,s0);
+})();
+</script>
+<!--End of Tawk.to Script-->
diff --git a/src/page/kline/index.vue b/src/page/kline/index.vue
index 7827f89..36bcd33 100644
--- a/src/page/kline/index.vue
+++ b/src/page/kline/index.vue
@@ -63,7 +63,7 @@
</span>
</div>
<div class="sanjiao">
-
+
</div>
</div>
<div class="bottom_balance">
@@ -82,7 +82,7 @@
}}</span> -->
<span
:class="singDetails.hcrate > 0 ? 'price green' : 'price red'"
- >{{ singDetails.nowPrice | _toLocaleString }}</span
+ >{{ singDetails.nowPrice }}</span
>
</div>
<div class="bottom_now">
@@ -93,7 +93,7 @@
}}{{ (singDetails.nowPrice - singDetails.preclose_px).toFixed(2) }}</span> -->
<span v-else>
{{
- (singDetails.nowPrice - singDetails.preclose_px) | _toLocaleString
+ (singDetails.nowPrice - singDetails.preclose_px).toFixed(2)
}}</span
>
</div>
@@ -121,7 +121,7 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.open_px | _toLocaleString }}</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 | _toLocaleString }}</span
+ >{{ singDetails.today_max }}</span
>
</div>
</div>
@@ -147,7 +147,7 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.preclose_px | _toLocaleString }}</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 | _toLocaleString }}</span
+ >{{ singDetails.today_min }}</span
>
</div>
</div>
@@ -433,7 +433,7 @@
<span>{{ $t("hj84") }}</span>
</div>
<div class="bottom_buy">
- <span>{{ singDetails.nowPrice | _toLocaleString }}</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 | _toLocaleString }}</span>
+ <span>{{ singDetails.nowPrice }}</span>
</div>
</div>
</div>
diff --git a/src/page/list/favorites/data.list.vue b/src/page/list/favorites/data.list.vue
index 8beeeb2..90f2b92 100644
--- a/src/page/list/favorites/data.list.vue
+++ b/src/page/list/favorites/data.list.vue
@@ -54,9 +54,9 @@
>{{ item.name }}</span
>
</div>
- <div class="bt">
+ <!-- <div class="bt">
<span>{{ item.code }}</span>
- </div>
+ </div> -->
</div></van-col
>
@@ -99,7 +99,7 @@
<div class="laber">
{{ shengouObj.type === 1 ? $t("hj57") : $t("配售数量") }}:
</div>
- <input type="number" :value="fromData.value" @input="fromDatavalue" />
+ <input type="text" :maxlength="9" v-model="fromData.value" @input="fromDatavalue" />
</div>
<div class="shijian">
@@ -220,7 +220,7 @@
},
methods: {
fromDatavalue(e) {
- this.fromData.value = e.target.value;
+ this.fromData.value = this.fromData.value.replace(/^(0+)|[^\d]+/g, '')
},
async newAddxg() {
console.log(this.shengouObj, "=====");
@@ -417,4 +417,4 @@
text-align: center;
line-height: 35px;
}
-</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 7caf392..eb0d1de 100644
--- a/src/page/list/tradingList/dazy.vue
+++ b/src/page/list/tradingList/dazy.vue
@@ -11,10 +11,11 @@
<div class="erty tghj">
<input
:placeholder="$t('hj262')"
- type="number"
+ type="text"
+ :minlength="4"
class="inpy"
v-model="num"
- @input="num = num.replace(/^(0+)|[^\d]+/g, '')"
+ @input="priceinput"
/>
<a>{{ $t("hj274") }}</a>
</div>
@@ -47,6 +48,13 @@
export default {
methods: {
+ priceinput(e){
+ this.num = this.num.replace(/^(0+)|[^\d]+/g, '')
+ var maxnum = this.enableAmt/this.currentItem.nowPrice
+ if(this.num>=maxnum){
+ this.num = Math.floor(maxnum)
+ }
+ },
async getxiadan() {
if (!this.num) {
this.show = false;
@@ -58,6 +66,7 @@
this.$toast(this.$t("hj264"));
return;
}
+
var opt = {
stockCode: this.currentItem.code,
password: this.password,
diff --git a/src/page/newUser/index.vue b/src/page/newUser/index.vue
index 832d45f..a8a81b8 100644
--- a/src/page/newUser/index.vue
+++ b/src/page/newUser/index.vue
@@ -61,7 +61,7 @@
>{{ $t("提款") }}</van-button
>
</van-col>
- <van-col span="8" style="display: flex; justify-content: center">
+ <!-- <van-col span="8" style="display: flex; justify-content: center">
<van-button
@click="leverShow = true"
class="btn-two"
@@ -69,7 +69,7 @@
>
{{ $t("申请杠杠") }}
</van-button>
- </van-col>
+ </van-col> -->
</van-row>
<van-dialog
@@ -1032,4 +1032,4 @@
input[type="file"] {
display: none !important;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/newUser/setting.vue b/src/page/newUser/setting.vue
index 3590ba6..66ca2eb 100644
--- a/src/page/newUser/setting.vue
+++ b/src/page/newUser/setting.vue
@@ -221,6 +221,7 @@
// 判断是否登录
this.$store.commit("dialogVisible", false);
this.$store.state.userInfo = data.data;
+ document.title = 'Setting'
this.userInfo = data.data;
} else {
this.$store.commit("dialogVisible", true);
diff --git a/src/page/trading/buy.vue b/src/page/trading/buy.vue
index af5cb99..c3cb513 100644
--- a/src/page/trading/buy.vue
+++ b/src/page/trading/buy.vue
@@ -86,12 +86,12 @@
</div>
</div>
</div>
- <div class="tr_rs gg" @click="showGg = true">
+ <!-- <div class="tr_rs gg" @click="showGg = true">
<div class="top_bzz">
<span>{{ $t("hj101") }}</span>
<span>{{ selectCycle }}</span>
</div>
- </div>
+ </div> -->
<div class="tr_rs">
<div class="top_bzz" style="padding-bottom: 0.2rem">
<span style="text-align: left">
@@ -105,7 +105,7 @@
<div class="bottom_bzz">
<span>
{{
- ((nowPrice / selectCycle.replace("X", "")) * num)
+ ((nowPrice * selectCycle.replace("X", "")) * num)
| _toLocaleString
}}
</span>
@@ -116,7 +116,7 @@
</div>
</div>
</div>
- <div class="switchs">
+ <!-- <div class="switchs">
<div class="zy">
<div class="left_zy">
<span>{{ $t("hj104") }}</span>
@@ -164,7 +164,7 @@
</div>
</div>
</div>
- </div>
+ </div> -->
<div class="btn_buy" @click="gdOrSetBuy()">
<div :class="tabsCurrentIndex == 0 ? 'maichu' : ''">
<span>{{ tabsCurrentIndex == 0 ? $t("hj84") : $t("hj85") }}</span>
@@ -965,6 +965,7 @@
.btn_buy {
width: 100%;
height: auto;
+ bottom: 0;
background: #fff;
padding: 0.8rem 0.8rem;
display: flex;
diff --git a/src/page/user/Warehouse/data.list.vue b/src/page/user/Warehouse/data.list.vue
index 443097d..38952e3 100644
--- a/src/page/user/Warehouse/data.list.vue
+++ b/src/page/user/Warehouse/data.list.vue
@@ -108,13 +108,13 @@
</div>
</div>
</van-col>
- <van-col span="8">
+ <!-- <van-col span="8">
<div style="text-align: center">
<div class="sport-content-title2">
{{ $t("止損價") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- {{ item.profitTargetPrice | _toLocaleString }}
+ {{ item.stopTargetPrice | _toLocaleString }}
</div>
</div>
</van-col>
@@ -124,10 +124,10 @@
{{ $t("止盈價") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- {{ item.stopTargetPrice | _toLocaleString }}
+ {{ item.profitTargetPrice | _toLocaleString }}
</div>
</div>
- </van-col>
+ </van-col> -->
</van-row>
<van-row>
<van-col span="12">
@@ -207,6 +207,7 @@
show: false,
actives: 0,
dataList: [],
+ timer: null,
tabsList: [
{
title: this.$t("持倉"),
@@ -220,7 +221,14 @@
],
};
},
-
+ created(){
+ this.timer = setInterval(() => {
+ this.getList();
+ }, 1000);
+ },
+ beforeDestroy() {
+ clearInterval(this.timer); // 在组件销毁前清除定时器
+ },
methods: {
pushRouter(item) {
const obj = {
@@ -245,7 +253,7 @@
});
},
onLoad() {
- this.pageNum++;
+ // this.pageNum++;
this.loading = true;
},
async confirm() {
@@ -273,13 +281,14 @@
const res = await getchicang({
state: this.actives,
stockType: laber || this.activeObj.laber,
- pageNum: this.pageNum,
- pageSize: this.pageSize,
+ pageNum: 1,
+ pageSize: 100,
});
this.loading = false;
if (res.status === 0) {
this.dataList = res.data.list;
+ this.$forceUpdate(); // 强制Vue重新渲染
// if (res.data.total <= this.dataList.length) {
this.finished = true;
// }
diff --git a/src/page/user/authentication.vue b/src/page/user/authentication.vue
index fbf0ad5..aa68601 100644
--- a/src/page/user/authentication.vue
+++ b/src/page/user/authentication.vue
@@ -35,6 +35,7 @@
</div>
<div class="form-block">
<div class="auth-msg" v-if="this.$store.state.userInfo.isActive == 3">
+ <!-- <div class="auth-msg" > -->
<p>认证失败，请重新认证</p>
<div>失败原因：{{ this.$store.state.userInfo.authMsg }}</div>
</div>
diff --git a/src/page/user/compontents/cash-list.vue b/src/page/user/compontents/cash-list.vue
index 5fa6051..bdeeb25 100644
--- a/src/page/user/compontents/cash-list.vue
+++ b/src/page/user/compontents/cash-list.vue
@@ -86,7 +86,7 @@
<span class="secondary col-xs-6"
>{{ $t("sj") }}:
<b v-if="item.applyTime">{{
- new Date(item.applyTime) | timeFormat
+ item.applyTime
}}</b>
<b v-else></b>
</span>
diff --git a/src/page/user/compontents/recharge-list.vue b/src/page/user/compontents/recharge-list.vue
index 4c5b33c..ef3d6bd 100644
--- a/src/page/user/compontents/recharge-list.vue
+++ b/src/page/user/compontents/recharge-list.vue
@@ -73,7 +73,7 @@
<span class="info-item"
>{{ $t("时间") }}:
<b v-if="item.addTime"
- >{{ new Date(item.addTime) | timeFormat }}
+ >{{item.addTime}}
</b>
<b v-else> </b>
</span>
diff --git a/src/page/user/yebs.vue b/src/page/user/yebs.vue
index f07dd72..f922991 100644
--- a/src/page/user/yebs.vue
+++ b/src/page/user/yebs.vue
@@ -67,7 +67,7 @@
$t("gm") + $t("sj") + "："
}}</span>
<span class="li-value">{{
- item.buyTime | filterTime
+ item.buyTime
}}</span>
</div>
</div>
@@ -75,7 +75,7 @@
<div class="li-info">
<span class="li-label">{{ $t("jssj") + "：" }}</span>
<span class="li-value">{{
- item.endTime | filterTime
+ item.endTime
}}</span>
</div>
</div>
diff --git a/src/page/wallet/index.vue b/src/page/wallet/index.vue
index 5da2f47..4013a07 100644
--- a/src/page/wallet/index.vue
+++ b/src/page/wallet/index.vue
@@ -131,11 +131,11 @@
<span>{{ $t('hj170a') }}</span>
</div>
</div>
- <div class="ttx_input" v-if="false"
+ <!-- <div class="ttx_input" v-if="false"
style="align-items: center;flex-wrap: wrap;justify-content: space-between;height: 67px;">
<div :class="index==payindex?'ttx_boxa':'ttx_box'" @click="slesetpay(item,index)"
v-for="(item,index) in array" :key="index">{{item.channelName}}</div>
- </div>
+ </div> -->
<div class="aaxx">
<!-- <template>
<vue-qr style="width:200px;height:200px;" logoSrc="https://image.dandelioncloud.cn//dist/img/NoSlightly.png" text="Hello world!" :size="200"></vue-qr>
@@ -143,15 +143,15 @@
<div v-show="payindex==3" class="qrcode" ref="qrCodeUrl"></div>
<div class="qrcode_txt">{{array[3].channelDesc}}</div>
</div>
-
+
<!-- <div class="ttx_input" style="align-items: center;flex-wrap: wrap;justify-content: space-between;height: 67px;">
<div :class="index==payindex?'ttx_boxa':'ttx_box'" @click="slesetpay(item,index)" v-for="(item,index) in array" :key="index">{{item.channelName}}</div>
</div> -->
-
+
<!-- <div>
<div style="width: 100%; display: flex; justify-content: center;align-items: center;display: flex;
flex-direction: column;">
-
+
</div>
</div> -->
@@ -550,7 +550,7 @@
payType: this.id,
payAmt: this.withdrawalValue
})
-
+
if (data.status === 0) {
if (navigator.vibrate) {
// 支持
@@ -1253,4 +1253,4 @@
.bank_1:last-child {
border: none;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index a0e4de3..a6c7385 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -245,7 +245,7 @@
path: "/setting",
name: "setting",
meta: {
- title: "设置",
+ title: "Setting",
requireAuth: true,
index: 91
},
@@ -436,7 +436,7 @@
path: "/yebs",
name: "yebs",
meta: {
- title: "余额宝记录",
+ title: "yebs—history",
requireAuth: true,
index: 1000
},
@@ -685,8 +685,9 @@
path: "/alertdetail",
name: "alertdetail",
meta: {
- title: "公告详情",
+ title: "Announcement details",
requireAuth: true,
+ hasHeader: true,
index: 40
},
component: Alertdetail
--
Gitblit v1.9.3