From 1314195e42b2598d0057cf179bf650a89a1ed574 Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Mon, 30 Jun 2025 13:57:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E7=BA=A7=E8=AE=A4=E8=AF=81=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E6=96=B0=E5=A2=9E=E5=AE=A1=E6=A0=B8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/auth/index.vue             | 29 +++++++++++++++++++---------
 pages/base/home.vue              |  8 ++++----
 pages/exchange/index.vue         | 10 +++++++++-
 pages/exchange/open-position.vue | 33 +++++++++++++++++++++++++++++---
 pages/exchange/sell-and-buy.vue  |  4 ++--
 pages/reg/index.vue              |  8 ++++----
 6 files changed, 69 insertions(+), 23 deletions(-)

diff --git a/pages/auth/index.vue b/pages/auth/index.vue
index b4440e8..670767d 100644
--- a/pages/auth/index.vue
+++ b/pages/auth/index.vue
@@ -1,8 +1,9 @@
 <template>
     <view class="layout-page" :style="themeStyle">
         <v-header :title="$t('auth.a0')" :leftClick="leftClick"></v-header>
-        <view class="rounded-md overflow-hidden m-lg bg-panel-3 box-shadow">
-            <v-link  :to="detail.primary_status==0?'/pages/auth/primary':''" class="d-flex align-center p-md  border-b link-active ">
+        <view class="rounded-md m-lg">
+			 <!-- overflow-hidden -->
+            <v-link  :to="detail.primary_status!=2&&detail.primary_status!=1?'/pages/auth/primary':''" style="margin-bottom: 20rpx;border-radius: 10px;" class="d-flex align-center p-md link-active bg-panel-3 box-shadow">
                 <view class="flex-fill color-light fn-lg">
                     {{$t('auth.a1')}}
                 </view>
@@ -10,14 +11,24 @@
                     <van-icon class="fn-middle" name="info-o" />
                     {{$t('auth.a2')}}
                 </view>
-                <view class="status color-buy" v-else>
-                    <van-icon class="fn-middle" name="passed" />
-                    {{$t('auth.a3')}}
-                </view>
+				<view class="status color-yellows" v-else-if="detail.primary_status==2">
+				    <van-icon class="fn-middle" name="clock-o" />
+				    {{$t('auth.a5')}}
+				</view>
+				<view class="status color-buy" v-else-if="detail.primary_status==1">
+				    <van-icon class="fn-middle" name="passed" />
+				    {{$t('auth.a3')}}
+				</view>
+				<view class="status color-sell" v-else-if="detail.primary_status==3">
+				    <van-icon class="fn-middle" name="close" />
+				    {{$t('auth.a6')}}
+				</view>
                 <van-icon class="m-l-xs" name="arrow" />
             </v-link>
-            <v-link tag="view" :to="detail.status!=2&&detail.status!=1?'/pages/auth/senior':''" class="d-flex align-center  p-md border-b link-active">
-                <view class="flex-fill color-light fn-lg ">
+			<view v-if="detail.primary_status==3" style="word-wrap:break-word;" class="color-sell"><van-icon class="m-l-xs" name="info-o" style="display: inline-block;" />{{detail.remark}}</view>
+            <v-link tag="view" :to="detail.status!=2&&detail.status!=1&&detail.primary_status==1?'/pages/auth/senior':''" style="border-radius: 10px;" class="d-flex align-center  p-md link-active  bg-panel-3 box-shadow">
+                 <!-- border-b -->
+				<view class="flex-fill color-light fn-lg ">
                     {{$t('auth.a4')}}
                 </view>
                 <view class="status " v-if="detail.status==0">
@@ -82,5 +93,5 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-    
+
 </style>
\ No newline at end of file
diff --git a/pages/base/home.vue b/pages/base/home.vue
index 72fdb92..5ae10f6 100644
--- a/pages/base/home.vue
+++ b/pages/base/home.vue
@@ -402,20 +402,20 @@
 						{{ $t("homeNewText.hh27",{name:"Flybtctree"}) }}
 					</view>
 					<img src="@/assets/img/home/home10.png" width="335" height="200" style="margin: 60rpx 0px;">
