From 8cf36aa4d63ecd7e2741970ec4c1f70e11866604 Mon Sep 17 00:00:00 2001
From: lxf <1371462558@qq.com>
Date: Sat, 26 Apr 2025 18:28:42 +0800
Subject: [PATCH] st，4.26号修改内容
---
src/page/user/Warehouse/Stockdetail.vue | 36 +++++++++---------
src/page/list/tradingList/data.list.vue | 20 +++++++--
src/page/kline/index.vue | 3 -
src/page/user/Warehouse/data.list.vue | 22 +++++-----
src/axios/api.url.js | 4 +-
src/page/trading/buy.vue | 25 +++++-------
6 files changed, 58 insertions(+), 52 deletions(-)
diff --git a/src/axios/api.url.js b/src/axios/api.url.js
index 6ba2672..5449c04 100644
--- a/src/axios/api.url.js
+++ b/src/axios/api.url.js
@@ -7,11 +7,11 @@
// baseURL: 'http://localhost:8070',
/* Util API */
// baseURL: '/',
- // baseURL: 'https://api.fidelityio.com/', // 线上
+ baseURL: 'https://api.fidelityio.com/', // 线上
// 0311
// baseURL: "https://api.amcfcxn.org/",
// 本地
- baseURL: "http://192.168.10.8:8091/",
+ // baseURL: "http://192.168.10.8:8091/",
util: {
image: "/util/image.html" // 图片上传
}
diff --git a/src/page/kline/index.vue b/src/page/kline/index.vue
index 717e4cf..848dba4 100644
--- a/src/page/kline/index.vue
+++ b/src/page/kline/index.vue
@@ -431,7 +431,7 @@
</div>-->
</div>
<div class="rights">
- <div class="buy_btn">
+ <div class="buy_btn" v-if="kLineDetails.type == 'HJ'">
<div class="top_buy" @click="goBuy(0)">
<span>{{ $t("hj84") }}</span>
</div>
@@ -442,7 +442,6 @@
<div
class="sell_btn"
@click="goBuy(1)"
- v-if="kLineDetails.type != 'HJ'"
>
<div class="top_sell">
<span>{{ $t("hj85") }}</span>
diff --git a/src/page/list/tradingList/data.list.vue b/src/page/list/tradingList/data.list.vue
index 63dd526..74668c9 100644
--- a/src/page/list/tradingList/data.list.vue
+++ b/src/page/list/tradingList/data.list.vue
@@ -97,7 +97,7 @@
<div style="text-align: right">
<div class="tp">
<span class="price_color">
- {{ item.nowPrice }}
+ {{ item.nowPrice }}
</span>
</div>
<div class="bt" v-if="active != 'DZ'">
@@ -105,7 +105,7 @@
</div>
</div>
</van-col>
- <van-col span="6" v-if="!['DZ',].includes(active)">
+ <van-col span="6" v-if="!['DZ'].includes(active)">
<div style="text-align: right">
<div
class="tp right_bs"
@@ -306,11 +306,21 @@
data.data.list = Object.entries(data.data).map(([name, nowPrice]) => {
let nowPriceArr = Object.entries(nowPrice);
+ let nowPriceObj = {};
+ nowPriceArr.map(item => {
+ if (name === item[0]) {
+ nowPriceObj.st_name = item[0];
+ nowPriceObj.nowPrice = item[1];
+ }
+ nowPriceObj = {
+ ...nowPriceObj,
+ [item[0]]: item[1]
+ };
+ });
return {
name,
- st_name: nowPriceArr[0][0],
- nowPrice: nowPriceArr[0][1],
- stock_type: "HJ"
+ stock_type: "HJ",
+ ...nowPriceObj
};
});
} else {
diff --git a/src/page/trading/buy.vue b/src/page/trading/buy.vue
index 5d650f1..55ba827 100644
--- a/src/page/trading/buy.vue
+++ b/src/page/trading/buy.vue
@@ -20,14 +20,14 @@
<div class="cot">
<div class="lefts">
<div class="top_new">
- <span> ﷼{{ nowPrice }}</span>
+ <span> {{ nowPrice }}</span>
</div>
<div class="bottom_es">
<span>{{ $t("hj98") }}</span>
</div>
</div>
- <div class="rights" v-if="KLine.type != 'HJ'">
- <div class="ese">
+ <div class="rights">
+ <div class="ese" v-if="KLine.type == 'HJ'">
<div
class="mc"
@click="handleTradingClick(0)"
@@ -108,7 +108,7 @@
</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>{{
@@ -117,34 +117,31 @@
: selectCycle
}}</span>
</div>
- </div>
+ </div> -->
<div class="tr_rs">
<div class="top_bzz" style="padding-bottom: 0.2rem">
- <span style="text-align: left"> {{ $t("交易总额") }}( ﷼) </span>
- <span style="text-align: right"> {{ $t("hj103") }}( ﷼) </span>
+ <span style="text-align: left"> {{ $t("交易总额") }} </span>
+ <span style="text-align: right"> {{ $t("hj103") }} </span>
</div>
<div class="bottom_bzz">
<span>
- ﷼{{
- (nowPrice * selectCycle.replace("X", "") * num)
-
- }}
+ {{ nowPrice * selectCycle.replace("X", "") * num }}
</span>
<span style="white-space: nowarp">
- ﷼{{ moneyData.availableBalance }}
+ {{ moneyData.availableBalance }}
</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: left"> {{ $t("hj44") }} </span>
<span style="text-align: right"> </span>
</div>
<div class="bottom_bzz">
<span>
- ﷼{{
+ {{
(nowPrice * selectCycle.replace("X", "") * num * sxf).toFixed(
2
)
diff --git a/src/page/user/Warehouse/Stockdetail.vue b/src/page/user/Warehouse/Stockdetail.vue
index 516fef7..038f46d 100644
--- a/src/page/user/Warehouse/Stockdetail.vue
+++ b/src/page/user/Warehouse/Stockdetail.vue
@@ -13,36 +13,36 @@
<div class="bottomIfr">
<div class="pagebox">
- <div class="pagebox_left">{{ $t("盈虧") }} (INR)</div>
- <div class="pagebox_right"> ﷼{{ pages.profitAndLose | _toString }}</div>
+ <div class="pagebox_left">{{ $t("盈虧") }}</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_left">{{ $t("hj141") }}</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_left">{{ $t("hj40") }}</div>
+ <div class="pagebox_right">{{ pages.now_price | _toString }}</div>
</div>
<div class="pagebox">
<div class="pagebox_left">
- {{ $t("持倉價") }} (INR)
+ {{ $t("持倉價") }}
</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)
+ {{ $t("訂單金額") }}
</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_left">{{ $t("hj44") }}</div>
+ <div class="pagebox_right">{{ pages.orderFee | _toString }}</div>
</div>
<div class="pagebox">
<div class="pagebox_left">
@@ -72,7 +72,7 @@
export default {
data() {
return {
- pages: {},
+ pages: {}
};
},
// 生命周期 - 创建完成（访问当前this实例）
@@ -88,17 +88,17 @@
},
async getInfoSite() {
var res = {
- positionSn: this.$route.query.codes,
+ positionSn: this.$route.query.codes
};
let data = await api.findByPostionSn(res);
if (data.status === 0) {
this.pages = data.data;
}
- },
- },
+ }
+ }
};
</script>
-<style scoped lang='less'>
+<style scoped lang="less">
/deep/ .van-nav-bar__content {
height: 65px;
}
diff --git a/src/page/user/Warehouse/data.list.vue b/src/page/user/Warehouse/data.list.vue
index d0a2585..b2d5086 100644
--- a/src/page/user/Warehouse/data.list.vue
+++ b/src/page/user/Warehouse/data.list.vue
@@ -56,7 +56,7 @@
: 'color:#3e9976;'
"
>
- ₹{{ item.profitAndLose }}
+ {{ item.profitAndLose }}
</div>
</div>
</van-col>
@@ -91,7 +91,7 @@
{{ $t("hj40") }}({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- ₹{{ item.now_price }}
+ {{ item.now_price }}
</div>
</div>
</van-col>
@@ -101,7 +101,7 @@
{{ $t("持倉價") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- ₹{{ item.buyOrderPrice }}
+ {{ item.buyOrderPrice }}
</div>
</div>
</van-col>
@@ -111,7 +111,7 @@
{{ $t("訂單金額") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- ₹{{ item.orderTotalPrice }}
+ {{ item.orderTotalPrice }}
</div>
</div>
</van-col>
@@ -123,7 +123,7 @@
{{ $t("hj44") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- ₹{{ item.orderFee }}
+ {{ item.orderFee }}
</div>
</div>
</van-col>
@@ -133,7 +133,7 @@
{{ $t("待补金额") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- ₹{{ item.amountToBeCovered }}
+ {{ item.amountToBeCovered }}
</div>
</div>
</van-col>
@@ -215,7 +215,7 @@
: 'color:#3e9976;'
"
>
- ₹{{ item.profitAndLose }}
+ {{ item.profitAndLose }}
</div>
</div>
</van-col>
@@ -250,7 +250,7 @@
{{ $t("hj40") }}({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- ₹{{ item.now_price }}
+ {{ item.now_price }}
</div>
</div>
</van-col>
@@ -260,7 +260,7 @@
{{ $t("持倉價") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- ₹{{ item.buyOrderPrice }}
+ {{ item.buyOrderPrice }}
</div>
</div>
</van-col>
@@ -270,7 +270,7 @@
{{ $t("訂單金額") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- ₹{{ item.orderTotalPrice }}
+ {{ item.orderTotalPrice }}
</div>
</div>
</van-col>
@@ -282,7 +282,7 @@
{{ $t("hj44") }} ({{ activeObj.symbolCode }})
</div>
<div class="sport-content-text2">
- ₹{{ item.orderFee }}
+ {{ item.orderFee }}
</div>
</div>
</van-col>
--
Gitblit v1.9.3