Merge pull request #107 from MuxiKeStack/spzy-dev

🐞 fix：修復 iconfont 組件圖標丟失
MuxiKeStack · Sep 2, 2024 · f29e768 · f29e768
2 parents a289894 + b404a03
commit f29e768
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/app.config.ts b/src/app.config.ts
@@ -1,5 +1,3 @@
-// import { useGlobalIconFont } from './common/components/iconfont/helper';
-
 export default defineAppConfig({
   pages: [
     // 'pages/questionInfo/index',
@@ -24,8 +22,10 @@ export default defineAppConfig({
       pages: ['pages/history/index'],
     },
   ],
-  /* eslint-disable */
-  // usingComponents: Object.assign(useGlobalIconFont()),
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+  usingComponents: Object.assign({
+    iconfont: './common/components/iconfont/weapp/weapp',
+  }),
   tabBar: {
     custom: true,
     list: [

diff --git a/src/common/components/iconfont/helper.js b/src/common/components/iconfont/helper.js
@@ -1,7 +1,7 @@
 /* eslint-disable */
 const useGlobalIconFont = () => {
   return {
-    iconfont: `common/components/iconfont/${process.env.TARO_ENV}/${process.env.TARO_ENV}`,
+    iconfont: `common/components\iconfont/${process.env.TARO_ENV}/${process.env.TARO_ENV}`,
   };
 };
 

diff --git a/src/common/components/iconfont/index.tsx b/src/common/components/iconfont/index.tsx
@@ -1,4 +1,5 @@
 /* tslint:disable */
+/* eslint-disable */
 
 import React, { FunctionComponent } from 'react';