-					<a style="display: block;width: 100%;text-decoration: none;">
-						<!-- https://app.flybtctree.com/download/Flybtctree.html -->
+					<!-- <a style="display: block;width: 100%;text-decoration: none;">
+						https://app.flybtctree.com/download/Flybtctree.html
 						<view class="store_view1">
 							<image src="@/assets/img/home/antFill-apple@2x.png" mode="" style="width: 48rpx;height: 48rpx;"></image>
 							<view style="margin-left: 20rpx;font-weight: bold;">APP Store</view>
 						</view>
 					</a>
 					<a style="display: block;width: 100%;text-decoration: none;">
-						<!-- https://app.flybtctree.com/download/Flybtctree.html -->
+						https://app.flybtctree.com/download/Flybtctree.html
 						<view class="store_view1">
 							<image src="@/assets/img/home/fa-android@2x.png" mode="" style="width: 48rpx;height: 48rpx;"></image>
 							<view style="margin-left: 20rpx;font-weight: bold;">Android</view>
 						</view>
-					</a>
+					</a> -->
 				</view>
 				
 				<view class="index_partners__3BIDL">
diff --git a/pages/exchange/index.vue b/pages/exchange/index.vue
index b4f7f96..2c366ad 100644
--- a/pages/exchange/index.vue
+++ b/pages/exchange/index.vue
@@ -2,7 +2,8 @@
   <v-page>
     <v-header :leftClick="() => {}" :left-arrow="false">
       <template #left>
-        <view @click="$back(-1)">
+        <!-- <view @click="$back(-1)"> -->
+        <view @click="tourl">
           <i class="van-icon van-icon-arrow-left van-nav-bar__arrow"></i>
         </view>
         <view
@@ -218,6 +219,7 @@ export default {
       isLoad: false,
       isShow: true,
       price_cny: 0,
+	  indes:1,
       app
     };
   },
@@ -360,6 +362,7 @@ export default {
       // if (this.isLoad) return;
       // this.isLoad = true;
       this.activeTime = idx;
+	  this.indes += 1
     },
     // 图形通知页面
     changeInterval($ev) {
@@ -498,6 +501,11 @@ export default {
         }
       });
     },
+	tourl(){
+		this._router.replace({
+		  path: "/pages/base/index"
+		});
+	}
   },
   onUnload() {
     this.isShow = false;
diff --git a/pages/exchange/open-position.vue b/pages/exchange/open-position.vue
index cdd427f..ccd0837 100644
--- a/pages/exchange/open-position.vue
+++ b/pages/exchange/open-position.vue
@@ -299,7 +299,9 @@
               :contract="1"
             >
 						<!-- 合约页面的买卖列表中间的实时价格 -->
-              <view class="fn-lg color-buy">{{newPrice.price}}
+              <view class="fn-lg color-buy">
+				{{newPrice.price}}
+				<!-- {{activeCoin}} -->
 								<!-- <span class="color-buy" v-if="newPrice.price>100">{{omitTo(newPrice.price,2)}}</span>
 								<span class="color-buy" v-if="newPrice.price>1&&newPrice.price<100">{{omitTo(newPrice.price,4)}}</span>
 								<span class="color-buy" v-if="newPrice.price<1">{{omitTo(newPrice.price,6)}}</span> -->
@@ -815,7 +817,8 @@ export default {
       refreshing:false,
       pingAmount:'',
       imgurl:'',
-      bao:0
+      bao:0,
+	  newPrice1:[]
     };
   },
   computed: {
@@ -870,6 +873,18 @@ export default {
         return plus.os.name
         // #endif
     },
+	activeCoin() {
+	  if (!this.newPrice1.length) return {};
+	  
+	  const targetPair = this.newPrice1?.flatMap(parentItem => 
+	      parentItem.marketInfoList || []
+	    ).find(item => item.pair_name === this.query.symbol);
+	  let num = targetPair.pair_name === 'BTC/USDT' ? (+targetPair.price).toFixed(1) : (+targetPair.price).toFixed(3);
+	  this.list.map(item=>{
+	    if(item.symbol==targetPair.symbol) item.realtimePrice = num
+	  })
+	  return num;
+	},
 		marginCheck(){
 			return parseInt(this.margin);
 		}
@@ -1268,6 +1283,7 @@ export default {
         this.buyList = res.data.swapBuyList;
         this.tradeList = res.data.swapTradeList;
         this.newPrice = this.tradeList[0] || {};
+		this.newPrice1 = this.tradeList[0] || {};
 				// console.info(this.newPrice)
         this.form.entrust_price = this.newPrice.price;
         this.linkSocket(data.symbol);
@@ -1423,6 +1439,11 @@ export default {
         cmd: "sub",
         msg: `swapTradeList_${symbol}`,
       });
+	  // 订阅最新价格
+	  this.ws.send({
+	      cmd: "sub",
+	      msg: `swapMarketList`,
+	  });
     },
     // 取消订阅
     unLink(symbol) {
@@ -1441,6 +1462,11 @@ export default {
         cmd: "unsub",
         msg: `swapTradeList_${symbol}`,
       });
