luyisha 3 years ago
parent
commit
389c9ed847
  1. 8
      layout/vDropdwon.vue
  2. 22
      pages/assets/records.vue
  3. 2
      pages/base/option-list.vue
  4. 1
      pages/exchange/exchange-transaction.vue
  5. 5
      pages/exchange/open-position.vue
  6. 18
      pages/transfer/bill.vue

8
layout/vDropdwon.vue

@ -125,7 +125,7 @@ export default {
list-style: none;
border-radius: 4rpx;
// background-color:$panel-4;
background-color: $black;
background-color: #fff;
padding-left: 0;
box-shadow: 6rpx 6rpx 10rpx rgba(122, 122, 122, 0.2);
transition: all 0.2s;
@ -133,7 +133,7 @@ export default {
overflow: hidden;
.li {
box-sizing: border-box;
color: $light;
color: #333;
height: 30px;
// border-bottom: 1px solid $panel-4;
font-size: 24rpx;
@ -164,8 +164,8 @@ export default {
}
.active{
// background-color: $panel-2;
background-color: #666;
color: $theme-1!important;
background-color: #ffffde;
color: #F7D558!important;
}
</style>

22
pages/assets/records.vue

@ -11,33 +11,33 @@
</template>
</v-header>
<view class="layout-main">
<view class="bg-panel-3" style="height: 100%;">
<view class="" style="height: 100%;">
<view class="rounded-md m-b-lg" v-if="list.length" style="padding-bottom: 100px !important;">
<view class="">
<table class="w-max">
<thead class="p-x-md">
<tr class="fn-sm p-x-md">
<tr class="fn-sm p-x-md" style="color: #999;">
<th class="p-b-md fn-left p-l-md">{{ $t("assets.c9") }}</th>
<th class="p-b-md fn-left">{{ $t("assets.d0") }}</th>
<th class="p-b-md fn-right p-r-md">{{ $t("assets.c0") }}</th>
</tr>
</thead>
<tbody>
<tr class="color-light trChange p-x-md rounded-md" v-for="item in list" :key="item.id">
<tr class="color-dark trChange p-x-md rounded-md" v-for="item in list" :key="item.id">
<td class="p-y-xs p-l-md rounded-tl-sm rounded-bl-sm fn-sm">
{{ item.datetime | parseTime }}
</td>
<td v-if="type=='draw'">
<view>{{ item.status_text }}</view>
</td>
<td v-if="type=='recharge'">
<view v-if="item.status==0">{{$t('assets.d1')}}</view>
<view v-if="item.status==1" class="color-buy">{{$t('assets.d2')}}</view>
<view v-if="item.status==2" class="color-sell">{{$t('assets.d3')}}</view>
</td>
<td v-if="type=='recharge'">
<view v-if="item.status==0">{{$t('assets.d1')}}</view>
<view v-if="item.status==1" class="color-buy">{{$t('assets.d2')}}</view>
<view v-if="item.status==2" class="color-sell">{{$t('assets.d3')}}</view>
</td>
<td class="fn-right p-r-md rounded-tr-sm rounded-br-sm">
{{ item.amount }}
<span class="color-default">({{ item.coin_name }})</span>
<span class="color-dark">({{ item.coin_name }})</span>
</td>
</tr>
<!-- <tr v-if="loadMore">
@ -119,5 +119,7 @@ import formData from "@/utils/class/date";
</script>
<style>
.trChange:nth-child(2n-1) td{
background-color: #ffffde !important;
}
</style>

2
pages/base/option-list.vue

@ -209,7 +209,7 @@
custom-style="width:70%;height:auto;padding:20px;border-radius:5px"
:show="popshow"
@close="popshow = false">
<view class="rounded-xs color-default">
<view class="rounded-xs color-default color-dark">
<text class="fn-20 d-block fn-center fn-bold">{{$t('base.a4')}}{{$t('invite.c8')}}</text>
<text class="d-block m-y-lg" v-html="optionInstruction"></text>
<v-button

1
pages/exchange/exchange-transaction.vue

@ -1134,6 +1134,7 @@ export default {
}
.bor5-active {
color: #F7D558;
border-bottom: 4px solid $theme-2;
}
.bg-panel-2{

5
pages/exchange/open-position.vue

@ -33,7 +33,7 @@
<view class="label">{{ $t("contract.d4") }}(USDT)</view>
<view class="num color-dark d-flex align-center" style="margin-top:8px;">
<text>{{ accountInfo.account_equity || "--"}}</text>
<van-icon name="exchange bg-form-panel-3" @click="_router.push('/pages/transfer/index')"
<van-icon name="exchange " @click="_router.push('/pages/transfer/index')"
class="p-l-xs color-theme-1 icon"/>
</view>
</view>
@ -724,7 +724,7 @@
custom-style="width:70%;height:auto;padding:20px;border-radius:5px"
:show="popshow"
@close="popshow = false">
<view class="rounded-xs color-default">
<view class="rounded-xs color-dark">
<text class="fn-20 d-block fn-center fn-bold">{{$t('exchange.a2')}}{{$t('invite.c8')}}</text>
<text class="d-block m-y-lg" v-html="contractInstruction"></text>
<v-button
@ -1824,6 +1824,7 @@ export default {
}
.bor5-active {
color: #F7D558;
border-bottom: 4px solid $theme-2;
position: relative;
top: 4px;

18
pages/transfer/bill.vue

@ -3,26 +3,26 @@
<v-header :title="$t('transfer.a0')"></v-header>
<v-scroll class="layout-main" @ref="ref" @load="load">
<ul class="list">
<div @click="paying(item.order_status)" class="item bg-panel-4 m-x-md m-y-xs rounded-sm box-shadow" v-for="item in list" :key="item.datetime">
<div @click="paying(item.order_status)" class="item m-x-md m-y-xs rounded-sm box-shadow" v-for="item in list" :key="item.datetime">
<div class="head d-flex align-center border-b p-x-md p-y-xs justify-between">
<div class="d-flex">
<div>
<div class="color-light fn-lg">{{item.coin_name}}</div>
<div class="fn-10">{{parseTime(item.datetime)}}</div>
<div class="color-dark fn-lg">{{item.coin_name}}</div>
<div class="fn-10 color-gray-6">{{parseTime(item.datetime)}}</div>
</div>
</div>
<div class="color-default" v-if="item.order_status==0">{{$t('auth.a5')}}</div>
<div class="color-dark" v-if="item.order_status==0">{{$t('auth.a5')}}</div>
<div class="color-buy" v-if="item.order_status==1">{{$t('assets.d2')}}</div>
<div class="color-sell" v-if="item.order_status==2">{{$t('assets.d3')}}</div>
</div>
<div class="p-x-md p-y-xs">
<div class="row d-flex m-y-xs justify-between">
<div class="label fn-sm">{{$t('transfer.a2')}}</div>
<div class="color-light">{{item.amount}}</div>
<div class="label fn-sm color-gray-6">{{$t('transfer.a2')}}</div>
<div class="color-dark">{{item.amount}}</div>
</div>
<div class="row d-flex m-y-xs justify-between">
<div class="label fn-sm">{{$t('transfer.a3')}}</div>
<div class="color-light">
<div class="label fn-sm color-gray-6">{{$t('transfer.a3')}}</div>
<div class="color-dark">
{{accountMap[item.draw_out_direction]}}
<i class="iconfont">&#xe61a;</i>
{{accountMap[item.into_direction]}}
@ -37,7 +37,7 @@
:show="popshow"
@close="popshow = false">
<view class="rounded-xs color-default fn-center">
<view class="rounded-xs color-default color-dark fn-center">
<img src="static/img/tt.png" width="60%" class=""/>
<text class="d-block m-y-lg">{{$t('common.c5')}}</text>
<v-button

Loading…
Cancel
Save