From f14c1d81cb26d339aff767c280ab35ced0639308 Mon Sep 17 00:00:00 2001
From: zzzz <690498789@qq.com>
Date: Mon, 22 Apr 2024 15:15:57 +0800
Subject: [PATCH] first
---
src/page/list/favoriteslist/data.list.vue | 9
src/locales/zh.json | 6
config/index.js | 2
src/locales/jp.json | 6
src/page/list/favorites/data.list.vue | 29 +++-
src/router/index.js | 8
src/page/list/favorites/tabs.vue | 4
src/locales/cht.json | 6
src/page/list/favoriteslist/tabs.vue | 4
src/locales/en.json | 8
src/page/user/compontents/recharge-list.vue | 2
src/page/user/rechargelist.vue | 197 ++++++++++++++-------------
src/page/authentication/index.vue | 4
src/page/newUser/index.vue | 42 ++---
src/page/user/cashlist.vue | 32 ++++
src/axios/api.url.js | 2
src/locales/kor.json | 6
src/locales/hi.json | 6
src/locales/th.json | 6
19 files changed, 226 insertions(+), 153 deletions(-)
diff --git a/config/index.js b/config/index.js
index 9de6093..8239307 100644
--- a/config/index.js
+++ b/config/index.js
@@ -40,7 +40,7 @@
},
// Various Dev Server settings
- host: "192.168.0.101", // can be overwritten by process.env.HOST
+ host: "192.168.0.102", // 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,
diff --git a/src/axios/api.url.js b/src/axios/api.url.js
index d9eb497..7afce09 100644
--- a/src/axios/api.url.js
+++ b/src/axios/api.url.js
@@ -9,7 +9,7 @@
// 0311
baseURL: "https://api.marwadi.online/",
// 本地
- // baseURL: "http://192.168.0.106:8091/",
+ // baseURL: "http://192.168.0.110:8091/",
util: {
image: "/util/image.html" // 图片上传
}
diff --git a/src/locales/cht.json b/src/locales/cht.json
index 2f5fd16..5a86fb1 100644
--- a/src/locales/cht.json
+++ b/src/locales/cht.json
@@ -556,5 +556,9 @@
"立即配售": "立即配售",
"配售时间": "配售時間",
"配售成功": "配售成功",
- "交易总额": "交易總額"
+ "交易总额": "交易總額",
+ "申购开启时间": "申購開啟時間",
+ "配售开启时间": "配售開啟時間",
+ "申购结束时间": "申購結束時間",
+ "配售结束时间": "配售結束時間"
}
\ No newline at end of file
diff --git a/src/locales/en.json b/src/locales/en.json
index eb7e410..8d8e791 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -383,7 +383,7 @@
"hj258": "deep",
"hj259": "Shanghai",
"hj260": "north",
- "hj261": "Large transactions",
+ "hj261": "Block Deals",
"hj262": "Please enter the quantity",
"hj263": "purchasing price",
"hj264": "Please enter the secret key",
@@ -563,5 +563,9 @@
"立即配售": "Immediate Placement",
"配售时间": "Placement time",
"配售成功": "Successful allocation",
- "交易总额": "Total transaction amount"
+ "交易总额": "Total transaction amount",
+ "申购开启时间": "Subscription opening time",
+ "配售开启时间": "Placement opening time",
+ "申购结束时间": "End time of subscription",
+ "配售结束时间": "End time of allocation"
}
\ No newline at end of file
diff --git a/src/locales/hi.json b/src/locales/hi.json
index 5f3f1a4..d5e3d0e 100644
--- a/src/locales/hi.json
+++ b/src/locales/hi.json
@@ -562,5 +562,9 @@
"立即配售": "तत्काल प्लेसमेंट",
"配售时间": "प्लेसमेंट का समय",
"配售成功": "प्लेसमेंट सफल रहा",
- "交易总额": "लेन-देन की कुल राशि"
+ "交易总额": "लेन-देन की कुल राशि",
+ "申购开启时间": "सदस्यता प्रारंभ समय",
+ "配售开启时间": "प्लेसमेंट खुलने का समय",
+ "申购结束时间": "सदस्यता समाप्ति समय",
+ "配售结束时间": "रखने का अंतिम समय"
}
\ No newline at end of file
diff --git a/src/locales/jp.json b/src/locales/jp.json
index eabf834..12d399b 100644
--- a/src/locales/jp.json
+++ b/src/locales/jp.json
@@ -551,5 +551,9 @@
"立即配售": "即時配給",
"配售时间": "配給時間",
"配售成功": "配給に成功した",
- "交易总额": "取引総額"
+ "交易总额": "取引総額",
+ "申购开启时间": "購買依頼オープン時間",
+ "配售开启时间": "ディストリビューションオープン時間",
+ "申购结束时间": "購買依頼終了時間",
+ "配售结束时间": "配給終了時間"
}
\ No newline at end of file
diff --git a/src/locales/kor.json b/src/locales/kor.json
index c32de96..3cfe044 100644
--- a/src/locales/kor.json
+++ b/src/locales/kor.json
@@ -551,5 +551,9 @@
"立即配售": "지금 판매",
"配售时间": "배급 판매 시간",
"配售成功": "배급 판매 성공",
- "交易总额": "거래 총액"
+ "交易总额": "거래 총액",
+ "申购开启时间": "요청서 시작 시간",
+ "配售开启时间": "배급 오픈 시간",
+ "申购结束时间": "요청서 마감 시간",
+ "配售结束时间": "배정 판매 종료 시간"
}
\ No newline at end of file
diff --git a/src/locales/th.json b/src/locales/th.json
index 8e84e6c..01ad57e 100644
--- a/src/locales/th.json
+++ b/src/locales/th.json
@@ -551,5 +551,9 @@
"立即配售": "จัดสรรเดี๋ยวนี้",
"配售时间": "เวลาวางจำหน่าย",
"配售成功": "ความสำเร็จในการจัดสรร",
- "交易总额": "จำนวนธุรกรรมทั้งหมด"
+ "交易总额": "จำนวนธุรกรรมทั้งหมด",
+ "申购开启时间": "เวลาเปิดรับสมัคร",
+ "配售开启时间": "เวลาเปิดทำการ",
+ "申购结束时间": "เวลาสิ้นสุดการเสนอราคา",
+ "配售结束时间": "เวลาสิ้นสุดการจัดสรร"
}
\ No newline at end of file
diff --git a/src/locales/zh.json b/src/locales/zh.json
index de6b7c0..0b2085b 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -550,5 +550,9 @@
"认购成功": "认购成功",
"待补金额": "待补金额",
"待上市": "待上市",
- "交易总额": "交易总额"
+ "交易总额": "交易总额",
+ "申购开启时间": "申购开启时间",
+ "配售开启时间": "配售开启时间",
+ "申购结束时间": "申购结束时间",
+ "配售结束时间": "配售结束时间"
}
\ No newline at end of file
diff --git a/src/page/authentication/index.vue b/src/page/authentication/index.vue
index f66a74b..6c59666 100644
--- a/src/page/authentication/index.vue
+++ b/src/page/authentication/index.vue
@@ -62,7 +62,7 @@
<el-upload
:with-credentials="true"
class="avatar-uploader"
- :action="admin + '/user/upload.do'"
+ :action="admin + 'user/upload.do'"
list-type="picture-card"
name="upload_file"
:show-file-list="false"
@@ -88,7 +88,7 @@
<el-upload
:with-credentials="true"
class="avatar-uploader"
- :action="admin + '/user/upload.do'"
+ :action="admin + 'user/upload.do'"
list-type="picture-card"
name="upload_file"
:show-file-list="false"
diff --git a/src/page/list/favorites/data.list.vue b/src/page/list/favorites/data.list.vue
index e4852cc..b65558d 100644
--- a/src/page/list/favorites/data.list.vue
+++ b/src/page/list/favorites/data.list.vue
@@ -71,7 +71,7 @@
</van-col>
<van-col span="6">
<div style="text-align: right">
- <div class="xgsgType">
+ <div :class="item.type === 1 ? 'xgsgType' : 'xgpsType'">
<span class="price_color">
{{ item.type === 1 ? $t("hj45") : $t("新股配售") }}
</span>
@@ -102,21 +102,28 @@
<div class="shijian">
<div class="xgsj">
<div class="sjtlt">
- {{ shengouObj.type === 1 ? $t("hj59") : $t("配售时间") }}:
+ {{
+ shengouObj.type === 1 ? $t("申购开启时间") : $t("配售开启时间")
+ }}:
</div>
<div class="xgTime">
{{
- $moment(shengouObj.subscribeTime).format(
+ $moment(shengouObj.subscriptionTime).format(
"DD-MM-YYYY hh:mm:ss A"
)
}}
</div>
</div>
<div class="xgsj">
- <div class="sjtlt">{{ $t("hj60") }}:</div>
+ <div class="sjtlt">
+ {{
+ shengouObj.type === 1 ? $t("申购结束时间") : $t("配售结束时间")
+ }}:
+ <!-- {{ $t("hj60") }}: -->
+ </div>
<div class="xgTime">
{{
- $moment(shengouObj.subscriptionTime).format(
+ $moment(shengouObj.subscribeTime).format(
"DD-MM-YYYY hh:mm:ss A"
)
}}
@@ -321,7 +328,7 @@
-ms-flex-align: center;
align-items: center;
.sjtlt {
- width: 25%;
+ width: 33%;
margin-left: 0.4rem;
}
}
@@ -390,10 +397,18 @@
}
.xgsgType {
border-radius: 0.1rem;
- background-color: rgba(102, 204, 153, 0.1);
+ // background-color: rgba(102, 204, 153, 0.1);
border: 0.04rem solid #5ce398;
color: #5ce398;
text-align: center;
line-height: 35px;
}
+.xgpsType {
+ border-radius: 0.1rem;
+ // background-color: rgba(102, 204, 153, 0.1);
+ border: 0.04rem solid #ba33a5;
+ color: #ba33a5;
+ text-align: center;
+ line-height: 35px;
+}
</style>
\ No newline at end of file
diff --git a/src/page/list/favorites/tabs.vue b/src/page/list/favorites/tabs.vue
index 145a12c..faa0a50 100644
--- a/src/page/list/favorites/tabs.vue
+++ b/src/page/list/favorites/tabs.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <van-tabs
+ <!-- <van-tabs
:active="active"
line-width="15px"
@change="(e) => change(e, 'active')"
@@ -27,7 +27,7 @@
</template>
</van-tab>
</van-tabs>
- </div>
+ </div> -->
<dataList
:active="active"
diff --git a/src/page/list/favoriteslist/data.list.vue b/src/page/list/favoriteslist/data.list.vue
index e18c268..2f57b32 100644
--- a/src/page/list/favoriteslist/data.list.vue
+++ b/src/page/list/favoriteslist/data.list.vue
@@ -17,7 +17,9 @@
<div class="title">
{{ item.newName }}
</div>
- <span class="buy_to_sell mairu">{{ $t("hj45") }}</span>
+ <span class="buy_to_sell mairu">{{
+ item.type === 1 ? $t("hj45") : $t("新股配售")
+ }}</span>
</div>
<div
style="
@@ -89,7 +91,7 @@
}}
</span>
<span v-else>
- {{ $t("认缴") }}
+ {{ $t("hj250") }}
</span>
</div>
@@ -288,7 +290,8 @@
.right_btn {
width: 110px;
margin-left: 10px;
- height: 0.6667rem;
+ min-height: 0.6667rem;
+ padding: 15px 0;
right: 1%;
top: 27%;
display: -webkit-box;
diff --git a/src/page/list/favoriteslist/tabs.vue b/src/page/list/favoriteslist/tabs.vue
index 8b2d7ee..6c8f6a6 100644
--- a/src/page/list/favoriteslist/tabs.vue
+++ b/src/page/list/favoriteslist/tabs.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <van-tabs
+ <!-- <van-tabs
:active="active"
line-width="15px"
@change="(e) => change(e, 'active')"
@@ -27,7 +27,7 @@
</template>
</van-tab>
</van-tabs>
- </div>
+ </div> -->
<dataList
:active="active"
diff --git a/src/page/newUser/index.vue b/src/page/newUser/index.vue
index 2b34c15..fb90630 100644
--- a/src/page/newUser/index.vue
+++ b/src/page/newUser/index.vue
@@ -27,7 +27,7 @@
<div class="content-box">
<van-row class="van-row-box">
- <van-col span="24">
+ <van-col span="20">
<div class="content-all">
<span>{{ $t("賬戶總資產") }}({{ $USD }})</span>
<i @click="xy = !xy" class="iconfont xy"></i>
@@ -36,33 +36,22 @@
<showHide :text="asstesAll" :flg="xy" />
</div>
</van-col>
+ <van-col span="4" style="display: flex; justify-content: flex-end">
+ <van-icon
+ @click="$router.push('/rechargelist')"
+ name="orders-o"
+ size="20"
+ />
+ </van-col>
</van-row>
- <!-- <van-row style="margin-top: 18px">
- <div
- class="van-col van-col--12"
- style="margin-top: 10px"
- v-for="item in listAsstes"
- :key="item.accectType"
- >
- <div class="content-title DINPro">
- {{ item.title3 }}
- ({{ item.symbolCode }})
- </div>
- <div>
- <div class="DINPro" style="font-size: 18px">
- <showHide :text="item.availableBalance" :flg="xy" />
- </div>
- </div>
- </div>
- </van-row> -->
+
<van-row style="margin-top: 16px">
<van-col span="8" style="display: flex; justify-content: center">
- <van-button
- @click="$router.push('/recharge')"
- class="btn-two"
- type="primary"
- >{{ $t("hj172") }}</van-button
- >
+ <!-- @click="$router.push('/recharge')" -->
+ <!-- @click="kefu" -->
+ <van-button @click="kefu" class="btn-two" type="primary">
+ {{ $t("hj172") }}
+ </van-button>
</van-col>
<van-col span="8" style="display: flex; justify-content: center">
<van-button
@@ -165,6 +154,9 @@
this.getInfoSite();
},
methods: {
+ kefu() {
+ // window.open(this.onlineService);
+ },
async getMoneyData() {
let data = await api.getMoney();
console.log(data);
diff --git a/src/page/user/cashlist.vue b/src/page/user/cashlist.vue
index ed9e2fb..97e2c47 100644
--- a/src/page/user/cashlist.vue
+++ b/src/page/user/cashlist.vue
@@ -1,11 +1,19 @@
<template>
<div class="wrapper">
+ <van-nav-bar
+ :placeholder="true"
+ :safe-area-inset-top="true"
+ :title="$t('hj162')"
+ left-arrow
+ @click-left="$router.go(-1)"
+ >
+ </van-nav-bar>
<div>
- <div class="box page-part transaction">
- <div class="box-contain clearfix">
- <cashList></cashList>
- </div>
+ <!-- <div class="box page-part transaction"> -->
+ <div class="box-contain clearfix">
+ <cashList></cashList>
</div>
+ <!-- </div> -->
</div>
</div>
</template>
@@ -46,6 +54,22 @@
};
</script>
<style lang="less" scoped>
+/deep/ .van-nav-bar__content {
+ height: 65px;
+}
+/deep/ .van-nav-bar__title {
+ font-family: "DINPro";
+ width: 100%;
+ height: 1.17333rem;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-style: normal;
+ font-weight: 500;
+ font-size: 0.48rem;
+ color: #14181f;
+}
+
.mint-header {
// background: #f4f4f4;
margin-bottom: 0.2rem;
diff --git a/src/page/user/compontents/recharge-list.vue b/src/page/user/compontents/recharge-list.vue
index 7d194ae..b97b57b 100644
--- a/src/page/user/compontents/recharge-list.vue
+++ b/src/page/user/compontents/recharge-list.vue
@@ -1,7 +1,7 @@
<template>
<div style="padding-bottom: 100px">
<div v-if="list.length <= 0" class="empty text-center">
- {{ $t("hj168") }}!
+ {{ $t("hj168") }}
</div>
<div v-else>
<ul
diff --git a/src/page/user/rechargelist.vue b/src/page/user/rechargelist.vue
index 3c10da4..b7fc020 100644
--- a/src/page/user/rechargelist.vue
+++ b/src/page/user/rechargelist.vue
@@ -1,18 +1,14 @@
<template>
<div class="wrapper">
- <div class="header">
- <!-- <mt-header fixed title="充值记录">
- <router-link to="/user" slot="left">
- <mt-button icon="back">我的</mt-button>
- </router-link>
- </mt-header> -->
- </div>
- <!-- <div class="text-center">
- <div class="btn-group">
- <a href="#/recharge" class="with-draw-btn">充值</a>
- <a href="javascript:;" class="with-draw-detai-btn on">记录</a>
- </div>
- </div> -->
+ <van-nav-bar
+ :placeholder="true"
+ :safe-area-inset-top="true"
+ :title="$t('hj168')"
+ left-arrow
+ @click-left="$router.go(-1)"
+ >
+ </van-nav-bar>
+
<div>
<div class="box page-part transaction">
<div class="box-contain clearfix">
@@ -24,111 +20,126 @@
</template>
<script>
-import rechargeList from './compontents/recharge-list'
+import rechargeList from "./compontents/recharge-list";
export default {
components: {
- rechargeList
+ rechargeList,
},
props: {},
- data () {
+ data() {
return {
- number: ''
- }
+ number: "",
+ };
},
watch: {},
computed: {},
- created () {},
- mounted () {},
+ created() {},
+ mounted() {},
methods: {
- toSure () {
+ toSure() {
// 确定
- }
- }
-}
+ },
+ },
+};
</script>
<style lang="less" scoped>
- .mint-header {
- // background: #f4f4f4;
- margin-bottom: 0.2rem;
- }
+/deep/ .van-nav-bar__content {
+ height: 65px;
+}
+/deep/ .van-nav-bar__title {
+ font-family: "DINPro";
+ width: 100%;
+ height: 1.17333rem;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-style: normal;
+ font-weight: 500;
+ font-size: 0.48rem;
+ color: #14181f;
+}
- .wrapper {
- // padding-top: 1.5rem;
- background-color: #16171d;
- }
+.mint-header {
+ // background: #f4f4f4;
+ margin-bottom: 0.2rem;
+}
- .btn-group {
- // background: #f4f4f4;
+.wrapper {
+ // padding-top: 1.5rem;
+ background-color: #16171d;
+}
+
+.btn-group {
+ // background: #f4f4f4;
+ text-align: center;
+ margin: 0 auto;
+ margin-bottom: 0.5rem;
+
+ a {
+ display: inline-block;
text-align: center;
- margin: 0 auto;
- margin-bottom: 0.5rem;
-
- a {
- display: inline-block;
- text-align: center;
- font-size: 0.29rem;
- height: 0.7rem;
- line-height: 0.6rem;
- width: 1.44rem;
- margin: 0;
- margin-top: 0;
- padding: 0;
- }
-
- .with-draw-btn {
- position: relative;
- right: -10px;
- width: 1.51rem;
- border-top-left-radius: 0.695rem;
- border-bottom-left-radius: 0.695rem;
- }
-
- .with-draw-detai-btn {
- border-top-right-radius: 0.695rem;
- border-bottom-right-radius: 0.695rem;
- }
-
- .on {
- color: #fff;
- }
+ font-size: 0.29rem;
+ height: 0.7rem;
+ line-height: 0.6rem;
+ width: 1.44rem;
+ margin: 0;
+ margin-top: 0;
+ padding: 0;
}
- .transaction {
- color: rgba(100, 100, 100, 0.78);
-
- .transaction-title {
- padding: 0.15rem 0.3rem;
- }
-
- .empty {
- height: 2.8rem;
- line-height: 2.8rem;
- }
+ .with-draw-btn {
+ position: relative;
+ right: -10px;
+ width: 1.51rem;
+ border-top-left-radius: 0.695rem;
+ border-bottom-left-radius: 0.695rem;
}
- .box.page-part.transaction {
+ .with-draw-detai-btn {
+ border-top-right-radius: 0.695rem;
+ border-bottom-right-radius: 0.695rem;
+ }
+
+ .on {
+ color: #fff;
+ }
+}
+
+.transaction {
+ color: rgba(100, 100, 100, 0.78);
+
+ .transaction-title {
+ padding: 0.15rem 0.3rem;
+ }
+
+ .empty {
+ height: 2.8rem;
+ line-height: 2.8rem;
+ }
+}
+
+.box.page-part.transaction {
+ background-color: #16171d;
+ .box-contain {
background-color: #16171d;
- .box-contain {
- background-color: #16171d;
- }
}
- .red-theme {
- .wrapper{
- background-color: #E9E9E9;
- }
- .box.page-part.transaction {
- background-color: #E9E9E9;
- .box-contain {
- background-color: #E9E9E9;
- .list-body{
+}
+.red-theme {
+ .wrapper {
+ background-color: #e9e9e9;
+ }
+ .box.page-part.transaction {
+ background-color: #e9e9e9;
+ .box-contain {
+ background-color: #e9e9e9;
+ .list-body {
+ background-color: #fff;
+ .order-info-box {
background-color: #fff;
- .order-info-box {
- background-color: #fff;
- }
}
}
}
-
}
+}
</style>
diff --git a/src/router/index.js b/src/router/index.js
index 6cef809..5190674 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -612,8 +612,8 @@
name: "rechargelist",
meta: {
title: i18n.t("hj168"),
- requireAuth: true,
- hasHeader: true,
+ requireAuth: false,
+ hasHeader: false,
index: 33
},
component: RechargeList
@@ -645,8 +645,8 @@
name: "cashlist",
meta: {
title: i18n.t("hj162"),
- requireAuth: true,
- hasHeader: true,
+ requireAuth: false,
+ hasHeader: false,
index: 36
},
component: Cashlist
--
Gitblit v1.9.3