From 937e5befa299a21454d62d7dd3d30f3f4f63650a Mon Sep 17 00:00:00 2001
From: lqins <lqins168@gmail.com>
Date: Mon, 23 Dec 2024 10:49:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/assets/css/chat-app.styl       |  2 +-
 web/src/assets/css/chat-plus.styl      |  2 +-
 web/src/assets/css/common.styl         | 27 +++++++++++------
 web/src/assets/css/image-sd.styl       |  3 +-
 web/src/assets/css/luma.styl           |  2 +-
 web/src/assets/css/mark-map.styl       |  5 ++-
 web/src/assets/css/sd-task-dialog.styl |  2 +-
 web/src/assets/css/suno.styl           |  2 +-
 web/src/assets/css/theme-dark.styl     | 42 +++++++++++---------------
 web/src/assets/css/theme-light.styl    | 31 +++++++------------
 web/src/assets/css/variables.styl      |  0
 web/src/components/ChatReply.vue       |  4 +--
 web/src/views/Home.vue                 | 35 +--------------------
 web/src/views/MarkMap.vue              | 18 ++++++++---
 web/src/views/Member.vue               |  9 +++---
 15 files changed, 79 insertions(+), 105 deletions(-)
 delete mode 100644 web/src/assets/css/variables.styl

diff --git a/web/src/assets/css/chat-app.styl b/web/src/assets/css/chat-app.styl
index 63f4e74b..bf86b8b3 100644
--- a/web/src/assets/css/chat-app.styl
+++ b/web/src/assets/css/chat-app.styl
@@ -115,7 +115,7 @@
               word-break: break-all;
               height 34px
               font-size: .875rem;
-              color var(--el-text-color-primary)
+              color var(--text-fb)
 
             }
           }
diff --git a/web/src/assets/css/chat-plus.styl b/web/src/assets/css/chat-plus.styl
index 2a91447c..872dd3bf 100644
--- a/web/src/assets/css/chat-plus.styl
+++ b/web/src/assets/css/chat-plus.styl
@@ -145,7 +145,7 @@
         min-width: 0;
         flex: 1;
         background-color: var(--el-bg-color)
-        color var(--el-text-color-primary)
+        color var(--text-fb)
   
         .chat-config {
           height 30px
diff --git a/web/src/assets/css/common.styl b/web/src/assets/css/common.styl
index f6412161..3f30e9bd 100644
--- a/web/src/assets/css/common.styl
+++ b/web/src/assets/css/common.styl
@@ -27,9 +27,10 @@
   --a-link-color: #6e8eff
   --shadow-color:rgba(223,71,255,0.6)
   --sm-btn-bg:#6052ed;
---theme-text-tertiary: #595959;
---theme-btn-fill-tertiary: #f0ebff;
---theme-text-btn-tertiary: #6841ea;
+  --theme-text-tertiary: #595959;
+  --theme-btn-fill-tertiary: #f0ebff;
+  --theme-text-btn-tertiary: #6841ea;
+ 
 
 
 // #e7e7e8
@@ -128,11 +129,19 @@
   }
 }
 .sm-btn-theme{
-      background-color: var(--theme-btn-fill-tertiary) !important;
-    color: var(--theme-text-btn-tertiary) !important;
-    border: none;
-  }
+    background-color: var(--theme-btn-fill-tertiary) !important;
+  color: var(--theme-text-btn-tertiary) !important;
+  border: none;
+}
   
