luyisha 3 years ago
parent
commit
ed8057cad6
  1. 2
      i18n/lang/de.json
  2. 4
      i18n/lang/en.json
  3. 2
      i18n/lang/fra.json
  4. 2
      i18n/lang/it.json
  5. 2
      i18n/lang/kor.json
  6. 2
      i18n/lang/spa.json
  7. 2
      i18n/lang/tr.json
  8. 2
      manifest.json
  9. 9
      pages/base/home.vue
  10. 41
      pages/exchange/open-position.vue
  11. 2
      pages/transfer/index.vue

2
i18n/lang/de.json

@ -119,7 +119,7 @@
"e6": "Klasse der Bergleute",
"e7": "Mineral",
"e8": "Währung",
"e9": "Konto des Vertrags"
"e9": "Vertragskonto"
},
"accountSettings": {
"a0": "Einstellungen des Kontos",

4
i18n/lang/en.json

@ -155,12 +155,12 @@
"e1": "Balance Assets",
"e2": "Freeze",
"e3": "Valution",
"e4": "Derivatives Account",
"e4": "Perpetual contracts",
"e5": "Contract conversion",
"e6": "Miner Level",
"e7": "Miner",
"e8": "Currency",
"e9": "Perpetual contracts"
"e9": "Contract Account"
},
"accountSettings": {
"a0": "Account Settings",

2
i18n/lang/fra.json

@ -119,7 +119,7 @@
"e6": "Classe de mineur",
"e7": "Mineurs",
"e8": "Monnaie",
"e9": "Comptes contractuels"
"e9": "Compte de contrat"
},
"accountSettings": {
"a0": "Configuration du compte",

2
i18n/lang/it.json

@ -119,7 +119,7 @@
"e6": "Classe di minerali",
"e7": "miner",
"e8": "Valuta",
"e9": "Conto contrattuale"
"e9": "Conto contratto"
},
"accountSettings": {
"a0": "Impostazioni account",

2
i18n/lang/kor.json

@ -119,7 +119,7 @@
"e6":"광부 등급",
"e7":"광부",
"e8": "화폐 종류",
"e9": "계약 계"
"e9": "계약 계"
},
"accountSettings": {
"a0":"계 정 설정",

2
i18n/lang/spa.json

@ -119,7 +119,7 @@
"e6":"Grado minero",
"e7":"Minero",
"e8": "Moneda",
"e9": "Cuentas contractuales"
"e9": "Cuenta de contrato"
},
"accountSettings": {
"a0":"Configuración de la cuenta",

2
i18n/lang/tr.json

@ -119,7 +119,7 @@
"e6": "Madenci Seviyesi",
"e7": "Madenci",
"e8": "para",
"e9": "Kontrat Hesabı"
"e9": "Sözleşme hesabı"
},
"accountSettings": {
"a0": "Hesap Ayarları",

2
manifest.json

@ -1,6 +1,6 @@
{
"name" : "XTZCoin",
"appid" : "__UNI__FB27865",
"appid" : "__UNI__B028700",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : 100,

9
pages/base/home.vue

@ -402,7 +402,7 @@
</view>
<template v-if="active==0" v-for="parentItem in (marketList)">
<view class="m-xs" :key="parentItem.coin_name" v-if="parentItem.coin_name=='USDT'">
<view v-for="item in parentItem.marketInfoList" :key="item.pair_name" class="bg-panel-3m-t-xs">
<view v-for="item in parentItem.marketInfoList" :key="item.pair_name" class="bg-panel-3m-t-xs" :class="item.pair_name=='BTC/USDT'?'AAAAAA':'BBBBB'">
<view class="w-12/12">
<view class="fn-center w-max">
<v-link
@ -411,11 +411,12 @@
query: { code: item.pair_name },
}"
class="m-b-md m-x-xs rounded-sm link-active d-flex justify-between align-center p-r-md p-y-md box-size p-x-xs"
v-for="item in parentItem.collect
>
<!-- v-for="itemA in parentItem.collect
? collect
: parentItem.marketInfoList"
:key="item.pair_name"
>
:key="itemA.pair_name"
> -->
<view class="fn-left w-1/12">
<img :src="item.coin_icon" alt="icon" srcset="" style="width: 8vw;vertical-align: middle;">
</view>

41
pages/exchange/open-position.vue

@ -153,12 +153,21 @@
<text>0%</text>
<text>100%</text>
</view> -->
<view class="d-flex justify-between">
<view class="borders w-23 rounded-3 fn-center p-y-xs fn-12"
<view class="d-flex justify-between" style="flex-wrap: wrap;">
<!-- <view class="borders w-23 rounded-3 fn-center p-y-xs fn-12"
v-for="(item,index) in progress" @click="sliderChange(item,index)"
:class="sliderActive==index?'color-theme-1 active':''">
{{item}}%
</view>
</view> -->
<slider style="width: 100%;margin:0px;" block-size="16" class="fn-center p-y-xs fn-12" value="0" @change="sliderChangeN" step="1" />
<view style="width: 100%;display: flex;justify-content: space-between;">
<text style="text-align: left;font-size: 12px;">0%</text>
<text style="text-align: right;font-size: 12px;">25%</text>
<text style="text-align: right;font-size: 12px;">50%</text>
<text style="text-align: right;font-size: 12px;">75%</text>
<text style="text-align: right;font-size: 12px;">100%</text>
</view>
<view style="width: 100%;">{{showSliderNum}}</view>
<!-- <bing-progress
activeColor="#60c08c"
barBorderRadius="20px"
@ -880,7 +889,8 @@ export default {
refreshing: false,
pingAmount: '',
imgurl: '',
bao: 0
bao: 0,
showSliderNum: '0%'
};
},
computed: {
@ -1196,13 +1206,6 @@ export default {
myCanvas.width = 0
myCanvas.height = 0
},
//
// sliderChange($ev) {
// this.form.amount = Math.round((this.maxNum * $ev) / 100)||'';
// },
// tooltip($ev) {
// return Math.round($ev) + "%";
// },
omitTo: math.omitTo,
Instruction() {
Contract.instruction().then((res) => {
@ -1446,6 +1449,22 @@ export default {
// this.openNum()
});
},
//
sliderChangeN(e){
console.log('value 发生变化:' + e.detail.value);
let num = e.detail.value;
this.showSliderNum = num+"%";
this.form.amount = Math.round((this.maxNum * num) / 100);
// this.sliderActive = i
this.sliderActive1 = num
this.margin = (this.form.amount / this.form.lever_rate).toFixed(5)
},
// sliderChange($ev) {
// this.form.amount = Math.round((this.maxNum * $ev) / 100)||'';
// },
// tooltip($ev) {
// return Math.round($ev) + "%";
// },
sliderChange(n, i) {
console.info(n, i)
this.form.amount = Math.round((this.maxNum * n) / 100);

2
pages/transfer/index.vue

@ -158,8 +158,10 @@ export default {
watch: {
//
["form.from_account"](n) {
// console.log(this.transferList, '-----=============-----', n);
if (!this.transferList[n].includes(this.form.to_account)) {
this.form.to_account = this.transferList[n][0];
// console.log(this.transferList, '-----=============-----');
}
this.getUserCoinAssets();

Loading…
Cancel
Save