marymelisa %!s(int64=4) %!d(string=hai) anos
pai
achega
4541c2f2dd

+ 2 - 0
src/assets/styles/theme.css

@@ -124,6 +124,7 @@
     --m-grey15-hover: rgba(114, 124, 152, .8);
     --m-grey16: #727C98;
     --m-grey16-hover: rgba(114, 124, 152, .8);
+    --m-grey17: #808E97;
     --m-grey18: #FFFFFF; /* #ECF2F5 */
     --m-grey19: #F6F8FA;
     --m-grey20: #DAE5EC;
@@ -228,6 +229,7 @@
     --m-grey15-hover: rgba(69, 87, 115, .8);
     --m-grey16: #405066;
     --m-grey16-hover: rgba(64, 80, 102, .8);
+    --m-grey17: #556772;
     --m-grey18: #1D2327;
     --m-grey19: #162534;
     --m-grey20: #1B2A38;

+ 1 - 1
src/assets/styles/variables.less

@@ -23,7 +23,7 @@
 @m-grey15-hover: var(--m-grey15-hover);
 @m-grey16: var(--m-grey16);
 @m-grey16-hover: var(--m-grey16-hover);
-@m-grey17: #556772;                         // orderTable颜色没用到
+@m-grey17: var(--m-grey17);
 @m-grey18: var(--m-grey18);
 @m-grey19: var(--m-grey19);
 @m-grey20: var(--m-grey20);

+ 51 - 54
src/layout/components/header.vue

@@ -1,65 +1,62 @@
 <template>
-  <!-- 风险管理 -->
+    <!-- 风险管理 -->
 
-  <div v-if="isOemByEnum(OemType.manager)">
-    <img src="../../assets/images/logoHeader.png" />
-    <span>深圳市多元世纪信息技术股份有限公司</span>
-  </div>
-  <!-- 云融 -->
+    <div v-if="isOemByEnum(OemType.manager)">
+        <img src="../../assets/images/logoHeader.png" />
+        <span>深圳市多元世纪信息技术股份有限公司</span>
+    </div>
+    <!-- 云融 -->
 
-  <div v-else-if="isOemByEnum(OemType.wrspot)">
-    <img src="../../assets/images/headLogo.jpg" />
-    <span>云融</span>
-  </div>
-  <div v-else>
-    <img src="../../assets/images/logoHeader.png" />
-    <span>深圳市多元世纪信息技术股份有限公司</span>
-  </div>
-  <div class="m-layout-header-right">
-    <div @click="openDrawer">
-      <span>{{ getUserName() }},您好!</span>
+    <div v-else-if="isOemByEnum(OemType.wrspot)">
+        <img src="../../assets/images/headLogo.jpg" />
+        <span>云融</span>
+    </div>
+    <div v-else>
+        <img src="../../assets/images/logoHeader.png" />
+        <span>深圳市多元世纪信息技术股份有限公司</span>
     </div>
-    <div class="relative">
-      <!-- <a-input-search ref="userNameInput"
+    <div class="m-layout-header-right">
+        <div @click="openDrawer">
+            <span>{{ getUserName() }},您好!</span>
+        </div>
+        <div class="relative">
+            <!-- <a-input-search ref="userNameInput"
                           class="searchInput"
                           readonly
                           placeholder="请输入代码/名称"
                           @pressEnter="search">
             </a-input-search>-->
-      <!-- <a-icon type="search" /> -->
-    </div>
-    <div class="news-container">
-      <a-badge @click="openNotice"
-               :dot="getUnReadNoticeLength() > 0">
-        <svg class="icon svg-icon"
-             aria-hidden="true">
-          <use xlink:href="#icon-xiaoxi" />
-        </svg>
-      </a-badge>
-    </div>
-    <div>
-      <a-popover v-model:visible="visible"
-                 trigger="click"
-                 placement="bottomRight">
-        <template #content>
-          <div v-for="item in setMenu"
-               class="popItem"
-               @click="chooseSetMenu(item.path)"
-               :key="item.path">{{ item.name }}</div>
-        </template>
-        <a-avatar :size="24">
-          <template #icon>
-            <!-- <SettingFilled /> -->
-            <svg class="icon svg-icon"
-                 aria-hidden="true">
-              <use xlink:href="#icon-yonghu4" />
-            </svg>
-          </template>
-        </a-avatar>
-      </a-popover>
-      <Setting />
+            <!-- <a-icon type="search" /> -->
+        </div>
+        <div class="news-container">
+            <a-badge @click="openNotice" :dot="getUnReadNoticeLength() > 0">
+                <svg class="icon svg-icon" aria-hidden="true">
+                    <use xlink:href="#icon-xiaoxi" />
+                </svg>
+            </a-badge>
+        </div>
+        <div>
+            <a-popover v-model:visible="visible" trigger="click" placement="bottomRight">
+                <template #content>
+                    <div
+                        v-for="item in setMenu"
+                        class="popItem"
+                        @click="chooseSetMenu(item.path)"
+                        :key="item.path"
+                    >{{ item.name }}</div>
+                </template>
+                <a-avatar :size="24">
+                    <template #icon>
+                        <!-- <SettingFilled /> -->
+                        <svg class="icon svg-icon" aria-hidden="true">
+                            <use xlink:href="#icon-yonghu4" />
+                        </svg>
+                    </template>
+                </a-avatar>
+            </a-popover>
+            <Setting />
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts">
@@ -87,8 +84,8 @@ const setFn = () => {
         // { name: '手机号码绑定/解绑', path: 'phone' },
         // { name: '关于我们', path: 'aboutUs' },
         { name: '退出', path: 'logout' },
-        // { name: '白主题', path: ThemeEnum.light },
-        // { name: '黑主题', path: ThemeEnum.dark },
+        { name: '白主题', path: ThemeEnum.light },
+        { name: '黑主题', path: ThemeEnum.dark },
     ];
     const { openAction } = openModal('logout');
     function chooseSetMenu(path: string) {