Merge branch 'master' of ssh://git.xingtongworld.com:10022/luyisha/B_coins_h5

pages/exchange/exchange-transaction.vue

@@ -494,13 +494,13 @@ export default {
       dtime: null,
       scrollTop:0,
       refreshing:false,
-	  marks:{
-		2: '0%',
-		25: '25%',
-		50: '50%',
-		75: '75%',
-		100: '100%',
-	  }
+			marks:{
+				0: '0%',
+				25: '25%',
+				50: '50%',
+				75: '75%',
+				100: '100%',
+			}
     };
   },
   computed: {
@@ -713,8 +713,10 @@ export default {
     },
     // 计算滑动出来的金额
     sliderChange(n,i) {
+			console.log(n,i,'-------');
       let num = n/100;
-      this.sliderActive=i
+      // this.sliderActive=i;//按钮--数组内索引
+      this.sliderActive=n;//滑块--对象内键名,切换方向时需要
       if (this.form.direction == "buy") {
         if (!this.targetBalance.usable_balance) return;
         if (this.form.type == 0) {
@@ -820,7 +822,8 @@ export default {
 		changeDirection(type){
 			this.form.direction = type;
 			this.getDefaultPrice();
-			let n = this.progress[this.sliderActive];
+			// let n = this.progress[this.sliderActive];// 按钮--数组
+			let n = this.sliderActive;// 滑块--对象
 			this.sliderChange(n, this.sliderActive);
 		},
     // 计算深度