Merge branch 'demo'

feige996 · feige996 · commit 04d7b1c99539 · 2024-05-12T19:13:03.000+08:00
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
@@ -82,13 +82,12 @@
     "useAttrs": true,
     "useCssModule": true,
     "useCssVars": true,
+    "useNavbarWeixin": true,
     "useSlots": true,
+    "useUpload": true,
     "watch": true,
     "watchEffect": true,
     "watchPostEffect": true,
-    "watchSyncEffect": true,
-    "useNavbarWeixin": true,
-    "useRequest": true,
-    "useUpload": true
+    "watchSyncEffect": true
   }
 }
diff --git a/.stylelintrc.cjs b/.stylelintrc.cjs
@@ -50,5 +50,6 @@ module.exports = {
     'comment-no-empty': null,
     'scss/comment-no-empty': null,
     'no-duplicate-selectors': null,
+    'font-family-no-missing-generic-family-keyword': null,
   },
 }
diff --git a/index.html b/index.html
@@ -21,7 +21,6 @@
 
   <body>
     <div id="app"><!--app-html--></div>
-    <script src="//at.alicdn.com/t/c/font_2757218_qx1mg9jed7i.js"></script>
     <script type="module" src="/src/main.ts"></script>
   </body>
 </html>
diff --git a/src/pages/demo/base/iconfont.vue b/src/pages/demo/base/iconfont.vue
@@ -8,12 +8,11 @@
 </route>
 
 <template>
-  <view class="">
-    iconfont
-    <svg class="icon" aria-hidden="true">
-      <!-- 如果修改了icon-前缀请相应替换，如我的 bap-icon- -->
-      <use xlink:href="#bap-icon-guanbi"></use>
-    </svg>
+  <view class="m-4">
+    <text mr-2>iconfont:</text>
+    <i class="iconfont icon-package text-primary"></i>
+    <i class="iconfont icon-chat text-primary"></i>
+    <i class="iconfont icon-my text-primary"></i>
   </view>
 </template>
 
diff --git a/src/style/iconfont.css b/src/style/iconfont.css
@@ -0,0 +1,29 @@
+/* https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=4543091 */
+@font-face {
+  font-family: iconfont; /* Project id 4543091 */
+  src:
+    url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAOwAAsAAAAAB9AAAANjAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDHAqDBIJqATYCJAMQCwoABCAFhGcHPRvnBsgusG3kMyE15/44PsBX09waBHv0REDt97oHAQDFrOIyPirRiULQ+TJcXV0hCYTuVFcBC915/2vX/32Q80hkZ5PZGZ9snvwruVLloidKqYN6iKC53bOtbKwVLSIi3W6zCWZbs3VbER3j9JpGX3ySYcc94IQRTK5s4epS/jSqIgvg37qlY2/jwQN7D9ADpfRCmIknQByTscVZPTBr+hnnCKg2o4bjakvXEPjuY65DJGeJNtBUhn1JxOBuB2UZmUpBOXdsFp4oxOv4GHgs3h/+wRDcicqSZJG1q9kK1z/Af9NpqxjpC2QaAdpHlCFh4spcYXs5sMWpSk5wUj31G2dLQKVKkZ/w7f/8/i/A3JVUSZK9f7xIKJeU14IFpBI/Qfkkz46GT/CuaGREfCtKJUougWeQWHvVC5Lcz2BGS+SePR99vj3yjJx7h574tp7uWcOh4yfaTjS/245TT/vkQrN+a7RLkK8+Vd+bz+FSGh+9srDQKPeJ2s29z7ah4+efdoxefRbbGwfy7ht+SuIWukzsu1b6ePP+6kN1aamb47qsPim1Ia3xdEpDcl1dckPKGYnneI23+57r2W1Mmkqs6ajrChRCs5qyQ66rTVWhgZaG7toOeHm5cxn0sSQuNDEgcUTdNTSupKI1JRZih/JssAUKezPeOJJzbNozF6zWJuuVavVU5Tgtkop/SDzHa7ytvnCTq0PhkEfi4xLLtb0PuwyOAYqmrYQApFJyoJjTnfz+ve94vvv2f/yWgxl8Jd8Di2DRDPuob59mU/+VfDCROQyR8xSnmP9fXm7liagmN39OlmbvjqG0sMsJKrU0EFXogaRSH5bNY1CmxhyUq7QC1cY1T67RwuQk5CoM2RUQNLoEUb03kDS6h2XzcyjT7iOUa/QXqq1Hn6/GUBAaGcGcWJFlGUmCoVOp8kLvABHnVczGYiOE2SVEUH5OXj/TSnTCDjHAviAWcE4RZYaGWszNiKoayGSGTASeY+PcrMjNpVMvyREMDRoxBMYRVojFMkQiMOhohubdzxtAiOapMMbERpKMnQT9SL4ceQysVdJZVa9kEbsFogIcRyEUE2kN0mL7CDVIGhBzupWMEHA5bDvipgq5hKJcKef8ivbx1kC15KgcYkghhzLxYNntxoKCReJ82jAHAAA=')
+      format('woff2'),
+    url('//at.alicdn.com/t/c/font_4543091_njpo5b95nl.woff?t=1715485842402') format('woff'),
+    url('//at.alicdn.com/t/c/font_4543091_njpo5b95nl.ttf?t=1715485842402') format('truetype');
+}
+
+.iconfont {
+  font-family: iconfont !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-my::before {
+  content: '\e78c';
+}
+
+.icon-package::before {
+  content: '\e9c2';
+}
+
+.icon-chat::before {
+  content: '\e600';
+}
diff --git a/src/style/index.scss b/src/style/index.scss
@@ -1,3 +1,5 @@
+@import './iconfont.css';
+
 .test {
   // 可以通过 @apply 多个样式封装整体样式
   @apply mt-4 ml-4;
diff --git a/uno.config.ts b/uno.config.ts
@@ -59,7 +59,10 @@ export default defineConfig({
    * 自定义快捷语句
    * @see https://github.com/unocss/unocss#shortcuts
    */
-  shortcuts: [['center', 'flex justify-center items-center']],
+  shortcuts: [
+    ['center', 'flex justify-center items-center'],
+    ['text-primary', 'text-yellow'],
+  ],
   transformers: [
     ...transformers,
     // 启用 @apply 功能

Original file line number	Diff line number	Diff line change
`@@ -50,5 +50,6 @@ module.exports = {`
`50`	`50`	`'comment-no-empty': null,`
`51`	`51`	`'scss/comment-no-empty': null,`
`52`	`52`	`'no-duplicate-selectors': null,`
	`53`	`+ 'font-family-no-missing-generic-family-keyword': null,`
`53`	`54`	`},`
`54`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+@import './iconfont.css';`
	`2`	`+`
`1`	`3`	`.test {`
`2`	`4`	`// 可以通过 @apply 多个样式封装整体样式`
`3`	`5`	`@apply mt-4 ml-4;`