From 6e8f4455ab385d1ceafab06ba60c939359ea80ac Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Tue, 9 Apr 2024 15:51:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layout/vPaging.vue                      | 13 +++++++------
 pages/assets/draw.vue                   |  1 +
 pages/exchange/exchange-transaction.vue |  2 ++
 pages/notice/index.vue                  | 10 +++++-----
 pages/reg/index.vue                     |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/layout/vPaging.vue b/layout/vPaging.vue
index ac3a5e4..a650dcf 100644
--- a/layout/vPaging.vue
+++ b/layout/vPaging.vue
@@ -41,12 +41,13 @@ export default {
       this.getList(over);
     },
     getList(over) {
-      let data = Object.assign(
-        {
-          page: this.page
-        },
-        this.data
-      );
+		let data = {}
+		if(this.$router.currentRoute.fullPath=='/pages/exchange/exchangeHis'){
+			data = Object.assign({page: this.page,symbol: sessionStorage.getItem('symbol')},this.data);
+		}else{
+			data = Object.assign({page: this.page,},this.data);
+		}
+      // let data = Object.assign({page: this.page,symbol: sessionStorage.getItem('symbol')},this.data);
       this.ajax(data).then((res) => {
         let queryVo = res.data;
         if (queryVo.current_page == 1) this.list = [];
diff --git a/pages/assets/draw.vue b/pages/assets/draw.vue
index a267ef8..8ea2f35 100644
--- a/pages/assets/draw.vue
+++ b/pages/assets/draw.vue
@@ -138,6 +138,7 @@
             <li>·{{ $t("assets.c7") }}</li>
           </ul>
         </view>
+		<view style="height: 10vh;"></view>
         <!-- <view class="rounded-md m-b-lg" v-if="list.length" style="padding-bottom: 100px !important;">
           <view class="title d-flex justify-between p-x-md p-y-xs align-center color-light">
             <span class="fn-lg">{{ $t("assets.c8") }}</span>
diff --git a/pages/exchange/exchange-transaction.vue b/pages/exchange/exchange-transaction.vue
index 72ecd8f..96b4b5a 100644
--- a/pages/exchange/exchange-transaction.vue
+++ b/pages/exchange/exchange-transaction.vue
@@ -513,6 +513,7 @@ export default {
     symbol(n, o) {
       this.getBooks();
       this.getUserBalance();
+	  sessionStorage.setItem('symbol',n)
       if (o) {
         this.unLink(o.replace("/", "").toLocaleLowerCase());
       }
@@ -839,6 +840,7 @@ export default {
     this.getBooks();
     this.getUserBalance();
     this.socketMessage();
+	sessionStorage.setItem('symbol',this.symbol)
     if (this.query.direction) {
       this.form.direction = this.query.direction;
     }
diff --git a/pages/notice/index.vue b/pages/notice/index.vue
index 8c8e9c7..1d1f319 100644
--- a/pages/notice/index.vue
+++ b/pages/notice/index.vue
@@ -21,11 +21,11 @@
     <v-paging class="layout-main" :key="1" :ajax="article" :data="{type:'notice'}" v-if="active==0">
       <template #box="list">
         <view class="list m-t-md" key="ul1">
-          <v-link tag="li" :to="{path:'/pages/notice/detail',query:{id:item.id}}" class="item d-flex p-md align-center m-x-md m-b-xs bg-panel-3 rounded box-shadow" v-for="item in $list(list)" :key="item.id">
+          <v-link tag="li" :to="{path:'/pages/notice/detail',query:{id:item.id}}" v-if="item.title!==null" class="item d-flex p-md align-center m-x-md m-b-xs bg-panel-3 rounded box-shadow" v-for="item in $list(list)" :key="item.id">
             <view class="flex-fill">
               <view class="title color-light eps-2 m-b-xs">{{item.title}}</view>
-              <!-- <view class="time fn-sm">{{item.created_at}}</view> -->
-							<view class="time fn-sm">{{item.created_ats| parseTime}}</view>
+              <view class="time fn-sm">{{item.created_at}}</view>
+							<!-- <view class="time fn-sm">{{item.created_ats| parseTime}}</view> -->
             </view>
             <van-icon name="arrow" />
           </v-link>
@@ -39,8 +39,8 @@
           <v-link tag="li" :to="{path:'/pages/notice/msg-detail',query:{id:item.id}}" class="item d-flex p-md align-center m-x-md m-b-xs bg-panel-3 rounded box-shadow" v-for="item in $list(list)" :key="item.id">
             <view class="flex-fill">
               <view class="title color-light eps-2 m-b-xs">{{item.data.title}}</view>
-              <!-- <view class="time fn-sm">{{item.created_at}}</view> -->
-							<view class="time fn-sm">{{item.created_ats| parseTime}}</view>
+              <view class="time fn-sm">{{item.created_at}}</view>
+							<!-- <view class="time fn-sm">{{item.created_ats| parseTime}}</view> -->
             </view>
             <van-icon name="arrow" />
           </v-link>
diff --git a/pages/reg/index.vue b/pages/reg/index.vue
index c5f96dc..0c3258f 100644
--- a/pages/reg/index.vue
+++ b/pages/reg/index.vue
@@ -216,7 +216,7 @@ export default {
   methods: {
     register() {
         if (!this.form.account) {
-          this.$toast(this.$t('reg.a3'));
+          this.$toast(this.$t('reg.a5'));
           return;
         }
       if (!this.check) {