From a816a75ce5a7d71f2e87b2101b2c01501b5e76ef Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Thu, 6 Mar 2025 09:41:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=B3=E8=B4=AD=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/base/_init.scss |  2 +-
 src/components/CommonHeader.vue |  4 ++--
 src/i18n/en.json                |  1 +
 src/i18n/tw.json                |  2 ++
 src/views/purchase/index.vue    | 28 ++++++++++++++++++----------
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/assets/scss/base/_init.scss b/src/assets/scss/base/_init.scss
index f672a24..c171af8 100644
--- a/src/assets/scss/base/_init.scss
+++ b/src/assets/scss/base/_init.scss
@@ -29,7 +29,7 @@ thead tr th {
 }
 
 thead th {
-	color: #F2F2F2;
+	// color: #F2F2F2;
 	font-size: 13px;
 	font-weight: 600;
 	border: 0 !important;
diff --git a/src/components/CommonHeader.vue b/src/components/CommonHeader.vue
index ba69cbc..7bc034c 100644
--- a/src/components/CommonHeader.vue
+++ b/src/components/CommonHeader.vue
@@ -46,9 +46,9 @@
                     <li class="nav-item">
                         <router-link class="nav-link" :to="learn.url">{{ learn.label }}</router-link>
                     </li>
-                    <!-- <li class="nav-item">
+                    <li class="nav-item">
                         <router-link class="nav-link" :to="purchase.url">{{ purchase.label }}</router-link>
-                    </li> -->
+                    </li>
 
                                        <!-- <li class="nav-item">
                                            <router-link class="nav-link" :to="learn.url">{{ learn.label }}</router-link>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 1b45f3f..e9bfcc8 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1026,6 +1026,7 @@
 		"k9": "Please enter the subscription code",
 		"l1": "Proportion of increase",
 		"l2": "Margin",
+		"l3":"times",
 		"l4": "Current valuation"
 	},
 	"otc": {
diff --git a/src/i18n/tw.json b/src/i18n/tw.json
index 92ceff4..2b0173e 100644
--- a/src/i18n/tw.json
+++ b/src/i18n/tw.json
@@ -968,6 +968,8 @@
 		"k9": "請輸入認購碼",
 		"l1": "漲幅比例",
 		"l2": "保證金",
+		"l3":"倍",
+		"l4":"当前估值",
 		"ContractList": "合約列表"
 	},
 	"otc": {
diff --git a/src/views/purchase/index.vue b/src/views/purchase/index.vue
index 4d73e61..9f3cda5 100644
--- a/src/views/purchase/index.vue
+++ b/src/views/purchase/index.vue
@@ -7,7 +7,7 @@
           <div class="h3 mb-3">{{ detail.coin_name }}</div>
           <div class>{{ $t("purchase.sendPrice") }}</div>
           <div class="price fn-20 blue">
-            1 {{ detail.coin_name }} = {{issue_price}}
+            1 {{ detail.coin_name }} = {{detail.issue_price}}
             <!-- {{ detail.issue_price }} -->
             USDT
           </div>
@@ -23,7 +23,8 @@
                 {{ $t("purchase.expected") }}
               </div>
               <div class="txt">
-                {{ parseTime(detail.expected_time_online) }}
+                <!-- {{ parseTime(detail.expected_time_online) }} -->
+                {{ detail.expected_time_online }}
               </div>
             </li>
             <li class="mt-3">
@@ -31,7 +32,8 @@
                 {{ $t("purchase.startTime") }}
               </div>
               <div class="txt">
-                {{ parseTime(detail.start_subscription_time) }}
+                <!-- {{ parseTime(detail.start_subscription_time) }} -->
+				{{ detail.start_subscription_time }}
               </div>
             </li>
             <li class="mt-3">
@@ -39,7 +41,8 @@
                 {{ $t("purchase.applyForPurchase") }}
               </div>
               <div class="txt">
-                {{ parseTime(detail.end_subscription_time) }}
+                <!-- {{ parseTime(detail.end_subscription_time) }} -->
+				{{ detail.end_subscription_time }}
               </div>
             </li>
           </ul>
@@ -64,13 +67,14 @@
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
+			<!-- :data-message="$t('nav.b9',{num:10})" -->
             <input
               type="number"
               class="form-control"
               :placeholder="$t('purchase.enterNum')"
               min="0"
               step="0.0000000001"
-              :data-message="$t('nav.b9',{num:10})"
+              
               required
               aria-label="Username"
               v-model="num"
@@ -116,7 +120,7 @@
       </div>
     </div>
     <!-- 进度 -->
-    <div v-if="activityList[0].amount" class="container panel my-4 px-4 pt-4 pb-5 rounded shadow-sm bg-panel">
+    <div v-if="activityList[0]" class="container panel my-4 px-4 pt-4 pb-5 rounded shadow-sm bg-panel">
       <div class="row">
         <div class="col-12">
           <h5 class="border-bottom pb-3 mb-5">
@@ -179,7 +183,8 @@
                                         <td>{{ item.subscription_currency_amount }}</td>
                                         <td>{{ item.payment_amount }}</td>
                                         <td>{{ item.payment_currency }}</td>
-                                        <td>{{ item.subscription_time|parseTime }}</td>
+                                        <!-- <td>{{ item.subscription_time|parseTime }}</td> -->
+                                        <td>{{ item.subscription_time }}</td>
                                         <td>{{(item.increase_ratio).toFixed(5)}}%</td>
                                         <td>{{(item.total_value).toFixed(5)}}</td>
                                         <!-- <td>{{ ( ((detail.issue_price-(item.payment_amount/item.subscription_currency_amount))/detail.issue_price)*100 ).toFixed(2) }}%</td> -->
@@ -210,17 +215,18 @@
             <el-step
               :title="$t('purchase.startSubscription')"
               :icon="detail.status >= 2 ? 'el-icon-success' : undefined"
-              :description="parseTime(detail.start_subscription_time)"
+              :description="detail.start_subscription_time"
             ></el-step>
+			<!-- :description="parseTime(detail.start_subscription_time)" -->
             <el-step
               :title="$t('purchase.endOfSubscription')"
               :icon="detail.status >= 3 ? 'el-icon-success' : undefined"
-              :description="parseTime(detail.end_subscription_time)"
+              :description="detail.end_subscription_time"
             ></el-step>
             <el-step
               :title="$t('purchase.announceResults')"
               :icon="detail.status >= 4 ? 'el-icon-success' : undefined"
-              :description="parseTime(detail.announce_time)"
+              :description="detail.announce_time"
             ></el-step>
           </el-steps>
         </div>
@@ -375,6 +381,7 @@ export default {
     getInfo() {
       Subscride.subscribe().then((res) => {
         this.detail = res;
+		console.log(this.detail.announce_time,'1111')
       });
     },
 
@@ -460,6 +467,7 @@ export default {
 <style lang='scss' scoped>
 .table tr:hover{
     background: #e9e9e9 !important;
+	color: #000 !important;
 }
 ::v-deep {
   .el-step__icon {