Browse Source

隐藏资产地区、合约实时成交数据过长、显示撤销按钮和撤销回复

master
liaoxinyu 1 year ago
parent
commit
ae2579235a
  1. 13
      src/api/home.js
  2. 4
      src/api/member.js
  3. 2
      src/api/server/index.js
  4. BIN
      src/assets/img/bg/111111.png
  5. BIN
      src/assets/img/home/kefu.png
  6. 125
      src/components/CommonFooter.vue
  7. 3
      src/i18n/en.json
  8. 3
      src/i18n/tw.json
  9. 2
      src/views/contract/handicap.vue
  10. 16
      src/views/home/index.vue
  11. 4
      src/views/wallet/exchange-assets.vue
  12. 10
      src/views/wallet/funding.vue

13
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;

4
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;

2
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) {

BIN
src/assets/img/bg/111111.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 147 KiB

BIN
src/assets/img/home/kefu.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

125
src/components/CommonFooter.vue

@ -1,6 +1,10 @@
<template>
<!-- colto-section -->
<footer class="footer" @click="toggleMenu($event,2)">
<div class="cszone" v-if="getUserInfo.is_agency!=1">
<a href="javascript:void(0);" @click="scbox()"><img src="../assets/img/home/kefu.png"></a>
<span class="circle-pulse1" v-if="newscount!==0">{{newscount>=100?'99+':newscount}}</span>
</div>
<div class="content">
<div class="footer-upper-section">
<!-- logo -->
@ -281,6 +285,11 @@
<img src="../assets/img/home/bitqr.png" alt="" style="width: 120px;height: 120px;">
<div style="font-size: 16px; color: #9c9c9c;margin-top: 12px;">{{ $t("homeNewText.ff20") }}</div>
</div>
<div class="cspopup" :class='{"hidden":ispopup?"":"none"}'>
<a href="javascript:void(0);" class="close_btn" @click="closebox();">x</a>
<iframe width="100%" height="100%" class="my-modal-body" :src="ifurl" frameborder="0" style="border-radius: 10px;background-color: #fff;"></iframe>
</div>
</div>
</footer>
</template>
@ -288,6 +297,8 @@
<script>
import College from "@/api/college";
import ContactUs from "@/api/contactUs";
import Member from "@/api/member";
import Home from "@/api/home";
import { mapState } from "vuex";
export default {
@ -296,6 +307,9 @@ export default {
service: [],
college: [],
email: "",
ispopup:false,
ifurl:"",
getUserInfo:JSON.parse(localStorage.getItem('auth')),
list: [
{ src: "https://www.rsncoin.com/static/flag/discord.png" },
{ src: "https://www.rsncoin.com/static/flag/telegram.png" },
@ -363,7 +377,8 @@ export default {
url: require("../assets/img/tw.jpg"),
},
],
showMenu: false
showMenu: false,
newscount:0
};
},
computed: {
@ -387,6 +402,9 @@ export default {
this.langer = require("../assets/img/" + lang + ".jpg");
return this.langList.find((item) => item.value == lang).label;
},
isLogin() {
return Boolean(localStorage.token);
},
},
methods: {
Jump(vle){
@ -440,12 +458,54 @@ export default {
})
.catch((err) => {});
},
scbox(e){
// under login
if (this.isLogin) {
// get user infomation
let user_str = localStorage.getItem("auth");
if(user_str!=""){
let user = JSON.parse(user_str);
//
Member.getUnameByUid({user_id:user.referrer}).then(rfres=>{
// query referr uname
this.ifurl ="https://cs.coinovi.com/chat/?toid="+rfres.username+"&room_id="+user.account+"&usid="+user.user_id;
// show popup
this.ispopup = ! this.ispopup
this.chatRead()
})
}
} else {
console.log("login fisrt!!")
this.$router.push({ path: '/sign-in' });
}
},
closebox(){
if(this.ispopup){
this.ispopup = false
}
this.ispopup =false
},
chat(){
Home.chat().then(res => {
this.newscount = res.count;
})
},
chatRead(){
Home.chatRead().then(res => {
console.log(res,'已读');
})
}
},
created() {
this.getCollegeLinks();
this.getServiceLink();
console.log(this.service);
this.getEmial();
if(this.isLogin){
this.chatcount = setInterval(()=>{
this.chat()
},2000)
}
},
};
</script>
@ -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;
}
</style>

3
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",

3
src/i18n/tw.json