-  .el-tag, .el-tag.el-tag--primary{
+.el-tag, .el-tag.el-tag--primary{
   --el-tag-bg-color:#f0ebff
-  }
\ No newline at end of file
+}
+.box-card{
+  padding: 20px;
+  background-color: var(--chat-bg);
+  border-radius: 8px;
+}
+.el-table th.el-table__cell {
+    background-color:  var(--chat-bg)
+}
\ No newline at end of file
diff --git a/web/src/assets/css/image-sd.styl b/web/src/assets/css/image-sd.styl
index 357d5e95..4b01149e 100644
--- a/web/src/assets/css/image-sd.styl
+++ b/web/src/assets/css/image-sd.styl
@@ -84,7 +84,8 @@
     .task-list-box {
       background: var(--chat-bg);
       width 100%
-      padding 0 10px 10px 10px
+      // padding 0 10px 10px 10px
+      padding: 10px
       color: var(--text-theme-color)
       overflow-x hidden
 
diff --git a/web/src/assets/css/luma.styl b/web/src/assets/css/luma.styl
index 474cf4f9..79209f6c 100644
--- a/web/src/assets/css/luma.styl
+++ b/web/src/assets/css/luma.styl
@@ -224,7 +224,7 @@
             text-overflow ellipsis
           }
           .prompt {
-            color var( --el-text-color-primary)
+            color var( --text-fb)
             cursor: text
           }
           .failed {
diff --git a/web/src/assets/css/mark-map.styl b/web/src/assets/css/mark-map.styl
index 3f735e07..7f19a0ad 100644
--- a/web/src/assets/css/mark-map.styl
+++ b/web/src/assets/css/mark-map.styl
@@ -130,10 +130,13 @@
           position: absolute
           bottom: 10px
           right: 20px
+          display: flex;
 
           .mm-toolbar {
+            line-height: 36px;
             display flex
             flex-flow row
+            margin-left: 10px;
 
             .mm-toolbar-brand {
               display none
@@ -141,7 +144,7 @@
 
             .mm-toolbar-item {
               cursor pointer
-              color var( --el-text-color-primary)
+              color var( --text-fb)
             }
           }
 
diff --git a/web/src/assets/css/sd-task-dialog.styl b/web/src/assets/css/sd-task-dialog.styl
index 959ae918..ada3061f 100644
--- a/web/src/assets/css/sd-task-dialog.styl
+++ b/web/src/assets/css/sd-task-dialog.styl
@@ -65,7 +65,7 @@
               label {
                 display flex
                 width 100px
-                color :var(--el-text-color-primary)
+                color :var(--text-fb)
               }
 
               .item-value {
diff --git a/web/src/assets/css/suno.styl b/web/src/assets/css/suno.styl
index c038fc2a..facd051a 100644
--- a/web/src/assets/css/suno.styl
+++ b/web/src/assets/css/suno.styl
@@ -293,7 +293,7 @@
 
           .tags {
             font-size 14px
-            color var(--el-text-color-primary)
+            color var(--text-fb)
             padding 3px 0
           }
         }
diff --git a/web/src/assets/css/theme-dark.styl b/web/src/assets/css/theme-dark.styl
index cb787e18..1b74cd8a 100644
--- a/web/src/assets/css/theme-dark.styl
+++ b/web/src/assets/css/theme-dark.styl
@@ -6,7 +6,6 @@
   --normal-color: rgba(163, 174, 208, 1); // 普通颜色
       --el-text-color-primary: #fff;
   p, h1, h2, h3, h4, h5, h6, article {
-    // color: var(--text-color) !important;
      font-family: $font-regular;
 
   }
@@ -20,31 +19,31 @@
   }
   --btnColor: linear-gradient(88deg, #af61f0 1.44%, #5b62ce);
   --border-active:rgba(255, 255, 255, 0.1);
-  // --card-bg: rgba(17, 28, 68, 1);
-  // --card-bg: #1f243f;
   --card-bg:#252d58;
-   --card-bg-table: rgba(17, 28, 68, 1);
+  --chat-bg:#1f243f
+  --chat-wel-bg:#2d2f388a;
+  --card-bg-table: rgba(17, 28, 68, 1);
   --theme-bg:rgb(13, 20, 53);
   --theme-bg-all:rgb(13, 20, 53);
-   --sign-bg: rgba(27, 37, 75, 1);
-   --text-theme-color: #fff;
+  --sign-bg: rgba(27, 37, 75, 1);
+  --text-theme-color: #fff;
   --text-color-primary: #d1c7ff;
-  --el-text-color-regular: rgba(163, 174, 208, 1)
-  --el-border-color:rgb(79, 80, 85)
-  --el-text-color-primary: #fff;//黑白切换
-   --el-bg-color-overlay: rgba(17, 28, 68, 1);
-   --el-border-color-light: rgba(255, 255, 255, 0.2);
+  --theme-text-color-secondary: #a3aed0;
+  --theme-text-color-primary: #fff;
+  --theme-text-primary: #f3f3f3;
   --line-box:rgba(255, 255, 255, 0.1);
-  // --chat-bg:#141a36;
-  --chat-bg:#1f243f
   --el-bg-color:#141a36;
   --el-fill-color-blank: rgba(17, 28, 68, 1);
   --el-fill-color-light: rgba(86, 86, 95, .2);
---el-color-primary-light-9:rgba(86, 86, 95, .2);
---chat-wel-bg:#2d2f388a;
-  --theme-text-color-secondary: #a3aed0;
-  // --el-pagination-button-bg-color: rgba(86,86,95,0.2); 
-
+  --el-color-primary-light-9:rgba(86, 86, 95, .2);
+  --el-text-color-regular: rgba(163, 174, 208, 1)
+  --el-border-color:rgb(79, 80, 85)
+  --el-text-color-primary: #fff;//黑白切换
+  --el-bg-color-overlay: rgba(17, 28, 68, 1);
+  --el-border-color-light: rgba(255, 255, 255, 0.2);
+  --chat-content-bg:rgba(86, 86, 95, .2);
+  --chat-content-bg-list:rgba(86, 86, 95, .2);
+  --hover-deep-color:#30323c;
    //layout 
   .more-menus li.moreTitle,
   .twoTittle .title,
@@ -61,10 +60,5 @@
     background: #0080006e;
   }
 
-  --theme-text-color-primary: #fff;
-  --theme-text-primary: #f3f3f3;
-  --chat-content-bg:rgba(86, 86, 95, .2);
-  --chat-content-bg-list:rgba(86, 86, 95, .2);
-  --hover-deep-color:#30323c;
-  // --theme-text-tertiary: #e1e1e1;
+
 }
