From 9b18a89db09caecb003960be72f52a202988db58 Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Sun, 25 Aug 2024 16:35:38 +0800
Subject: [PATCH] Merge branch '6-29印度股票' of http://124.156.157.155:8060/r/dg/dabao_wap into 6-29印度股票

---
 src/App.vue |   67 +++++++++++++++++++++++++--------
 1 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index c49c629..9ba2471 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,20 +1,12 @@
 <template>
-  <div
-    id="app"
-    :class="`${$state.theme === 'red' ? 'red-theme' : 'black-theme'}`"
-  >
+  <div id="app" :class="`${$state.theme === 'red' ? 'red-theme' : 'black-theme'}`">
     <div :class="`header-box`" v-if="hasHeader && title !== $t('hj248')">
       <mt-header :title="title">
         <mt-button icon="back" slot="left" @click="$router.go(-1)"></mt-button>
 
         <div v-if="!is_Show">
           <template v-if="iconRight == 'search'">
-            <img
-              slot="right"
-              class="search-right"
-              src="./assets/ico/fangdajing.png"
-              alt
-            />
+            <img slot="right" class="search-right" src="./assets/ico/fangdajing.png" alt />
           </template>
           <template v-else>
             <mt-button icon="more" slot="right"></mt-button>
@@ -24,7 +16,9 @@
     </div>
     <div class="body-box">
       <transition :name="transitionName">
-        <router-view></router-view>
+        <!-- <keep-alive include="TradingList"> -->
+          <router-view></router-view>
+        <!-- </keep-alive> -->
       </transition>
     </div>
     <foot v-if="$route.meta.show !== true" @close="footColse"></foot>
@@ -51,7 +45,7 @@
   },
   name: "App",
   created() {
-    this.setUseInfo();
+    //this.setUseInfo();
     this.$state.theme = "red";
     let title = this.$route.meta.title || this.$t("hj224");
     this.title = title;
@@ -99,7 +93,7 @@
   },
   data() {
     return {
-      title: "首页",
+      title: "Home",
       hasHeader: false,
       iconRight: "default",
       transitionName: "",
@@ -124,95 +118,121 @@
 /deep/ .van-list__finished-text {
   line-height: 1.925926rem !important;
 }
+
 /deep/ .van-list__error-text {
   line-height: 1.925926rem !important;
 }
+
 #app {
   width: 100vw;
   height: 100vh;
   overflow: hidden;
   font-family: "rubik";
+
   .header-box {
     width: 100%;
     height: 1.4rem;
+
     /deep/.mint-header {
       height: 100%;
       background-color: #16171d;
+
       // background-color: rgba(20, 45, 55, 0.3);
       .is-left {
         .mintui {
           font-size: 20px;
         }
       }
+
       .mint-header-title {
         font-size: 0.36rem;
         color: rgba(255, 255, 255, 1);
       }
     }
+
     button {
       outline: none;
     }
   }
+
   .body-box {
     width: 100%;
     height: 100%;
     // height: calc(100% - 1rem);
     box-sizing: border-box;
+    background: #fff;
     overflow-y: auto;
   }
+
   &.red-theme {
     background: rgb(241, 242, 246);
     color: #000;
+
     /deep/.mint-header {
       background: none;
+
       .mint-header-title {
         font-size: 0.42rem;
         color: #212121;
       }
+
       .mintui {
         color: #212121;
       }
     }
+
     /deep/.van-swipe-item {
       color: #000;
     }
+
     /deep/.navs_content {
       background: #fff !important;
     }
+
     /deep/.fo_content {
       background: #fff;
     }
+
     /deep/.news-tab {
       background: #fff;
     }
+
     /deep/.mint-tab-item-label {
       color: #000;
       font-size: 0.26rem;
     }
+
     /deep/.top_title {
       color: #000;
     }
+
     /deep/.titContent {
       color: #000;
     }
+
     /deep/.mint-navbar {
       background: #fff;
     }
+
     /deep/.mint-tab-item {
       background: #fff;
       border: none;
     }
+
     /deep/.footCss {
       background: #fff;
     }
+
     /deep/.newDetail-tits {
       color: #aaa;
     }
+
     /deep/.van-skeleton__row,
     .van-skeleton__title {
       background-color: #fff !important;
     }
   }
+
   &.black-theme {
     // background: #16171d;
     // background: rgb(14, 14, 15);
@@ -221,48 +241,58 @@
     /deep/.navs_content {
       background: #272733;
     }
+
     /deep/.fo_content {
       background: #272733;
     }
+
     /deep/.news-tab {
       background: #272733;
     }
+
     /deep/.mint-navbar {
       background: #272733;
     }
+
     /deep/.mint-tab-item-label {
       color: #fff;
       font-size: 0.26rem;
     }
+
     /deep/.titContent {
       color: #000;
     }
-    /deep/.mint-tab-container {
-    }
+
+    /deep/.mint-tab-container {}
 
     /deep/.mint-tab-item {
       background: #272733;
     }
+
     /deep/.van-swipe-item {
       color: #000;
     }
+
     /deep/.footCss {
       background: rgb(33, 33, 43);
     }
+
     /deep/.newDetail-tits {
       color: #999;
     }
   }
 }
+
 .search-right {
   width: 0.3rem;
   height: 0.3rem;
 }
+
 .mint-search-list {
   position: relative !important;
 }
-.topLeft {
-}
+
+.topLeft {}
 
 /deep/.el-alert {
   width: 75% !important;
@@ -275,12 +305,15 @@
   margin: auto !important;
   font-size: 0.36rem !important;
 }
+
 /deep/.el-alert__title {
   font-size: 0.36rem !important;
 }
+
 /deep/.el-icon-close::before {
   display: none;
 }
+
 /deep/.icon-icon_A::before {
   font-size: 0.6rem !important;
 }

--
Gitblit v1.9.3