@ -35,7 +35,8 @@
"c6":"發行時間",
"c7":"白皮書地址",
"c8":"官網地址",
"c9":"簡介"
"c9":"簡介",
"rejection":"拒絕理由"
},
"common": {
"million": "幾百萬",

2
src/views/contract/handicap.vue

@ -107,7 +107,7 @@
{{ $t("contract.e1") }}({{ $t("contract.e2") }})
</div>
</div>
<div class="d-flex fn-14" v-for="(item, idx) in tradeList" :key="idx">
<div class="d-flex fn-14" v-for="(item, idx) in tradeList.slice(0,30)" :key="idx">
<div class="w-10/24">
{{ parseTime(item.ts, false, "{h}:{i}:{s}") }}
</div>

16
src/views/home/index.vue

@ -369,7 +369,7 @@
</div>
</div>
<div class="illustration_area" style="padding-top: 50px;" v-if="marketList[0]">
<div class="left" style="width: 400px;margin-right: 180px;">
<div class="left" style="width: 400px;margin-right: 100px;">
<div style="font-size: 40px;font-weight: bold;">{{ $t("homeNewText.ff2") }}</div>
<div style="font-size: 23px;margin: 10px 0px;">{{ $t("homeNewText.ff3") }}</div>
<router-link v-if="!isLogin" class="jump_btn" :to="{name:'signUp'}" style="margin-top: 25px;border-radius: 31px;">
@ -381,8 +381,8 @@
</div>
<div class="right" style="width: 500px;">
<div tyle="width: 440px;">
<div style="display: flex;flex-wrap: wrap;">
<div v-for="(item, index) in marketList[0].marketInfoList.slice(0,5)" :key="index" style="border: 1px solid #353535;margin: 10px;padding: 10px;border-radius: 10px;width: 120px;">
<div style="display: flex;flex-wrap: wrap;margin-top: 100px;">
<div v-for="(item, index) in marketList[0].marketInfoList.slice(0,6)" :key="index" style="border: 1px solid #353535;margin: 10px;padding: 10px;border-radius: 10px;width: 120px;">
<div>
<img class="icon" :src="item.coin_icon" style="width: 40px;height: 40px;">
</div>
@ -397,7 +397,7 @@
</div>
<!-- 数字货币交易 -->
<div class="illustration_area" style="padding-top: 100px;">
<div class="illustration_area" style="padding-top: 50px;">
<!-- <div class="img_cellphone"><img src="@/assets/img/home/home3.png" alt=""></div> -->
<div class="img_container">
<div class="backgrounde" :class="{ 'flipped': !imageVisible1 }"></div>
@ -421,7 +421,7 @@
</div>
</div>
<div class="illustration_area" style="background-color:#000000;padding-top: 100px;">
<div class="illustration_area" style="background-color:#000000;padding-top: 50px;">
<div style="margin-right: 60px;" ref="imgContainer2">
<div style="display: flex;align-items: center;">
<img src="@/assets/img/home/home4.png" alt="" width="50" height="50">
@ -445,7 +445,7 @@
</div>
</div>
<div class="illustration_area" style="background-color:#000000;padding-top: 100px;">
<div class="illustration_area" style="background-color:#000000;padding-top: 50px;">
<!-- <div style="width: 493px;height: 650px;border: 1px solid #2c2c2c;padding: 10px;border-radius: 10px;"><img src="@/assets/img/home_people.png" alt=""></div> -->
<div class="img_container1">
<div class="backgrounde" :class="{ 'flipped': !imageVisible3 }"></div>
@ -465,7 +465,7 @@
</div>
</div>
<div class="illustration_area" style="background-color:#000000;padding-top: 100px;">
<div class="illustration_area" style="background-color:#000000;padding-top: 50px;">
<div class="build-bottom d-flex">
<div class="build-left">
<div class="gouma_text">{{ $t("homeNewText.ff12") }}</div>
@ -495,7 +495,7 @@
</div>
</div>
</div>
<div style="width: 1200px;font-size: 40px;font-weight: 700;margin: 0px auto;background-color:#000000;padding-top: 100px;">{{ $t("homeNewText.ff14") }}</div>
<div style="width: 1200px;font-size: 40px;font-weight: 700;margin: 0px auto;background-color:#000000;padding-top: 50px;">{{ $t("homeNewText.ff14") }}</div>
<div class="illustration_area" style="background-color:#000000;margin-top: 10px;">
<div style="width: 1200px;">
<router-link :to="'/notice/'+item.id" v-for="(item, index) in helpList" :key="index+'help'">

4
src/views/wallet/exchange-assets.vue

@ -12,13 +12,13 @@
<!-- <div class="w-6/24">{{$t('login.phone')}}</div> -->
<div class="w-5/24">{{$t('login.email')}}</div>
<div class="w-6/24">{{$t('wallet.Authentication')}}</div>
<div class="w-6/24">{{$t('wallet.countryRegion')}}</div>
<!-- <div class="w-6/24">{{$t('wallet.countryRegion')}}</div> -->
</div>
<div class="d-flex px-5 fn-16">
<!-- <div class="w-6/24">{{ phoneNumbe }}</div> -->
<div class="w-5/24">{{ userInfo.email }}</div>
<div class="w-6/24">{{ userInfo.user_auth_level_text }}</div>
<div class="w-6/24">{{ userInfo.country_code }}</div>
<!-- <div class="w-6/24">{{ userInfo.country_code }}</div> -->
</div>
</div>
</div>

10
src/views/wallet/funding.vue

@ -84,7 +84,8 @@
<th>{{$t('wallet.num')}}</th>
<th>{{$t('wallet.handlingFee1')}}</th>
<th class="text-right">{{$t('wallet.status')}}</th>
<!-- <th class="text-right">{{$t('contract.c0')}}</th> -->
<th class="text-right">{{$t('contract.c0')}}</th>
<th class="">{{$t('nav.rejection')}}</th>
</tr>
</thead>
<tbody>
@ -103,9 +104,12 @@
<!-- <td v-if="item.status==0" class="text-right">{{$t('wallet.processing')}}</td>
<td v-if="item.status==1" class="text-right">{{$t('wallet.success')}}</td>
<td v-if="item.status==2" class="text-right">{{$t('wallet.error')}}</td> -->
<!-- <td class="text-right">
<td class="text-right">
<button v-if="item.status==0" class="btn btn-danger btn-sm" @click="cancelWithdraw(item)">{{$t('contract.c2')}}</button>
</td> -->
</td>
<td style="word-wrap: break-word;width: 200px;">
<div style="width: 200px;" v-if="item.remark">{{item.remark}}</div>
</td>
</tr>
</tbody>
</table>

Loading…
Cancel
Save