litong
/
jiaoyi_xtzcoins_web
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

3

master
luyisha 3 years ago
parent
9d1eae8a56
commit
755bcd5a58
10 changed files with 146 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      package-lock.json
  2. 2
      package.json
  3. 59
      src/components/SecondaryNav.vue
  4. 8
      src/views/profile/certification.vue
  5. 2
      src/views/profile/index.vue
  6. 2
      src/views/wallet/address.vue
  7. 2
      src/views/wallet/contract-assets.vue
  8. 120
      src/views/wallet/exchange-assets.vue
  9. 2
      src/views/wallet/funding.vue
  10. 2
      src/views/wallet/transfer.vue

2
package-lock.json
View File

@ -14091,7 +14091,7 @@
}, },
"vue-i18n": { "vue-i18n": {
"version": "8.28.2", "version": "8.28.2",
"resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.28.2.tgz", "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-8.28.2.tgz",
"integrity": "sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA==", "integrity": "sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA==",
"dev": true "dev": true
}, },

2
package.json
View File

@ -92,7 +92,7 @@
"style-resources-loader": "^1.3.3", "style-resources-loader": "^1.3.3",
"uglifyjs-webpack-plugin": "^1.1.1", "uglifyjs-webpack-plugin": "^1.1.1",
"url-loader": "^0.5.8", "url-loader": "^0.5.8",
"vue-i18n": "^8.18.2", "vue-i18n": "^8.28.2",
"vue-loader": "^13.3.0", "vue-loader": "^13.3.0",
"vue-style-loader": "^3.1.2", "vue-style-loader": "^3.1.2",
"vue-template-compiler": "^2.5.2", "vue-template-compiler": "^2.5.2",

59
src/components/SecondaryNav.vue
View File

