2

src/assets/scss/module/_contact-us.css

@@ -2,4 +2,5 @@
   background: #cfd6df url("~@/assets/img/concat_us.png");
   background-size: cover;
   max-width: 700px;
+  height: 210px;
 }

src/assets/scss/module/_contact-us.min.css

@@ -1 +1,2 @@
-.contact-us-page .form-content{background:#cfd6df url("~@/assets/img/concat_us.png");background-size:cover;max-width:700px}
+.contact-us-page .form-content{background:#cfd6df url("~@/assets/img/concat_us.png");background-size:cover;max-width:700px;
+    height: 210px;}

src/components/SecondaryNav.vue

@@ -51,10 +51,11 @@ export default {
                 {
                     url: `/wallet/funding`,
                     label: this.$t('common.rechargeWithdraw')
-                },{
-                    url: `/wallet/address`,
-                    label: this.$t('common.addressManagement'),
                 }
+                // ,{
+                //     url: `/wallet/address`,
+                //     label: this.$t('common.addressManagement'),
+                // }
             ];
         },
 

src/i18n/de.json

@@ -793,9 +793,11 @@
         "startSubscription":"Abonnement starten",
         "endOfSubscription":"Schließen Sie das Abonnement",
         "announceResults":"Veröffentlichen von Ergebnissen",
+        "ListedTraded": "Gelistet und gehandelt",
         "projectCetails":"Details des Projekts",
         "useOrNot":"Verwenden oder nicht",
         "subscribe":"für den Kauf",
+        "SubscriptionPrice":"Einschreibegebühr",
         "prompt":"Tipps",
         "subscribeSuccess":"Erfolgreicher Kauf"
     },

src/i18n/en.json

@@ -893,9 +893,11 @@
         "startSubscription": "Apply start",
         "endOfSubscription": "Apply close",
         "announceResults": "Results release",
+        "ListedTraded": "Listed and traded",
         "projectCetails": "Project details",
         "useOrNot": "Using?",
         "subscribe": "Apply",
+        "SubscriptionPrice":"Subscription price",
         "prompt": "Tips",
         "subscribeSuccess": "Apply Success"
     },

src/i18n/fra.json

@@ -793,9 +793,11 @@
         "startSubscription":"Début de la souscription",
         "endOfSubscription":"Clôture de la souscription",
         "announceResults":"Publication des résultats",
+        "ListedTraded": "Coté et négocié",
         "projectCetails":"Détails du projet",
         "useOrNot":"Oui Non",
         "subscribe":"Abonnement",
+        "SubscriptionPrice":"Prix ​​de l'abonnement",
         "prompt":"Conseils",
         "subscribeSuccess":"Souscription réussie"
     },

src/i18n/it.json

@@ -793,9 +793,11 @@
         "startSubscription":"Avvia sottoscrizione",
         "endOfSubscription":"Chiudi l'abbonamento",
         "announceResults":"Pubblica i risultati",
+        "ListedTraded": "Quotato e scambiato",
         "projectCetails":"Dettagli del progetto",
         "useOrNot":"Uso o no",
         "subscribe":"domanda per l'acquisto",
+        "SubscriptionPrice":"Prezzo dell'abbonamento",
         "prompt":"Suggerimenti",
         "subscribeSuccess":"Acquisto riuscito"
     },

src/i18n/jp.json

@@ -792,9 +792,11 @@
         "startSubscription":"申し込みを開始する",
         "endOfSubscription":"申し込みを終了する",
         "announceResults":"結果を公表する",
+        "ListedTraded": "上場および取引される",
         "projectCetails":"プロジェクトの詳細",
         "useOrNot":"使用するかどうか",
         "subscribe":"購入を申請する",
+        "SubscriptionPrice":"定期購入価格",
         "prompt":"ヒント",
         "subscribeSuccess":"申し込み成功"
     },

src/i18n/kor.json

