luyisha 3 years ago
parent
commit
e3886551ef
  1. 31
      src/assets/scss/base/_common.scss
  2. 2
      src/assets/scss/module/_home.scss
  3. 3
      src/assets/scss/module/_option.scss
  4. 9
      src/components/CommonFooter.vue
  5. 7
      src/components/CommonHeader.vue
  6. 17
      src/components/NewMsg.vue
  7. 6
      src/components/SecondaryNav.vue
  8. 8
      src/components/VBox.vue
  9. 2
      src/views/contract/handicap.vue
  10. 12
      src/views/forgotPwd/index.vue
  11. 8
      src/views/setting/index.vue
  12. 6
      src/views/setting/login-pwd.vue
  13. 55
      src/views/wallet/address.vue
  14. 2
      src/views/wallet/contract-assets.vue
  15. 26
      src/views/wallet/exchange-assets.vue
  16. 3
      src/views/wallet/funding.vue
  17. 2
      src/views/wallet/transfer.vue
  18. 2
      static/Kline/charting_library/static/bundles/library.a8de6f8cf4dda6895071c6ec45f900d9.css
  19. 6
      static/Kline/charting_library/static/css/tradingview_black.css
  20. BIN
      static/images/logo.png

31
src/assets/scss/base/_common.scss

@ -456,19 +456,19 @@ $basew: 24;
} }
.el-cascader__dropdown { .el-cascader__dropdown {
background-color: #000 !important; background-color: #fff !important;
border-color: #666; border-color: #eee;
.el-cascader-node { .el-cascader-node {
&:hover { &:hover {
color: #409EFF; color: #F7D558;
} }
color: $clr; color: #666;
} }
.is-active, .is-active,
.el-cascader-node__prefix { .el-cascader-node__prefix {
color: #409EFF; color: #F7D558;
} }
// .popper__arrow::after { // .popper__arrow::after {
// border-bottom-color: #666 !important; // border-bottom-color: #666 !important;
@ -480,16 +480,16 @@ $basew: 24;
} }
.el-select-dropdown { .el-select-dropdown {
background-color: #000; background-color: #fff;
border-color: #666; border-color: #eee;
.el-select-dropdown__item { .el-select-dropdown__item {
background-color: #000; background-color: #fafafa;
color: $clr; color: rgba(103, 103, 103, 0.85);
&:hover, &:hover,
.selected { .selected {
color: #409EFF; color: #F7D558;
} }
} }
.popper__arrow { .popper__arrow {
@ -502,14 +502,21 @@ $basew: 24;
.el-message-box__wrapper { .el-message-box__wrapper {
background-color: rgba(0,0,0,0.5); background-color: rgba(0,0,0,0.5);
.el-message-box { .el-message-box {
background-color: #000; background-color: #fff;
border-color: #232121; // border-color: #232121;
border: none;
.el-button { .el-button {
border:none; border:none;
&:nth-child(1) { &:nth-child(1) {
background-color: $underpainting; background-color: $underpainting;
} }
&.bg-yellow2{
background-color: #F7D558 !important;
}
&.bg-gray-ccc{
background-color: #ccc !important;
}
} }
} }

2
src/assets/scss/module/_home.scss

@ -832,7 +832,7 @@ textarea:focus {
|---------------------------------------------------------------------------- |----------------------------------------------------------------------------
*/ */
.modal-backdrop { .modal-backdrop {
background: #1b1e63; // background: #1b1e63;
} }
.modal-container .modal-content { .modal-container .modal-content {

3
src/assets/scss/module/_option.scss

@ -205,7 +205,8 @@
} }
.el-popper[x-placement^=bottom] .popper__arrow::after{ .el-popper[x-placement^=bottom] .popper__arrow::after{
border-bottom-color: $panel-1; // border-bottom-color: $panel-1;
border-bottom-color: #ff0;
} }
.el-collapse-item__content{ .el-collapse-item__content{
color:$color; color:$color;

9
src/components/CommonFooter.vue

@ -409,16 +409,19 @@ export default {
.foot_p { .foot_p {
color: #bbb; color: #666;
font-size: 14px; font-size: 14px;
margin: 0; margin: 0;
a:hover { a:hover {
color: #bbb; color: #666;
} }
a:visited { a:visited {
color: #bbb; color: #666;
}
a{
color: #666;
} }
} }

7
src/components/CommonHeader.vue

@ -3,7 +3,7 @@
<nav class="navbar navbar-expand-lg"> <nav class="navbar navbar-expand-lg">
<a class="navbar-brand" href="#/"> <a class="navbar-brand" href="#/">
<img :src="appConfig.head_logo" alt="logo"/> <img :src="appConfig.head_logo" alt="logo"/>
<!-- <img src="../assets/img/logo.png" alt="logo" style="width:102px;height:30px"/> --> <!-- <img src="../../static/images/logo.png" alt="logo" style="width:128px;height:30px"/> -->
<!-- <span class="logo-text"> <!-- <span class="logo-text">
AMATAK AMATAK
</span>--> </span>-->
@ -161,7 +161,7 @@
<img src="../assets/img/avatar.svg" alt/> <img src="../assets/img/avatar.svg" alt/>
</a> </a>
<div class="info text-center"> <div class="info text-center">
<p class="name font-weight-bold mb-0"> <p class="name font-weight-bold mb-0 text-dark">
{{ userInfo.user_auth_level_text || signed.user_auth_level_text }} {{ userInfo.user_auth_level_text || signed.user_auth_level_text }}
<a href="#/profile/certification" <a href="#/profile/certification"
v-if="userInfo.user_auth_level!=2">{{ $t('common.goTo') }}</a> v-if="userInfo.user_auth_level!=2">{{ $t('common.goTo') }}</a>
@ -695,6 +695,9 @@ color: #000 !important;
.dropdown-menu{ .dropdown-menu{
background-color: #fff; background-color: #fff;
} }
.dropdown-menu::before{
background-color: #F7D558;
}
.dropdown-header{ .dropdown-header{
border-bottom: 1px solid #bec0c5; border-bottom: 1px solid #bec0c5;
} }

17
src/components/NewMsg.vue

@ -142,4 +142,21 @@ export default {
right: 0; right: 0;
top: 0; top: 0;
} }
.dropdown-menu{
background-color: #fff;
}
.dropdown-menu::before{
z-index: 1;
background-color: #F7D558;
}
.dropdown-header{
background-color: #fff;
border-bottom: 1px solid #ddd;
}
.dropdown-menu p{
color: #333;
}
.dropdown-footer{
border-top: 1px solid #ddd;
}
</style> </style>

6
src/components/SecondaryNav.vue

@ -252,10 +252,14 @@ export default {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
a:hover{
color: #F7D558 !important;
}
.SecondaryNavActive { .SecondaryNavActive {
position: relative; position: relative;
// color: @clr; // color: @clr;
color: #F7D558;
&::after { &::after {
content: ''; content: '';
@ -265,7 +269,7 @@ export default {
bottom: 0; bottom: 0;
left: 0; left: 0;
// background: linear-gradient(135deg, rgba(188, 106, 188, 1) 0%, rgba(104, 86, 166, 1) 100%); // background: linear-gradient(135deg, rgba(188, 106, 188, 1) 0%, rgba(104, 86, 166, 1) 100%);
background: black; background: #F7D558;
} }
} }
} }

8
src/components/VBox.vue

@ -194,9 +194,9 @@ export default {
} }
.v-box__container { .v-box__container {
color: #333;
// background: white; background: white;
background: $underpainting; // background: $underpainting;
border-radius: 4px; border-radius: 4px;
overflow: hidden; // overflow: hidden; //
@ -212,7 +212,7 @@ export default {
.v-box__title { .v-box__title {
height: 52px; height: 52px;
padding: 15px; padding: 15px;
border-bottom: 1px solid #4e4e5d; border-bottom: 1px solid #ddd;
// border-radius: 10px 10px 0px 0px; // border-radius: 10px 10px 0px 0px;
@include flexible(row); @include flexible(row);

2
src/views/contract/handicap.vue

@ -64,7 +64,7 @@
</template> </template>
</div> </div>
<div <div
class="current-nav d-flex border-top border-bottom align-items-center" class="current-nav d-flex border-top align-items-center"
> >
<div class="w-10/24"> <div class="w-10/24">
<div class="name text-secondary fn-12">{{ $t("contract.g3") }}</div> <div class="name text-secondary fn-12">{{ $t("contract.g3") }}</div>

12
src/views/forgotPwd/index.vue

@ -1,11 +1,11 @@
<template> <template>
<div class="container"> <div class="container">
<div class="vh-100 d-flex justify-content-center"> <div class="vh-100 d-flex justify-content-center">
<div class="form-access my-auto bg-panel"> <div class="form-access my-auto" style="background-color: #fafafa;">
<form class="chk-body"> <form class="chk-body" style="box-shadow: none;">
<template v-if="step == 1"> <template v-if="step == 1">
<div class="text-center h3 mb-4"> <div class="text-center h3 mb-4 text-dark">
<span>{{ $t("login.find-password") }}</span> <span>{{ $t("login.find-password") }}</span>
</div> </div>
@ -13,7 +13,7 @@
<div class="form-group"> <div class="form-group">
<input type="text" v-model="user.account" class="form-control" :placeholder="$t('login.enter-account')" > <input type="text" v-model="user.account" class="form-control" :placeholder="$t('login.enter-account')" >
</div> </div>
<button type="submit" class="btn btn-primary rounded-pill" @click.prevent="step1">{{ $t("login.submit") }}</button> <button type="submit" class="btn rounded-pill" style="background-color: #F7D558;" @click.prevent="step1">{{ $t("login.submit") }}</button>
</template> </template>
<template v-else-if="step == 2"> <template v-else-if="step == 2">
@ -46,11 +46,11 @@
<get-code class="btn get-code btn-outline-primary" :data="{country_code:user.country_code, phone:user.phone}" :type="6" /> <get-code class="btn get-code btn-outline-primary" :data="{country_code:user.country_code, phone:user.phone}" :type="6" />
</div> </div>
</div> </div>
<button type="submit" class="btn btn-primary rounded-pill" @click.prevent="step2">{{$t("login.submit")}}</button> <button type="submit" class="btn rounded-pill" style="background-color: #F7D558;" @click.prevent="step2">{{$t("login.submit")}}</button>
</template> </template>
</form> </form>
<h2>Remembered your password? <h2 class="text-muted">Remembered your password?
<router-link to="/sign-in">Log In</router-link> <router-link to="/sign-in">Log In</router-link>
</h2> </h2>
</div> </div>

8
src/views/setting/index.vue

@ -1,17 +1,17 @@
<template> <template>
<div class="setting-page"> <div class="setting-page">
<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 text-dark">
<div class="h3">{{$t('setting.safeSetting')}}</div> <div class="h3">{{$t('setting.safeSetting')}}</div>
</div> </div>
<div class="row"> <div class="row">
<!-- 登录密码 --> <!-- 登录密码 -->
<div class="col-md-6 d-flex"> <div class="col-md-6 d-flex">
<div class="panel-box bg-panel shadow-sm mb-4 w-100 d-flex flex-column"> <div class="panel-box bg-panel shadow-sm mb-4 w-100 d-flex flex-column" style="background-color: #fafafa;">
<div class="heading">{{$t('setting.loginPassword')}}</div> <div class="heading">{{$t('setting.loginPassword')}}</div>
<div class="tab-content flex-fill d-flex flex-column justify-content-between align-items-start"> <div class="tab-content flex-fill d-flex flex-column justify-content-between align-items-start">
<div>{{$t('setting.loginPassword')}}</div> <div class="text-black-50">{{$t('setting.loginPassword')}}</div>
<button class="btn btn-primary btn-sm" @click="loginShow=true">{{$t('setting.resLoginPassword')}}</button> <button class="btn btn-sm" @click="loginShow=true" style="background-color: #F7D558;">{{$t('setting.resLoginPassword')}}</button>
</div> </div>
</div> </div>
</div> </div>

6
src/views/setting/login-pwd.vue

@ -46,7 +46,7 @@
:placeholder="$t('setting.enterEmailVer')" :placeholder="$t('setting.enterEmailVer')"
/> />
<div class="input-group-append"> <div class="input-group-append">
<get-code class="btn btn-outline-primary" :data="{type:2}" :type="1" /> <get-code class="btn" style="background-color: #F7D558;" :data="{type:2}" :type="1" />
</div> </div>
</div> </div>
</div> </div>
@ -63,8 +63,8 @@
</div> </div>
</div> </div>
<div class="text-center"> <div class="text-center">
<button type="button" class="btn w-25 btn-secondary" @click="$emit('close')">{{$t('common.cancelBtn')}}</button> <button type="button" class="btn w-25" style="background-color: #ccc;" @click="$emit('close')">{{$t('common.cancelBtn')}}</button>
<button type="button" class="btn w-25 btn-primary" @click="setPassword">{{$t('common.confirmBtn')}}</button> <button type="button" class="btn w-25" style="background-color: #F7D558;" @click="setPassword">{{$t('common.confirmBtn')}}</button>
</div> </div>
</div> </div>
</template> </template>

55
src/views/wallet/address.vue

@ -117,6 +117,7 @@
alt="Copy to clipboard" alt="Copy to clipboard"
:data-index="index" :data-index="index"
class="btn btn-outline-light btn-sm withdrawal-control" class="btn btn-outline-light btn-sm withdrawal-control"
style="color: #F7D558; border: none;vertical-align: bottom;"
>{{ $t("wallet.copy") }}</a >{{ $t("wallet.copy") }}</a
> >
</span> </span>
@ -126,7 +127,8 @@
<!-- <div class="btn-group btn-group-sm text-nowrap" role="group" aria-label="Basic example"> --> <!-- <div class="btn-group btn-group-sm text-nowrap" role="group" aria-label="Basic example"> -->
<button <button
type="button" type="button"
class="btn btn-sm btn-info" class="btn btn-sm"
style="background-color: #F7D558;"
data-toggle="modal" data-toggle="modal"
data-target="#editAddress" data-target="#editAddress"
@click="edit(address)" @click="edit(address)"
@ -135,7 +137,8 @@
</button> </button>
<button <button
type="button" type="button"
class="btn btn-sm btn-danger" class="btn btn-sm"
style="background-color: #C7A048;"
@click="del(address.id)" @click="del(address.id)"
> >
{{ $t("wallet.deleteAddress") }} {{ $t("wallet.deleteAddress") }}
@ -163,7 +166,7 @@
aria-hidden="true" aria-hidden="true"
> >
<div class="modal-dialog modal-dialog-centered"> <div class="modal-dialog modal-dialog-centered">
<div class="modal-content bg-panel"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel"> <h5 class="modal-title" id="exampleModalLabel">
{{ action == "add" ? $t("wallet.add") : $t("wallet.edit") {{ action == "add" ? $t("wallet.add") : $t("wallet.edit")
@ -230,14 +233,16 @@
<div class="modal-footer"> <div class="modal-footer">
<button <button
type="button" type="button"
class="btn btn-secondary rounded-pill" class="btn rounded-pill"
style="background-color: #ccc;"
data-dismiss="modal" data-dismiss="modal"
> >
{{ $t("common.cancelBtn") }} {{ $t("common.cancelBtn") }}
</button> </button>
<button <button
type="button" type="button"
class="btn btn-primary rounded-pill" class="btn rounded-pill"
style="background-color: #F7D558;"
@click="handleUserAddress" @click="handleUserAddress"
> >
{{ $t("common.confirmBtn") }} {{ $t("common.confirmBtn") }}
@ -314,7 +319,14 @@ export default {
del(id) { del(id) {
this.$confirm(this.$t("wallet.remarksDelete") + "?",{ this.$confirm(this.$t("wallet.remarksDelete") + "?",{
confirmButtonText:this.$t('common.confirmBtn'), confirmButtonText:this.$t('common.confirmBtn'),
cancelButtonText: this.$t('common.cancelBtn') cancelButtonText: this.$t('common.cancelBtn'),
iconColor:'#F7D558',//
confirmButtonType: 'Warning',//
type: 'Warning',//
confirmButtonColor:'#F7D558',//
confirmButtonType:'Warning',//
confirmButtonClass:'bg-yellow2',//
cancelButtonClass:'bg-gray-ccc',//
}) })
.then(() => { .then(() => {
Wallet.withdrawalAddressDeleted({ id }) Wallet.withdrawalAddressDeleted({ id })
@ -411,9 +423,26 @@ export default {
border-color:#4e4e5d; border-color:#4e4e5d;
} }
.el-collapse-item__wrap{ .el-collapse-item__wrap{
background: transparent; border-color:#eee;
border-color:#4e4e5d;
} }
}
.wallet-page .tab-pane .table thead tr,
.wallet-page .tab-pane .table tbody tr{
background: #fff !important;
line-height: 29px;
}
.wallet-page .tab-pane .table tbody tr:hover{
background-color: #ffffde;
}
.wallet-page .tab-pane .table thead tr th{
color: #999;
}
.wallet-page .tab-pane .table tr td{
color: #666;
}
.stripe tbody tr:first-of-type td{
border-top-color: #eee;
} }
.wallet-page .panel-box .heading{ .wallet-page .panel-box .heading{
background: #fff; background: #fff;
@ -425,4 +454,14 @@ export default {
/deep/ .el-collapse-item__header{ /deep/ .el-collapse-item__header{
border-color: #f8f8f8; border-color: #f8f8f8;
} }
.modal-content{
background-color: #fff;
}
.modal-header{
border-bottom-color: #ddd;
}
.modal-footer{
border-top-color: #ddd;
}
</style> </style>

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

@ -119,6 +119,6 @@ export default {
color: #666; color: #666;
} }
.stripe tbody tr:hover{ .stripe tbody tr:hover{
background: #f2f2f2; background: #ffffde;
} }
</style> </style>

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

@ -142,10 +142,10 @@
<td> <td>
<div class="btn-group btn-group-sm" role="group" aria-label="Basic example"> <div class="btn-group btn-group-sm" role="group" aria-label="Basic example">
<!-- data-target="#deposite" --> <!-- data-target="#deposite" -->
<button type="button" class="btn btn-outline-primary" data-toggle="modal" @click="enterDeposite(item)" :disabled="!item.is_withdraw">{{$t('wallet.recharge')}}</button> <button type="button" class="btn" :class="item.is_withdraw?'mybtn111':''" style="border:1px solid #F7D558;" data-toggle="modal" @click="enterDeposite(item)" :disabled="!item.is_withdraw">{{$t('wallet.recharge')}}</button>
<button type="button" class="btn btn-outline-primary" data-toggle="modal" data-target="#withdraw" @click="enterWithdraw(item)" :disabled="!item.is_withdraw">{{$t('wallet.withdrawal')}}</button> <button type="button" class="btn" :class="item.is_withdraw?'mybtn111':''" style="border:1px solid #F7D558;" data-toggle="modal" data-target="#withdraw" @click="enterWithdraw(item)" :disabled="!item.is_withdraw">{{$t('wallet.withdrawal')}}</button>
<div class="btn-group btn-group-sm" role="group"> <div class="btn-group btn-group-sm" role="group">
<button id="btnGroupDrop1" type="button" class="btn btn-outline-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{$t('wallet.transaction')}}</button> <button id="btnGroupDrop1" type="button" class="btn mybtn111 dropdown-toggle" style="border:1px solid #F7D558;" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{$t('wallet.transaction')}}</button>
<div class="dropdown-menu" aria-labelledby="btnGroupDrop1" v-for="(symbol,index) in item.symbol" :key="index"> <div class="dropdown-menu" aria-labelledby="btnGroupDrop1" v-for="(symbol,index) in item.symbol" :key="index">
<router-link :to="`/exchange/${symbol.coin_name.replace(/\//g, '')}`">{{symbol.coin_name.toUpperCase()}}</router-link> <router-link :to="`/exchange/${symbol.coin_name.replace(/\//g, '')}`">{{symbol.coin_name.toUpperCase()}}</router-link>
@ -294,7 +294,7 @@
</div> </div>
</div> </div>
<div class="modal-footer" v-if="active==1"> <div class="modal-footer" v-if="active==1">
<button type="button" class="btn btn-primary" @click="paypalSbumit">{{$t('common.confirmBtn')}}</button> <button type="button" class="btn" style="background-color: #F7D558;" @click="paypalSbumit">{{$t('common.confirmBtn')}}</button>
</div> </div>
</div> </div>
</div> </div>
@ -340,7 +340,7 @@
</span> </span>
<span> <span>
{{$t('wallet.low')}}:{{withdrawFee.withdrawal_min}} {{withdrawCoin}} {{$t('wallet.low')}}:{{withdrawFee.withdrawal_min}} {{withdrawCoin}}
<router-link to="/wallet/address" class="text-primary">{{$t('wallet.addressList')}}</router-link> <router-link to="/wallet/address" style="color: #F7D558;">{{$t('wallet.addressList')}}</router-link>
</span> </span>
</label> </label>
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">
@ -382,7 +382,7 @@
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-primary rounded-pill" @click="toHandleWithdraw">{{$t('common.confirmBtn')}}</button> <button type="button" class="btn rounded-pill" style="background-color: #F7D558;" @click="toHandleWithdraw">{{$t('common.confirmBtn')}}</button>
</div> </div>
</div> </div>
</div> </div>
@ -805,4 +805,18 @@ created() {
background-color: #f8f8f8; background-color: #f8f8f8;
border-color: #f8f8f8; border-color: #f8f8f8;
} }
.dropdown-menu{
background-color: #fff;
border-color: #f8f8f8;
}
.dropdown-menu::before{
background: #F7D558;
}
.mybtn111:hover{
background: #F7D558;
}
input[type=radio]{
accent-color: #F7D558;
border-color: #fff;
}
</style> </style>

3
src/views/wallet/funding.vue

@ -308,4 +308,7 @@ tr td{
.table td, .table th{ .table td, .table th{
border-top: none; border-top: none;
} }
.markets-pair-list .nav-link.active::after{
background-color: #F7D558;
}
</style> </style>

2
src/views/wallet/transfer.vue

@ -160,6 +160,6 @@ export default {
color: #666; color: #666;
} }
.stripe tbody tr:hover{ .stripe tbody tr:hover{
background: #f2f2f2; background: #ffffde;
} }
</style> </style>

2
static/Kline/charting_library/static/bundles/library.a8de6f8cf4dda6895071c6ec45f900d9.css

File diff suppressed because one or more lines are too long

6
static/Kline/charting_library/static/css/tradingview_black.css

@ -34,3 +34,9 @@
background-color:#007bff; background-color:#007bff;
border: none; border: none;
} }
body.chart-page{
background-color: #fff!important;
}
.chart-container .chart-controls-bar{
background-color: #fff!important;
}

BIN
static/images/logo.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Loading…
Cancel
Save