diff --git a/.stylelintrc.cjs b/.stylelintrc.cjs index 2cb661a..574beef 100644 --- a/.stylelintrc.cjs +++ b/.stylelintrc.cjs @@ -53,5 +53,6 @@ module.exports = { 'no-duplicate-selectors': null, 'scss/comment-no-empty': null, 'selector-class-pattern': null, + 'font-family-no-missing-generic-family-keyword': null, }, } diff --git a/.vscode/settings.json b/.vscode/settings.json index 88eb9d1..aa5e6f4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -39,6 +39,7 @@ "climblee", "commitlint", "dcloudio", + "iconfont", "qrcode", "refresherrefresh", "scrolltolower", diff --git a/pages.config.ts b/pages.config.ts index abc552b..0748717 100644 --- a/pages.config.ts +++ b/pages.config.ts @@ -37,14 +37,20 @@ export default defineUniPages({ { pagePath: 'pages/index/about', text: '关于', - icon: 'i-carbon-3d-mpr-toggle', + icon: 'i-carbon-code', iconType: 'unocss', }, + // { + // pagePath: 'pages/my/index', + // text: '我的', + // icon: '/static/logo.svg', + // iconType: 'local', + // }, { pagePath: 'pages/my/index', text: '我的', - icon: '/static/logo.svg', - iconType: 'local', + icon: 'iconfont icon-my', + iconType: 'iconfont', }, ], }, diff --git a/src/components/fg-tabbar/fg-tabbar.vue b/src/components/fg-tabbar/fg-tabbar.vue index bc8b6b9..de65199 100644 --- a/src/components/fg-tabbar/fg-tabbar.vue +++ b/src/components/fg-tabbar/fg-tabbar.vue @@ -13,7 +13,10 @@ :title="item.text" :icon="item.icon" > - +