luyisha 3 years ago
parent
commit
748dd74f3e
  1. 5
      assets/scss/app.scss
  2. 3
      assets/scss/theme.scss
  3. 1
      assets/scss/vant.scss
  4. 5
      i18n/lang/zh-TW.json
  5. 1
      layout/vLang.vue
  6. 4
      pages/assets/recharge.vue
  7. 6
      pages/auth/index.vue
  8. 45
      pages/base/home.vue
  9. 4
      pages/base/mine.vue
  10. 4
      pages/exchange/open-position.vue
  11. 5
      pages/safe/login-password.vue
  12. 2
      pages/transfer/index.vue
  13. BIN
      static/img/Page1.png
  14. BIN
      static/img/Page10.png
  15. BIN
      static/img/Page3.png
  16. BIN
      static/img/Page4.png
  17. BIN
      static/img/Page5.png
  18. BIN
      static/img/Page7.png
  19. BIN
      static/img/light/Page1.png
  20. BIN
      static/img/light/Page10.png
  21. BIN
      static/img/light/Page3.png
  22. BIN
      static/img/light/Page4.png
  23. BIN
      static/img/light/Page5.png
  24. BIN
      static/img/light/Page7.png
  25. BIN
      static/img/light/user-avatar.png
  26. BIN
      static/img/user-avatar.png

5
assets/scss/app.scss

@ -708,7 +708,10 @@ $i: 1;
.bg-FA{
background-color: #fafafa !important;
}
.bg-yellow2{
.bg-yellow-a{
background-color: #F7D558 !important;
}
.color-yellow-a{
color: #F7D558 !important;
}
@import "./vant.scss";

3
assets/scss/theme.scss

@ -38,7 +38,8 @@ $green: #60c08c !default;
// ------随便你改-------
// $plain:var(--plain,#fff);
$plain:rgba(0,0,0,1.000);
$theme-1: #ceb359 !default;
// $theme-1: #ceb359 !default;
$theme-1: #F7D558 !default;
$theme-2: #f0c947 !default;
// $theme-1:#ff4d5c !default;
$buy: #60c08c !default;

1
assets/scss/vant.scss

@ -244,3 +244,4 @@
::v-deep .tab-active-class{
color: $theme-1!important;
}

5
i18n/lang/zh-TW.json

@ -269,7 +269,10 @@
"d2": "護照",
"d3": "身份證",
"d4": "選擇日期",
"d5": "請選擇"
"d5": "請選擇",
"e0": "未實名認證",
"e1": "已實名認證",
"e2": "已高級認證"
},
"exchange": {
"a0": "幣幣",

1
layout/vLang.vue

@ -20,7 +20,6 @@ export default {
lang: "lang",
}),
label() {
console.log(this.langList, 9999);
return this.langList.find((item) => item.value == this.lang).label;
}
},

4
pages/assets/recharge.vue

@ -58,12 +58,12 @@
<!-- <view class="label w-100">{{$t('assets.e7')}}</view> -->
<view class="border-r w-10/12 autowidth p-x-md p-y-ms address-txt p-x-xs flex-fill color-dark fn-center bg-F5 rounded-xs">{{form.address}}</view>
<!-- #ifndef H5 -->
<view class="w-9/12 bg-yellow2 p-y-ms rounded-xs m-t-md autowidth color-black p-x-xs fn-16 fn-center" @click="$copy(form.address)">
<view class="w-9/12 bg-yellow-a p-y-ms rounded-xs m-t-md autowidth color-black p-x-xs fn-16 fn-center" @click="$copy(form.address)">
{{$t('recharge.a4')}}<i class="iconfont color-black m-l-xs">&#xe706;</i>
</view>
<!-- #endif -->
<!-- #ifdef H5 -->
<view class="w-9/12 bg-yellow2 p-y-ms rounded-xs m-t-md autowidth color-black p-x-xs fn-16 fn-center" @click="copy(form.address)">
<view class="w-9/12 bg-yellow-a p-y-ms rounded-xs m-t-md autowidth color-black p-x-xs fn-16 fn-center" @click="copy(form.address)">
{{$t('recharge.a4')}}<i class="iconfont color-black m-l-xs">&#xe706;</i>
</view>
<!-- #endif -->

