zhb 1 mês atrás
pai
commit
1bf93ce3eb
4 arquivos alterados com 36 adições e 6 exclusões
  1. 9 4
      App.vue
  2. 1 1
      components/cwg-pc-header.vue
  3. 25 0
      static/images/logo-full.svg
  4. 1 1
      windows/top-window.vue

+ 9 - 4
App.vue

@@ -74,21 +74,26 @@ onMounted(() => {
 	font-family: 'Google Sans';
 	src: url('/static/Google_Sans/GoogleSans-VariableFont_GRAD,opsz,wght.ttf') format('truetype-variations');
 	font-weight: 100 900;
-	/* 可变字重范围 */
 	font-style: normal;
 	font-display: swap;
 }
 
-/* 全局应用到所有文本元素 */
+/* 全局字体,不破坏 uni-icons 图标 */
 view,
 text,
 button,
 input,
 textarea,
 label {
-	font-family: 'Google Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif !important;
+	font-family: 'Google Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
 	font-weight: 400;
-	/* 默认常规 */
+}
+
+/* 专门保护 uni-icons 不被覆盖 */
+.uni-icon,
+[class*="uni-icons-"],
+.uni-icons {
+	font-family: uniicons !important;
 }
 
 /* 让整个项目文字都能选中 */

+ 1 - 1
components/cwg-pc-header.vue

@@ -7,7 +7,7 @@
 					@click="openLeftDrawer" />
 			</div>
 			<div class="left">
-				<image class="left-img" src="/static/images/logo.png" mode="widthFix" alt="logo" />
+				<image class="left-img" src="/static/images/logo-full.svg" mode="widthFix" alt="logo" />
 			</div>
 			<div class="right">
 				<cwg-system />

+ 25 - 0
static/images/logo-full.svg

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 745.2 167.7" style="enable-background:new 0 0 745.2 167.7;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#E32326;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M31.5,0h104.7c17.4,0,31.5,14.1,31.5,31.5v104.7c0,17.4-14.1,31.5-31.5,31.5H31.5C14.1,167.7,0,153.6,0,136.2
+	V31.5C0,14.1,14.1,0,31.5,0"/>
+<path d="M463.9,106l-36.6-82.3h24.1l39,87.9c3,6.8,6.1,10.8,13.8,10.8c7.4,0,11.2-3.2,14.4-9.8l44.2-89h23.3L538.5,122
+	c-6.9,14.1-18.3,21.9-34,21.9c-12,0-21.7-4.8-28.7-14.2c-7,9.8-17.6,14.2-29.5,14.2c-16.6,0-27.7-9.1-34.3-24l-42.8-96.2h24.1
+	l39,87.9c3.1,6.8,6.1,10.8,13.9,10.8c7.4,0,11.1-3.3,14.4-9.8L463.9,106z"/>
+<path d="M721.8,121.6V79.5h22.3v64.6h-93.7c-41.3,0-57.5-20.1-57.5-60.2s16.2-60.2,57.5-60.2h93.7V46h-93.7
+	c-27.9,0-34.2,11.8-34.2,37.9s6.4,37.7,34.2,37.7L721.8,121.6L721.8,121.6z"/>
+<path d="M350.3,23.7V46h-93.7c-27.9,0-34.1,11.8-34.1,37.9s6.4,37.7,34.1,37.7h93.7v22.5h-93.7c-41.3,0-57.5-20.1-57.5-60.2
+	s16.2-60.2,57.5-60.2L350.3,23.7L350.3,23.7z"/>
+<path class="st1" d="M90.1,27.3c17.1,0,33.3,7.7,44,21.1l-2.4,2.1l-15.3,13.8c-10.8-14.5-31.4-17.5-45.9-6.7S53,89,63.8,103.5
+	s31.4,17.5,45.9,6.7c2.5-1.9,4.8-4.2,6.7-6.7l15.3,13.7l2.4,2.1c-19.6,24.3-55.2,28.2-79.5,8.6S26.5,72.8,46,48.5
+	C56.8,35.1,73,27.3,90.1,27.3 M89.9,31.7C61.1,32.1,38,55.8,38.4,84.6c0.4,28.3,23.2,51.1,51.5,51.5V121
+	c-20.5-0.3-36.9-17.2-36.6-37.8C53.7,63.2,69.8,47,89.9,46.7V31.7z M89.2,55.9C73.8,56.8,62,70,62.8,85.4
+	c0.8,14.3,12.2,25.7,26.5,26.5v-4.6c-12.9-0.5-23-11.3-22.6-24.3C67.1,70.8,77,60.9,89.2,60.5V55.9z M84.7,37.1
+	c-25.8,3-44.3,26.3-41.4,52.1c2.5,21.7,19.6,38.9,41.4,41.4v-4.8c-23.2-3-39.6-24.2-36.6-47.4c2.5-19.1,17.5-34.1,36.6-36.6V37.1z"
+	/>
+</svg>

+ 1 - 1
windows/top-window.vue

@@ -1,7 +1,7 @@
 <template>
   <header class="cwg-pc-header">
     <div class="left">
-      <image class="left-img" src="/static/images/logo.png" mode="widthFix" alt="logo" @click="openLeftDrawer" />
+      <image class="left-img" src="/static/images/logo-full.svg" mode="widthFix" alt="logo" @click="openLeftDrawer" />
     </div>
     <div class="right" v-if="visible">
       <cwg-payment />