修复合约杠杆默认值

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);
 
 				}

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
         }
     }
 };

pages/exchange/open-position.vue

@@ -105,7 +105,7 @@
                             </v-picker> -->
                             <v-dropdwon v-if="lever_rage.length>0"
                                         class="w-40 m-r-xs posi bg-form-panel-3 p-y-xxs rounded" :contract="contract"
-                                        :list="lever_rage" @onClick="openNum">
+                                        :list="lever_rage" @onClick="openNum" :leverShow="leverShow">
                             </v-dropdwon>
                         </view>
                         <view class="m-b-ms">
@@ -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.lever_rage.length;item++){
+            			if(e.value==this.lever_rage[item].value){
+            				// leverShow 要传给v-dropdwon组件作为查找默认text
+            				// 用indexof查找的话，因数据地址不同会返回-1
+            				this.leverShow = item.toString();
+            			}
+            		}
+            		// console.log('111111111111', this.leverShow, this.form.lever_rate);
+            }
             Contract.openNum(data, {toast: false}).then((res) => {
                 this.maxNum = res.data;
             });