From 154848e66fd2f82ce1a9be92f1abbe502d661fc3 Mon Sep 17 00:00:00 2001
From: lxf <1371462558@qq.com>
Date: Thu, 24 Apr 2025 22:42:31 +0800
Subject: [PATCH] feat: 基本完成
---
src/page/login/register.vue | 17 +++--
src/locales/st.json | 20 ++++++
src/page/user/transfer.vue | 15 ++++
src/page/list/tradingList/data.list.vue | 37 ++++++++++--
src/page/kline/index.vue | 50 +++++++++-------
src/page/trading/buy.vue | 4
6 files changed, 101 insertions(+), 42 deletions(-)
diff --git a/src/locales/st.json b/src/locales/st.json
index 0f070d8..b62ffa7 100644
--- a/src/locales/st.json
+++ b/src/locales/st.json
@@ -578,5 +578,21 @@
"馬股账户": "حساب الأسهم الماليزية",
"马来西亚": "ماليزيا",
"马来西亚新闻": "أخبار ماليزيا",
- "马股": "الأسواق الماليزية"
-}
+ "马股": "الأسواق الماليزية",
+ "获取验证码": "احصل على رمز التحقق",
+ "重新获取": "إعادة الحصول",
+ "黄金原油": "الذهب والنفط الخام",
+ "划转": "تحويل",
+ "账户资金互转": "تحويل الأموال بين الحسابات",
+ "沙特账户转黄金原油账户": "تحويل من حساب السعودية إلى حساب الذهب والنفط الخام",
+ "黄金原油账户转沙特账户": "تحويل من حساب الذهب والنفط الخام إلى حساب السعودية",
+ "可转金额": "المبلغ القابل للتحويل",
+ "转账金额": "مبلغ التحويل",
+ "请输入转账金额": "الرجاء إدخال مبلغ التحويل",
+ "确认转入黄金原油账户": "تأكيد التحويل إلى حساب الذهب والنفط الخام",
+ "确认转入沙特账户": "تأكيد التحويل إلى حساب السعودية",
+ "充值": "شحن",
+ "请输入充值金额": "الرجاء إدخال مبلغ الشحن",
+ "GOLD": "ذهب",
+ "CRUDE OIL": "النفط الخام"
+}
\ No newline at end of file
diff --git a/src/page/kline/index.vue b/src/page/kline/index.vue
index 96f0d8f..717e4cf 100644
--- a/src/page/kline/index.vue
+++ b/src/page/kline/index.vue
@@ -9,10 +9,10 @@
</div>
<div class="right_title">
<div class="t_t" style="white-space: nowrap">
- <span v-if="singDetails.gid"
+ <span v-if="singDetails.gid"
>{{ singDetails.name }}({{ singDetails.gid }})</span
>
- <span v-else>{{ singDetails.name }}</span>
+ <span v-else>{{ $t(singDetails.name) }}</span>
</div>
<div class="b_t">
<span>{{ singDetails.spell }}</span>
@@ -85,7 +85,7 @@
}}</span> -->
<span
:class="singDetails.hcrate > 0 ? 'price green' : 'price red'"
- >{{ singDetails.nowPrice }}</span
+ >{{ singDetails.nowPrice }}</span
>
</div>
<div class="bottom_now">
@@ -124,7 +124,7 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.open_px }}</span
+ >{{ singDetails.open_px }}</span
>
</div>
<div class="rights topes">
@@ -136,7 +136,7 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.today_max }}</span
+ >{{ singDetails.today_max }}</span
>
</div>
</div>
@@ -150,10 +150,10 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.preclose_px }}</span
+ >{{ singDetails.preclose_px }}</span
>
</div>
- <div class="rights bots">
+ <div class="rights bots">
<span class="titles">{{ $t("hj75") }}</span>
<!-- <span :class="singDetails.preclose_px < 0 ? 'number green' : 'number red'">{{
singDetails.today_min
@@ -162,7 +162,7 @@
:class="
singDetails.hcrate > 0 ? 'number green' : 'number red'
"
- >{{ singDetails.today_min }}</span
+ >{{ singDetails.today_min }}</span
>
</div>
</div>
@@ -177,9 +177,9 @@
style="display: none"
v-if="
kLineDetails.if_us != 1 &&
- kLineDetails.type != 'hk' &&
- kLineDetails.type != 'hk' &&
- kLineDetails.if_zhishu == 0
+ kLineDetails.type != 'hk' &&
+ kLineDetails.type != 'hk' &&
+ kLineDetails.if_zhishu == 0
"
>
<div class="t_title">
@@ -426,7 +426,7 @@
/>
<img src="../../assets/img/shoucangle.png" alt v-else />
</div>
-<!-- <div class="right_xx" @click="handleJj()">
+ <!-- <div class="right_xx" @click="handleJj()">
<a href="#"><img src="../../assets/img/xiaoxi.png" alt /></a>
</div>-->
</div>
@@ -436,15 +436,19 @@
<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)" v-if="kLineDetails.type != 'HJ'">
+ <div
+ class="sell_btn"
+ @click="goBuy(1)"
+ v-if="kLineDetails.type != 'HJ'"
+ >
<div class="top_sell">
<span>{{ $t("hj85") }}</span>
</div>
<div class="bottom_sell">
- <span>{{ singDetails.nowPrice }}</span>
+ <span>{{ singDetails.nowPrice }}</span>
</div>
</div>
</div>
@@ -474,11 +478,11 @@
newsdetailList: [],
bayType: "",
timer: null,
- key:0,
+ key: 0
};
},
components: {
- Kline,
+ Kline
},
created() {
@@ -505,7 +509,7 @@
// },
methods: {
async getHknews() {
- await api.queryIndexNews().then((res) => {
+ await api.queryIndexNews().then(res => {
if (res.status === 0) {
this.newsdetailList = res.data.data;
}
@@ -527,13 +531,13 @@
this.optionBtn = false;
this.$message({
message: this.$t("hj97"),
- type: "success",
+ type: "success"
});
} else {
this.optionBtn = false;
this.$message({
message: data.msg,
- type: "warning",
+ type: "warning"
});
}
} else {
@@ -543,12 +547,12 @@
this.optionBtn = false;
this.$message({
message: this.$t("hj96"),
- type: "success",
+ type: "success"
});
} else {
this.$message({
message: data.msg,
- type: "warning",
+ type: "warning"
});
this.optionBtn = false;
}
@@ -572,7 +576,7 @@
},
async getOpation() {
let opts = {
- code: this.$route.query.code,
+ code: this.$route.query.code
};
let data = await api.isOption(opts);
if (data.status === 0) {
diff --git a/src/page/list/tradingList/data.list.vue b/src/page/list/tradingList/data.list.vue
index e0e5f29..d221c31 100644
--- a/src/page/list/tradingList/data.list.vue
+++ b/src/page/list/tradingList/data.list.vue
@@ -22,6 +22,19 @@
{{ $t("hj315") }}
</div>
</van-col>
+ <van-col span="6" v-if="active == 'ST'">
+ <van-popover
+ theme="dark"
+ v-model="showPopover"
+ trigger="click"
+ :actions="actions"
+ @select="onSelect"
+ >
+ <template #reference>
+ <van-button type="primary">الترتيب</van-button>
+ </template>
+ </van-popover>
+ </van-col>
</van-row>
</div>
<van-pull-refresh
@@ -46,7 +59,7 @@
:key="item.indexCode"
>
<van-row type="flex" align="center" gutter="20">
- <van-col span="8">
+ <van-col span="8" style="padding-right: 0 !important;">
<div>
<div class="tp">
<div class="collection" @click="optionszx(item)">
@@ -58,13 +71,14 @@
<div
class="title_color"
style="
+ font-size: 14px;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
"
>
- {{ item.st_name || item.stockName }}
+ {{ item.st_name || item.name || item.stockName }}
</div>
</div>
<div class="bt">
@@ -95,7 +109,7 @@
<div style="text-align: right">
<div
class="tp right_bs"
- :class="`${item.hcrateP.charAt(0) == '+' ? 'green' : 'red'}`"
+ :class="`${item.hcrate > 0 ? 'green' : 'red'}`"
>
<span class="price_color">{{ item.hcrateP }}</span>
</div>
@@ -177,13 +191,20 @@
},
data() {
return {
+ showPopover: false,
loadings: false,
finished: false,
listArr: [],
pageNumVal: 1,
getInterval: null,
num: 1,
- refreshing: false
+ orderBy: "",
+ refreshing: false,
+ actions: [
+ { text: "ترتيب", zh: "升序", val: "asc" },
+ { text: "التخفيض", zh: "降序", val: "desc" },
+ { text: "طبيعي", zh: "正常", val: "" }
+ ]
};
},
beforeDestroy() {
@@ -202,6 +223,10 @@
// }, 5000);
},
methods: {
+ onSelect(action) {
+ this.orderBy = action.val;
+ this.getStock(this.active, this.zxactive, 1);
+ },
filterSH(val) {
if (val === "sh") {
return 1;
@@ -231,7 +256,6 @@
var ifZhishu = "0";
var ifUs =
item.stock_type === "us" ? "1" : item.stock_type === "hk" ? "2" : "";
- console.log("td_item:", item);
this.$router.push({
path: "/kline",
query: {
@@ -266,7 +290,7 @@
stockPlate: "",
keyWords: this.sousuo,
stockType: stockType,
- orderBy: ""
+ orderBy: this.orderBy
};
// console.log();
@@ -315,7 +339,6 @@
this.listArr = data.data.list;
this.loadings = false;
// this.finished = true;
- console.log("listArr", this.listArr);
if (this.listArr.length % 20) {
this.finished = true;
}
diff --git a/src/page/login/register.vue b/src/page/login/register.vue
index e5fae1b..0ba60db 100644
--- a/src/page/login/register.vue
+++ b/src/page/login/register.vue
@@ -15,7 +15,13 @@
clearable
@input="handleInput()"
>
- <el-select v-model="select11" style="width: 100px;" slot="prepend" placeholder="请选择">
+ <el-select
+ v-model="select11"
+ style="width: 100px;"
+ slot="prepend"
+ placeholder="请选择"
+ >
+ <el-option label="+1" value="1"></el-option>
<el-option label="+90" value="90"></el-option>
<el-option label="+91" value="91"></el-option>
<el-option label="+92" value="92"></el-option>
@@ -53,12 +59,11 @@
<el-option label="+997" value="997"></el-option>
<el-option label="+998" value="998"></el-option>
<el-option label="+999" value="999"></el-option>
-
</el-select>
</el-input>
<!-- 添加发送验证码的输入框和按钮 -->
- <div style="margin-top: 0.46rem; display: flex; align-items: center;">
+ <!-- <div style="margin-top: 0.46rem; display: flex; align-items: center;">
<el-input
style="flex-grow: 1;"
:placeholder="$t('hj25')"
@@ -74,9 +79,9 @@
:disabled="isCounting"
@click="sendVerificationCode"
>
- {{ $t('获取验证码') }}
+ {{ $t("获取验证码") }}
</el-button>
- </div>
+ </div> -->
<el-input
style="margin-top: 0.46rem"
@@ -152,7 +157,7 @@
name: "newRegister",
data() {
return {
- select11: '91',
+ select11: "1",
checked: false,
verification: this.$t("hj25"),
loginWay: this.$t("hj26"),
diff --git a/src/page/trading/buy.vue b/src/page/trading/buy.vue
index 7337d3d..aa6ca39 100644
--- a/src/page/trading/buy.vue
+++ b/src/page/trading/buy.vue
@@ -8,7 +8,7 @@
</div>
<div class="right_title">
<div class="t_t" style="white-space: nowrap">
- <span v-if="KLine.type == 'HJ'">{{ name }}</span>
+ <span v-if="KLine.type == 'HJ'">{{ $t(name) }}</span>
<span v-else>{{ name }}({{ gid }})</span>
</div>
<div class="b_t">
@@ -26,7 +26,7 @@
<span>{{ $t("hj98") }}</span>
</div>
</div>
- <div class="rights" v-if="KLine.type == 'HJ'">
+ <div class="rights" v-if="KLine.type != 'HJ'">
<div class="ese">
<div
class="mc"
diff --git a/src/page/user/transfer.vue b/src/page/user/transfer.vue
index 295f647..d782b51 100644
--- a/src/page/user/transfer.vue
+++ b/src/page/user/transfer.vue
@@ -1,12 +1,20 @@
<template>
<div class="wrapper">
- <div class="header">
+ <!-- <div class="header">
<mt-header :title="$t('账户资金互转')">
<router-link to="/user" slot="left">
<mt-button icon="back"></mt-button>
</router-link>
</mt-header>
- </div>
+ </div> -->
+ <van-nav-bar
+ :placeholder="true"
+ :safe-area-inset-top="true"
+ :title="$t('账户资金互转')"
+ left-arrow
+ @click-left="onClickLeft"
+ >
+ </van-nav-bar>
<mt-navbar v-model="selected">
<mt-tab-item id="1">{{ $t("沙特账户转黄金原油账户") }}</mt-tab-item>
<mt-tab-item id="2">{{ $t("黄金原油账户转沙特账户") }}</mt-tab-item>
@@ -143,6 +151,9 @@
this.getUserInfo();
},
methods: {
+ onClickLeft() {
+ this.$router.push("/user");
+ },
async getProductSetting() {
let data = await api.getProductSetting();
if (data.status === 0) {
--
Gitblit v1.9.3