From 4f68b98a8aca50845e4d97d8b40deed0df0c9f75 Mon Sep 17 00:00:00 2001
From: zzzz <690498789@qq.com>
Date: Sun, 31 Mar 2024 15:43:40 +0800
Subject: [PATCH] 注册页面的客服地址错误
---
src/locales/india.js | 4
src/page/login/register.vue | 6 -
src/locales/tw.js | 4
config/index.js | 39 ++++-----
src/page/user/recharge-sure.vue | 25 ++----
src/locales/zh.js | 4
src/locales/hanyu.js | 4
src/locales/riyu.js | 40 +++++----
src/locales/taiyu.js | 4
src/locales/en.js | 4
src/page/user/ransferIndex.vue | 45 +++++-----
src/page/newUser/setting.vue | 32 --------
src/page/newUser/index.vue | 22 +++--
13 files changed, 101 insertions(+), 132 deletions(-)
diff --git a/config/index.js b/config/index.js
index ee283dc..b5cad3c 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,15 +1,14 @@
-'use strict'
+"use strict";
// Template version: 1.3.1
// see http://vuejs-templates.github.io/webpack for documentation.
-const path = require('path')
+const path = require("path");
module.exports = {
dev: {
-
// Paths
- assetsSubDirectory: 'static',
- assetsPublicPath: '/',
+ assetsSubDirectory: "static",
+ assetsPublicPath: "/",
proxyTable: {
// '/api': {
// target:'http://43.198.126.79:8091/',
@@ -19,29 +18,29 @@
// '^/api': '/'
// }
// },
- '/': {
+ "/": {
// target: 'https://pc.zsycyy.com',
// target: 'http://www.shehua56.com',
- target:'http://121.43.237.202:8091/',
+ target: "http://121.43.237.202:8091/",
// target:'https://api.guosen.org/',
secure: false,
changeOrigin: true,
pathRewrite: {
- '^/': '/'
+ "^/": "/"
}
},
- '/dk': {
- target: 'http://121.43.237.202:8091/',
+ "/dk": {
+ target: "http://121.43.237.202:8091/",
secure: false,
changeOrigin: true,
pathRewrite: {
- '^/dk': '/dk'
+ "^/dk": "/dk"
}
}
},
// Various Dev Server settings
- host: '127.0.0.1', // can be overwritten by process.env.HOST
+ host: "192.168.0.105", // 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,
@@ -61,7 +60,7 @@
*/
// https://webpack.js.org/configuration/devtool/#development
- devtool: 'cheap-module-eval-source-map',
+ devtool: "cheap-module-eval-source-map",
// If you have problems debugging vue-files in devtools,
// set this to false - it *may* help
@@ -73,12 +72,12 @@
build: {
// Template for index.html
- index: path.resolve(__dirname, '../dist/index.html'),
+ index: path.resolve(__dirname, "../dist/index.html"),
// Paths
- assetsRoot: path.resolve(__dirname, '../dist'),
- assetsSubDirectory: 'static',
- assetsPublicPath: './',
+ assetsRoot: path.resolve(__dirname, "../dist"),
+ assetsSubDirectory: "static",
+ assetsPublicPath: "./",
/**
* Source Maps
@@ -86,14 +85,14 @@
productionSourceMap: false,
// https://webpack.js.org/configuration/devtool/#production
- devtool: '#source-map',
+ devtool: "#source-map",
// Gzip off by default as many popular static hosts such as
// Surge or Netlify already gzip all static assets for you.
// Before setting to `true`, make sure to:
// npm install --save-dev compression-webpack-plugin
productionGzip: false,
- productionGzipExtensions: ['js', 'css'],
+ productionGzipExtensions: ["js", "css"],
// Run the build command with an extra argument to
// View the bundle analyzer report after build finishes:
@@ -101,4 +100,4 @@
// Set to `true` or `false` to always turn it on or off
bundleAnalyzerReport: process.env.npm_config_report
}
-}
+};
diff --git a/src/locales/en.js b/src/locales/en.js
index c43b7a7..8b23e15 100644
--- a/src/locales/en.js
+++ b/src/locales/en.js
@@ -963,5 +963,7 @@
支持得提款渠道: "Supported withdrawal channels",
銀行卡充值: "Bank card recharge",
韩股總資產: "Total assets of Korean stocks",
- "上傳憑證：": "Upload voucher:"
+ "上傳憑證：": "Upload voucher:",
+ 从: "from",
+ 到: "to"
};
diff --git a/src/locales/hanyu.js b/src/locales/hanyu.js
index c230596..7acc1d5 100644
--- a/src/locales/hanyu.js
+++ b/src/locales/hanyu.js
@@ -524,5 +524,7 @@
支持得提款渠道: "지원 인출 루트",
銀行卡充值: "은행카드 충전",
韩股總資產: "한국 주식 총자산",
- "上傳憑證：": "자격 증명 업로드:"
+ "上傳憑證：": "자격 증명 업로드:",
+ 从: "부터",
+ 到: "에"
};
diff --git a/src/locales/india.js b/src/locales/india.js
index ea429ef..3ee2d26 100644
--- a/src/locales/india.js
+++ b/src/locales/india.js
@@ -953,5 +953,7 @@
支持得提款渠道: " समर्थन निकासी चैनल",
銀行卡充值: " बैंक कार्ड टॉप-अप",
韩股總資產: " कोरियाई शेयरों की कुल संपत्ति",
- "上傳憑證：": " प्रमाणपत्र अपलोड करें"
+ "上傳憑證：": " प्रमाणपत्र अपलोड करें",
+ 从: "से",
+ 到: "को"
};
diff --git a/src/locales/riyu.js b/src/locales/riyu.js
index dcf18b4..821760c 100644
--- a/src/locales/riyu.js
+++ b/src/locales/riyu.js
@@ -506,23 +506,25 @@
馬股总资产: " マレーシア株式市場の総資産",
买跌: "買い下げ",
买涨: "買い占め",
- 韩国股市:"韓国株式市場",
-韩股总资产:" 韓国株の総資産",
-韩股資產:" 韓国の株式資産",
-韩股可用:" 韓国株もあるし",
-韩股冻结:" 韓国株は凍結",
-支持得支付渠道:" サポートされている支払いチャネル",
-充值中心:" リチャージセンター",
-最小充值金額:" 最低チャージ金額",
-收款卡號:" 支払いカード番号",
-收款銀行:" 受取銀行",
-收款人名字:" 支払者名",
-請選擇充值賬戶:" リチャージアカウントを選択してください",
-最小充值金額:" 最低チャージ金額",
-上傳憑證:" 証明書をアップロードし",
-HG:" 韓国の株式口座",
-支持得提款渠道:" 引き出しチャネルのサポート",
-銀行卡充值:" 銀行カードのチャージ",
-韩股總資產:" 韓国株の総資産",
-'上傳憑證：':" 証明書をアップロードします",
+ 韩国股市: "韓国株式市場",
+ 韩股总资产: " 韓国株の総資産",
+ 韩股資產: " 韓国の株式資産",
+ 韩股可用: " 韓国株もあるし",
+ 韩股冻结: " 韓国株は凍結",
+ 支持得支付渠道: " サポートされている支払いチャネル",
+ 充值中心: " リチャージセンター",
+ 最小充值金額: " 最低チャージ金額",
+ 收款卡號: " 支払いカード番号",
+ 收款銀行: " 受取銀行",
+ 收款人名字: " 支払者名",
+ 請選擇充值賬戶: " リチャージアカウントを選択してください",
+ 最小充值金額: " 最低チャージ金額",
+ 上傳憑證: " 証明書をアップロードし",
+ HG: " 韓国の株式口座",
+ 支持得提款渠道: " 引き出しチャネルのサポート",
+ 銀行卡充值: " 銀行カードのチャージ",
+ 韩股總資產: " 韓国株の総資産",
+ "上傳憑證：": " 証明書をアップロードします",
+ 从: "から",
+ 到: "に"
};
diff --git a/src/locales/taiyu.js b/src/locales/taiyu.js
index 886e202..877cd7a 100644
--- a/src/locales/taiyu.js
+++ b/src/locales/taiyu.js
@@ -523,5 +523,7 @@
支持得提款渠道: " รองรับช่องทางการถอนเงิน",
銀行卡充值: " เติมเงินบัตรธนาคาร",
韩股總資產: " สินทรัพย์รวมของหุ้นเกาหลี",
- "上傳憑證：": " อัพโหลดใบรับรอง"
+ "上傳憑證：": " อัพโหลดใบรับรอง",
+ 从: "จาก",
+ 到: "ถึง"
};
diff --git a/src/locales/tw.js b/src/locales/tw.js
index 35074c3..bc9d586 100644
--- a/src/locales/tw.js
+++ b/src/locales/tw.js
@@ -1190,5 +1190,7 @@
支持得提款渠道: " 支持得提款渠道",
銀行卡充值: " 銀行卡充值",
韩股總資產: " 韩股總資產",
- "上傳憑證：": " 上傳憑證："
+ "上傳憑證：": " 上傳憑證：",
+ 从: "從",
+ 到: "到"
};
diff --git a/src/locales/zh.js b/src/locales/zh.js
index 623ae44..678485d 100644
--- a/src/locales/zh.js
+++ b/src/locales/zh.js
@@ -520,5 +520,7 @@
支持得提款渠道: "支持得提款渠道",
銀行卡充值: "銀行卡充值",
韩股總資產: "韩股總資產",
- "上傳憑證：": "上傳憑證："
+ "上傳憑證：": "上傳憑證：",
+ 从: "从",
+ 到: "到"
};
diff --git a/src/page/login/register.vue b/src/page/login/register.vue
index 61edde4..52bd8b9 100644
--- a/src/page/login/register.vue
+++ b/src/page/login/register.vue
@@ -129,11 +129,7 @@
} else if (isNull(this.rePassword)) {
Notify({ type: "warning", message: this.$t("hj31") });
} else {
- if (!/(^[1-9]\d*$)/.test(this.phone)) {
- Notify({ type: "warning", message: this.$t("hj28") });
- } else if (this.phone.toString().length != 10) {
- Notify({ type: "warning", message: this.$t("hj28") });
- } else if (this.userPassword !== this.rePassword) {
+ if (this.userPassword !== this.rePassword) {
this.password = 0;
this.password2 = 0;
Notify({ type: "warning", message: this.$t("hj32") });
diff --git a/src/page/newUser/index.vue b/src/page/newUser/index.vue
index fc2e14d..3e7f5fd 100644
--- a/src/page/newUser/index.vue
+++ b/src/page/newUser/index.vue
@@ -38,19 +38,21 @@
</van-col>
</van-row>
<van-row style="margin-top: 18px">
- <div class="van-col van-col--8" style="margin-top: 10px">
- <div class="content-title DINPro">{{ $t("美股總資產") }}(USD)</div>
- <div>
- <div class="DINPro" style="font-size: 18px">
- <showHide :text="userInfo.usTotalAssets" :flg="xy" />
- </div>
+ <div
+ class="van-col van-col--8"
+ style="margin-top: 10px"
+ v-for="item in listAsstes"
+ :key="item.accectType"
+ >
+ <div class="content-title DINPro">
+ {{
+ item.accectType === "US" ? $t("美股總資產") : $t("馬股總資產")
+ }}
+ ({{ item.symbolCode }})
</div>
- </div>
- <div class="van-col van-col--8" style="margin-top: 10px">
- <div class="content-title">{{ $t("馬股總資產") }}(USD)</div>
<div>
<div class="DINPro" style="font-size: 18px">
- <showHide :text="userInfo.masTotalAssets" :flg="xy" />
+ <showHide :text="item.availableBalance" :flg="xy" />
</div>
</div>
</div>
diff --git a/src/page/newUser/setting.vue b/src/page/newUser/setting.vue
index f58809b..52bee7e 100644
--- a/src/page/newUser/setting.vue
+++ b/src/page/newUser/setting.vue
@@ -273,17 +273,9 @@
}
},
goWall() {
- if (this.userInfo.length === 0) {
- this.$store.commit("dialogVisible", true);
- return;
- }
this.$router.push("/wallet");
},
gotoa(e) {
- if (this.userInfo.length === 0) {
- this.$store.commit("dialogVisible", true);
- return;
- }
if (e == 0) {
this.$router.push("/wallet");
} else if (e == 1) {
@@ -301,10 +293,6 @@
handleZh() {
this.selectUserFlag = !this.selectUserFlag;
- if (this.userInfo.length === 0) {
- this.$store.commit("dialogVisible", true);
- return;
- }
if (navigator.vibrate) {
// 支持
navigator.vibrate([55]);
@@ -345,10 +333,6 @@
.catch(() => {});
},
goToSettings() {
- if (this.userInfo.length === 0) {
- this.$store.commit("dialogVisible", true);
- return;
- }
// 每次打开dialog 清空密码数据
this.pswDialog = !this.pswDialog;
if (this.pswDialog) {
@@ -358,31 +342,15 @@
}
},
handleGoToTransfer() {
- if (this.userInfo.length === 0) {
- this.$store.commit("dialogVisible", true);
- return;
- }
this.$router.push("/transfers");
},
handleGoToAuthentication() {
- if (this.userInfo.length === 0) {
- this.$store.commit("dialogVisible", true);
- return;
- }
this.$router.push("/authentications");
},
handleGoToAuthenticationaz() {
- if (this.userInfo.length === 0) {
- this.$store.commit("dialogVisible", true);
- return;
- }
this.$router.push("/download");
},
handleGoToBankCard() {
- if (this.userInfo.length === 0) {
- this.$store.commit("dialogVisible", true);
- return;
- }
this.$router.push("/bankCard");
},
async toRegister() {
diff --git a/src/page/user/ransferIndex.vue b/src/page/user/ransferIndex.vue
index 1a5c744..b15641a 100644
--- a/src/page/user/ransferIndex.vue
+++ b/src/page/user/ransferIndex.vue
@@ -11,7 +11,7 @@
<div>
<div class="main-header">
<div class="main-li" @click="show = true">
- <span class="li-left">從</span
+ <span class="li-left">{{ $t("从") }}</span
><span class="li-center">{{ from.name }}</span>
<div class="img-con">
<img
@@ -36,7 +36,7 @@
/>
</div>
<div class="main-li" @click="toShow = true">
- <span class="li-left">到</span
+ <span class="li-left">{{ $t("到") }}</span
><span class="li-center">{{ to.name }}</span>
<div class="img-con">
<img
@@ -69,7 +69,6 @@
class="van-cell van-field white-input"
modelmodifiers="[object Object]"
>
- <!----><!---->
<div class="van-cell__value van-field__value">
<div class="van-field__body">
<input
@@ -80,14 +79,14 @@
class="van-field__control"
:placeholder="$t('請選擇')"
@input="inputValue"
- /><!----><!---->
+ />
<div class="van-field__button" style="margin-right: 10px">
- <span style="color: rgb(79, 82, 87)">USD</span>
+ <span style="color: rgb(79, 82, 87)">{{
+ from.symbolCode
+ }}</span>
</div>
</div>
- <!----><!---->
</div>
- <!----><!---->
</div>
</van-col>
<div class="huazhuan">
@@ -107,30 +106,28 @@
{{ $t("轉換得到金額") }}
</div>
<div class="van-cell van-field van-field--disabled white-input">
- <!----><!---->
<div class="van-cell__value van-field__value">
<div class="van-field__body">
- <input
- type="text"
- id="van-field-48-input"
- class="van-field__control"
- disabled=""
- :placeholder="$t('請選擇')"
- style="padding-left: 10px"
- /><!----><!---->
+ <div class="van-field__control" style="padding-left: 10px">
+ {{
+ from.accectType !== "US"
+ ? (formValue / exchangeRate).toFixed(2)
+ : (formValue * exchangeRate).toFixed(2)
+ }}
+ </div>
<div class="van-field__button" style="">
- <span style="color: rgb(79, 82, 87)">USD</span>
+ <span style="color: rgb(79, 82, 87)">{{
+ to.symbolCode
+ }}</span>
</div>
</div>
- <!----><!---->
</div>
- <!----><!---->
</div>
</van-col>
</van-row>
<div
- @click="formValue = from.availableBalanceUSD"
+ @click="formValue = from.availableBalance"
style="
color: rgb(5, 106, 239);
text-align: right;
@@ -143,11 +140,10 @@
<div class="balance">
<div>{{ $t("可用餘額") }}</div>
<div class="balance-text">
- {{ from.availableBalanceUSD || "0.0000" }} USD
+ {{ from.availableBalance || "0.0000" }} {{ from.symbolCode }}
</div>
</div>
</div>
- <!-- transfer -->
<van-button type="primary" @click="transferIndex" class="but">{{
$t("確認劃轉")
}}</van-button>
@@ -164,9 +160,11 @@
created() {
this.getMoneyData();
},
+
components: {},
data() {
return {
+ exchangeRate: 7.3,
formValue: "",
from: {},
to: {},
@@ -211,6 +209,7 @@
if (e.accectType === this.from.accectType) {
return Notify({ type: "warning", message: this.$t("不能选择一样的") });
}
+
this.to = e;
this.formValue = "";
},
@@ -336,7 +335,7 @@
padding: 0;
height: 60px;
color: var(--van-field-input-text-color);
- line-height: inherit;
+ line-height: 60px;
text-align: left;
background-color: transparent;
border: 0;
diff --git a/src/page/user/recharge-sure.vue b/src/page/user/recharge-sure.vue
index b06bd3d..1f2f100 100644
--- a/src/page/user/recharge-sure.vue
+++ b/src/page/user/recharge-sure.vue
@@ -38,14 +38,6 @@
<div v-if="rechargeSelect.key !== undefined">
<div class="main-title">{{ $t("請選擇銀行卡") }}</div>
<van-cell is-link :title="bankCard.bankNo || $t('請選擇')" />
- <!-- @click="show = true" -->
- <!-- <van-action-sheet
- v-model="show"
- :actions="actions"
- :cancel-text="$t('hj106')"
- close-on-click-action
- @select="select"
- /> -->
</div>
<div class="main-title">{{ $t("請選擇充值金額") }}</div>
<div class="white-input">
@@ -57,7 +49,9 @@
<div>
<div class="dz-title" v-if="rechargeAccountData.key !== undefined">
<div>餘額</div>
- <div class="balance-text">{{ availableBalanceUSD }} USD</div>
+ <div class="balance-text">
+ {{ availableBalanceUSD }} {{ symbolCode }}
+ </div>
</div>
<!-- <div class="dz-title">
@@ -97,7 +91,7 @@
// 提款聚到
rechargeSelect: {},
- actions: [{ name: this.$t("銀行卡充值"), key: "YHK" }],
+ actions: [{ name: this.$t("hj215"), key: "YHK" }],
paymentShow: false,
rechargeAccountShow: false,
@@ -109,10 +103,6 @@
key: "US",
},
{
- name: this.$t("IN"),
- key: "IN",
- },
- {
name: this.$t("MAS"),
key: "MAS",
},
@@ -121,6 +111,7 @@
availableBalanceUSD: "0.0000",
getMoneyList: [],
assetsType: "",
+ symbolCode: "",
};
},
mounted() {
@@ -129,7 +120,6 @@
},
methods: {
async setOutMoney() {
- console.log(this.assetsType);
const res = await outMoney({
amt: this.value,
assetsType: this.accectType,
@@ -160,7 +150,8 @@
res.data.map((item) => {
if (item.accectType === this.rechargeAccountData.key) {
console.log(item.accectType, "assetsType1");
- this.availableBalanceUSD = item.availableBalanceUSD;
+ this.availableBalanceUSD = item.availableBalance;
+ this.symbolCode = item.symbolCode;
this.accectType = item.accectType;
}
});
@@ -193,8 +184,8 @@
this.rechargeAccountData = e;
(this.getMoneyList || []).map((item) => {
if (item.accectType === this.rechargeAccountData.key) {
- console.log(item.accectType, "accectType2", item);
this.availableBalanceUSD = item.availableBalanceUSD;
+ this.symbolCode = item.symbolCode;
this.accectType = item.accectType;
}
});
--
Gitblit v1.9.3