From 38b662ef9dec7b94051f232fb95ccaf359de6e4e Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Fri, 14 Mar 2025 10:43:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E7=BA=A6=E4=BF=9D?=
 =?UTF-8?q?=E8=AF=81=E9=87=91=E9=99=90=E5=88=B6=E3=80=81=E5=B8=81=E5=B8=81?=
 =?UTF-8?q?k=E7=BA=BF=E4=B8=8D=E4=BC=9A=E5=8A=A8=E3=80=81=E5=90=88?=
 =?UTF-8?q?=E7=BA=A6=E4=BB=B7=E6=A0=BC=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/KLine.vue              |  2 +-
 src/i18n/en.json                      |  3 ++-
 src/i18n/tw.json                      |  3 ++-
 src/views/contract/exchange-store.vue | 15 +++++++++++++++
 src/views/contract/handicap.vue       |  2 ++
 src/views/contract/index.vue          | 18 +++++++++++++-----
 src/views/wallet/funding.vue          | 10 +++++++---
 7 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/components/KLine.vue b/src/components/KLine.vue
index cb5d6db..989e76e 100644
--- a/src/components/KLine.vue
+++ b/src/components/KLine.vue
@@ -311,7 +311,7 @@ export default {
       this.model.subscribe([
         {
           cmd: "sub",
-          msg: `Kline_${this.symbol}_${this.interval}min`
+          msg: `Kline_${this.symbol}_1day`
         }
       ]);
       console.log(this.lang)
diff --git a/src/i18n/en.json b/src/i18n/en.json
index af9b87e..1dcd58a 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -35,7 +35,8 @@
         "c6":"Time of issue",
         "c7":"White paper address",
         "c8":"Official website address",
-        "c9":"brief introduction"
+        "c9":"brief introduction",
+		"rejection":"Reason for rejection"
     },
     "common": {
         "million": "million",
diff --git a/src/i18n/tw.json b/src/i18n/tw.json
index 54ed9cb..61717f5 100644
--- a/src/i18n/tw.json
+++ b/src/i18n/tw.json
@@ -35,7 +35,8 @@
         "c6":"發行時間",
         "c7":"白皮書地址",
         "c8":"官網地址",
-        "c9":"簡介"
+        "c9":"簡介",
+		"rejection":"拒絕理由"
     },
     "common": {
         "million": "幾百萬",
diff --git a/src/views/contract/exchange-store.vue b/src/views/contract/exchange-store.vue
index cdf9479..2cf6c62 100644
--- a/src/views/contract/exchange-store.vue
+++ b/src/views/contract/exchange-store.vue
@@ -99,6 +99,8 @@
               class="form-control"
               v-model="marginBuy"
               :placeholder="tips"
+			  @input="inputEnter(false)"
+			  title=""
           />
           <!-- <div class="input-group-append">
               <span class="input-group-text">{{ $t("contract.e2") }}</span>
@@ -222,6 +224,8 @@
               class="form-control"
               v-model="marginSell"
               :placeholder="tips"
+			  @input="inputEnter(true)"
+			  title=""
           />
           <!-- <div class="input-group-append">
               <span class="input-group-text">{{ $t("contract.e2") }}</span>
@@ -524,6 +528,17 @@ export default {
     }
   },
   methods: {
+	inputEnter(boll) {
+		if(boll){
+			this.marginSell = this.marginSell
+			    .replace(/[^\d.]/g, "") // 移除非数字、非小数点的字符
+			    .replace(/^(\d*\.?\d{0,2}).*$/, "$1"); // 限制最多两位小数
+		}else{
+			this.marginBuy = this.marginBuy
+			    .replace(/[^\d.]/g, "") // 移除非数字、非小数点的字符
+			    .replace(/^(\d*\.?\d{0,2}).*$/, "$1"); // 限制最多两位小数
+		}
+	},
     // 获取合约账户信息
     contractAccount(boo) {
       if (!this.isLogin) return;
diff --git a/src/views/contract/handicap.vue b/src/views/contract/handicap.vue
index 868ce72..a20f30b 100644
--- a/src/views/contract/handicap.vue
+++ b/src/views/contract/handicap.vue
@@ -198,6 +198,7 @@ export default {
         bus.$on('collapse', msg => {
             this.newPriceObj.price =this.symbol=='BTC'? (msg.close).toFixed(1):(msg.close).toFixed(3);
             this.$emit("input", this.newPriceObj);
+			localStorage.setItem("price",this.newPriceObj.price)
         });
     },
   // 获取盘口
@@ -214,6 +215,7 @@ export default {
             this.tradeList = res.swapTradeList;
             this.newPriceObj = this.tradeList[0];
             this.$emit("input", this.newPriceObj);
+			localStorage.setItem("price",this.newPriceObj.price)
         });
     },
     // 计算深度
diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue
index 018384b..2eb6eb8 100644
--- a/src/views/contract/index.vue
+++ b/src/views/contract/index.vue
@@ -20,7 +20,8 @@
               decreace2: activeContract.increase < 0,
               increase: activeContract.increase >= 0
             }">
-            {{ activeContract.price }}
+            <!-- {{ activeContract.price }} -->
+			{{price1}}
           </div>
           <!-- <div class="title mb-1 text-secondary">
             {{ $t("contract.h6") }}
@@ -97,7 +98,7 @@
                   </td>
                   <td class="w-7/24 text-right" >
                     <!-- :class="item.increase < 0 ? 'decreace' : 'increase'" -->
-                    {{ item.close }}
+                    {{item.symbol == activeSymbol ? price1 : item.price}}
                   </td>
                   <td
                     class="w-8/24 text-right"
@@ -239,7 +240,9 @@ export default {
         symbolDetail:{},
         currentIcon: '',
         filterCoin: "",
-        contractListFilter: []
+        contractListFilter: [],
+		price1:0,
+		intervalId:''
     };
   },
   computed: {
@@ -309,8 +312,7 @@ export default {
             if(item.symbol==this.activeContract.symbol) item.realtimePrice=this.activeContract.price
         })
     });
-  
-
+	this.startWatchingPrice();
   },
   //三秒更新一次数据
   mounted: function () {
@@ -319,6 +321,12 @@ export default {
       }, 2000)
   },
   methods: {
+	startWatchingPrice(){
+		this.intervalId = setInterval(() => {
+			let newPrice = localStorage.getItem('price');
+			this.price1 = newPrice;
+		}, 10); // 每秒检查一次
+	},
     ispopover1(item){
         this.activeSymbol=item;
         // this.$refs.popover.showPopper = false;
diff --git a/src/views/wallet/funding.vue b/src/views/wallet/funding.vue
index 6fe3c93..d6979ab 100644
--- a/src/views/wallet/funding.vue
+++ b/src/views/wallet/funding.vue
@@ -84,7 +84,8 @@
                                             <th>{{$t('wallet.num')}}</th>
                                             <th>{{$t('wallet.handlingFee1')}}</th>
                                             <th class="text-right">{{$t('wallet.status')}}</th>
-                                            <!-- <th class="text-right">{{$t('contract.c0')}}</th> -->
+                                            <th class="text-right">{{$t('contract.c0')}}</th>
+											<th>{{$t('nav.rejection')}}</th>
                                         </tr>
                                     </thead>
                                     <tbody>
@@ -103,9 +104,12 @@
                                             <!-- <td v-if="item.status==0" class="text-right">{{$t('wallet.processing')}}</td>
                                             <td v-if="item.status==1" class="text-right">{{$t('wallet.success')}}</td>
                                             <td v-if="item.status==2" class="text-right">{{$t('wallet.error')}}</td> -->
-                                            <!-- <td class="text-right">
+                                            <td class="text-right">
                                                 <button v-if="item.status==0" class="btn btn-danger btn-sm" @click="cancelWithdraw(item)">{{$t('contract.c2')}}</button>
-                                            </td> -->
+                                            </td>
+											<td style="word-wrap: break-word;width: 200px;">
+												<div style="width: 200px;" v-if="item.remark">{{item.remark}}</div>
+											</td>
                                         </tr>
                                     </tbody>
                                 </table>