diff --git a/src/api/home.js b/src/api/home.js index 5a7ca30..351a8fd 100644 --- a/src/api/home.js +++ b/src/api/home.js @@ -26,7 +26,18 @@ class Home { static getNewestVersion(){ return server.get('/getNewestVersion') } - + /* + * 获取未读消息 + */ + static chat(){ + return server.get('/user/chat',{config:{loading:false}}) + } + /* + * 已读消息 + */ + static chatRead(){ + return server.get('/user/chatRead',{config:{loading:false}}) + } } export default Home; \ No newline at end of file diff --git a/src/api/member.js b/src/api/member.js index 86b45a3..1b51136 100644 --- a/src/api/member.js +++ b/src/api/member.js @@ -156,6 +156,10 @@ class Member { static getWdcode(data){ return server.get(`/user/wdcode`,{params:data}); } + // 查询用户的帐号 + static getUnameByUid(data){ + return server.get(`/user/getUserName`, {params:data}); + } } export default Member; diff --git a/src/api/server/index.js b/src/api/server/index.js index 0dcfee3..ec56f88 100644 --- a/src/api/server/index.js +++ b/src/api/server/index.js @@ -90,6 +90,8 @@ let loading = null; server.interceptors.request.use( config => { + let token = localStorage.getItem("token"); + config.headers["authorization"] = `bearer ${token}` // 剔除部分高频接口 主要是交易时的后台操作 if (!exclude.find(item => config.url.includes(item))) { if (!config.config || config.config.loading) { diff --git a/src/assets/img/bg/111111.png b/src/assets/img/bg/111111.png index 2160637..3030cfd 100644 Binary files a/src/assets/img/bg/111111.png and b/src/assets/img/bg/111111.png differ diff --git a/src/assets/img/home/kefu.png b/src/assets/img/home/kefu.png new file mode 100644 index 0000000..c1e6d2f Binary files /dev/null and b/src/assets/img/home/kefu.png differ diff --git a/src/components/CommonFooter.vue b/src/components/CommonFooter.vue index a10e8ca..cc4be0e 100644 --- a/src/components/CommonFooter.vue +++ b/src/components/CommonFooter.vue @@ -1,6 +1,10 @@ @@ -288,6 +297,8 @@ @@ -455,12 +515,28 @@ export default { background-color: #121212; border-top: none; + .cszone{ + width:48px; + position:fixed; + bottom:10%; + right:26px; + z-index:999; + background-color: #fff; + border-radius: 10px; + } + + .cszone img{ + text-align:center; + width:48px; + height:48px; + } + .content{ display: flex; justify-content: space-between; align-items: center; width: 1200px; - // height: 560px; + height: 560px; margin: 0px auto; } .footer-upper-section { @@ -590,7 +666,35 @@ export default { color: #fff; } } - + .cspopup{ + position:fixed; + top:50%; + left:50%; + transform: translate(-50%, -50%); + width:560px; + height:560px; + z-index:999; + + .close_btn{ + width:35px; + height:35px; + font-size:20px; + font-weight:500; + line-height:30px; + text-align:center; + display:block; + color:#fff; + background:#553646; + border-radius:50%; + position:absolute; + right:-10px; + top:-10px; + z-index:1000; + } + } + .hidden{ + display:none; + } } .serviceText{ @@ -639,4 +743,19 @@ export default { } } } + +.circle-pulse1 { + background: red; + display: flex; + justify-content: center; + align-items: center; + min-width: 20px; + height: 20px; + font-size: 12px; + border-radius: 50%; + position: absolute; + right: -20%; + top: -10px; + color: #fff; +} diff --git a/src/i18n/en.json b/src/i18n/en.json index dc51a1b..129e925 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -35,7 +35,8 @@ "c6":"Time of issue", "c7":"White paper address", "c8":"Official website address", - "c9":"brief introduction" + "c9":"brief introduction", + "rejection":"Reason for rejection" }, "common": { "million": "million", diff --git a/src/i18n/tw.json b/src/i18n/tw.json index 037ae7d..a1cff02 100644 --- a/src/i18n/tw.json +++ b/src/i18n/tw.json @@ -35,7 +35,8 @@ "c6":"發行時間", "c7":"白皮書地址", "c8":"官網地址", - "c9":"簡介" + "c9":"簡介", + "rejection":"拒絕理由" }, "common": { "million": "幾百萬", diff --git a/src/views/contract/handicap.vue b/src/views/contract/handicap.vue index 868ce72..3302791 100644 --- a/src/views/contract/handicap.vue +++ b/src/views/contract/handicap.vue @@ -107,7 +107,7 @@ {{ $t("contract.e1") }}({{ $t("contract.e2") }}) -
+
{{ parseTime(item.ts, false, "{h}:{i}:{s}") }}
diff --git a/src/views/home/index.vue b/src/views/home/index.vue index c4bcbc8..65675bc 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -369,7 +369,7 @@
-
+
{{ $t("homeNewText.ff2") }}
{{ $t("homeNewText.ff3") }}
@@ -381,8 +381,8 @@
-
-
+
+
@@ -397,7 +397,7 @@
-
+
@@ -421,7 +421,7 @@
-
+
@@ -445,7 +445,7 @@
-
+
@@ -465,7 +465,7 @@
-
+
{{ $t("homeNewText.ff12") }}
@@ -495,7 +495,7 @@
-
{{ $t("homeNewText.ff14") }}
+
{{ $t("homeNewText.ff14") }}
diff --git a/src/views/wallet/exchange-assets.vue b/src/views/wallet/exchange-assets.vue index fd8b631..29cf0be 100644 --- a/src/views/wallet/exchange-assets.vue +++ b/src/views/wallet/exchange-assets.vue @@ -12,13 +12,13 @@
{{$t('login.email')}}
{{$t('wallet.Authentication')}}
-
{{$t('wallet.countryRegion')}}
+
{{ userInfo.email }}
{{ userInfo.user_auth_level_text }}
-
{{ userInfo.country_code }}
+
diff --git a/src/views/wallet/funding.vue b/src/views/wallet/funding.vue index 6fe3c93..1cd80c6 100644 --- a/src/views/wallet/funding.vue +++ b/src/views/wallet/funding.vue @@ -84,7 +84,8 @@ {{$t('wallet.num')}} {{$t('wallet.handlingFee1')}} {{$t('wallet.status')}} - + {{$t('contract.c0')}} + {{$t('nav.rejection')}} @@ -103,9 +104,12 @@ - + + +
{{item.remark}}
+