From 411edaf3d05d0a7393e4784ff8f3310a0ccb2196 Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Sun, 02 Nov 2025 15:33:02 +0800
Subject: [PATCH] 1
---
src/locales/es.json | 6
src/page/login/register.vue | 21 +-
src/locales/zh.json | 6
src/locales/de.json | 6
src/locales/jp.json | 6
src/page/kline/index.vue | 10
src/page/user/webview.vue | 8
src/axios/api.js | 6
src/page/trading/buy.vue | 175 +++++++++++++++++++++
src/locales/cht.json | 4
src/page/user/myOrder.vue | 158 ++++++++++++-------
src/locales/en.json | 4
src/page/register.vue | 2
src/locales/ens.json | 6
src/axios/api.url.js | 4
src/locales/kor.json | 6
src/locales/hi.json | 6
src/locales/fra.json | 6
src/locales/th.json | 6
src/page/user/account.vue | 2
20 files changed, 353 insertions(+), 95 deletions(-)
diff --git a/src/axios/api.js b/src/axios/api.js
index dbe97a7..bf9086a 100644
--- a/src/axios/api.js
+++ b/src/axios/api.js
@@ -229,9 +229,9 @@
return post("/user/delOrder.do", options);
}
// 挂单列表
-// export function getorderList (options) {
-// return post('/user/orderList.do', options)
-// }
+export function getorderList (options) {
+ return post('/user/orderList.do', options)
+}
// 美股详情
export function getUsDetail(options) {
diff --git a/src/axios/api.url.js b/src/axios/api.url.js
index 2db7af3..f6a8fb9 100644
--- a/src/axios/api.url.js
+++ b/src/axios/api.url.js
@@ -2,7 +2,7 @@
export default {
// DOMAIN: "https://api.amcfcxn.org/",
- DOMAIN: "http://156.245.145.211/",
+ DOMAIN: "https://usapi.yanshiz.com/",
// DOMAIN: "https://api.coinbtcs.com/",
// baseURL: ENV == 'development'?'https://api.guosen.org/':'https://api.guosen.org/',
// baseURL: 'http://localhost:8070',
@@ -14,7 +14,7 @@
// 本地
baseURL:
// process.env.NODE_ENV == "development" ? "https://192.168.10.12:8091/" : "https://api.kuspitai.com/",
- process.env.NODE_ENV == "development" ? "http://156.245.145.211/" : "http://156.245.145.211/",
+ process.env.NODE_ENV == "development" ? "https://usapi.yanshiz.com/" : "https://usapi.yanshiz.com/",
util: {
image: "/util/image.html" // 图片上传
}
diff --git a/src/locales/cht.json b/src/locales/cht.json
index 9fca910..06bbeb2 100644
--- a/src/locales/cht.json
+++ b/src/locales/cht.json
@@ -1,4 +1,8 @@
{
+ "已挂单":"已掛單",
+ "买入失败":"買入失敗",
+ "场外买入":"場外買入",
+ "场外卖出":"場外賣出",
"已上市": "已上市",
"关于我们详情": "我們的多元化團隊包括計算機科學、會計、工商管理碩士、特許金融分析師等專業人士。五角集團為社會各界提供一站式綜合商業、法律和金融解決方案。五角證券經紀是五角集團的股票、衍生品、共同基金等業務單位。",
"关于我们详情1": "為投資者群體提供證券經紀平台，以及貨幣段等內部存管參與者服務。我們的團隊擁有豐富且多元的經驗，包括一些歷史交易和公司程序。",
diff --git a/src/locales/de.json b/src/locales/de.json
index 3bac7d7..ff63412 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -1,4 +1,8 @@
{
+ "已挂单":"Ausstehende Bestellung",
+ "买入失败":"Der Kauf ist fehlgeschlagen",
+ "场外买入":"Kaufen Sie rezeptfrei",
+ "场外卖出":"Mitnahme",
"已上市": "Bereits auf dem Markt",
"秘钥": "Geheimer Schlüssel",
"描述": "beschreiben",
@@ -647,4 +651,4 @@
"日内":"In the meantime",
"建仓成本":"Position-building cost",
"已申购":"Already purchased"
-}
\ No newline at end of file
+}
diff --git a/src/locales/en.json b/src/locales/en.json
index 03a1728..a3e3d3b 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,4 +1,8 @@
{
+ "已挂单":"Pending order",
+ "买入失败":"Buy failed",
+ "场外买入":"Buy over the counter",
+ "场外卖出":"Takeout",
"已上市": "Already on the market",
"关于我们详情": "Our diverse team includes CS, CA, MBA, CFA and other professionals. Pentagon Group provides a one-stop-shop providing integrated business, legal and financial solutions to various sections of the society. Pentagon Stock Broking, Pentagon Group's unit dealing in equities, derivatives, mutual funds,",
"关于我们详情1": "Provides stock broking platform to its investor groups along with services of inhouse depository participant for currency segment etc. Our team has rich and diverse experience, including some historical transactions and corporate proceedings.",
diff --git a/src/locales/ens.json b/src/locales/ens.json
index 93507fd..61373a8 100644
--- a/src/locales/ens.json
+++ b/src/locales/ens.json
@@ -1,4 +1,8 @@
{
+ "已挂单":"Pending order",
+ "买入失败":"Buy failed",
+ "场外买入":"Buy over the counter",
+ "场外卖出":"Takeout",
"已上市": "Already on the market",
"秘钥": "Secret key",
"描述": "Describe",
@@ -661,4 +665,4 @@
"日内":"In the meantime",
"建仓成本":"Position-building cost",
"已申购":"Already purchased"
-}
\ No newline at end of file
+}
diff --git a/src/locales/es.json b/src/locales/es.json
index db5d1d9..a5c228d 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -1,4 +1,8 @@
{
+ "已挂单":"Pedido pendente",
+ "买入失败":"Falha na compra",
+ "场外买入":"Compre no balcão",
+ "场外卖出":"Retirar",
"已上市": "Listada",
"秘钥": "Clave",
"描述": "Descripción",
@@ -666,4 +670,4 @@
"uv1":"En verificación",
"sc":"Código de existencias",
"abc":"Añadir tarjeta bancaria"
-}
\ No newline at end of file
+}
diff --git a/src/locales/fra.json b/src/locales/fra.json
index ac336b6..12d916b 100644
--- a/src/locales/fra.json
+++ b/src/locales/fra.json
@@ -1,4 +1,8 @@
{
+ "已挂单":"Orden pendiente",
+ "买入失败":"Compra fallida",
+ "场外买入":"Acheter sans ordonnance",
+ "场外卖出":"À emporterं",
"已上市": "Déjà sur le marchéै",
"秘钥": "clé",
"描述": "décrire",
@@ -646,4 +650,4 @@
"日内":"In the meantime",
"建仓成本":"Position-building cost",
"已申购":"Already purchased"
-}
\ No newline at end of file
+}
diff --git a/src/locales/hi.json b/src/locales/hi.json
index 39da7c2..9a7c74d 100644
--- a/src/locales/hi.json
+++ b/src/locales/hi.json
@@ -1,4 +1,8 @@
{
+ "已挂单":"अपूर्ण आदेश",
+ "买入失败":"खरीदारी विफल",
+ "场外买入":"काउंटर पर खरीदें",
+ "场外卖出":"साथ ले जाएं",
"已上市": "पहले से ही बाजार में",
"关于我们详情": "हमारी विविध टीम में सीएस, सीए, एमबीए, सीएफए और अन्य पेशेवर शामिल हैं। पेंटागन ग्रुप समाज के विभिन्न वर्गों को एकीकृत व्यवसाय, कानूनी और वित्तीय समाधान प्रदान करने वाली एक स्टॉप-शॉप सेवा प्रदान करता है। पेंटागन स्टॉक ब्रोकिंग, पेंटागन ग्रुप की इकाई जो इक्विटी, डेरिवेटिव्स, म्यूचुअल फंड,",
"关于我们详情1": "अपने निवेशक समूहों को स्टॉक ब्रोकिंग प्लेटफॉर्म प्रदान करता है साथ ही करेंसी सेगमेंट आदि के लिए इन-हाउस डिपॉजिटरी पार्टिसिपेंट की सेवाएं भी प्रदान करता है। हमारी टीम के पास समृद्ध और विविध अनुभव है, जिसमें कुछ ऐतिहासिक लेन-देन और कॉर्पोरेट प्रक्रियाएं शामिल हैं।",
@@ -689,4 +693,4 @@
"id1": "भारत",
"kf1": "यदि आपको कोई सहायता चाहिए, तो कृपया अपने समर्पित व्यापार सहायक या खाता खोलने विशेषज्ञ से संपर्क करें।",
"划转": "स्थानांतरण"
-}
\ No newline at end of file
+}
diff --git a/src/locales/jp.json b/src/locales/jp.json
index 36f715f..f41923d 100644
--- a/src/locales/jp.json
+++ b/src/locales/jp.json
@@ -1,4 +1,8 @@
{
+ "已挂单":"未決注文",
+ "买入失败":"購入に失敗しました",
+ "场外买入":"店頭で購入する",
+ "场外卖出":"テイクアウト",
"已上市": "すでに市場に出ています",
"秘钥": "鍵",
"描述": "説明する",
@@ -648,4 +652,4 @@
"日内":"In the meantime",
"建仓成本":"Position-building cost",
"已申购":"Already purchased"
-}
\ No newline at end of file
+}
diff --git a/src/locales/kor.json b/src/locales/kor.json
index b912b83..929fff3 100644
--- a/src/locales/kor.json
+++ b/src/locales/kor.json
@@ -1,4 +1,8 @@
{
+ "已挂单":"대기 중인 주문",
+ "买入失败":"구매 실패",
+ "场外买入":"카운터에서 구매하세요",
+ "场外卖出":"테이크아웃",
"已上市": "已上시",
"秘钥": "밀폐",
"描述": "설명하다",
@@ -648,4 +652,4 @@
"日内":"In the meantime",
"建仓成本":"Position-building cost",
"已申购":"Already purchased"
-}
\ No newline at end of file
+}
diff --git a/src/locales/th.json b/src/locales/th.json
index 492e659..6f3b3e3 100644
--- a/src/locales/th.json
+++ b/src/locales/th.json
@@ -1,4 +1,8 @@
{
+ "已挂单":"คำสั่งซื้อที่รอดำเนินการ",
+ "买入失败":"การซื้อล้มเหลว",
+ "场外买入":"ซื้อผ่านเคาน์เตอร์",
+ "场外卖出":"ซื้อกลับบ้าน",
"已上市": "ออกสู่ตลาดแล้ว",
"秘钥": "อาหาร",
"描述": "อธิบาย",
@@ -648,4 +652,4 @@
"日内":"In the meantime",
"建仓成本":"Position-building cost",
"已申购":"Already purchased"
-}
\ No newline at end of file
+}
diff --git a/src/locales/zh.json b/src/locales/zh.json
index c9ab8ee..424bd2c 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -1,4 +1,8 @@
{
+ "已挂单":"已挂单",
+ "买入失败":"买入失败",
+ "场外买入":"场外买入",
+ "场外卖出":"场外卖出",
"已上市": "已上市",
"关于我们详情": "我们的多元化团队包括计算机科学、会计、工商管理硕士、特许金融分析师等专业人士。五角集团为社会各界提供一站式综合商业、法律和金融解决方案。五角证券经纪是五角集团的股票、衍生品、共同基金等业务单位。",
"关于我们详情1": "为投资者群体提供证券经纪平台，以及货币段等内部存管参与者服务。我们的团队拥有丰富且多元的经验，包括一些历史交易和公司程序。",
@@ -713,4 +717,4 @@
"平仓盈亏":"平仓盈亏",
"获取验证码":"获取验证码",
"hjsfz": "15分钟"
-}
\ No newline at end of file
+}
diff --git a/src/page/kline/index.vue b/src/page/kline/index.vue
index 21d42bd..5c22296 100644
--- a/src/page/kline/index.vue
+++ b/src/page/kline/index.vue
@@ -481,7 +481,8 @@
newsdetailList: [],
bayType: "",
timer: null,
- key: 0
+ key: 0,
+ preMarket:0,
};
},
components: {
@@ -495,7 +496,7 @@
clearTimeout(i);
clearInterval(i);
}
-
+
const { query } = this.$route;
this.kLineDetails = query;
if (query.if_us === "1") {
@@ -605,7 +606,7 @@
if (res.status === 0) {
this.singDetails = res.data.stock;
this.bayType = res.data.stock.type;
-
+ this.preMarket = res.data.stock.preMarket
if (res.data.introduction) {
this.jianjie = res.data.introduction;
} else {
@@ -695,7 +696,8 @@
spell: this.singDetails.spell,
if_us: this.kLineDetails.if_us,
bayType: this.bayType,
- gid: this.singDetails.gid
+ gid: this.singDetails.gid,
+ preMarket:this.preMarket
}
});
if (navigator.vibrate) {
diff --git a/src/page/login/register.vue b/src/page/login/register.vue
index 8b7f606..5b4b357 100644
--- a/src/page/login/register.vue
+++ b/src/page/login/register.vue
@@ -11,14 +11,7 @@
<el-input :placeholder="$t('请输入')" :size="medium" v-model="phone" clearable @input="handleInput()">
</el-input>
- <!-- <div class="forms_title">{{ $t("hj25") }}</div>
- <el-input :placeholder="$t('请输入')" :size="medium" v-model="yzmCode" clearable @input="handleInput()">
- <template slot="append">
- <van-button type="info" size="small" @click="getYzm" :loading="djs > 0" :loading-text="djs + ''">
- <span style="font-size: 14px;">{{ $t('获取验证码') }}</span>
- </van-button>
- </template>
-</el-input> -->
+
<div class="forms_title">{{ $t("Password") }}</div>
<el-input :placeholder="$t('hj19')" :size="medium" v-model="userPassword" clearable @input="handleInput()">
@@ -31,7 +24,17 @@
<div class="forms_title">{{ $t("hj21") }}</div>
<el-input :placeholder="$t('请输入')" :size="medium" v-model="userName" clearable @input="handleInput()">
</el-input>
+
+ <div class="forms_title">{{ $t("hj25") }}</div>
+ <el-input :placeholder="$t('请输入')" :size="medium" v-model="yzmCode" clearable @input="handleInput()">
+ <template slot="append">
+ <van-button type="info" size="small" @click="getYzm" :loading="djs > 0" :loading-text="djs + ''">
+ <span style="font-size: 14px;">{{ $t('获取验证码') }}</span>
+ </van-button>
+ </template>
+ </el-input>
</div>
+
<div class="radio-con" style="display: flex; align-items: center; font-size: 14px">
<van-checkbox v-model="checked" @change="handleInput()">
{{ $t("我已閱讀並同意") }}
@@ -78,7 +81,7 @@
placeholder: this.$t("hj16"),
phone: "",
userName: "",
- yzmCode: '6666',
+ yzmCode: '',
code: "",
userPassword: "",
btnClass: false,
diff --git a/src/page/register.vue b/src/page/register.vue
index e294456..f96275b 100644
--- a/src/page/register.vue
+++ b/src/page/register.vue
@@ -94,7 +94,7 @@
<div
:style="{'font-size':'.2rem', color:$state.theme =='red'?'#000':'#86CBD1'}"
>已有账号？<span
- :style="{color:$state.theme =='red'?'#BB1815':'#fff'}"
+ :style="{color:$state.theme =='red'?'#BB1815':'#fff'}"
@click="goLogin">返回登录</span></div>
</div>
</div>
diff --git a/src/page/trading/buy.vue b/src/page/trading/buy.vue
index 3ca4e80..26c02ca 100644
--- a/src/page/trading/buy.vue
+++ b/src/page/trading/buy.vue
@@ -118,8 +118,8 @@
</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">
@@ -144,7 +144,7 @@
</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>
@@ -221,6 +221,14 @@
</div>
</div>
</div> -->
+ <div class="btn_buy" @click="clickishow()">
+ <div
+ :class="tabsCurrentIndex == 0 ? 'maichu' : ''"
+ :style="preMarket==0?'background-color:#555555 !important':'background-color:#287dff'"
+ >
+ <span>{{ tabsCurrentIndex == 0 ? $t("场外卖出") : $t("场外买入") }}</span>
+ </div>
+ </div>
<div class="btn_buy" @click="gdOrSetBuy()">
<div
:class="tabsCurrentIndex == 0 ? 'maichu' : ''"
@@ -230,6 +238,37 @@
</div>
</div>
</div>
+ <van-popup v-model="isshow" position="center" round>
+ <div class="edit-popup">
+ <div class="edit-title">
+ {{ tabsCurrentIndex == 0 ? $t("场外卖出") : $t("场外买入") }}
+ </div>
+ <div class="division"></div>
+
+ <div class="edit-form">
+ <div class="form-item">
+ <div class="form-label">
+ <span class="required">*</span>{{ $t("hj271") }}
+ </div>
+ <input
+ pattern="^(0\.\d+|[1-9]\d*(\.\d+)?)$"
+ type="number"
+ v-model="preMarketPrice"
+ :placeholder="$t('hj271')"
+ class="form-input"
+ />
+ </div>
+ </div>
+
+ <div class="division"></div>
+ <div class="edit-buttons">
+ <div class="cancel-btn" @click="isshow = false">
+ {{ $t("qx") }}
+ </div>
+ <div class="save-btn" @click="saveEdit">{{ $t("qr") }}</div>
+ </div>
+ </div>
+ </van-popup>
<van-action-sheet
v-model="showGg"
:actions="siteLeverList"
@@ -278,6 +317,9 @@
if (this.$route.query.if_us) {
this.if_us = this.$route.query.if_us;
}
+ if(this.$route.query.preMarket){
+ this.preMarket = this.$route.query.preMarket;
+ }
},
data() {
return {
@@ -290,6 +332,9 @@
nums: 1,
profit: false,
nowPrice: 0,
+ isshow: false,
+ preMarketPrice:"",
+ preMarket:0,
type: 0,
code: "",
name: "",
@@ -378,6 +423,30 @@
}
},
methods: {
+ async clickishow(){
+ if(this.preMarket==0){
+ return
+ }
+ if(this.tabsCurrentIndex == 0 ){
+ this.$store.commit("elAlertShow", {
+ elAlertShow: true,
+ elAlertText: this.$t("失败")
+ });
+ }else{
+ this.isshow = true
+ }
+ },
+ async saveEdit(){
+ if(this.preMarketPrice<=0){
+ this.$store.commit("elAlertShow", {
+ elAlertShow: true,
+ elAlertText: this.$t("hj277")+0
+ });
+ }else{
+ this.setBuy()
+ }
+
+ },
async queryStockConfig() {
let data = await api.queryStockConfig();
if (data.status === 0) {
@@ -528,6 +597,14 @@
this.selectLever = val.label;
},
gdOrSetBuy() {
+ if(this.preMarket == 1){
+ this.$store.commit("elAlertShow", {
+ elAlertShow: true,
+ elAlertText: this.$t('hj113'),
+ elAlertType: "success"
+ });
+ return
+ }
if (this.priceTabsCurrentIndex == 0) {
this.setBuy();
} else {
@@ -604,7 +681,7 @@
// buyType: this.selectType,
lever: this.selectCycle ? this.selectCycle : 0,
// subaccountNumber:this.subaccountNumber
-
+ preMarketPrice:this.preMarketPrice,
// 买入是买涨buyType:0, 卖出是买跌buyType:1,卖出的状态是0，买入的状态是1
buyNum: this.num, // 单位为手
// buyNum: (this.num.match(/\d+/g))[0] * 100, // 单位为手
@@ -759,6 +836,7 @@
</script>
<style scoped lang="less">
+ @green: #287dff;
.buy_page {
width: 100%;
min-height: 100vh;
@@ -771,6 +849,95 @@
background-color: #222;
}
}
+.edit-popup {
+ width: 100%;
+ padding: 0.25rem 0;
+ box-sizing: border-box;
+
+ .division {
+ width: 100%;
+ height: 0.25rem;
+ background-color: #f5f5f5;
+ }
+}
+/deep/ .van-popup {
+ width: 80%;
+ border-radius: 8px;
+}
+.edit-popup {
+ width: 100%;
+ padding: 0.25rem 0;
+ box-sizing: border-box;
+
+ .division {
+ width: 100%;
+ height: 0.25rem;
+ background-color: #f5f5f5;
+ }
+}
+.form-item {
+ // margin-bottom: 15px;
+ border-bottom: 1px solid #f5f5f5;
+ padding: 0.35rem 0 0.25rem;
+}
+
+.form-label {
+ font-size: 0.4rem;
+ margin-bottom: 0.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: 0.3rem;
+ box-sizing: border-box;
+ color: #333;
+}
+
+.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;
+}
+.edit-title {
+ text-align: center;
+ font-size: 0.45rem;
+ font-weight: 700;
+ padding: 0.25rem;
+ color: #333;
+}
+
+.edit-form {
+ padding: 0.25rem;
+}
.top_cny {
width: 100%;
diff --git a/src/page/user/account.vue b/src/page/user/account.vue
index deae51b..29a65c7 100644
--- a/src/page/user/account.vue
+++ b/src/page/user/account.vue
@@ -6,7 +6,7 @@
<div>{{ userInfo.phone }}</div>
</div>
<div class="tui-rightsetting flex-center">
- <img src="@/assets/img/services.png" alt="" @click="$router.push('/webview')" />
+ <img src="@/assets/img/services.png" alt="" @click="$router.push('/webview?phone'+ userInfo.phone)" />
<img src="@/assets/img/setting.png" alt="" @click="$router.push('/setting')" />
</div>
</div>
diff --git a/src/page/user/myOrder.vue b/src/page/user/myOrder.vue
index ed248a0..84323c2 100644
--- a/src/page/user/myOrder.vue
+++ b/src/page/user/myOrder.vue
@@ -63,6 +63,7 @@
<van-tabs v-model="active" title-inactive-color="#898a8e">
<van-tab :title="$t('hj2')" name="0" title-style="font-size:0.4rem;"></van-tab>
<van-tab :title="$t('hj121')" name="1" title-style="font-size:0.4rem;"></van-tab>
+ <van-tab :title="$t('hj109')" name="2" title-style="font-size:0.4rem;"></van-tab>
</van-tabs>
<div class="mo_list" v-if="active == '0'">
@@ -78,58 +79,7 @@
{{ i.orderDirection == "买涨" ? $t("gm") : $t("hj78") }}
</div>
</div>
- <!-- <div class="moli_orderTitle">
- <span>{{ $t("订单号") }}</span>
- <span style="margin-left: 1em;">{{ i.buyOrderId }}</span>
- </div> -->
<div style="display:flex;flex-wrap:wrap;padding:0 .3rem .35rem;">
- <!-- <div class="tui-wrapItem flex-start">
- <div>
- {{ $t("Price") }}
- </div>
- <div style="margin-left: .25rem;font-size: .4rem;">
- {{ i.orderTotalPrice }}
- </div>
- </div>
-
- <div class="tui-wrapItem flex-start" style="width: 46%;">
- <div>
- {{ $t("盈虧") }}
- </div>
- <div
- style="margin-left: .25rem;font-size: .4rem;"
- :style="
- `color:${
- i.profitAndLose > 0
- ? 'green'
- : i.profitAndLose < 0
- ? 'red'
- : ''
- }`
- "
- >
- {{ i.profitAndLose }}
- </div>
- </div>
-
- <div class="tui-wrapItem flex-start">
- <div>
- {{ $t("持倉價") }}
- </div>
- <div style="margin-left: .25rem;">
- {{ i.buyOrderPrice }}
- </div>
- </div>
-
- <div class="tui-wrapItem flex-start" style="width:100%">
- <div>
- {{ $t("持倉時間") }}
- </div>
- <div style="margin-left: .25rem;">
- {{ $moment(i.buyOrderTime).format("DD-MM-YYYY hh:mm:ss A") }}
- </div>
- </div> -->
-
<div class="tui-wrapItem" style="width: 25%;">
<div style="font-size: 0.28rem;margin-bottom: .25rem;">
{{ $t("MingCheng") }}/{{ $t("市值") }}
@@ -293,6 +243,81 @@
<span>{{ $t("沒有更多了") }}</span>
</div>
</div>
+
+ <div class="mo_list" v-if="active == '2'">
+ <div class="mol_item" v-for="(i, index) in orderList" :key="i.id" >
+ <div class="moli_title flex-between">
+ <div>
+ {{ i.stockName }}
+ </div>
+ <div >
+ </div>
+ </div>
+
+ <div style="display:flex;flex-wrap:wrap;padding-bottom: .35rem;margin: 0 10px;">
+ <div class="tui-wrapItem flex-start">
+ <div>
+ {{ $t("hj125") }}
+ </div>
+ <div style="margin-left: .25rem;font-size: .4rem;">
+ {{ i.nowPrice }}
+ </div>
+ </div>
+
+ <div class="tui-wrapItem flex-start" style="width: 46%;">
+ <div>
+ {{ $t("hj101") }}
+ </div>
+ <div style="margin-left: .25rem;font-size: .4rem;" >
+ {{ i.lever }}
+ </div>
+ </div>
+
+ <div class="tui-wrapItem flex-start">
+ <div>
+ {{ $t("hj270") }}
+ </div>
+ <div style="margin-left: .25rem;">
+ {{ i.buyNum }}
+ </div>
+ </div>
+
+ <div class="tui-wrapItem flex-start" style="width: 46%;">
+ <div>
+ {{ $t("hj271") }}
+ </div>
+ <div style="margin-left: .25rem;">
+ {{ i.targetPrice }}
+ </div>
+ </div>
+
+ <div class="tui-wrapItem">
+ <div>
+ {{ $t("操作时间") }}
+ </div>
+ <div>
+ {{ i.addTime }}
+ </div>
+ </div>
+
+ <div class="tui-wrapItem" style="width: 46%;">
+ <div>
+ {{ $t("状态") }}
+ </div>
+ <div v-if="i.status==0">
+ {{ $t('已挂单') }}
+ </div>
+ <div v-if="i.status==2">
+ {{ $t('买入失败') }}
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="more-news">
+ <span>{{ $t("沒有更多了") }}</span>
+ </div>
+ </div>
</div>
</template>
@@ -311,6 +336,7 @@
active: "0",
pageNum: 1,
pageSize: 9999,
+ orderList:[],//挂单列表
total: 1,
list: [], // 持仓数据
list2: [], // 平仓数据
@@ -322,15 +348,20 @@
watch: {
active: {
handler(state) {
- this.pageNum = 1;
- this.getList(state);
-
- clearInterval(teimss2);
- // 判断如果是获取平仓数据就不再轮询
- if(state == '1') return
- teimss2 = setInterval(() => {
+ console.log(state);
+ if(state==2){
+ this.getorderList()
+ }else{
+ this.pageNum = 1;
this.getList(state);
- }, 3000);
+
+ clearInterval(teimss2);
+ // 判断如果是获取平仓数据就不再轮询
+ if(state == '1') return
+ teimss2 = setInterval(() => {
+ this.getList(state);
+ }, 3000);
+ }
},
immediate: true
}
@@ -353,6 +384,13 @@
clearInterval(teimss2);
},
methods: {
+ // 获取 挂单 数据
+ async getorderList() {
+ let data = await api.getorderList();
+ if (data.status === 0) {
+ this.orderList = data.data
+ }
+ },
// 获取 持仓 数据
async getList(state = 0) {
let opt = {
@@ -360,7 +398,7 @@
pageNum: this.pageNum,
pageSize: this.pageSize
};
-
+
let data = await api.getchicang(opt);
if (data.status === 0) {
if (this.active == "0") this.list = data.data.list;
diff --git a/src/page/user/webview.vue b/src/page/user/webview.vue
index 90ebedd..42961ce 100644
--- a/src/page/user/webview.vue
+++ b/src/page/user/webview.vue
@@ -3,7 +3,7 @@
<van-nav-bar :placeholder="true" :safe-area-inset-top="true" :title="$t('kf')" left-arrow
@click-left="$router.go(-1)">
</van-nav-bar>
- <iframe :src="serverUrl" width="100%" :height="screenHeight + 'px'"></iframe>
+ <iframe :src="serverUrl+'?phone'+phone" width="100%" :height="screenHeight + 'px'"></iframe>
</div>
</template>
@@ -17,9 +17,13 @@
return {
serverUrl: '',
screenHeight: 0,
+ phone:''
};
},
- created() { },
+ created() {
+ const { query } = this.$route;
+ this.phone = query.phone
+ },
mounted() {
this.getInfoSite()
this.screenHeight = window.innerHeight-100;
--
Gitblit v1.9.3