litong
/
jiaoyi_cxicoin_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/jiaoyi_cxicoin_h5

master
luyisha 3 years ago
parent
9bc7f5fdc9 2a5d6e604d
commit
78cbd28502
5 changed files with 34 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      i18n/lang/en.json
  2. 40
      pages/base/home.vue
  3. 6
      pages/exchange/open-position.vue
  4. 8
      pages/exchange/position.vue
  5. 10
      pages/exchange/trade-list.vue

4
i18n/lang/en.json
View File

@ -374,7 +374,7 @@
},
"reg": {
"a0": "Mobile registration",
"a1": "Regiser Account",
"a1": "Register Account",
"a2": "Email",
"a3": "Enter your email address",
"a4": "Email",
@ -838,5 +838,5 @@
"a80": "Market place",
"a81": "24 hours market trend",
"a82": "Add cryptocurrency funds to your wallet and start trading instantly"
}
}
}

40
pages/base/home.vue
View File

@ -16,7 +16,7 @@
</view>
</template>
<!-- <template #title>
</template> -->
<template #right>
<!-- <v-link to="/pages/list/list?isSearch=1" class="d-flex align-center">
@ -138,7 +138,7 @@
<view
class="d-flex flex-col align-center fn-sm justify-center"
>
<!-- <view class="color-theme-6">≈ ￥{{omitTo(item.close*price_cny,2)}}</view> -->
</view>
</v-link>
@ -208,12 +208,12 @@
</view>
<van-icon name="arrow" class="color-theme-2"/>
</view> -->
<!-- <view class="m-x-md ">
<text @click="infoActive=0" class="m-r-lg" :class="infoActive==0?'fn-bold fn-16 bor5 color-light':''">{{ $t("first.b5") }}</text>
<text @click="infoActive=1" class="m-l-lg" :class="infoActive==1?'fn-bold fn-16 bor5 color-light':''">{{ $t("first.b4") }}</text>
</view> -->
<view class="section-h-1">
<template v-if="!isLogin">
<view class=""><image src="../../static/img/illustration-1.png" style="width: 454rpx;height: 400rpx;"></image></view>
@ -473,7 +473,7 @@
<view class="right color-light">{{ $t("common.dark") }}</view>
</view>
</view> -->
<!-- <img width="25px" height="25px" @click="changtTheme" :src="theme == 'light' ? 'static/img/moon.png' : 'static/img/sun.png'" /> -->
</view>
<view class="information p-l-md m-t-xl">
@ -483,7 +483,7 @@
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>
@ -492,7 +492,7 @@
<i class="iconfont m-l-lg" @click="$copy(user.user_id+'')">&#xe706;</i>
#endif
</span> -->
<!-- v-else -->
<view v-if="!isLogin" class="color-light" @click.stop>
<view class="fn-bold fn-16">
@ -508,7 +508,7 @@
</v-link>
</view>
</view>
<v-link :to="detail.status!=2?'/pages/auth/index':''" tag="div" class="bg-form-panel-3 p-xs m-xs color-theme-1 d-flex justify-between align-center">
<v-link to="/pages/auth/index" tag="div" class="bg-form-panel-3 p-xs m-xs color-theme-1 d-flex justify-between align-center">
<view class=" d-flex align-center">
<van-icon name="manager" class="fn-18"/>
<text class="p-l-md fn-14">{{$t('auth.a1')}}</text>
@ -545,7 +545,7 @@
</view>
</view> -->
<view class="personalCenter-bottom m-t-md" >
<!-- <v-link
to="/pages/commission/index"
tag="div"
@ -558,9 +558,9 @@
</view>
<van-icon name="arrow" class="fn-18" />
</view>
<!-- </v-link> -->
<!-- <v-link
to="/pages/otc/pays"
tag="div"
@ -664,7 +664,7 @@
</view>
</van-popup>
<van-toast id="van-toast" />
</view>
</template>
@ -910,7 +910,7 @@ export default {
{
series:iitem.series
}
})
})
this.dunshift();
@ -1099,7 +1099,7 @@ export default {
this.indexMarketList();
this.getCurrencyExCny();
this.getCollegeLinks();
if (this.isLogin) {
this.createWalletAddress();
this.getAuthInfo()
@ -1376,7 +1376,7 @@ export default {
display: flex;
flex-direction: column;
align-items: center;
image{
margin-bottom: 20rpx;
}
@ -1389,7 +1389,7 @@ export default {
flex-wrap: wrap;
margin-top: 40rpx;
justify-content: space-around;
.text1{
color: #444;
font-size: 18px;
@ -1427,7 +1427,7 @@ export default {
background-color: #fff;
padding: 30rpx 30rpx 50rpx;
box-sizing: border-box;
.title1{
font-size: 18px;
color: #101010;
@ -1440,7 +1440,7 @@ export default {
color: #999;
line-height: 22px;
}
.section-h-3-list{
.list-left{
width: 50px;
@ -1480,7 +1480,7 @@ export default {
color: #326AEB;
background-image: url('../../static/img/homeBtn_2.png');
background-size: 100% 100%;
image{
width: 24px;
height: 24px;
@ -1489,4 +1489,4 @@ export default {
}
}
}
</style>
</style>

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

@ -559,7 +559,7 @@
</view>
</view>
<view class="p-x-md p-t-0">
<v-input class="p-sm rounded border m-t-sm" :placeholder="$t('contract.i3')" type="number" v-model="strategyForm.tp_trigger_price">
<v-input class="p-sm rounded border m-t-sm" :placeholder="$t('contract.i3')" type="text" v-model="strategyForm.tp_trigger_price">
<template #left>
<span class="color-default">{{ $t("contract.i4") }}：</span>
</template>
@ -574,7 +574,7 @@
}}
USDT
</view> -->
<v-input class="p-sm rounded border m-t-sm" :placeholder="$t('contract.i3')" type="number" v-model="strategyForm.sl_trigger_price">
<v-input class="p-sm rounded border m-t-sm" :placeholder="$t('contract.i3')" type="text" v-model="strategyForm.sl_trigger_price">
<template #left>
<span class="color-default">{{ $t("contract.i7") }}：</span>
</template>
@ -1274,7 +1274,7 @@ export default {
Contract.getSymbolDetail(data).then((res) => {
console.info('res.data', res.data.default_lever, res.data.lever_rage, res)
this.unit_amount = res.data.unit_amount;
// if (!this.lever_rage.length) {
this.lever_rage = res.data.lever_rage.map((item) => ({
label: item,

8
pages/exchange/position.vue
View File

@ -270,7 +270,7 @@ export default {
many(item, newPrice) {
let face = this.symbolDetail.unit_amount;
return math.omitTo(
((newPrice - item.avg_price) * item.avail_position * face) /
((newPrice - item.avg_price) * item.avail_position * face) /
item.avg_price,
4
);
@ -332,7 +332,7 @@ export default {
.confirm({
title: this.$t("contract.c4"),
message: `${this.$t("contract.j1")}${item.pair_name}?`,
confirmButtonText: this.$t("common.confirm"),
confirmButtonText: this.$t("common.confirm"),
cancelButtonText: this.$t("common.cancel")
})
.then(() => {
@ -422,7 +422,7 @@ export default {
this.$toast(this.$t("contract.l2"));
});
});
},
},
mounted() {
@ -451,4 +451,4 @@ export default {
margin-right: $padding-sm;
}
}
</style>
</style>

10
pages/exchange/trade-list.vue
View File

@ -341,7 +341,7 @@
</view>
</template>
<van-empty v-if="!list.length&&active==0" description="" />
<template v-if="active==1">
<view
class="item border-b bg-panel-3"
@ -402,7 +402,7 @@
<view class="d-flex w-50 align-center">
<view v-if="item.side==1" class="suatus color-buy fn-16 m-r-xs d-flex align-center">{{$t('exchange.c0')}}<text class="color-light fn-bold fn-left">{{item.symbol}}/USDT</text></view>
<view v-if="item.side==2" class="suatus color-sell fn-16 m-r-xs">{{$t('exchange.c2')}}<text class="color-light fn-bold fn-left">{{item.symbol}}/USDT</text></view>
</view>
<view class="d-flex w-50">
<view class="label">{{$t('assets.d0')}}：</view>
@ -648,7 +648,7 @@ export default {
confirmButtonText: this.$t("common.confirm"), //改变确认按钮上显示的文字
cancelButtonText: this.$t("common.cancel")
}).then(()=>{
this.cancelEntrust(item)
this.cancelEntrust(item)
})
},
cancelEntrust(item){
@ -835,7 +835,7 @@ export default {
});
},
personalCenter(){
}
},
mounted() {
@ -976,4 +976,4 @@ export default {
.w-75{
width: 75%;
}
</style>
</style>

Write Preview
Loading…
Cancel
Save