diff --git a/api/serve/index.js b/api/serve/index.js index aa876e0..5d1ae78 100644 --- a/api/serve/index.js +++ b/api/serve/index.js @@ -85,7 +85,10 @@ x.fn = x.prototype = { console.info(newMsg) if(Cache.get(newMsg).data){ if(newMsg!='_user_walletImage'&& newMsg!='_user_getAuthInfo' && newMsg!='_user_withdrawalBalance' - && newMsg!='_wallet_getBalance' && newMsg!='_contract_getMarketInfo'&& newMsg!='_contract_openNum' && newMsg!='_indexList'&& newMsg!='_user_subscribe'){ + && newMsg!='_wallet_getBalance' && newMsg!='_contract_getMarketInfo'&& newMsg!='_contract_openNum' + && newMsg!='_user_primaryAuth' && newMsg!='_user_subscribeTokenList' + && newMsg!='_user_subscribeRecords' && newMsg!='_user_subscribeNow' && newMsg!='_exchange_getMarketInfo' + && newMsg!='_indexList'&& newMsg!='_user_subscribe'&& newMsg!='_contract_getSymbolDetail' && newMsg!='_user_withdrawalRecord'){ resolve(Cache.get(newMsg).data); } diff --git a/layout/vDropdwon.vue b/layout/vDropdwon.vue index cfffc0c..7d3a49a 100644 --- a/layout/vDropdwon.vue +++ b/layout/vDropdwon.vue @@ -38,10 +38,14 @@ export default { type: [String, Number], default: 0 }, - contract: { - type: String, - default: '' - } + contract: { + type: String, + default: '' + }, + leverShow: { + type: String, + default: '' + }, }, data() { return { @@ -50,6 +54,31 @@ export default { active:2 }; }, + watch:{ + leverShow:{ + deep: true, + handler:function(newVal,oldVal) { + console.log(newVal, '下拉组件leverShow更新'); + this.$nextTick(() => { + this.text=this.list[newVal].label; + }) + } + }, + list:{ + deep: true, + handler:function(newVal,oldVal) { + console.log(newVal, '下拉组件list更新'); + if(this.contract==1&&this.list){ + this.text=this.list[1].label + }else if(this.contract==0&&this.list){ + this.text=this.list[0].label + } + if(this.leverShow){ + this.text=this.list[this.leverShow].label + } + } + } + }, methods: { handlerItem(value,index) { this.showIf = false @@ -65,10 +94,13 @@ export default { }, mounted() { if(this.contract==1&&this.list){ - this.text=this.list[1].label - // this.text=this.list[0].label + this.text=this.list[1].label + // this.text=this.list[0].label }else if(this.contract==0&&this.list){ - this.text=this.list[0].label + this.text=this.list[0].label + } + if(this.leverShow){ + this.text=this.list[this.leverShow].label } } }; diff --git a/pages/exchange/open-position.vue b/pages/exchange/open-position.vue index 27b69ca..a88ae32 100644 --- a/pages/exchange/open-position.vue +++ b/pages/exchange/open-position.vue @@ -105,7 +105,7 @@ --> + :list="lever_rage" @onClick="openNum" :leverShow="leverShow"> @@ -811,6 +811,7 @@ export default { accountInfo: {}, // 杠杆倍数 lever_rage: [], + leverShow: '', // 最多可开张数 maxNum: 0, form: { @@ -1328,40 +1329,40 @@ export default { symbol: this.symbolLeft, }; Contract.getSymbolDetail(data).then((res) => { - console.info(res) - this.unit_amount = res.data.unit_amount; - if (!this.lever_rage.length) { - this.lever_rage = res.data.lever_rage.map((item) => ({ - label: item, - value: item, - })); - // this.form.lever_rate = this.lever_rage[2].value; - this.form.lever_rate = res.data.default_lever; - // this.lever_rage.length =0; - // console.info(this.form.lever_rate) - console.info(res.data.default_lever); - // let e=this.lever_rage[2] - let e = res.data.default_lever - this.openNum(e); - } - this.$emit("getSymbolDetail", res.data); - if (!this.form.lever_rate) { - // this.form.lever_rate = this.lever_rage[2].value; - this.form.lever_rate = res.data.default_lever; - this.openNum(e); - } + console.info('res.data', res.data.default_lever, res.data.lever_rage) + this.unit_amount = res.data.unit_amount; + + this.lever_rage = res.data.lever_rage.map((item) => ({ + label: item, + value: item, + })); + + let e={value:res.data.default_lever, label: res.data.default_lever} + this.openNum(e); + + this.$emit("getSymbolDetail", res.data); + }); }, // 获取可开启张数 openNum(e) { - if (e) { - this.form.lever_rate = e.value - } if (!this.isLogin) return; let data = { symbol: this.symbolLeft, //ETH lever_rate: this.form.lever_rate, //10 }; + if (e) { + this.form.lever_rate = e.value; + data.lever_rate = e.value; + for(let item =0;item { this.maxNum = res.data; });