@ -199,72 +199,71 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.SecondaryNav { .SecondaryNav {
width: 100%; width: 180px;
height: 50px; height: calc(100vh - 68px);
@include flexible(row, center, center);
// background: #f5f9fc;
// background : $underpainting;
background : #fff; background : #fff;
border-right: 1px solid #f5f5f5;
// @include flexible(row, center, center);
&.navBarWrap {
position: fixed;
// top: 68px;
top: 0;
left: 0;
z-index: 999;
height: 100%;
}
.SecondaryNavWidth { .SecondaryNavWidth {
width: 1280px; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
justify-content: space-between;
align-items: center; align-items: center;
} }
} }
.holder { .holder {
width: 100%; width: 180px;
height: 50px; height: 100%;
background: #f5f9fc; background: #f5f9fc;
} }
.navBarWrap {
position: fixed;
top: 0;
z-index: 999;
width: 100%;
}
.SecondaryNavUl { .SecondaryNavUl {
display: flex; width: 100%;
height: 100%; height: 100%;
display: flex;
flex-direction: column;
.SecondaryNavList { .SecondaryNavList {
display: flex; width: 100%;
justify-content: center; margin-bottom: 10px;
align-items: center; height: 40px;
margin-right: 20px;
height: 100%;
a { a {
font-weight: 500; font-weight: 500;
// color: rgba(193, 187, 242, 1);
color: black; color: black;
// color: $clr; // color: $clr;
width: 100%; width: 100%;
height: 100%; height: 100%;
// border: 1px solid red;
display: flex; display: flex;
justify-content: center; justify-content: start;
align-items: center; align-items: center;
padding-left: 30px;
} }
a:hover{ a:hover{
color: #F7D558 !important; color: #F7D558 !important;
background-color: #f5f5f5;
} }
.SecondaryNavActive { .SecondaryNavActive {
position: relative; position: relative;
// color: @clr; // color: @clr;
color: #F7D558; color: #F7D558;
background-color: #f5f5f5;
&::after { &::before {
content: ''; content: '';
width: 100%; width: 3px;
height: 2px; height: 100%;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;

8
src/views/profile/certification.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="profile-page"> <div class="profile-page d-flex">
<secondary-nav></secondary-nav> <secondary-nav></secondary-nav>
<div class="container"> <div class="container">
<div class="w-100 d-flex justify-content-center mb-3 mt-4"> <div class="w-100 d-flex justify-content-center mb-3 mt-4">
@ -186,7 +186,7 @@
<template #text> <template #text>
<div class="el-upload__text"> <div class="el-upload__text">
{{$t('profile.positive')}}-{{$t('profile.dragHere')}} {{$t('profile.positive')}}-{{$t('profile.dragHere')}}
<em>{{$t('profile.clickUpload')}}</em> <em style="color:#F7D558">{{$t('profile.clickUpload')}}</em>
</div> </div>
</template> </template>
</upload-img> </upload-img>
@ -199,7 +199,7 @@
<template #text> <template #text>
<div class="el-upload__text"> <div class="el-upload__text">
{{$t('profile.theOtherSide')}}-{{$t('profile.dragHere')}} {{$t('profile.theOtherSide')}}-{{$t('profile.dragHere')}}
<em>{{$t('profile.clickUpload')}}</em> <em style="color:#F7D558">{{$t('profile.clickUpload')}}</em>
</div> </div>
</template> </template>
</upload-img> </upload-img>
@ -425,7 +425,7 @@ export default {
color: white; color: white;
} }
.el-upload-dragger{ .el-upload-dragger{
background-color: #1e2834; // background-color: #1e2834;
} }
} }
.profile-page{ .profile-page{

2
src/views/profile/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="profile-page profile111-page"> <div class="profile-page profile111-page d-flex">
<secondary-nav></secondary-nav> <secondary-nav></secondary-nav>
<div class="container"> <div class="container">
<div class="w-100 d-flex justify-content-between align-items-center mb-3 mt-4"> <div class="w-100 d-flex justify-content-between align-items-center mb-3 mt-4">

2
src/views/wallet/address.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="wallet-page"> <div class="wallet-page d-flex">
<secondary-nav></secondary-nav> <secondary-nav></secondary-nav>
<div class="container"> <div class="container">
<div <div

2
src/views/wallet/contract-assets.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="wallet11-page"> <div class="wallet11-page d-flex">
<secondary-nav></secondary-nav> <secondary-nav></secondary-nav>
<div class="container"> <div class="container">
<div <div

120
src/views/wallet/exchange-assets.vue
View File

@ -1,20 +1,46 @@
<template> <template>
<div class="settings wallet-page"> <div class="settings wallet-page d-flex">
<secondary-nav></secondary-nav> <secondary-nav></secondary-nav>
<!-- 资产 --> <!-- 资产 -->
<div class="container"> <div class="container">
<div class="w-100 d-flex align-items-center mb-3 mt-4" style="padding: 20px 20px 20px 30px;background-color: #fafafa;">
<img style="margin-right: 15px;width: 58px;height: 58px;" src="../../assets/img/avatar.svg" />
<div>
<div>{{ userInfo.user_auth_level_text || signed.user_auth_level_text }}</div>
<div>{{ userInfo.account }}</div>
</div>
</div>
<div class="w-100 d-flex justify-content-between align-items-center mb-3 mt-4"> <div class="w-100 d-flex justify-content-between align-items-center mb-3 mt-4">
<router-link v-if="step==0||step==1" to="/profile/certification">您尚未完成实名认证，请<span style="color: #F7D558!important;">前往认证</span></router-link>
<div v-else-if="step==2">恭喜您，已经通过身份认证！</div>
</div>
<!-- <div class="w-100 d-flex justify-content-between align-items-center mb-3 mt-4">
<div class="h3">{{$t('wallet.assets')}}</div> <div class="h3">{{$t('wallet.assets')}}</div>
<div> <div> -->
<!-- 24小时提币限额： 0 / 20000 USD --> <!-- 24小时提币限额： 0 / 20000 USD -->
<span class="icon-Icon-Increase"></span> <!-- <span class="icon-Icon-Increase"></span>
</div> </div>
</div> </div> -->
<div class="row" style="border-bottom: 1px solid #e7e7e7;"> <div class="row" style="border-bottom: 1px solid #f5f5f5;">
<div class="col-md-7"> <div class="col-md-7" style="padding-bottom: 20px;">
<div class="panel-box bg-panel mb-3">
<div class="heading d-flex justify-content-between align-items-center">
<div class="h6" style="color:#333;">账户入金</div>
<!-- <div>币安支持多种入金方式，您可以选择最适合您的方式</div> -->
</div>
<div class="content buy-content-a">
<div class="d-flex buy-flex-a">
<div>
<div>买币</div>
<div style="color: #999;font-size: 12px;">新用户建议直接用现金买币，便捷无忧</div>
</div>
<router-link to="/exchange" class="buy-btn-a">买入</router-link>
</div>
</div>
</div>
<div class="panel-box bg-panel"> <div class="panel-box bg-panel">
<div class="heading d-flex justify-content-between align-items-center"> <div class="heading d-flex justify-content-between align-items-center">
<div class="h6">{{$t('wallet.allAssets')}}</div> <div class="h6" style="color:#333;">{{$t('wallet.allAssets')}}</div>
<div> <div>
<div class="custom-control custom-switch"> <div class="custom-control custom-switch">
<input type="checkbox" v-model="showValue" class="custom-control-input" id="numerical-control" /> <input type="checkbox" v-model="showValue" class="custom-control-input" id="numerical-control" />
@ -88,7 +114,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-5" style="box-shadow: 0px 1px 2px 3px rgba(0,0,0,.02);"> <div class="col-md-5">
<inner-transfer @change="getUserAssets"></inner-transfer> <inner-transfer @change="getUserAssets"></inner-transfer>
</div> </div>
</div> </div>
@ -100,7 +126,7 @@
<a class="nav-link active" data-toggle="pill" href="#tab1" role="tab" aria-selected="false">现货账户</a> <a class="nav-link active" data-toggle="pill" href="#tab1" role="tab" aria-selected="false">现货账户</a>
</li> </li>
</ul>--> </ul>-->
<form class="form-inline search-box" style="border-bottom: 1px solid #e7e7e7;"> <form class="form-inline search-box" style="border-bottom: 1px solid #f5f5f5;">
<div class="form-check mb-2 mr-sm-2"> <div class="form-check mb-2 mr-sm-2">
<input class="form-check-input" type="checkbox" id="hideZero" v-model="isHideZero" /> <input class="form-check-input" type="checkbox" id="hideZero" v-model="isHideZero" />
<label class="form-check-label" for="hideZero">{{$t('wallet.hide')}} 0 {{$t('wallet.balanceAssets')}}</label> <label class="form-check-label" for="hideZero">{{$t('wallet.hide')}} 0 {{$t('wallet.balanceAssets')}}</label>
@ -464,7 +490,8 @@ export default {
number:"", number:"",
amount:"", amount:"",
images:"" images:""
} },
step: 0,//实名认证步骤
}; };
}, },
@ -485,6 +512,36 @@ export default {
} }
} }
}, },
computed: {
signed() {
const userRec = JSON.parse(localStorage.getItem("auth"));
console.log(userRec);
let {
username = "",
email = null,
phone = null,
user_auth_level_text = this.$t("common.notCertified"),
user_id = "",
} = userRec;
let account;
if (email) {
// 先显示邮箱
const res = /^([\w\-\.]+)@([\w\.\-]+)$/.exec(email);
account = `${res[1].slice(0, 3)}${"*".repeat(5)}@${res[2]}`;
} else if (phone) {
// 再查找手机号
account = phone.replace(/^(\d{3})\d{4}(\d{4})$/, "$1****$2");
}
return {
account,
username,
user_auth_level_text,
user_id,
};
},
},
methods: { methods: {
//确认提交贝宝支付 //确认提交贝宝支付
paypalSbumit(){ paypalSbumit(){
@ -656,9 +713,26 @@ export default {
// 获取个人信息 // 获取个人信息
getUserInfo() { getUserInfo() {
Profile.getUserInfo({}).then(res => { Profile.getUserInfo({}).then(res => {
this.userInfo = res this.userInfo = res;
}); });
} },
// 获取实名信息
getAuthInfo() {
Profile.getAuthInfo()
.then(res => {
// this.detail = res;
// 展示页面
if (res.primary_status == 0) {
this.step = 0;
return;
} else if (res.status == 0) {
this.step = 1;
} else {
this.step = 2;
}
})
.catch(res => {});
},
}, },
created() { created() {
@ -666,7 +740,8 @@ created() {
this.getUserAssets(); this.getUserAssets();
this.getCoinAssets(); this.getCoinAssets();
this.createWalletAddress(); this.createWalletAddress();
this.getUserInfo() this.getUserInfo();
this.getAuthInfo();
}, },
mounted() { mounted() {
@ -781,7 +856,7 @@ created() {
.bg-panel, .bg-panel,
.wallet-page .panel-box .heading, .wallet-page .panel-box .heading,
.wallet-page .panel-box .tab-content{ .wallet-page .panel-box .tab-content{
background: #fff; background: #fafafa;
} }
.wallet-page .tab-pane .table thead tr, .wallet-page .tab-pane .table thead tr,
.wallet-page .tab-pane .table tbody tr{ .wallet-page .tab-pane .table tbody tr{
@ -819,4 +894,21 @@ input[type=radio]{
accent-color: #F7D558; accent-color: #F7D558;
border-color: #fff; border-color: #fff;
} }
.buy-content-a{
padding: 14px;
}
.buy-flex-a{
justify-content: space-between;
align-items: center;
}
.buy-btn-a{
width: 80px;
height: 30px;
line-height: 30px;
text-align: center;
font-size: 14px;
color: #000!important;
background-color: #F7D558;
border-radius: 4px;
}
</style> </style>

2
src/views/wallet/funding.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="wallet-page"> <div class="wallet-page d-flex">
<secondary-nav></secondary-nav> <secondary-nav></secondary-nav>
<div class="container"> <div class="container">
<div class="w-100 d-flex justify-content-between align-items-center mb-3 mt-4"> <div class="w-100 d-flex justify-content-between align-items-center mb-3 mt-4">

2
src/views/wallet/transfer.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="wallet22-page"> <div class="wallet22-page d-flex">
<secondary-nav></secondary-nav> <secondary-nav></secondary-nav>
<div class="container"> <div class="container">
<div class="w-100 d-flex justify-content-between align-items-center mb-3 mt-4"> <div class="w-100 d-flex justify-content-between align-items-center mb-3 mt-4">

Write Preview
Loading…
Cancel
Save