@@ -792,9 +792,11 @@
         "startSubscription":"구 매 신청 을 시작 하 다",
         "endOfSubscription":"구 매 신청 을 마감 하 다",
         "announceResults":"결 과 를 발표 하 다",
+        "ListedTraded": "상장 및 거래",
         "projectCetails":"프로젝트 정보",
         "useOrNot":"사용 여부",
         "subscribe":"구입 을 신청 하 다.",
+        "SubscriptionPrice":"구독 가격",
         "prompt":"제시 하 다.",
         "subscribeSuccess":"구 매 신청 성공"
     },

src/i18n/pt.json

@@ -793,9 +793,11 @@
         "startSubscription":"Início da subscrição",
         "endOfSubscription":"Fim da subscrição",
         "announceResults":"Publicação dos resultados",
+        "ListedTraded": "Listado e negociado",
         "projectCetails":"Pormenores do projecto",
         "useOrNot":"São utilizados",
         "subscribe":"subscrição",
+        "SubscriptionPrice":"Preço da assinatura",
         "prompt":"dica",
         "subscribeSuccess":"O pedido foi aceite."
     },

src/i18n/spa.json

@@ -793,9 +793,11 @@
         "startSubscription":"Inicio de la compra",
         "endOfSubscription":"Cierre de la suscripción",
         "announceResults":"Publicación de los resultados",
+        "ListedTraded": "Listado y negociado",
         "projectCetails":"Detalles del proyecto",
         "useOrNot":"Usar o no",
         "subscribe":"Suscripción",
+        "SubscriptionPrice":"Precio de suscripción",
         "prompt":"Prompt",
         "subscribeSuccess":"éxito de la compra"
     },

src/i18n/tr.json

@@ -793,9 +793,11 @@
         "startSubscription":"Satın almaya başla",
         "endOfSubscription":"Aboneliğin sonu",
         "announceResults":"Sonuçları duyurun",
+        "ListedTraded": "Listelendi ve işlem gördü",
         "projectCetails":"Proje detayları",
         "useOrNot":"kullan ya da kullanma",
         "subscribe":"Abone ol",
+        "SubscriptionPrice":"Abonelik ücreti",
         "prompt":"Komut istemi",
         "subscribeSuccess":"Başarılı abonelik"
         },

src/i18n/tw.json

@@ -835,9 +835,11 @@
         "startSubscription": "開始申購",
         "endOfSubscription": "結束申購",
         "announceResults": "公佈結果",
+        "ListedTraded": "上市交易",
         "projectCetails": "項目詳情",
         "useOrNot": "是否使用",
         "subscribe": "申購",
+        "SubscriptionPrice":"申購價格",
         "prompt": "提示",
         "subscribeSuccess": "申購成功"
     },

src/views/contactUs/index.vue

@@ -38,22 +38,22 @@
                 </div> -->
                 <div class="col-12">
                     <div class="py-2">
-                        <div class="my-3" style="text-align: center;">
+                        <!-- <div class="my-3" style="text-align: center;">
                             {{$t('contact.contactInformation')}}:
                             <div class="">{{contacts.contact}}</div>
                         </div>
                         <div class="my-3" style="text-align: center;">
                             <div class="label">{{$t('contact.routineConsultation')}}:</div>
                             <div class="">{{contacts.email}}</div>
-                        </div>
-                        <div class="my-3" style="text-align: center;">
+                        </div> -->
+                        <div class="my-3" style="text-align: center;font-size: 20px;">
                             <div class="label">{{$t('contact.customerService')}}:</div>
-                            <div class="">{{contacts.service}}</div>
+                            <div class="">{{contacts.contact}}</div>
                         </div>
-                        <div class="my-3" style="text-align: center;">
+                        <!-- <div class="my-3" style="text-align: center;">
                             <div class="label">{{$t('contact.mediaCooperation')}}:</div>
                             <div class="">{{contacts.media}}</div>
-                        </div>
+                        </div> -->
                     </div>
                 </div>
             </div>