\ No newline at end of file
diff --git a/web/src/assets/css/theme-light.styl b/web/src/assets/css/theme-light.styl
index 9a24880a..74b35952 100644
--- a/web/src/assets/css/theme-light.styl
+++ b/web/src/assets/css/theme-light.styl
@@ -3,50 +3,41 @@
 @import 'font.styl'
 :root[data-theme="light"] {
   --text-fb:#000;
-  // rgba(43, 54, 116, 1)
   --text-color: #5b62ce; // 主要的文本颜色
   --normal-color: rgba(43, 54, 116, 1); // 普通颜色
   p, h1, h2, h3, h4, h5, h6, article {
-    // color: var(--text-color) !important;
     font-family: $font-regular;
   }
   html,
   body,
   #app,
   .wrapper {
-    // background: var(--theme-bg)
-    // background-color: var(--theme-bg)
-
-      // background: linear-gradient(88deg, #fff3f3 1.44%, #e7e8ff);
-    
     font-family: $font-regular;
-  }//#6b61f6
+  }
 
   --btnColor: linear-gradient(88deg, #af61f0 1.44%, #5b62ce);
   --border-active:rgba(134, 140, 255, 1);
   --code-btnColor: linear-gradient(88deg, #af61f0 1.44%, #5b62ce);
   --card-bg:#fff;
+  --chat-bg:#fff;
   --theme-bg:linear-gradient(88deg, #fff3f3 1.44%, #e7e8ff);
   --theme-bg-all:#f5f7fd;
   --sign-bg: rgba(244, 247, 254, 1);
-   --text-theme-color: rgba(43, 54, 116, 1)
+  --text-theme-color: rgba(43, 54, 116, 1)
   --text-color-primary: rgba(67, 24, 255, 1);
   --line-box:rgba(79, 89, 102, 0.122);
-   --el-bg-color-overlay: #fff;
-  --el-bg-color:#fff;
-  --el-fill-color-blank: #fff;
-
-   --theme-text-color-primary: #000;
+  --theme-text-color-primary: #000;
   --theme-text-primary: #000;
   --theme-text-color-secondary: #666;
-  --chat-bg: #fff;
-
   --chat-content-bg:#f5f7fc;
   --chat-list-bg: #0302020a;
---chat-content-bg-list:#fff;
---chat-wel-bg:rgba(247, 247, 248, 1);
---el-pagination-button-bg-color: rgba(86,86,95,0.2);
---hover-deep-color:#fff;
+  --chat-content-bg-list:#fff;
+  --chat-wel-bg:rgba(247, 247, 248, 1);
+  --hover-deep-color:#fff;
+  --el-bg-color-overlay: #fff;
+  --el-bg-color:#fff;
+  --el-fill-color-blank: #fff;
+  --el-pagination-button-bg-color: rgba(86,86,95,0.2);
 
 }
 
diff --git a/web/src/assets/css/variables.styl b/web/src/assets/css/variables.styl
deleted file mode 100644
index e69de29b..00000000
diff --git a/web/src/components/ChatReply.vue b/web/src/components/ChatReply.vue
index 05c3dd04..a3a307a9 100644
--- a/web/src/components/ChatReply.vue
+++ b/web/src/components/ChatReply.vue
@@ -257,7 +257,8 @@ const reGenerate = (prompt) => {
             code {
               // color:var(--theme-text-color-primary);
               color:#fff
-              background-color var(--el-color-primary-light-3)
+              // background-color var(--el-color-primary-light-3)
+              background-color: var(--el-color-primary);
               padding 3px 5px;
               border-radius 5px;
             }
@@ -349,7 +350,6 @@ const reGenerate = (prompt) => {
           padding 10px 10px 10px 0;
 
           .bar-item {
-            background-color var( --little-btn-bg);
             padding 3px 5px;
             margin-right 10px;
             border-radius 5px;
diff --git a/web/src/views/Home.vue b/web/src/views/Home.vue
index bc97b80b..4e5dbaef 100644
--- a/web/src/views/Home.vue
+++ b/web/src/views/Home.vue
@@ -77,16 +77,6 @@
               {{ item.name }}
             </div>
           </li>
-
-          <!-- <li
-            class="menu-list-item flex-center-col"
-            v-for="item in 5"
-            :key="item"
-          >
-            <el-icon><Location /></el-icon>
-            <div>首页</div>
-          </li> -->
-
           <!-- 更多 -->
           <div class="bot" :style="{ width: isCollapse ? '65px' : '170px' }">
             <div class="bot-line"></div>
@@ -174,13 +164,11 @@
               </a>
 
               <ThemeChange />
-              <!-- <div v-if="!isCollapse">会员</div> -->
             </li>
           </div>
         </ul>
       </div>
     </div>
-    <!-- :style="{ 'padding-left': isCollapse ? '65px' : '170px' }" -->
     <el-scrollbar class="right-main">
       <div
         v-if="loginUser.id === undefined || !loginUser.id"
@@ -196,7 +184,6 @@
           >登录</el-button
         >
       </div>
-      <!-- <div class="content custom-scroll"> -->
       <div class="content custom-scroll">
         <router-view :key="routerViewKey" v-slot="{ Component }">
           <transition name="move" mode="out-in">
@@ -234,7 +221,7 @@ import { ElMessage } from "element-plus";
 import { UserFilled } from "@element-plus/icons-vue";
 import { checkSession, getLicenseInfo, getSystemInfo } from "@/store/cache";
 import { removeUserToken } from "@/store/session";
-import LoginDialog from "@/components/LoginDialog.vue";
+// import LoginDialog from "@/components/LoginDialog.vue";
 import { useSharedStore } from "@/store/sharedata";
 import ConfigDialog from "@/components/UserInfoDialog.vue";
 import { showMessageError } from "@/utils/dialog";
@@ -244,12 +231,10 @@ const router = useRouter();
 const logo = ref("");
 const mainNavs = ref([]);
 const moreNavs = ref([]);
-// const curPath = ref(router.currentRoute.value.path);
 const curPath = ref();
 
 const title = ref("");
 const showNoticeLogin = ref(false);
-// const mainWinHeight = window.innerHeight - 50;
 
 /**
  * 从路径名中提取第一个路径段
@@ -276,15 +261,9 @@ const getFirstPathSegment = (url) => {
   }
 };
 const loginUser = ref({});
-const mainWinHeight = loginUser.value.id
-  ? window.innerHeight
-  : window.innerHeight;
-
-const version = ref(process.env.VUE_APP_VERSION);
 const routerViewKey = ref(0);
 const showConfigDialog = ref(false);
 const license = ref({ de_copy: true });
-const docsURL = ref(process.env.VUE_APP_DOCS_URL);
 const gitURL = ref(process.env.VUE_APP_GIT_URL);
 
 const store = useSharedStore();
@@ -296,12 +275,6 @@ watch(
   }
 );
 
-// 监听路由变化
-// router.beforeEach((to, from, next) => {
-//   curPath.value = to.path;
-//   next();
-// });
-
 if (curPath.value === "/external") {
   curPath.value = router.currentRoute.value.query.url;
 }
@@ -380,12 +353,6 @@ const logout = function () {
       ElMessage.error("注销失败！");
     });
 };
-
-const loginCallback = () => {
-  init();
-  // 刷新组件
-  routerViewKey.value += 1;
-};
 </script>
 
 <style lang="stylus" scoped>
diff --git a/web/src/views/MarkMap.vue b/web/src/views/MarkMap.vue
index 68f9c6e2..28aeff20 100644
--- a/web/src/views/MarkMap.vue
+++ b/web/src/views/MarkMap.vue
@@ -87,18 +87,25 @@
         </div>
 
         <div class="chat-box">
-          <div class="top-bar">
+          <!-- <div class="top-bar">
             <el-button @click="downloadImage" type="primary">
               <el-icon>
                 <Download />
               </el-icon>
-              <span>下载图片</span>
+              <span>下载图片-</span>
             </el-button>
-          </div>
+          </div> -->
 
           <div class="body" id="markmap">
             <svg ref="svgRef" :style="{ height: rightBoxHeight + 'px' }" />
-            <div id="toolbar"></div>
+            <div id="toolbar">
+              <el-button @click="downloadImage" type="primary">
+                <el-icon>
+                  <Download />
+                </el-icon>
+                <span>下载图片</span>
+              </el-button>
+            </div>
           </div>
         </div>
         <!-- end task list box -->
@@ -119,7 +126,8 @@ import { Toolbar } from "markmap-toolbar";
 import { useSharedStore } from "@/store/sharedata";
 
 const leftBoxHeight = ref(window.innerHeight - 105);
-const rightBoxHeight = ref(window.innerHeight - 115);
+//const rightBoxHeight = ref(window.innerHeight - 115);
+const rightBoxHeight = ref(window.innerHeight);
 
 const prompt = ref("");
 const text = ref("");
diff --git a/web/src/views/Member.vue b/web/src/views/Member.vue
index 86377dc7..7718759f 100644
--- a/web/src/views/Member.vue
+++ b/web/src/views/Member.vue
@@ -127,11 +127,12 @@
             </el-col>
           </el-row>
           <el-empty description="暂无数据" v-else :image="nodata" />
+          <div class="box-card">
+            <h2 class="headline">消费账单</h2>
 
-          <h2 class="headline">消费账单</h2>
-
-          <div class="user-order">
-            <user-order v-if="isLogin" :key="userOrderKey" />
+            <div class="user-order">
+              <user-order v-if="isLogin" :key="userOrderKey" />
+            </div>
           </div>
         </div>
       </div>