合并代码

jeepay-ui-merchant/package.json

@@ -28,6 +28,7 @@
     "qrcode.vue": "^3.3.3",
     "qs": "^6.10.1",
     "reconnectingwebsocket": "^1.0.0",
+    "sass": "^1.50.1",
     "snabbdom": "^3.5.1",
     "store": "^2.0.12",
     "v-viewer": "^3.0.11",

jeepay-ui-merchant/src/main.ts

@@ -26,9 +26,7 @@ import 'bootstrap-icons/font/bootstrap-icons.css'
 import { VueClipboard } from '@soerenmartius/vue3-clipboard' //复制插件 https://github.com/soerenmartius/vue3-clipboard
 
 import icons from './icons'
-
 import infoBox from '@/utils/infoBox'
-
 import { setSiteInfos } from './oemconfig'
 
 import { setGlobalApp } from '@/config/appConfig'

jeepay-ui-merchant/tsconfig.json

@@ -14,7 +14,9 @@
     "paths": {
       "@/*": [
         "src/*"
-      ]
+      ],
+      "~/*": ["./src/*"],
+      "pinia": ["./node_modules/pinia"]
     },
   },
   "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue",