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

Merge branch 'master' of ssh://git.xingtongworld.com:10022/luyisha/B_coins_h5

master
‘daijinzheng@xingtongworld.com’ 2 years ago
parent
f9658bcde6 74975ceb7f
commit
9db8b83aaf
3 changed files with 58 additions and 45 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. 10
      pages/base/contract.vue
  2. 24
      pages/exchange/exchange-transaction.vue
  3. 69
      pages/exchange/open-position.vue

10
pages/base/contract.vue
View File

@ -1,15 +1,5 @@
<template> <template>
<v-page> <v-page>
<!-- <v-header class="nav-tab" :left-arrow="false" style="background-color: #141414;" :left-click="personalCenter">
<template #left>
<image src="@/assets/img/home/top.png" mode="aspectFit" style="width: 36rpx;height: 36rpx;"></image>
</template>
<template #title>
<view style="color: #ffffff; font-size: 30rpx;">{{$t('exchange.a2')}}</view>
</template>
<template #right>
</template>
</v-header> -->
<!-- <v-header :left-arrow="false" :title="$t('exchange.a2')"></v-header> --> <!-- <v-header :left-arrow="false" :title="$t('exchange.a2')"></v-header> -->
<!-- <van-tabs <!-- <van-tabs
:ellipsis="false" :ellipsis="false"

24
pages/exchange/exchange-transaction.vue
View File