+	  // 取消最新价格
+	  	this.ws.send({
+	  	    cmd: "unsub",
+	  	    msg: `swapMarketList`,
+	  	});
     },
     socketMessage() {
       // 节流防抖
@@ -1474,7 +1500,8 @@ export default {
 								this.newPrice = arr[i]
 							}
 						}
-						// console.log(this.newPrice, '----------')
+						// this.newPrice1 = JSON.parse(JSON.stringify(data));
+						// console.log(data, '----------')
             break;
         }
       });
diff --git a/pages/exchange/sell-and-buy.vue b/pages/exchange/sell-and-buy.vue
index 8758794..ea43099 100644
--- a/pages/exchange/sell-and-buy.vue
+++ b/pages/exchange/sell-and-buy.vue
@@ -17,7 +17,7 @@
             <!-- <span class="color-sell" v-if="item.price>100">{{omitTo(item.price,2)}}</span>
             <span class="color-sell" v-if="item.price>1&&item.price<100">{{omitTo(item.price,4)}}</span>
             <span class="color-sell" v-if="item.price<1">{{omitTo(item.price,6)}}</span> -->
-						<span class="p-r-xs">{{omitTo(item.amount,2)}}</span>
+						<span class="p-r-xs">{{omitTo(item.amount,4)}}</span>
           <div
             class="proagess h-max bg-sell-transparent"
             :style="{width:getValue(item.amount)+'%'}"
@@ -40,7 +40,7 @@
             <!-- <span class="color-buy" v-if="item.price>100">{{omitTo(item.price,2)}}</span>
             <span class="color-buy" v-if="item.price>1&&item.price<100">{{omitTo(item.price,4)}}</span>
             <span class="color-buy" v-if="item.price<1">{{omitTo(item.price,6)}}</span> -->
-        <span class="p-r-xs">{{omitTo(item.amount,2)}}</span>
+        <span class="p-r-xs">{{omitTo(item.amount,4)}}</span>
         <div class="proagess h-max bg-buy-transparent" :style="{width:getValue(item.amount)+'%'}"></div>
       </div>
     </div>
diff --git a/pages/reg/index.vue b/pages/reg/index.vue
index 64718ff..fafa1e3 100644
--- a/pages/reg/index.vue
+++ b/pages/reg/index.vue
@@ -237,10 +237,10 @@ export default {
         }
         return;
       }
-	  if (!this.form.invite_code) {
-	    this.$toast(this.$t('reg.c7'));
-	    return;
-	  }
+	  // if (!this.form.invite_code) {
+	  //   this.$toast(this.$t('reg.c7'));
+	  //   return;
+	  // }
 	  if (!this.form.withdrawal_psw) {
 	  	this.$toast(this.$t('common.c14'));
 	  	return;