@@ -121,4 +121,8 @@ export default {
 </script>
 
 <style scoped>
+.contact-us-page .form-content{
+    height: 260px;
+    padding: 4.5rem !important;
+}
 </style>

src/views/contract/handicap.vue

@@ -215,8 +215,10 @@ 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);
+            // this.newPriceObj.price = +(this.symbol=='BTC'? (msg.close).toFixed(1):(msg.close).toFixed(3));
+            // 上面的代码会导致最新价格在几个币种之间跳动
+            // let price = +(this.symbol=='BTC'? (msg.close).toFixed(1):(msg.close).toFixed(3));
+            // this.$emit("input", price);
         });
     },
   // 获取盘口
@@ -286,8 +288,8 @@ export default {
             this.tradeList.unshift(data);
             this.tradeList.pop();
             // console.info(this.tradeList, 2222222)
-            // this.newPriceObj = data;
-            // this.$emit("input", this.newPriceObj);
+            this.newPriceObj = data;
+            this.$emit("input", this.newPriceObj);
             } else if (type == "ping" ||cmd == "ping") {
             this.ws.send({
                 cmd: "pong"

src/views/contract/hold-position.vue

@@ -30,8 +30,8 @@
             <th>{{ $t("contract.i3") }}</th>
             <!-- <th>{{ $t("contract.g8") }}（{{ $t("contract.e2") }}）</th>
             <th>{{ $t("contract.a5") }}（{{ $t("contract.e2") }}）</th> -->
-            <th>{{ $t("contract.g9") }}</th>
-            <th>{{ $t("contract.g3") }}</th>
+            <th style="width:180px;">{{ $t("contract.g9") }}</th>
+            <th style="width:150px;">{{ $t("contract.g3") }}</th>
             <!-- <th>{{ $t("contract.a8") }}</th> -->
             <th >{{ $t("contract.a6") }}</th>
             <th>{{ $t("contract.h0") }}</th>
@@ -48,8 +48,8 @@
             <td>{{ item.side == 1 ? $t("contract.i4") : $t("contract.i5") }}</td>
             <!-- <td>{{ item.avail_position }}</td>
             <td>{{ item.freeze_position }}</td> -->
-            <td>{{ item.avg_price * 1 }}</td>
-            <td>{{ item.realtimePrice }}</td>
+            <td style="width:180px;">{{ item.avg_price * 1 }}</td>
+            <td style="width:150px;">{{ item.realtimePrice }}</td>
             <!-- <td>{{ item.flatPrice }}</td> -->
             <td :class="item.unRealProfit>0?'increase':item.unRealProfit<0?'decreace':''">{{ (parseFloat(item.unRealProfit)).toFixed(2) }}</td>
             <td>{{ item.profitRate }}</td>

src/views/contract/index.vue

@@ -166,7 +166,7 @@
                       class="w-7/24 "
                       :class="item.increase < 0 ? 'decreace' : 'increase'"
                     >
-                      {{ item.price }}
+                      {{ item.close }}
                     </td>
                     <td
                       class="w-7/24 text-right"
@@ -312,7 +312,7 @@ export default {
             if(val.price){
                 delete contractList.price
             }
-        // console.log(contractList, 'co-activeContract----------------')
+        // console.log(contractList.price, 'co-activeContract----------------')
         return contractList;
     },
     isLogin() {
@@ -341,18 +341,21 @@ export default {
       this.swapMarketList();
     });
     // console.info(this.$refs)
-    bus.$on('collapse', msg => {
-        this.activeContract.price =this.activeContract.symbol=='BTC'? (msg.close).toFixed(1):(msg.close).toFixed(3);
-        this.holdPositionList.map(item=>{
-            if(item.symbol==this.activeContract.symbol) item.realtimePrice=this.activeContract.price
-        })
-    });
+    // bus.$on('collapse', msg => {
+    //     // this.activeContract.price =this.activeContract.symbol=='BTC'? (msg.close).toFixed(1):(msg.close).toFixed(3);
+    //     // 上面的代码会导致最新价格在几个币种之间跳动
+    //     let price = +this.activeContract.symbol=='BTC'? (msg.close).toFixed(1):(msg.close).toFixed(3);
+    //     this.holdPositionList.map(item=>{
+    //         if(item.symbol==this.activeContract.symbol) item.realtimePrice=price;
+    //     })
+    // });
+    
   },
   //三秒更新一次数据
   mounted: function () {
-      setInterval(() => {
-        this.holdPosition();
-      }, 2000)
+      // setInterval(() => {
+      //   this.holdPosition();
+      // }, 2000)
   },
   methods: {
     ispopover1(item){

src/views/exchange/book-trades.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="col-md-4" style="margin-left: -15px;">
+<div class="right-box-A">
     <div style="display: flex;flex-direction: column;align-items: end;height: 100%;">
         <div class="order-book mb15" style="width: 95%;background-color: #fff;">
             <h2 class="heading">{{ $t("exchange.order-book") }}</h2>
@@ -21,8 +21,8 @@
                         <!-- 卖单 使用弹性盒子倒序排列 -->
                         <tr style="display:block;" class="tb-cells" @click.stop="handleOrder(item.price)">
                             <td class="w-33 red" title="pick this price to sell">{{ item.price|omitTo(priceDecimals) }}</td>
-                            <td class="w-33 text-right">{{ item.amount|omitTo(qtyDecimals) }}</td>
-                            <td class="w-33 text-right">{{ item.price|multiple(item.amount, priceDecimals) }}</td>
+                            <td class="w-33 text-right p-y-0">{{ item.amount|omitTo(qtyDecimals) }}</td>
+                            <td class="w-33 text-right p-y-0">{{ item.price|multiple(item.amount, priceDecimals) }}</td>
                         </tr>
                     </div>
                 </tbody>
@@ -67,8 +67,8 @@
                         <!-- 卖单 使用弹性盒子倒序排列 -->
                         <tr style="display:block;" class="tb-cells" @click.stop="handleOrder(item.price)">
                             <td class="w-33 green" title="pick this price to buy">{{ item.price|omitTo(priceDecimals) }}</td>
-                            <td class="w-33 text-right">{{ item.amount|omitTo(qtyDecimals) }}</td>
-                            <td class="w-33 text-right">{{ item.price|multiple(item.amount, priceDecimals) }}</td>
+                            <td class="w-33 text-right p-y-0">{{ item.amount|omitTo(qtyDecimals) }}</td>
+                            <td class="w-33 text-right p-y-0">{{ item.price|multiple(item.amount, priceDecimals) }}</td>
                         </tr>
                     </div>
 
@@ -272,6 +272,12 @@ export default {
 </script>
 
 <style lang="scss">
+.right-box-A{
+    max-width: 27%;
+    flex: 0 0 27%;
+    width: 100%;
+    position: relative;
+}
 .w-33 {
     width: 32% !important;
     display: inline-block !important;
@@ -400,6 +406,9 @@ export default {
 .table td, .table th{
     border-top: 1px solid #e0e0e0;
 }
+.table td.p-y-0{
+    padding: 10px 0px;
+}
 .order-item{
     color: #666;
     background-color: #fff!important;

src/views/exchange/index.vue

@@ -10,7 +10,7 @@
     <div class="container-fluid no-fluid" style="background-color: #f5f5f5;padding: 15px 15px;">
         <div class="row sm-gutters">
 
-            <div class="col-md-8" style="padding-right:0px!important;margin-right: 15px;">
+            <div class="left-box-A">
                 <div class="row">
                     <div class="col-md-12" style="padding-right: 0px!important;">
                         <div class="px-4 py-3 heading">
@@ -584,6 +584,14 @@ export default {
 </script>
 
 <style scoped>
+.left-box-A{
+    position: relative;
+    width: 100%;
+    flex: 0 0 73%;
+    max-width: 73%;
+    padding-left: 7.5px;
+    padding-right:0px!important;
+}
 .heading{
     color: #333;
     border: 1px solid #e5e5e5;

src/views/exchange/make-deal.vue

@@ -178,10 +178,13 @@
                             </p>
                         </el-popover>
 
-                        <!-- Available -->
+                        
                         <p>
+                            <!-- 购买的数量 -->
                             {{ $t('exchange.amount') }}
-                            <span> {{toBalance}} {{pair.to}}</span><br />
+                            <!-- <span> {{toBalance}} {{pair.to}}</span><br /> -->
+                            <span> {{+(buyTotal/buyorder.entrust_price).toFixed(8)}} {{ pair.to }}</span><br />
+                            <!-- Available -->
                             {{ $t('exchange.balance') }}
                             <span> {{fromBalance}} {{pair.from}}</span>
                         </p>
@@ -255,15 +258,15 @@
                             <p slot="reference">
                                 {{ $t('exchange.order-total') }}
                                 <span>
-                                    <b>{{sellTotal}}</b> {{pair.from}} </span>
+                                    <b>{{sellorder.amount}}</b> {{pair.to}} </span>
                             </p>
                         </el-popover>
 
                         <p>
                             {{$t('exchange.amount')}}
-                            <span> {{toBalance}} {{pair.to}} </span><br />
+                            <span> {{+(sellorder.amount*sellorder.entrust_price).toFixed(8)}} {{pair.from}}</span><br />
                             {{ $t('exchange.balance') }}
-                            <span> {{fromBalance}} {{pair.from}}</span>
+                            <span> {{toBalance}} {{pair.to}} </span>
                         </p>
                         <button class="btn sell" @click="handleSellOrder">{{ $t("common.sell") }} {{pair.to}}</button>
                     </div>
@@ -363,7 +366,8 @@ export default {
                 if (!this.isMarket) {
                     return Math.multiple(this.buyorder.entrust_price, this.buyorder.amount);
                 } else {
-                    return this.cacheTotal===0?'':this.cacheTotal;
+                    // return this.cacheTotal===0?'':this.cacheTotal;
+                    return this.cacheTotal;
                 }
             },
             set(val) {
@@ -543,8 +547,8 @@ export default {
             this.sellorder.trigger_price = Math.omitTo(price, this.priceDecimals);
 
             // 清空数量
-            this.buyorder.amount = '';
-            this.sellorder.amount = '';
+            this.buyorder.amount = 0;
+            this.sellorder.amount = 0;
 
             // total赋值会触发set方法
             // this.buyTotal = 0;

src/views/profile/certification.vue

@@ -40,40 +40,48 @@
               </div>
             </div>
             <div class="form-row">
+                <!-- <div class="form-group col-md-12"> -->
+                    <!-- <label>{{$t('profile.phoneNumber')}}*</label> -->
+                    <!-- <div class="input-group mb-3"> -->
                             <div class="form-group col-md-3">
-                <label>{{$t('profile.documentType')}}*</label>
-                <el-select v-model="form.type" :placeholder="$t('profile.pelaseSelect')">
+                                <label>{{$t('profile.SelectAreaCode')}}*</label>
+                                <el-select v-model="form.country_id" filterable placeholder="请选择" >
                                     <el-option
-                    v-for="item in cardType"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  ></el-option>
+                                    v-for="item in countryList"
+                                    :key="item.id"
+                                    :label="'+'+item.country_code +'('+item.name+')'"
+                                    :value="item.id">
+                                    </el-option>
                                 </el-select>
                             </div>
-              <div class="form-group col-md-9">
-                <label>{{$t('profile.certificateNumber')}}*</label>
-                <input
-                  type="text"
-                  required
-                  v-model="form.id_card"
-                  class="form-control"
-                  :placeholder="$t('profile.endterIDNumber')"
-                />
-              </div>
-            </div>
-            <!-- <div class="label my-2 blue">{{$t('profile.addressInfo')}}</div> -->
-            <!-- <div class="form-group">
-              <label>{{$t('profile.residentialAddress')}}*</label>
+                            <!-- <el-dropdown tragger="click" class="input-group-prepend">
+                                <button
+                                class="btn btn-outline-secondary dropdown-toggle"
+                                type="button"
+                                >+{{country.country_code}}</button>
+                                <el-dropdown-menu slot="dropdown">
+                                <el-dropdown-item
+                                    icon="el-icon-plus"
+                                    v-for="item in countryList"
+                                    :key="item.id"
+                                    @click.native="form.country_id=item.id"
+                                >{{item.country_code}}（{{item.name}}）</el-dropdown-item>
+                                </el-dropdown-menu>
+                            </el-dropdown> -->
+                            <!-- <div class="form-group col-md-9">
+                                <label>{{$t('profile.phoneNumber')}}*</label>
                                 <input
                                     type="text"
                                     required
-                v-model="form.address"
+                                    v-model="form.phone"
                                     class="form-control"
-                :placeholder="$t('profile.residentialAddress1')"
+                                    :placeholder="$t('profile.enterPhoneNumber')"
                                 />
                             </div> -->
-            <!-- <div class="form-row">
+                        <!-- </div>
+                </div> -->
+            </div>
+            <div class="form-row">
               <div class="form-group col-md-6">
                 <label>{{$t('profile.ciy')}}*</label>
                 <input
@@ -94,54 +102,48 @@
                   :placeholder="$t('profile.thePostcode')"
                 />
               </div>
-            </div> -->
-            <!-- <div class="form-group">
-                <label>{{$t('profile.additionalInformation')}}（{{$t('profile.optional')}}）</label>
-                <input type="text" v-model="form.extra" class="form-control" placeholder />
-            </div> -->
-            <!-- <div class="label my-2 blue">{{$t('profile.contactInformation')}}</div> -->
-            <div class="form-row" v-if="0">
-                <!-- <div class="form-group col-md-12"> -->
-                    <!-- <label>{{$t('profile.phoneNumber')}}*</label> -->
-                    <!-- <div class="input-group mb-3"> -->
+            </div>
+            <div class="form-row">
               <div class="form-group col-md-3">
-                                <label>{{$t('profile.SelectAreaCode')}}*</label>
-                                <el-select v-model="form.country_id" filterable placeholder="请选择" >
+                <label>{{$t('profile.documentType')}}*</label>
+                <el-select v-model="form.type" :placeholder="$t('profile.pelaseSelect')">
                   <el-option
-                                    v-for="item in countryList"
-                                    :key="item.id"
-                                    :label="'+'+item.country_code +'('+item.name+')'"
-                                    :value="item.id">
-                                    </el-option>
+                    v-for="item in cardType"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
                 </el-select>
               </div>
-                            <!-- <el-dropdown tragger="click" class="input-group-prepend">
-                                <button
-                                class="btn btn-outline-secondary dropdown-toggle"
-                                type="button"
-                                >+{{country.country_code}}</button>
-                                <el-dropdown-menu slot="dropdown">
-                                <el-dropdown-item
-                                    icon="el-icon-plus"
-                                    v-for="item in countryList"
-                                    :key="item.id"
-                                    @click.native="form.country_id=item.id"
-                                >{{item.country_code}}（{{item.name}}）</el-dropdown-item>
-                                </el-dropdown-menu>
-                            </el-dropdown> -->
               <div class="form-group col-md-9">
-                                <label>{{$t('profile.phoneNumber')}}*</label>
+                <label>{{$t('profile.certificateNumber')}}*</label>
                 <input
                   type="text"
                   required
-                                    v-model="form.phone"
+                  v-model="form.id_card"
                   class="form-control"
-                                    :placeholder="$t('profile.enterPhoneNumber')"
+                  :placeholder="$t('profile.endterIDNumber')"
                 />
               </div>
-                        <!-- </div>
-                </div> -->
             </div>
+            <!-- <div class="label my-2 blue">{{$t('profile.addressInfo')}}</div> -->
+            <!-- <div class="form-group">
+              <label>{{$t('profile.residentialAddress')}}*</label>
+              <input
+                type="text"
+                required
+                v-model="form.address"
+                class="form-control"
+                :placeholder="$t('profile.residentialAddress1')"
+              />
+            </div> -->
+            
+            <!-- <div class="form-group">
+                <label>{{$t('profile.additionalInformation')}}（{{$t('profile.optional')}}）</label>
+                <input type="text" v-model="form.extra" class="form-control" placeholder />
+            </div> -->
+            <!-- <div class="label my-2 blue">{{$t('profile.contactInformation')}}</div> -->
+            
             <!-- <div class="text-center"> -->
               <!-- <button type="button" class="btn w-25 btn-primary rounded-pill" @click="primaryAuth" >{{$t('profile.nextStep')}}</button> -->
               <!-- <button

src/views/purchase/index.vue

@@ -175,6 +175,7 @@
                                     <tr>
                                         <th>{{$t('purchase.subscribe')}}</th>
                                         <th>{{$t('otc.a5')}}</th>
+                                        <th>{{$t('purchase.SubscriptionPrice')}}</th>
                                         <th>{{$t('wallet.money')}}</th>
                                         <th>{{$t('purchase.subscriptionCurrency')}}</th>
                                         <th>{{$t('contract.b1')}}</th>
@@ -192,6 +193,7 @@
                                             {{ item.subscription_currency_name }}
                                         </td>
                                         <td>{{ item.subscription_currency_amount }}</td>
+                                        <td>{{ item.currency_price }}</td>
                                         <td>{{ item.payment_amount }}</td>
                                         <td>{{ item.payment_currency }}</td>
                                         <td>{{ item.subscription_time|parseTime }}</td>
@@ -233,7 +235,7 @@
               :description="parseTime(detail.end_subscription_time)"
             ></el-step>
             <el-step
-              :title="$t('purchase.announceResults')"
+              :title="$t('purchase.ListedTraded')"
               :icon="detail.status >= 4 ? 'el-icon-success' : undefined"
               :description="parseTime(detail.announce_time)"
             ></el-step>

src/views/wallet/exchange-assets.vue

@@ -141,7 +141,7 @@
                 <input type="text" v-model="keyword" class="form-control mb-2 mr-sm-2" :placeholder="$t('wallet.searchCurrency')" />
 
                 <!-- <router-link to="/wallet/address" class="btn btn-success rounded-pill mb-2">{{$t('wallet.addressManagement')}}</router-link> -->
-                <router-link to="/wallet/address" class="btn rounded-pill mb-2" style="background-color: #F7D558;color: #000!important;">{{$t('wallet.addressManagement')}}</router-link>
+                <!-- <router-link to="/wallet/address" class="btn rounded-pill mb-2" style="background-color: #F7D558;color: #000!important;">{{$t('wallet.addressManagement')}}</router-link> -->
               </div>
             </form>
             <div class="tab-content">
@@ -371,7 +371,7 @@
                           </span>
                           <span>
                             {{$t('wallet.low')}}:{{withdrawFee.withdrawal_min}} {{withdrawCoin}}
-                            <router-link to="/wallet/address" style="color: #F7D558;">{{$t('wallet.addressList')}}</router-link>
+                            <!-- <router-link to="/wallet/address" style="color: #F7D558;">{{$t('wallet.addressList')}}</router-link> -->
                           </span>
                         </label>
                         <div class="input-group input-group-sm">
@@ -923,4 +923,7 @@ input[type=radio]{
 .modal-content .close{
   color: #000;
 }
+.active, a:hover{
+    color: #000!important;
+}
 </style>