@ -494,13 +494,13 @@ export default {
dtime: null, dtime: null,
scrollTop:0, scrollTop:0,
refreshing:false, refreshing:false,
marks:{ marks:{
2: '0%', 0: '0%',
25: '25%', 25: '25%',
50: '50%', 50: '50%',
75: '75%', 75: '75%',
100: '100%', 100: '100%',
} }
}; };
}, },
computed: { computed: {
@ -713,8 +713,10 @@ export default {
}, },
// 计算滑动出来的金额 // 计算滑动出来的金额
sliderChange(n,i) { sliderChange(n,i) {
console.log(n,i,'-------');
let num = n/100; let num = n/100;
this.sliderActive=i // this.sliderActive=i;//按钮--数组内索引
this.sliderActive=n;//滑块--对象内键名,切换方向时需要
if (this.form.direction == "buy") { if (this.form.direction == "buy") {
if (!this.targetBalance.usable_balance) return; if (!this.targetBalance.usable_balance) return;
if (this.form.type == 0) { if (this.form.type == 0) {
@ -820,7 +822,8 @@ export default {
changeDirection(type){ changeDirection(type){
this.form.direction = type; this.form.direction = type;
this.getDefaultPrice(); this.getDefaultPrice();
let n = this.progress[this.sliderActive]; // let n = this.progress[this.sliderActive];// 按钮--数组
let n = this.sliderActive;// 滑块--对象
this.sliderChange(n, this.sliderActive); this.sliderChange(n, this.sliderActive);
}, },
// 计算深度 // 计算深度
@ -1160,4 +1163,7 @@ export default {
.reda{ .reda{
color: #CA3F66; color: #CA3F66;
} }
::v-deep .el-slider__button-wrapper{
z-index: 1;
}
</style> </style>

69
pages/exchange/open-position.vue
View File

@ -142,7 +142,7 @@
@change="form.entrust_price=$event.detail" @change="form.entrust_price=$event.detail"
v-if="form.type == 0" v-if="form.type == 0"
/> --> /> -->
<view class="" style="display: flex;"> <view class="" style="display: flex;" v-if="false">
<view class="" style="border: 1px solid #1B1B1B;width: 100px;padding-left: 5px;font-size: 20rpx;"> <view class="" style="border: 1px solid #1B1B1B;width: 100px;padding-left: 5px;font-size: 20rpx;">
{{$t('exchange.d2')}}(USDT) {{$t('exchange.d2')}}(USDT)
<input type="text" v-model="form.entrust_price" :placeholder="$t('exchange.c5')"> <input type="text" v-model="form.entrust_price" :placeholder="$t('exchange.c5')">
@ -179,8 +179,9 @@
:placeholder="$t('exchange.c5')" style="border: 1px solid #202020;"> :placeholder="$t('exchange.c5')" style="border: 1px solid #202020;">
<template #right> <template #right>
<view class="color-light fn-bold" style="margin-right: 10px;"> <view class="color-light fn-bold" style="margin-right: 10px;">
<!-- {{ $t("contract.d8") }} --> {{ $t("contract.d8") }}
BTC<i class="iconfont m-l-xs fn-sm">&#xe6e9;</i> <!-- {{symbol.split('/')[0]}} -->
<i class="iconfont m-l-xs fn-sm">&#xe6e9;</i>
</view> </view>
</template> </template>
</v-input> </v-input>
@ -234,16 +235,30 @@
{{$t('first.a3')}} {{$t('first.a3')}}
<text class="color-theme-1">({{$t('reg.b4')}})</text> <text class="color-theme-1">({{$t('reg.b4')}})</text>
</view> --> </view> -->
<view class="fn-sm m-t-xs d-flex justify-between" style="width: 100%;">
<view class="d-flex"> <view class="fn-sm m-t-md d-flex justify-between" style="width: 100%;">
{{ $t("common.c3") }} <view class="">{{ $t("contract.d4") }}(USDT)</view>
<view class="m-l-xs"> <view class="num color-light d-flex align-center">
{{ maxNum }} <text>{{ accountInfo.account_equity || "--"}}</text>
{{ $t("contract.d8") }} </view>
</view> </view>
</view> <view class="fn-sm m-t-xs d-flex justify-end" style="width: 100%;">
<img :src="$localImgUrl('antOutline.png')" alt="" class="h-18" /> <img :src="$localImgUrl('antOutline.png')" alt="" class="h-18" @click="_router.push('/pages/transfer/index')" />
</view> </view>
<view class="fn-sm m-t-xs d-flex justify-between" style="width: 100%;">
<view class="label">{{ $t("contract.e4") }}(USDT)</view>
<view class="">{{accountInfo.usable_balance}}</view>
</view>
<view class="fn-sm m-t-sm d-flex justify-between" style="width: 100%;" v-if="false">
<view class="d-flex">
{{ $t("common.c3") }}
<view class="m-l-xs">
{{ maxNum }}
{{ $t("contract.d8") }}
</view>
</view>
<img :src="$localImgUrl('antOutline.png')" alt="" class="h-18" @click="_router.push('/pages/transfer/index')" />
</view>
<!-- <view class="d-flex justify-between m-y-xs align-center"> <!-- <view class="d-flex justify-between m-y-xs align-center">
<v-input <v-input
@ -263,7 +278,7 @@
<!-- 止盈/止损 --> <!-- 止盈/止损 -->
<view style="margin-top: 10px;"> <view style="margin-top: 10px;">
<van-checkbox :value="shows" @change="shows = !shows" checked-color="#fff" shape="square" icon-size="15px"> <van-checkbox :value="shows" @change="shows = !shows" checked-color="#fff" shape="square" icon-size="15px">
<text class="col-fff m-r-xs" style="font-size: 13px;">{{ $t('contract.i4') }}/{{ $t('contract.i7') }}</text> <text class="col-fff m-r-xs fn-12">{{ $t('contract.i4') }}/{{ $t('contract.i7') }}</text>
</van-checkbox> </van-checkbox>
</view> </view>
<view style="margin: 10px 0px;" v-if="shows"> <view style="margin: 10px 0px;" v-if="shows">
@ -301,7 +316,7 @@
<span class="but_text">{{ $t("contract.c0") }}</span> <span class="but_text">{{ $t("contract.c0") }}</span>
<!-- <span class="fn-10 but_right">{{ $t("contract.e0") }}</span> --> <!-- <span class="fn-10 but_right">{{ $t("contract.e0") }}</span> -->
</v-button> </v-button>
<view class="fn-sm m-t-xs d-flex"> <!-- <view class="fn-sm m-t-xs d-flex">
<view class=""> <view class="">
{{$t("base.g3")}} {{$t("base.g3")}}
</view> </view>
@ -316,7 +331,7 @@
<view class="" style="margin-left: 10px;"> <view class="" style="margin-left: 10px;">
-- --
</view> </view>
</view> </view> -->
</template> </template>
<template v-else> <template v-else>
<v-button <v-button
@ -353,7 +368,7 @@
<span class="but_text">{{ $t("contract.c2") }}</span> <span class="but_text">{{ $t("contract.c2") }}</span>
<!--<span class="fn-10 but_right">{{ $t("contract.e2") }}</span>--> <!--<span class="fn-10 but_right">{{ $t("contract.e2") }}</span>-->
</v-button> </v-button>
<view class="fn-sm m-t-xs d-flex"> <!-- <view class="fn-sm m-t-xs d-flex">
<view class=""> <view class="">
{{$t("base.g4")}} {{$t("base.g4")}}
</view> </view>
@ -368,7 +383,7 @@
<view class="" style="margin-left: 10px;"> <view class="" style="margin-left: 10px;">
-- --
</view> </view>
</view> </view> -->
</template> </template>
<template v-else> <template v-else>
<v-button <v-button
@ -382,25 +397,25 @@
</v-button </v-button
> >
</template> </template>
<!-- <view class="fn-sm m-t-xs d-flex justify-between"> <view class="fn-sm m-t-xs d-flex justify-between">
<view class=""> <view class="">
{{ $t("common.c3") }} {{ $t("common.c3") }}
</view> </view>
<view class=""> <view class="">
{{ maxNum }} {{ maxNum }}
{{ $t("contract.d8") }} <!-- {{ $t("contract.d8") }} -->
</view> </view>
</view> --> </view>
<!-- <view class="fn-sm m-t-xs d-flex justify-between"> <view class="fn-sm m-t-xs d-flex justify-between">
<view class=""> <view class="">
{{ $t("common.c4") }} {{ $t("common.c4") }}
{{ $t('contract.d2') }} <!-- {{ $t('contract.d2') }} -->
</view> </view>
<view class=""> <view class="">
{{ form.amount}} USDT <!-- {{ form.amount}} USDT -->
{{amount}} {{amount}}
</view> </view>
</view> --> </view>
</view> </view>
<!-- <view <!-- <view
class="m-b-xs border-t border-b p-y-xs d-flex justify-between align-center" class="m-b-xs border-t border-b p-y-xs d-flex justify-between align-center"
@ -2124,5 +2139,7 @@ export default {
border: 2px solid #fff; border: 2px solid #fff;
background-color: #121212; background-color: #121212;
} }
::v-deep .el-slider__button-wrapper{
z-index: 1;
}
</style> </style>
Write Preview
Loading…
Cancel
Save