修复合约杠杆默认问题

layout/vDropdwon.vue

@@ -58,12 +58,14 @@ export default {
 	},
 	watch:{
 		leverShow:{
-			deep:true,
+			deep: true,
 			handler:function(newVal,oldVal) {
+				console.log(newVal, '下拉组件leverShow更新');
 				this.$nextTick(() => {
-					this.text=this.list[newVal].label 
+					this.text=this.list[newVal].label;
 				})
-			}
+			},
+			immediate: true,
 		},
 	},
 	methods: {
@@ -87,8 +89,11 @@ export default {
         }else if(this.contract==0&&this.list){
             this.text=this.list[0].label 
         }
+				if(this.leverShow){
 					this.text=this.list[this.leverShow].label
 				}
+				
+    }
 };
 </script>
 

pages/exchange/open-position.vue

@@ -1348,52 +1348,41 @@ export default {
                 symbol: this.symbolLeft,
             };
             Contract.getSymbolDetail(data).then((res) => {
-				console.log(3333333333333);
+							console.info('res.data', res.data.default_lever, res.data.lever_rage)
-                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,
 							}));
-					console.log(444444444444);
+							
-					// let index = res.data.lever_rage.indexOf(res.data.default_lever);
+							let e={value:res.data.default_lever, label: res.data.default_lever}
-					// this.dropdwonText = this.lever_rage[index].label
-					// this.dropdwonText = res.data.default_lever
-					// console.log('dropdwonText',this.dropdwonText);
-					// lever 要传给v-dropdwon组件作为查找默认text
-					console.log("45454545454",res.data.lever_rage.indexOf(res.data.default_lever));
-					this.leverShow = (res.data.lever_rage.indexOf(res.data.default_lever)).toString();
-                    // 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
-					let e={value:res.data.default_lever}
-					console.log('111111111111111', this.leverShow);
 							this.openNum(e);
-                // }
+							
 							this.$emit("getSymbolDetail", res.data);
-				console.log(5555555555);
+
-                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);
-                }
             });
         },
         // 获取可开启张数
         openNum(e) {
-            if (e) {
+						// console.log(e, '切换杠杆', this.lever_rage);
-                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;
             });
@@ -1429,6 +1418,7 @@ export default {
                 ...this.form,
             };
             data.type = this.form.type == 0 ? 1 : 2
+						console.log(data, '-------');
             let btn;
             if (side == 1) {
                 //开多