From df43dbd4f80baedb88764ca9545e4b5ec7e1ac73 Mon Sep 17 00:00:00 2001
From: PC-20250623MANY\Administrator <344137771@qq.com>
Date: Sun, 27 Jul 2025 16:26:34 +0800
Subject: [PATCH] 1
---
src/page/list/list.vue | 2
src/locales/es.json | 3
src/page/markets/fundOrder.vue | 2
src/page/list/list-stock.vue | 6
src/page/list/list-index.vue | 6
src/page/list/index-list.vue | 2
src/assets/img/语言切换.png | 0
src/locales/en.json | 5
src/page/login/login.vue | 84 ++++----
src/page/markets/aiTrading.vue | 2
src/page/list/compontent/stock/stockHq.vue | 6
src/page/login/register.vue | 93 ++++-----
src/page/bankCard/banklist.vue | 258 +++++++++++++++++++++---
src/page/list/list-kechuang.vue | 6
src/page/home/home.vue | 4
src/page/markets/blockTrading.vue | 2
src/page/markets/ipo.vue | 2
src/page/markets/blockTradingOrder.vue | 2
src/page/markets/ipoOrder.vue | 2
src/components/index-component.vue | 10
src/page/markets/aiTradingOrder.vue | 2
src/page/list/list-search.vue | 2
src/page/home/newHome.vue | 2
src/page/openaccount.vue | 14
src/page/list/list-futures.vue | 6
src/page/markets/fund.vue | 2
src/page/newUser/setting.vue | 30 +-
src/page/list/indexlist-search.vue | 2
28 files changed, 366 insertions(+), 191 deletions(-)
diff --git "a/src/assets/img/\350\257\255\350\250\200\345\210\207\346\215\242.png" "b/src/assets/img/\350\257\255\350\250\200\345\210\207\346\215\242.png"
new file mode 100644
index 0000000..ad860aa
--- /dev/null
+++ "b/src/assets/img/\350\257\255\350\250\200\345\210\207\346\215\242.png"
Binary files differ
diff --git a/src/components/index-component.vue b/src/components/index-component.vue
index ed9f66a..44eb433 100644
--- a/src/components/index-component.vue
+++ b/src/components/index-component.vue
@@ -1,9 +1,5 @@
<template>
- <div
- class="index_component"
- :class="dataObj.chg > 0 ? 'bg-green' : 'bg-red'"
- @click="toLine"
- >
+ <div class="index_component" :class="dataObj.chg > 0 ? 'bg-green' : 'bg-red'" @click="toLine">
<div class="item_title">
<span class="line-one">{{ dataObj.name }}</span>
</div>
@@ -29,7 +25,7 @@
},
dataObj: {
type: Object,
- default: () => {}
+ default: () => { }
}
},
computed: {
@@ -91,11 +87,11 @@
padding: 0 0.5em;
font-size: 0.35em;
color: #333;
- font-weight: 500;
span {
width: 100%;
display: inline-block;
+ font-weight: 800;
}
}
diff --git a/src/locales/en.json b/src/locales/en.json
index decf00c..afd298e 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -593,7 +593,7 @@
"电话号码": "telephone number",
"当前充值渠道已关闭请选择在线客服进行充值。": "The current recharge channel has been closed Please choose online customer service to recharge.",
"删除": "Delete",
- "快捷方式": "Shortcut",
+ "快捷方式": "Quick Access",
"量化交易": "Quantitative trading",
"理财基金": "Wealth management fund",
"美股指数": "Us stock index",
@@ -666,5 +666,6 @@
"确认还款吗":"Confirm repayment",
"日内":"In the meantime",
"建仓成本":"Position-building cost",
- "已申购":"Already purchased"
+ "已申购":"Already purchased",
+ "hj316": "Please enter bank cardholder name"
}
\ No newline at end of file
diff --git a/src/locales/es.json b/src/locales/es.json
index defe275..245436b 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -651,5 +651,6 @@
"确认还款吗": "¿Confirmar pago?",
"日内": "Intradía",
"建仓成本": "Costo de Apertura",
- "已申购": "Suscrito"
+ "已申购": "Suscrito",
+ "hj316": "Introduzca el nombre del titular de la tarjeta bancaria"
}
\ No newline at end of file
diff --git a/src/page/bankCard/banklist.vue b/src/page/bankCard/banklist.vue
index db92095..751ec87 100644
--- a/src/page/bankCard/banklist.vue
+++ b/src/page/bankCard/banklist.vue
@@ -1,48 +1,65 @@
<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 :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">
- <van-swipe-cell
- v-for="(item, index) in banklist"
- :key="index"
- :right-width="65"
- @close="onClose"
- >
- <div class="bank_name" @click="goBankcard(item)">
+ <!-- <van-swipe-cell v-for="(item, index) in banklist" :key="index" :right-width="65" @close="onClose"> -->
+ <van-swipe-cell v-for="(item, index) in banklist" :key="index" :right-width="65">
+ <div class="bank_name" @click="openEditDialog(item)">
+ <!-- <div class="bank_name" @click="goBankcard(item)"> -->
<div class="lefts">{{ item.bankName }}</div>
<div class="rights">{{ item.bankNo }}</div>
+ <van-button square class="delete-btn" type="danger" :text="$t('删除')"
+ @click.stop="deleteBank(item, index)" />
</div>
- <template #right>
- <van-button
- square
- class="delete-btn"
- type="danger"
- :text="$t('删除')"
- @click="deleteBank(item, index)"
- />
- </template>
+ <!-- <template #right>
+ <van-button square class="delete-btn" type="danger" :text="$t('删除')" @click="deleteBank(item, index)" />
+ </template> -->
</van-swipe-cell>
</div>
<div class="bank_name">
- <div class="bank_box" @click="$router.push('/bankcard')">
+ <!-- <div class="bank_box" @click="$router.push('/bankcard')"> -->
+ <div class="bank_box" @click="openEditDialog()">
{{ $t("hj220").substring(0, 2) }}{{ $t("hj247") }}
</div>
</div>
</div>
+
+ <!-- 编辑银行卡弹窗 -->
+ <van-popup v-model="showEditDialog" position="center" round>
+ <div class="edit-popup">
+ <div class="edit-title">{{ !this.editForm.id ? $t('hj211') : $t('hj212') }}</div>
+ <div class="division"></div>
+ <div class="edit-form">
+ <div class="form-item">
+ <div class="form-label"><span class="required">*</span>{{ $t('hj213') }}</div>
+ <input type="text" v-model="editForm.bankName" :placeholder="$t('hj213')" class="form-input" />
+ </div>
+ <div class="form-item">
+ <div class="form-label"><span class="required">*</span>{{ $t('hj215') }}</div>
+ <input type="text" v-model="editForm.bankNo" :placeholder="$t('hj215')" class="form-input" />
+ </div>
+ <div class="form-item" v-if="!editForm.id">
+ <div class="form-label"><span class="required">*</span>{{ $t('银行卡户主名称') }}</div>
+ <input type="text" v-model="editForm.bankCardholderName" :placeholder="$t('银行卡户主名称')" class="form-input" />
+ </div>
+ </div>
+ <div class="division"></div>
+ <div class="edit-buttons">
+ <div class="cancel-btn" @click="showEditDialog = false">{{ $t('qx') }}</div>
+ <div class="save-btn" @click="saveEdit">{{ $t('qr') }}</div>
+ </div>
+ </div>
+ </van-popup>
</div>
</template>
<script>
import * as api from "@/axios/api";
-import { Toast } from "mint-ui";
+// import { Toast } from "mint-ui";
+import { Toast, Dialog } from 'vant';
import { isNull, bankNoReg, isName } from "@/utils/utils";
export default {
@@ -61,26 +78,96 @@
addBank: false,
id: "",
code: "",
- name: ""
- };
+ name: "",
+ // 编辑弹窗相关数据
+ showEditDialog: false,
+ editForm: {
+ bankName: "",
+ bankNo: "",
+ bankCardholderName: "",
+ id: "",
+ }
+ }
},
created() {
this.getCardDetail();
this.getbanklist();
},
methods: {
- async deleteBank(item, index) {
- // this.$dialog
- // ? await this.$dialog.confirm({ message: "确定删除该银行卡吗？" })
- // : null;
- // 调用删除接口
- let res = await api.deleteBankCard({ id: item.id });
- if (res.status === 0) {
- this.banklist.splice(index, 1);
- Toast(res.msg);
+ // 打开编辑弹窗
+ openEditDialog(item) {
+ if (!item) {
+ this.editForm = {
+ bankName: '',
+ bankNo: '',
+ bankCardholderName: "", // 如果没有持卡人信息，设置为空字符串
+ }
} else {
- Toast(res.msg);
+ this.editForm = {
+ bankName: item.bankName,
+ bankNo: item.bankNo,
+ bankCardholderName: item.bankCardholderName || "", // 如果没有持卡人信息，设置为空字符串
+ id: item.id,
+ };
}
+ this.showEditDialog = true;
+ },
+ // 保存编辑
+ async saveEdit() {
+ // 表单验证
+ if (isNull(this.editForm.bankName)) {
+ Toast(this.$t("hj218"));
+ } else if (isNull(this.editForm.bankNo)) {
+ Toast(this.$t("hj217"));
+ } else if (isNull(this.editForm.bankCardholderName) && !this.editForm.id) {
+ Toast(this.$t("hj316"));
+ }
+ else {
+ let opts = {
+ bankName: this.editForm.bankName,
+ bankNo: this.editForm.bankNo,
+ // bankAddress: this.editForm.banif,
+ // bankImg: this.editForm.code,
+ // bankEmail: this.editForm.bankEmail,
+ bankCardholderName: this.editForm.bankCardholderName
+ };
+
+ let data;
+ // 编辑
+ if (!!this.editForm.id) {
+ opts.id = this.editForm.id;
+ data = await api.getUpdate(opts);
+ }
+ // 新增
+ else {
+ data = await api.addBankCard(opts);
+ }
+ if (data.status === 0) {
+ // Toast(this.$t("hj220"));
+ // this.$router.go(-1);
+ this.showEditDialog = false;
+ this.getCardDetail();
+ } else {
+ Toast(data.msg);
+ }
+ }
+ },
+ deleteBank(item, index) {
+ Dialog.confirm({
+ title: this.$t('删除') + '?',
+ confirmButtonText: this.$t('qr'),
+ cancelButtonText: this.$t('qx'),
+ }).then(async () => {
+ // 调用删除接口
+ let res = await api.deleteBankCard({ id: item.id });
+ if (res.status === 0) {
+ this.banklist.splice(index, 1);
+ // Toast(res.msg);
+ } else {
+ Toast(res.msg);
+ }
+ })
+
},
goBankcard(item) {
// 跳转修改银行卡
@@ -167,6 +254,8 @@
</script>
<style scoped lang="less">
+@green: #c4d600;
+
.bank_box {
width: 100%;
display: flex;
@@ -174,6 +263,7 @@
align-items: center;
font-size: 20px;
}
+
.bank_card_page {
width: 100%;
height: 100%;
@@ -188,7 +278,7 @@
width: 100%;
height: 2rem;
- > div {
+ >div {
width: 10%;
height: 100%;
display: flex;
@@ -217,7 +307,7 @@
width: 100%;
height: 1.5rem;
display: flex;
- padding: 0 0.2rem;
+ padding: 0 0 0 .2rem;
background: rgb(247, 247, 247);
border-radius: 0.2rem;
margin-top: 0.3rem;
@@ -261,9 +351,11 @@
font-weight: 600;
}
}
+
/deep/ .van-nav-bar__content {
height: 65px;
}
+
/deep/ .van-nav-bar__title {
font-family: "DINPro";
width: 100%;
@@ -288,8 +380,96 @@
font-size: 16px;
letter-spacing: 2px;
transition: background 0.2s;
+
&:active {
background: #d9363e;
}
}
+
+/* 编辑弹窗样式 */
+/deep/ .van-popup {
+ border-radius: .5rem !important;
+}
+
+.edit-popup {
+ width: 100%;
+ padding: .25rem 0;
+ box-sizing: border-box;
+
+ .division {
+ width: 100%;
+ height: 0.25rem;
+ background-color: #f5f5f5;
+ }
+}
+
+.edit-title {
+ text-align: center;
+ font-size: .45rem;
+ font-weight: 700;
+ padding: .25rem;
+ color: #333;
+}
+
+.edit-form {
+ padding: .25rem;
+}
+
+.form-item {
+ // margin-bottom: 15px;
+ border-bottom: 1px solid #f5f5f5;
+ padding: .35rem 0 .25rem;
+}
+
+.form-label {
+ font-size: .4rem;
+ margin-bottom: .2rem;
+ color: #333;
+}
+
+.required {
+ color: red;
+ margin-right: 4px;
+}
+
+.form-input {
+ width: 100%;
+ height: 1.1rem;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ padding: 0 10px;
+ font-size: .3rem;
+ box-sizing: border-box;
+}
+
+.edit-buttons {
+ display: flex;
+ justify-content: space-between;
+ border-top: 1px solid #f5f5f5;
+ padding-top: 15px;
+}
+
+.cancel-btn,
+.save-btn {
+ flex: 1;
+ height: 40px;
+ line-height: 40px;
+ text-align: center;
+ font-size: 16px;
+ cursor: pointer;
+}
+
+.cancel-btn {
+ color: #333;
+}
+
+.save-btn {
+ color: @green;
+ font-weight: 500;
+}
+
+/deep/ .van-popup {
+ width: 80%;
+ border-radius: 8px;
+}
</style>
diff --git a/src/page/home/home.vue b/src/page/home/home.vue
index 9a32ff6..7b832be 100644
--- a/src/page/home/home.vue
+++ b/src/page/home/home.vue
@@ -1231,7 +1231,7 @@
.name {
font-family: PingFang SC;
font-style: normal;
- font-weight: 400;
+ font-weight: 500;
font-size: 0.32rem;
line-height: 0.45333rem;
color: #14181f;
@@ -1259,7 +1259,7 @@
.name {
font-family: PingFang SC;
font-style: normal;
- font-weight: 400;
+ font-weight: 500;
font-size: 0.32rem;
line-height: 0.45333rem;
color: #14181f;
diff --git a/src/page/home/newHome.vue b/src/page/home/newHome.vue
index b5d3960..e39ae3d 100644
--- a/src/page/home/newHome.vue
+++ b/src/page/home/newHome.vue
@@ -815,7 +815,7 @@
}
.icon-title {
font-size: .24rem;
- font-weight: 400;
+ font-weight: 500;
}
.icon-router.home-ico-router {
padding: .4rem 0;
diff --git a/src/page/list/compontent/stock/stockHq.vue b/src/page/list/compontent/stock/stockHq.vue
index 8b1548d..a490336 100644
--- a/src/page/list/compontent/stock/stockHq.vue
+++ b/src/page/list/compontent/stock/stockHq.vue
@@ -1296,7 +1296,7 @@
span{
font-size:0.24rem;
font-family:Arial;
- font-weight:400;
+ font-weight:500;
color:rgba(255,255,255,1);
line-height:0.36rem;
}
@@ -1308,7 +1308,7 @@
h4{
font-size:0.24rem;
font-family:Microsoft YaHei;
- font-weight:400;
+ font-weight:500;
color:rgba(255,255,255,0.5);
line-height:0.36rem;
}
@@ -1616,7 +1616,7 @@
vertical-align: top;
font-size:0.21rem;
font-family:MicrosoftYaHeiLight;
- font-weight:400;
+ font-weight:500;
color:rgba(255,255,255,1);
box-sizing: border-box;
border-right: 1px solid #292A32;
diff --git a/src/page/list/index-list.vue b/src/page/list/index-list.vue
index 0d46bf8..918488e 100644
--- a/src/page/list/index-list.vue
+++ b/src/page/list/index-list.vue
@@ -203,7 +203,7 @@
&.no-bold {
span {
- font-weight: 400;
+ font-weight: 500;
}
}
}
diff --git a/src/page/list/indexlist-search.vue b/src/page/list/indexlist-search.vue
index f9fe38e..ec4077f 100644
--- a/src/page/list/indexlist-search.vue
+++ b/src/page/list/indexlist-search.vue
@@ -181,7 +181,7 @@
&.no-bold {
span {
- font-weight: 400;
+ font-weight: 500;
}
}
}
diff --git a/src/page/list/list-futures.vue b/src/page/list/list-futures.vue
index bf5f60f..f71e6fe 100644
--- a/src/page/list/list-futures.vue
+++ b/src/page/list/list-futures.vue
@@ -237,7 +237,7 @@
&.no-bold {
span {
- font-weight: 400;
+ font-weight: 500;
}
}
}
@@ -294,7 +294,7 @@
li{
font-size:0.28rem;
font-family:MicrosoftYaHeiLight;
- font-weight:400;
+ font-weight:500;
color:rgba(255,255,255,0.5);
text-align: center;
display: flex;
@@ -327,7 +327,7 @@
span{
font-size:0.26rem;
font-family:MicrosoftYaHeiLight;
- font-weight:400;
+ font-weight:500;
color:rgba(177,37,37,1);
}
}
diff --git a/src/page/list/list-index.vue b/src/page/list/list-index.vue
index c404d2b..e21aba8 100644
--- a/src/page/list/list-index.vue
+++ b/src/page/list/list-index.vue
@@ -247,7 +247,7 @@
&.no-bold {
span {
- font-weight: 400;
+ font-weight: 500;
}
}
}
@@ -297,7 +297,7 @@
li{
font-size:0.28rem;
font-family:MicrosoftYaHeiLight;
- font-weight:400;
+ font-weight:500;
color:rgba(255,255,255,0.5);
text-align: center;
display: flex;
@@ -329,7 +329,7 @@
span{
font-size:0.26rem;
font-family:MicrosoftYaHeiLight;
- font-weight:400;
+ font-weight:500;
color:rgba(177,37,37,1);
}
}
diff --git a/src/page/list/list-kechuang.vue b/src/page/list/list-kechuang.vue
index 0567d59..528fc36 100644
--- a/src/page/list/list-kechuang.vue
+++ b/src/page/list/list-kechuang.vue
@@ -216,7 +216,7 @@
&.no-bold {
span {
- font-weight: 400;
+ font-weight: 500;
}
}
}
@@ -304,7 +304,7 @@
li{
font-size:0.28rem;
font-family:MicrosoftYaHeiLight;
- font-weight:400;
+ font-weight:500;
color:rgba(255,255,255,0.5);
text-align: center;
display: flex;
@@ -336,7 +336,7 @@
span{
font-size:0.26rem;
font-family:MicrosoftYaHeiLight;
- font-weight:400;
+ font-weight:500;
color:rgba(177,37,37,1);
}
}
diff --git a/src/page/list/list-search.vue b/src/page/list/list-search.vue
index 6a048f6..7d1e740 100644
--- a/src/page/list/list-search.vue
+++ b/src/page/list/list-search.vue
@@ -189,7 +189,7 @@
&.no-bold {
span {
- font-weight: 400;
+ font-weight: 500;
}
}
}
diff --git a/src/page/list/list-stock.vue b/src/page/list/list-stock.vue
index ad6b377..c583ae3 100644
--- a/src/page/list/list-stock.vue
+++ b/src/page/list/list-stock.vue
@@ -260,7 +260,7 @@
&.no-bold {
span {
- font-weight: 400;
+ font-weight: 500;
}
}
}
@@ -347,7 +347,7 @@
li{
font-size:0.28rem;
font-family:MicrosoftYaHeiLight;
- font-weight:400;
+ font-weight:500;
color:rgba(255,255,255,0.5);
text-align: center;
display: flex;
@@ -379,7 +379,7 @@
span{
font-size:0.26rem;
font-family:MicrosoftYaHeiLight;
- font-weight:400;
+ font-weight:500;
color:rgba(177,37,37,1);
}
}
diff --git a/src/page/list/list.vue b/src/page/list/list.vue
index e589ba7..31e3c23 100644
--- a/src/page/list/list.vue
+++ b/src/page/list/list.vue
@@ -223,7 +223,7 @@
.mint-tab-item-label {
font-size: 0.28rem;
font-family: MicrosoftYaHeiLight;
- font-weight: 400;
+ font-weight: 500;
color: rgba(255, 255, 255, 1);
}
&.is-selected {
diff --git a/src/page/login/login.vue b/src/page/login/login.vue
index adfb805..b852d92 100644
--- a/src/page/login/login.vue
+++ b/src/page/login/login.vue
@@ -7,32 +7,20 @@
<div class="logins_content">
<div class="login_forms">
<div class="top_forms">
- <el-input
- :placeholder="$t('hj9')"
- :size="medium"
- v-model="userName"
- clearable
- >
+ <el-input :placeholder="$t('hj9')" :size="medium" v-model="userName" clearable>
</el-input>
- <el-input
- style="margin-top: 0.46rem"
- show-password
- :placeholder="$t('hj10')"
- :size="medium"
- v-model="userPassword"
- @input="handleInput()"
- >
+ <el-input style="margin-top: 0.46rem" show-password :placeholder="$t('hj10')" :size="medium"
+ v-model="userPassword" @input="handleInput()">
</el-input>
</div>
<div class="bottom_btns">
- <van-button
- type="info"
- :disabled="!btnClass"
- class="butn"
- @click="loginIN"
- >{{ $t("立即登录") }}</van-button
- >
- <div class="password-operate" data-v-8cc76a7b="">
+ <van-button type="info" :disabled="!btnClass" class="butn" @click="loginIN">
+ {{ $t("立即登录") }}
+ </van-button>
+ <van-button type="info" plain class="butn_2" @click="$router.push('/register')">
+ {{ $t("免費註冊") }}
+ </van-button>
+ <!-- <div class="password-operate" data-v-8cc76a7b="">
<div class="forget" data-v-8cc76a7b="" @click="getApp()">
{{ $t("hj12") }}
</div>
@@ -41,19 +29,14 @@
$t("記住帳戶密碼")
}}</van-checkbox>
</div>
- </div>
+ </div> -->
</div>
</div>
- <div class="register" data-v-8cc76a7b="">
- {{ $t("還沒賬號？")
- }}<span
- @click="$router.push('/register')"
- data-v-8cc76a7b=""
- style="color:#c4d600"
- >{{ $t("免費註冊") }}</span
- >
- </div>
+ <!-- <div class="register" data-v-8cc76a7b="">
+ {{ $t("還沒賬號？") }}
+ <span @click="$router.push('/register')" data-v-8cc76a7b="" style="color:#c4d600">{{ $t("免費註冊") }}</span>
+ </div> -->
</div>
</div>
</template>
@@ -132,7 +115,7 @@
this.$store.state.userInfo.token = data.data.token;
this.undataToken(data.data.token);
window.localStorage.setItem("USERTOKEN", data.data.token);
- Notify({ type: "success", message: this.$t("hj36") });
+ // Notify({ type: "success", message: this.$t("hj36") });
setTimeout(() => {
// this.$router.push("/home");
@@ -147,17 +130,19 @@
}
}
},
- beforeDestroy() {},
- created() {}
+ beforeDestroy() { },
+ created() { }
};
</script>
<style scoped lang="less">
@green: #c4d600;
+
.password-operate {
display: flex;
justify-content: space-between;
margin-top: 0.53333rem;
+
.forget {
font-style: normal;
font-weight: 400;
@@ -174,7 +159,7 @@
.register {
font-style: normal;
- font-weight: 400;
+ font-weight: 500;
font-size: 0.37333rem;
color: #8c9fad;
margin: 0.4rem auto;
@@ -182,10 +167,12 @@
width: 100%;
height: 6rem;
text-align: center;
+
span {
color: rgb(5, 106, 239);
}
}
+
.login_title {
font-family: "DINPro", serif;
font-style: normal;
@@ -195,17 +182,20 @@
color: #14181f;
margin-left: 0.53333rem;
}
+
/deep/ .van-checkbox__label {
font-style: normal;
- font-weight: 400;
+ font-weight: 500;
font-size: 0.37333rem;
line-height: 0.53333rem;
color: #8c9fad;
}
+
/deep/ .van-button__text {
font-size: 24px;
font-family: "DINPro";
}
+
.login_page {
display: flex;
flex-direction: column;
@@ -247,7 +237,7 @@
// background: #1e1e1e;
border-radius: 0.3564rem;
- > input {
+ >input {
width: 100%;
height: 100%;
padding-left: 0.3564rem;
@@ -269,6 +259,7 @@
.bottom_btns {
width: 100%;
height: 3.3333rem;
+
// margin-top: 0.8528rem;
.butn {
width: 100%;
@@ -278,6 +269,17 @@
background: @green;
border: none;
}
+
+ .butn_2 {
+ width: 100%;
+ margin-top: 40px;
+ height: 60px;
+ border-radius: 8px;
+ color: @green;
+ border-color: @green;
+ margin-top: .4rem;
+ }
+
.top_btn {
border: none;
width: 100%;
@@ -291,7 +293,7 @@
font-size: 0.5128rem;
margin-top: 0.75rem;
- > span {
+ >span {
font-weight: 530 !important;
}
}
@@ -340,7 +342,7 @@
align-items: center;
justify-content: center;
- > span {
+ >span {
font-size: 0.3046rem;
color: #000;
background-color: #fff;
@@ -403,7 +405,7 @@
width: 3rem;
height: 3.5769rem;
- > img {
+ >img {
width: 100%;
height: 100%;
}
diff --git a/src/page/login/register.vue b/src/page/login/register.vue
index 914c954..f798786 100644
--- a/src/page/login/register.vue
+++ b/src/page/login/register.vue
@@ -7,49 +7,22 @@
<div class="logins_content">
<div class="login_forms">
<div class="top_forms">
- <el-input
- :placeholder="placeholder"
- size="medium"
- v-model="phone"
- maxlength="10"
- clearable
- @input="handleInput()"
- >
+ <el-input :placeholder="placeholder" size="medium" v-model="phone" maxlength="10" clearable
+ @input="handleInput()">
<template slot="prepend">＋91</template>
</el-input>
- <el-input
- style="margin-top: 0.46rem"
- show-password
- :placeholder="$t('hj19')"
- size="medium"
- v-model="userPassword"
- @input="handleInput()"
- >
+ <el-input style="margin-top: 0.46rem" show-password :placeholder="$t('hj19')" size="medium"
+ v-model="userPassword" @input="handleInput()">
</el-input>
- <el-input
- style="margin-top: 0.46rem"
- show-password
- :placeholder="$t('hj20')"
- size="medium"
- v-model="rePassword"
- @input="handleInput()"
- >
+ <el-input style="margin-top: 0.46rem" show-password :placeholder="$t('hj20')" size="medium"
+ v-model="rePassword" @input="handleInput()">
</el-input>
- <el-input
- style="margin-top: 0.46rem"
- :placeholder="$t('hj21')"
- size="medium"
- v-model="userName"
- clearable
- @input="handleInput()"
- >
+ <el-input style="margin-top: 0.46rem" :placeholder="$t('hj21')" size="medium" v-model="userName" clearable
+ @input="handleInput()">
</el-input>
</div>
- <div
- class="radio-con"
- style="display: flex; align-items: center; font-size: 14px"
- >
+ <div class="radio-con" style="display: flex; align-items: center; font-size: 14px">
<van-checkbox v-model="checked">{{
$t("我已閱讀並同意")
}}</van-checkbox>
@@ -58,18 +31,16 @@
}}</span>
</div>
<div class="bottom_btns" :class="btnClass ? 'on' : 'off'">
- <van-button
- type="info"
- :disabled="!btnClass"
- class="butn"
- @click="gook"
- >{{ $t("立即注册") }}</van-button
- >
+ <van-button type="info" :disabled="!btnClass" class="butn" @click="gook">{{ $t("立即注册") }}</van-button>
- <div class="register" @click="$router.push('/login')">
+ <van-button type="info" class="butn_2" plain @click="$router.push('/login')">
+ {{ $t("已有賬號？") + $t("馬上登錄") }}
+ </van-button>
+
+ <!-- <div class="register" @click="$router.push('/login')">
{{ $t("已有賬號？")
}}<span style="color: #c4d600">{{ $t("馬上登錄") }}</span>
- </div>
+ </div> -->
</div>
</div>
</div>
@@ -170,33 +141,39 @@
<style scoped lang="less">
@green: #c4d600;
+
.register {
font-style: normal;
- font-weight: 400;
+ font-weight: 500;
font-size: 0.37333rem;
color: #8c9fad;
text-align: center;
margin: 20px auto;
// margin-top: 10px;
}
+
.radio-con {
margin-top: 0.32rem;
}
+
/deep/ .van-checkbox__icon--checked .van-icon {
background: @green;
border-color: @green;
}
+
/deep/ .van-checkbox__label {
font-style: normal;
- font-weight: 400;
+ font-weight: 500;
font-size: 0.37333rem;
line-height: 0.53333rem;
color: #8c9fad;
}
+
/deep/ .van-button__text {
font-size: 24px;
font-family: "DINPro";
}
+
.login_title {
font-family: "DINPro", serif;
font-style: normal;
@@ -206,6 +183,7 @@
color: #14181f;
margin-left: 0.53333rem;
}
+
.login_page {
position: relative;
width: 100%;
@@ -238,7 +216,7 @@
color: #000;
font-weight: 600 !important;
- > span {
+ >span {
font-weight: 600 !important;
}
}
@@ -268,7 +246,7 @@
// background: #1e1e1e;
border-radius: 0.3564rem;
- > input {
+ >input {
width: 100%;
height: 100%;
padding-left: 0.3564rem;
@@ -290,6 +268,7 @@
.bottom_btns {
width: 100%;
height: 3.3333rem;
+
// margin-top: 0.8528rem;
.butn {
width: 100%;
@@ -299,6 +278,17 @@
background-color: @green;
border-color: @green;
}
+
+ .butn_2 {
+ width: 100%;
+ margin-top: 40px;
+ height: 60px;
+ border-radius: 8px;
+ color: @green;
+ border-color: @green;
+ margin-top: .4rem;
+ }
+
.mes {
width: 100%;
height: 20%;
@@ -343,7 +333,7 @@
align-items: center;
justify-content: center;
- > span {
+ >span {
font-size: 0.3046rem;
color: #000;
background-color: #fff;
@@ -404,7 +394,7 @@
width: 3rem;
height: 3.5769rem;
- > img {
+ >img {
width: 100%;
height: 100%;
}
@@ -446,6 +436,7 @@
/deep/.el-input__clear {
font-size: 0.5rem !important;
}
+
/deep/ .el-input-group__prepend {
border: none !important;
border-radius: 0 !important;
diff --git a/src/page/markets/aiTrading.vue b/src/page/markets/aiTrading.vue
index eb1a037..91bbe52 100644
--- a/src/page/markets/aiTrading.vue
+++ b/src/page/markets/aiTrading.vue
@@ -281,7 +281,7 @@
color: #323233;
span {
font-size: 0.4em;
- font-weight: 300;
+ font-weight: 500;
}
& > span:last-child {
color: #969799;
diff --git a/src/page/markets/aiTradingOrder.vue b/src/page/markets/aiTradingOrder.vue
index b5c9cf6..cfa09d1 100644
--- a/src/page/markets/aiTradingOrder.vue
+++ b/src/page/markets/aiTradingOrder.vue
@@ -172,7 +172,7 @@
color: #323233;
span {
font-size: 0.4em;
- font-weight: 300;
+ font-weight: 500;
}
& > span:last-child {
color: #969799;
diff --git a/src/page/markets/blockTrading.vue b/src/page/markets/blockTrading.vue
index 33874dc..a8d3a2b 100644
--- a/src/page/markets/blockTrading.vue
+++ b/src/page/markets/blockTrading.vue
@@ -402,7 +402,7 @@
color: #323233;
span {
font-size: 0.4em;
- font-weight: 300;
+ font-weight: 500;
}
& > span:last-child {
color: @grey-two;
diff --git a/src/page/markets/blockTradingOrder.vue b/src/page/markets/blockTradingOrder.vue
index 6a939f4..6a5145e 100644
--- a/src/page/markets/blockTradingOrder.vue
+++ b/src/page/markets/blockTradingOrder.vue
@@ -210,7 +210,7 @@
color: #323233;
span {
font-size: 0.4em;
- font-weight: 300;
+ font-weight: 500;
}
& > span:last-child {
color: @grey-two;
diff --git a/src/page/markets/fund.vue b/src/page/markets/fund.vue
index 2ba52b2..daa7800 100644
--- a/src/page/markets/fund.vue
+++ b/src/page/markets/fund.vue
@@ -263,7 +263,7 @@
color: #323233;
span {
font-size: 0.4em;
- font-weight: 300;
+ font-weight: 500;
}
& > span:last-child {
color: #969799;
diff --git a/src/page/markets/fundOrder.vue b/src/page/markets/fundOrder.vue
index fc6a448..1a7ef48 100644
--- a/src/page/markets/fundOrder.vue
+++ b/src/page/markets/fundOrder.vue
@@ -166,7 +166,7 @@
color: #323233;
span {
font-size: 0.4em;
- font-weight: 300;
+ font-weight: 500;
}
& > span:last-child {
color: @grey-two;
diff --git a/src/page/markets/ipo.vue b/src/page/markets/ipo.vue
index 90fc58d..ba654ea 100644
--- a/src/page/markets/ipo.vue
+++ b/src/page/markets/ipo.vue
@@ -203,7 +203,7 @@
color: #323233;
span {
font-size: 0.4em;
- font-weight: 300;
+ font-weight: 500;
}
& > span:last-child {
color: #969799;
diff --git a/src/page/markets/ipoOrder.vue b/src/page/markets/ipoOrder.vue
index 62ebc4c..d2dddb7 100644
--- a/src/page/markets/ipoOrder.vue
+++ b/src/page/markets/ipoOrder.vue
@@ -192,7 +192,7 @@
color: #323233;
span {
font-size: 0.4em;
- font-weight: 300;
+ font-weight: 500;
}
& > span:last-child {
color: @grey-two;
diff --git a/src/page/newUser/setting.vue b/src/page/newUser/setting.vue
index fd7499a..3a1d7ad 100644
--- a/src/page/newUser/setting.vue
+++ b/src/page/newUser/setting.vue
@@ -1,12 +1,7 @@
<template>
<div class="content">
- <van-nav-bar
- :placeholder="true"
- :safe-area-inset-top="true"
- :title="$t('setting')"
- left-arrow
- @click-left="$router.go(-1)"
- >
+ <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)">
@@ -22,6 +17,7 @@
<div class="left_gn">
<div class="l_icon">
<!-- <img src="../../assets/img/yeb.png" alt /> -->
+ <van-icon name="friends" size=".8rem" />
</div>
<div class="r_title">
<span>{{ $t("关于我们") }}</span>
@@ -35,6 +31,7 @@
<div class="left_gn">
<div class="l_icon">
<!-- <img src="../../assets/img/yeb.png" alt /> -->
+ <van-icon name="card" size=".8rem" />
</div>
<div class="r_title">
<span>{{ $t("hj147") }}</span>
@@ -48,6 +45,7 @@
<div class="left_gn">
<div class="l_icon">
<!-- <img src="../../assets/img/yeb.png" alt /> -->
+ <van-icon name="lock" size=".8rem" />
</div>
<div class="r_title">
<span>{{ $t("hj144") }}</span>
@@ -62,6 +60,7 @@
<div class="left_gn">
<div class="l_icon">
<!-- <img src="../../assets/img/yeb.png" alt /> -->
+ <van-icon name="manager" size=".8rem" />
</div>
<div class="r_title">
<span>KYC</span>
@@ -78,7 +77,9 @@
<div class="jy" @click="clicklang()">
<div class="left_gn">
- <div class="l_icon"></div>
+ <div class="l_icon">
+ <img src="../../assets/img/语言切换.png" alt />
+ </div>
<div class="r_title">
<span>{{ $t("yy") }}</span>
</div>
@@ -269,7 +270,7 @@
.then(() => {
this.toRegister();
})
- .catch(() => {});
+ .catch(() => { });
},
goToSettings() {
// 每次打开dialog 清空密码数据
@@ -360,9 +361,11 @@
<style scoped lang="less">
@green: #c4d600;
+
/deep/ .van-nav-bar__content {
height: 65px;
}
+
/deep/ .van-nav-bar__title {
font-family: "DINPro";
width: 100%;
@@ -507,10 +510,11 @@
display: flex;
justify-content: center;
align-items: center;
+ padding-left: 0.4rem;
img {
- width: 0.5041rem;
- height: 0.5041rem;
+ width: .8rem;
+ height: .8rem;
}
}
@@ -521,7 +525,7 @@
align-items: center;
font-size: 0.4046rem;
color: #404040;
- padding-left: 0.4rem;
+ padding-left: 0.2rem;
span {
font-weight: 600;
@@ -609,7 +613,7 @@
display: flex;
background-color: #fff;
- > div {
+ >div {
width: 10%;
height: 100%;
display: flex;
diff --git a/src/page/openaccount.vue b/src/page/openaccount.vue
index cca25ca..3bb355d 100644
--- a/src/page/openaccount.vue
+++ b/src/page/openaccount.vue
@@ -142,7 +142,7 @@
.title-wrapper{
font-size:0.3rem;
font-family:Microsoft YaHei;
- font-weight:400;
+ font-weight:500;
color:rgba(255,255,255,1);
line-height:1rem;
text-align: center;
@@ -182,7 +182,7 @@
.el-step__title{
font-size: 0.26rem;
font-family:Microsoft YaHei;
- font-weight:400;
+ font-weight:500;
color:rgba(255,255,255,1);
line-height:0.7rem;
}
@@ -210,7 +210,7 @@
h3{
font-size:0.26rem;
font-family:Microsoft YaHei;
- font-weight:400;
+ font-weight:500;
color:rgba(255,255,255,1);
line-height:0.42rem;
margin: 0;
@@ -218,7 +218,7 @@
p{
font-size:0.24rem;
font-family:Microsoft YaHei;
- font-weight:400;
+ font-weight:500;
color:#E6003E;
line-height:0.42rem;
}
@@ -297,7 +297,7 @@
h2 {
font-size:0.3rem;
font-family:Microsoft YaHei;
- font-weight:400;
+ font-weight:500;
color:rgba(255,255,255,1);
line-height: 0.92rem;
}
@@ -329,14 +329,14 @@
h3{
font-size:0.24rem;
font-family:Microsoft YaHei;
- font-weight:400;
+ font-weight:500;
color:rgba(255,255,255,1);
line-height:0.46rem;
}
p{
font-size: 0.2rem;
font-family:Microsoft YaHei;
- font-weight:400;
+ font-weight:500;
color:rgba(208,208,208,1);
line-height:0.42rem;
text-align: center;
--
Gitblit v1.9.3