From 6a5902050c246c7cce76ed6521eee0d8972c2b96 Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Tue, 14 Nov 2023 15:10:29 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B8=81=E5=B8=81=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E6=96=B9=E5=90=91=E9=80=89=E6=8B=A9=E7=99=BE=E5=88=86=E6=AF=94?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/exchange/exchange-transaction.vue | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pages/exchange/exchange-transaction.vue b/pages/exchange/exchange-transaction.vue
index 5a5bf73..254e3b3 100644
--- a/pages/exchange/exchange-transaction.vue
+++ b/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);
 		},
     // 计算深度

From 8d39eb3f833d4f37098e9996c312510036aa6447 Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Tue, 14 Nov 2023 16:01:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=B8=81=E5=B8=81=E5=90=88=E7=BA=A6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/exchange/exchange-transaction.vue |  3 ++
 pages/exchange/open-position.vue        | 69 +++++++++++++++----------
 2 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/pages/exchange/exchange-transaction.vue b/pages/exchange/exchange-transaction.vue
index 044886e..842ea61 100644
--- a/pages/exchange/exchange-transaction.vue
+++ b/pages/exchange/exchange-transaction.vue
@@ -1163,4 +1163,7 @@ export default {
 .reda{
 	color: #CA3F66;
 }
+::v-deep .el-slider__button-wrapper{
+	z-index: 1;
+}
 </style>
diff --git a/pages/exchange/open-position.vue b/pages/exchange/open-position.vue
index d903a0d..63f8e1a 100644
--- a/pages/exchange/open-position.vue
+++ b/pages/exchange/open-position.vue
@@ -142,7 +142,7 @@
                                 @change="form.entrust_price=$event.detail"
                                 v-if="form.type == 0"
                             /> -->
-							<view class="" style="display: flex;">
+							<view class="" style="display: flex;" v-if="false">
 								<view class="" style="border: 1px solid #1B1B1B;width: 100px;padding-left: 5px;font-size: 20rpx;">
 									{{$t('exchange.d2')}}(USDT)
 									<input type="text" v-model="form.entrust_price" :placeholder="$t('exchange.c5')">
@@ -179,8 +179,9 @@
 							   :placeholder="$t('exchange.c5')" style="border: 1px solid #202020;">
 							   <template #right>
 							     <view class="color-light fn-bold" style="margin-right: 10px;">
-								 <!-- {{ $t("contract.d8") }} -->
-								 BTC<i class="iconfont m-l-xs fn-sm">&#xe6e9;</i>
+								 {{ $t("contract.d8") }}
+								 <!-- {{symbol.split('/')[0]}} -->
+								 <i class="iconfont m-l-xs fn-sm">&#xe6e9;</i>
 								 </view>
 							   </template>
 							 </v-input>
@@ -234,16 +235,30 @@
                                 {{$t('first.a3')}}
                                 <text class="color-theme-1">({{$t('reg.b4')}})</text>
                             </view> -->
-							<view class="fn-sm m-t-xs d-flex justify-between" style="width: 100%;">
-							    <view class="d-flex">
-							        {{ $t("common.c3") }}
-									<view class="m-l-xs">
-									    {{ maxNum }}
-									    {{ $t("contract.d8") }}
-									</view>
-							    </view>
-								<img :src="$localImgUrl('antOutline.png')" alt="" class="h-18" />
-							</view>
+							
+													<view class="fn-sm m-t-md d-flex justify-between" style="width: 100%;">
+														<view class="">{{ $t("contract.d4") }}(USDT)</view>
+														<view class="num color-light d-flex align-center">
+																<text>{{ accountInfo.account_equity || "--"}}</text>
+														</view>
+													</view>
+													<view class="fn-sm m-t-xs d-flex justify-end" style="width: 100%;">
+														<img :src="$localImgUrl('antOutline.png')" alt="" class="h-18" @click="_router.push('/pages/transfer/index')" />
+													</view>
+													<view class="fn-sm m-t-xs d-flex justify-between" style="width: 100%;">
+														<view class="label">{{ $t("contract.e4") }}(USDT)</view>
+														<view class="">{{accountInfo.usable_balance}}</view>
+													</view>
+													<view class="fn-sm m-t-sm d-flex justify-between" style="width: 100%;" v-if="false">
+															<view class="d-flex">
+																	{{ $t("common.c3") }}
+															<view class="m-l-xs">
+																	{{ maxNum }}
+																	{{ $t("contract.d8") }}
+															</view>
+															</view>
+														<img :src="$localImgUrl('antOutline.png')" alt="" class="h-18" @click="_router.push('/pages/transfer/index')" />
+													</view>
 							
                             <!-- <view class="d-flex justify-between m-y-xs align-center">
                                 <v-input
@@ -263,7 +278,7 @@
 							<!-- 止盈/止损 -->
 							<view style="margin-top: 10px;">
 								<van-checkbox :value="shows" @change="shows = !shows"  checked-color="#fff" shape="square" icon-size="15px">
-									<text class="col-fff m-r-xs" style="font-size: 13px;">{{ $t('contract.i4') }}/{{ $t('contract.i7') }}</text>
+									<text class="col-fff m-r-xs fn-12">{{ $t('contract.i4') }}/{{ $t('contract.i7') }}</text>
 								</van-checkbox>
 							</view>
 							<view style="margin: 10px 0px;" v-if="shows">
@@ -301,7 +316,7 @@
                                     <span class="but_text">{{ $t("contract.c0") }}</span>
                                     <!-- <span class="fn-10 but_right">{{ $t("contract.e0") }}</span> -->
                                 </v-button>
-								<view class="fn-sm m-t-xs d-flex">
+								<!-- <view class="fn-sm m-t-xs d-flex">
 								    <view class="">
 								        {{$t("base.g3")}}
 								    </view>
@@ -316,7 +331,7 @@
 									<view class="" style="margin-left: 10px;">
 										--
 									</view>
-								</view>
+								</view> -->
                             </template>
                             <template v-else>
                                 <v-button
@@ -353,7 +368,7 @@
                                     <span class="but_text">{{ $t("contract.c2") }}</span>
                                     <!--<span class="fn-10 but_right">{{ $t("contract.e2") }}</span>-->
                                 </v-button>
-								<view class="fn-sm m-t-xs d-flex">
+								<!-- <view class="fn-sm m-t-xs d-flex">
 								    <view class="">
 								        {{$t("base.g4")}}
 								    </view>
@@ -368,7 +383,7 @@
 									<view class="" style="margin-left: 10px;">
 										--
 									</view>
-								</view>
+								</view> -->
                             </template>
                             <template v-else>
                                 <v-button
@@ -382,25 +397,25 @@
                                 </v-button
                                 >
                             </template>
-                            <!-- <view class="fn-sm m-t-xs d-flex justify-between">
+                            <view class="fn-sm m-t-xs d-flex justify-between">
                                 <view class="">
                                     {{ $t("common.c3") }}
                                 </view>
                                 <view class="">
                                     {{ maxNum }}
-                                    {{ $t("contract.d8") }}
+                                    <!-- {{ $t("contract.d8") }} -->
                                 </view>
-                            </view> -->
-                            <!-- <view class="fn-sm m-t-xs d-flex justify-between">
+                            </view>
+                            <view class="fn-sm m-t-xs d-flex justify-between">
                                 <view class="">
                                     {{ $t("common.c4") }}
-                                    {{ $t('contract.d2') }}
+                                    <!-- {{ $t('contract.d2') }} -->
                                 </view>
                                 <view class="">
-                                    {{  form.amount}} USDT
+                                    <!-- {{  form.amount}} USDT -->
                                     {{amount}}
                                 </view>
-                            </view> -->
+                            </view>
                         </view>
                         <!-- <view
                           class="m-b-xs border-t border-b p-y-xs d-flex justify-between align-center"
@@ -2124,5 +2139,7 @@ export default {
 	border: 2px solid #fff;
 	background-color: #121212;
 }
-
+::v-deep .el-slider__button-wrapper{
+	z-index: 1;
+}
 </style>
\ No newline at end of file

From 74975ceb7fa0173f2b04ce92ce07f9363ec2988e Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Tue, 14 Nov 2023 16:02:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=A4=8D=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/base/contract.vue | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pages/base/contract.vue b/pages/base/contract.vue
index 9bf637c..6533e83 100644
--- a/pages/base/contract.vue
+++ b/pages/base/contract.vue
@@ -1,15 +1,5 @@
 <template>
   <v-page>
-		<!-- <v-header class="nav-tab" :left-arrow="false" style="background-color: #141414;" :left-click="personalCenter">
-			<template #left>
-				<image src="@/assets/img/home/top.png" mode="aspectFit" style="width: 36rpx;height: 36rpx;"></image>
-			</template>
-			<template #title>
-				<view style="color: #ffffff; font-size: 30rpx;">{{$t('exchange.a2')}}</view>
-			</template>
-			<template #right>
-			</template>
-		</v-header> -->
     <!-- <v-header :left-arrow="false" :title="$t('exchange.a2')"></v-header> -->
     <!-- <van-tabs
       :ellipsis="false"