6
pages/auth/index.vue

@ -10,7 +10,7 @@
<van-icon class="fn-middle" name="info-o" />
{{$t('auth.a2')}}
</view>
<view class="status color-buy" v-else>
<view class="status color-yellow-a" v-else>
<van-icon class="fn-middle" name="passed" />
{{$t('auth.a3')}}
</view>
@ -28,7 +28,7 @@
<van-icon class="fn-middle" name="clock-o" />
{{$t('auth.a5')}}
</view>
<view class="status color-buy" v-else-if="detail.status==2">
<view class="status color-yellow-a" v-else-if="detail.status==2">
<van-icon class="fn-middle" name="passed" />
{{$t('auth.a3')}}
</view>
@ -61,7 +61,7 @@ export default {
methods:{
getAuthInfo(){
Profile.getAuthInfo().then(res=>{
console.log(res.data);
console.log(res.data);
this.detail = res.data
})
},

45
pages/base/home.vue

@ -486,27 +486,10 @@
</view>
</v-link>
</view>
<view class="information p-l-md m-t-xl">
<view class="information p-l-md m-t-xl" v-if="!isLogin">
<!-- <img :src="logoMap.login_logo" class="h-50 w-50 d-block m-r-xs rounded-max flex-shrink" /> -->
<view class="inf-rig flex-fill">
<!-- <span class="fn-lg color-light" v-if="isLogin">{{
user.account
}}</span>
@click="toAccountSettings"
<span v-if="isLogin"
class="inf-rig-cent fn-20 color-light">UID{{ isLogin ? user.user_id : "-" }}
#ifdef H5
<i class="iconfont m-l-lg" @click="copy(user.user_id)">&#xe706;</i>
#endif
#ifndef H5
<i class="iconfont m-l-lg" @click="$copy(user.user_id+'')">&#xe706;</i>
#endif
</span> -->
<!-- v-else -->
<view v-if="!isLogin" class="color-dark" @click.stop>
<view class="color-dark" @click.stop>
<view class="fn-bold fn-16">
{{ $t("first.b2") }}
</view>
@ -521,16 +504,24 @@
</v-link> -->
</view>
</view>
<!-- <v-link :to="detail.status!=2?'/pages/auth/index':''" tag="div"-->
<v-link :to="detail.status!=2?'/pages/auth/index':'/pages/auth/index'" tag="div"
class="bg-form-panel-3 color-theme-1 d-flex justify-between align-center"
<v-link :to="detail.status!=2?'/pages/auth/index':'/pages/auth/index'" tag="div" v-if="isLogin"
class="bg-form-panel-3 d-flex justify-between align-center"
style="background-color: #fff;padding: 12px;">
<view class=" d-flex align-center">
<van-icon name="manager" class="fn-18" />
<text class="p-l-md fn-14">{{$t('auth.a1')}}</text>
<image src="../../static/img/light/user-avatar.png" mode=""
style="width: 100upx;height:100upx;margin-right: 30upx;"></image>
<view style="flex: 1;">
<view style="" class="m-b-xs color-dark fn-16 fn-bold">{{ user.account }}</view>
<view class="d-flex align-center fn-13">
<!-- <van-icon name="manager" class="fn-18 color-theme-1" /> -->
<text v-if="detail.primary_status==0" style="color: #979797;background-color: #fafafa;
padding: 2px 4px;border-radius: 3px;">{{$t('auth.e0')}}</text>
<text v-else-if="detail.status==2" style="color: #fdd434;background-color: #FFFBEA;
padding: 2px 4px;border-radius: 3px;">{{$t('auth.e2')}}</text>
<text v-else-if="detail.primary_status==1" style="color: #41AD87;background-color: #E8FEF2;
padding: 2px 4px;border-radius: 3px;">{{$t('auth.e1')}}</text>
</view>
</view>
<!-- <text class="bg-theme-1 color-white p-x-xs p-y-xxs rounded" v-if="detail.status!=2">{{$t('first.a0')}}</text> -->
<!-- <text class="bg-theme-1 color-white p-x-xs p-y-xxs rounded" v-else>{{$t('auth.a3')}}</text> -->
<van-icon name="arrow" class="fn-18" />
</v-link>
<!-- <view class="personalCenter-center border-b border-gray-5">
<view class="d-flex justify-around">

4
pages/base/mine.vue

@ -95,7 +95,7 @@
<view class="box-shadow wallet" v-if="tabActive==0">
<view class="m-x-md m-b-xs m-t-sm">
<view class="bg-yellow2 p-x-md p-y-xs m-y-xs rounded-ms" :class="theme == 'light' ? 'bgb3-white' : ''"
<view class="bg-yellow-a p-x-md p-y-xs m-y-xs rounded-ms" :class="theme == 'light' ? 'bgb3-white' : ''"
style="position: relative">
<text class="fn-20 d-block color-dark m-t-xs">
{{ (account.funds_account_usd).toFixed(2) }}
@ -170,7 +170,7 @@
</view>
<view class="m-x-md" v-if="tabActive==1">
<view class="bg-yellow2 p-x-md p-y-xs m-y-xs rounded-ms" :class="theme == 'light' ? 'bgb3-white' : ''"
<view class="bg-yellow-a p-x-md p-y-xs m-y-xs rounded-ms" :class="theme == 'light' ? 'bgb3-white' : ''"
style="position: relative">
<view class="fn-sm d-flex justify-between color-gray-6 m-t-xs">
<span> USDT </span>

4
pages/exchange/open-position.vue

@ -500,13 +500,13 @@
</view>
<view class="row d-flex m-y-xs align-center justify-between fn-13 p-t-xs">
<text
class="bg-yellow2 box-shadow rounded-xs p-y-ms w-33 p-x-ms fn-center color-theme-1"
class="bg-yellow-a box-shadow rounded-xs p-y-ms w-33 p-x-ms fn-center color-theme-1"
style="color: #000;"
@click="toStoploss(item)">{{ $t("contract.h5") }}
</text>
<!-- <text class="bg-form-panel-4 box-shadow rounded-xs p-y-ms w-33 p-x-ms fn-center color-theme-1" @click="onekeyReverse(item)">{{ $t("contract.k8") }}</text> -->
<text
class="bg-yellow2 box-shadow rounded-xs p-y-ms w-33 p-x-ms fn-center color-theme-1"
class="bg-yellow-a box-shadow rounded-xs p-y-ms w-33 p-x-ms fn-center color-theme-1"
style="color: #000;"
@click="closePositionShow(item)">{{ $t("contract.h3") }}
</text>

5
pages/safe/login-password.vue

@ -83,5 +83,8 @@ export default {
};
</script>
<style lang="scss" scoped>
/deep/ .green-plain uni-button{
color: #F7D558;
border: 1px solid #F7D558;
}
</style>

2
pages/transfer/index.vue

@ -87,7 +87,7 @@
<view class="d-flex fn-md">
<view class="m-r-xs">{{ form.coin_name }}</view>
<view
class="border-l color-buy p-l-xs"
class="border-l color-yellow-a p-l-xs"
@click="change"
>{{ $t("transfer.b3") }}</view
>

BIN
static/img/Page1.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
static/img/Page10.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
static/img/Page3.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
static/img/Page4.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
static/img/Page5.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
static/img/Page7.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 418 B

BIN
static/img/light/Page1.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
static/img/light/Page10.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
static/img/light/Page3.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
static/img/light/Page4.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
static/img/light/Page5.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
static/img/light/Page7.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 418 B

BIN
static/img/light/user-avatar.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
static/img/user-avatar.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Loading…
Cancel
Save