diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..16f9eae
Binary files /dev/null and b/.DS_Store differ
diff --git a/.npmrc b/.npmrc
index 54d704c..152f324 100644
--- a/.npmrc
+++ b/.npmrc
@@ -2,5 +2,5 @@
# 提示:如果你不希望pnpm在对等依赖问题上失败，在项目根目录下的.npmrc文件中添加"strict-peer-dependencies=false"。
# auto-install-peers=true
strict-peer-dependencies=false
-registry=https://registry.npmmirror.com
-# registry=https://registry.npmjs.org
+# registry=https://registry.npmmirror.com
+registry=https://registry.npmjs.org
diff --git a/build/vitePlugins.ts b/build/vitePlugins.ts
index 8da09c1..b3e83d3 100644
--- a/build/vitePlugins.ts
+++ b/build/vitePlugins.ts
@@ -1,5 +1,6 @@
import type { PluginOption } from 'vite';
import uni from '@dcloudio/vite-plugin-uni';
+import tailwindcss from '@tailwindcss/vite';
import { visualizer } from 'rollup-plugin-visualizer';
import autoImport from 'unplugin-auto-import/vite';
import viteRestart from 'vite-plugin-restart';
@@ -14,6 +15,7 @@ export function createVitePlugins({ isProd }: VitePluginConfig): PluginOption[]
return [
// @ts-expect-error TODO uni() 会报错：uni is not a function,暂时使用此方式解决
uni?.default(),
+ tailwindcss(),
uvtw({
rem2rpx: true,
disabled: WeappTailwindcssDisabled,
diff --git a/package.json b/package.json
index bef9508..a821872 100644
--- a/package.json
+++ b/package.json
@@ -44,64 +44,64 @@
},
"dependencies": {
"@alova/adapter-uniapp": "^2.0.11",
- "@alova/mock": "^2.0.11",
+ "@alova/mock": "^2.0.12",
"@alova/shared": "^1.1.2",
- "@dcloudio/uni-app": "3.0.0-alpha-4040220241217001",
- "@dcloudio/uni-app-plus": "3.0.0-alpha-4040220241217001",
- "@dcloudio/uni-components": "3.0.0-alpha-4040220241217001",
- "@dcloudio/uni-h5": "3.0.0-alpha-4040220241217001",
- "@dcloudio/uni-i18n": "3.0.0-alpha-4040220241217001",
- "@dcloudio/uni-mp-alipay": "3.0.0-alpha-4040220241217001",
- "@dcloudio/uni-mp-baidu": "3.0.0-alpha-4040220241217001",
- "@dcloudio/uni-mp-kuaishou": "3.0.0-alpha-4040220241217001",
- "@dcloudio/uni-mp-lark": "3.0.0-alpha-4040220241217001",
- "@dcloudio/uni-mp-qq": "3.0.0-alpha-4040220241217001",
- "@dcloudio/uni-mp-toutiao": "3.0.0-alpha-4040220241217001",
- "@dcloudio/uni-mp-weixin": "3.0.0-alpha-4040220241217001",
- "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-4040220241217001",
+ "@dcloudio/uni-app": "3.0.0-alpha-4050320250224001",
+ "@dcloudio/uni-app-plus": "3.0.0-alpha-4050320250224001",
+ "@dcloudio/uni-components": "3.0.0-alpha-4050320250224001",
+ "@dcloudio/uni-h5": "3.0.0-alpha-4050320250224001",
+ "@dcloudio/uni-i18n": "3.0.0-alpha-4050320250224001",
+ "@dcloudio/uni-mp-alipay": "3.0.0-alpha-4050320250224001",
+ "@dcloudio/uni-mp-baidu": "3.0.0-alpha-4050320250224001",
+ "@dcloudio/uni-mp-kuaishou": "3.0.0-alpha-4050320250224001",
+ "@dcloudio/uni-mp-lark": "3.0.0-alpha-4050320250224001",
+ "@dcloudio/uni-mp-qq": "3.0.0-alpha-4050320250224001",
+ "@dcloudio/uni-mp-toutiao": "3.0.0-alpha-4050320250224001",
+ "@dcloudio/uni-mp-weixin": "3.0.0-alpha-4050320250224001",
+ "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-4050320250224001",
"@multiavatar/multiavatar": "^1.0.7",
- "alova": "^3.2.7",
+ "alova": "^3.2.10",
"crypto-js": "^4.2.0",
"lodash-es": "^4.17.21",
- "pinia": "^2.3.0",
+ "pinia": "^2.3.1",
"vue": "^3.5.13"
},
"devDependencies": {
- "@antfu/eslint-config": "^3.12.0",
+ "@antfu/eslint-config": "^4.8.1",
"@dcloudio/types": "^3.4.14",
- "@dcloudio/uni-automator": "3.0.0-alpha-4040220241217001",
- "@dcloudio/uni-cli-shared": "3.0.0-alpha-4040220241217001",
- "@dcloudio/uni-stacktracey": "3.0.0-alpha-4040220241217001",
- "@dcloudio/uni-uts-v1": "3.0.0-alpha-4040220241217001",
- "@dcloudio/vite-plugin-uni": "3.0.0-alpha-4040220241217001",
- "@egoist/tailwindcss-icons": "^1.8.2",
- "@iconify/json": "^2.2.287",
+ "@dcloudio/uni-automator": "3.0.0-alpha-4050320250224001",
+ "@dcloudio/uni-cli-shared": "3.0.0-alpha-4050320250224001",
+ "@dcloudio/uni-stacktracey": "3.0.0-alpha-4050320250224001",
+ "@dcloudio/uni-uts-v1": "3.0.0-alpha-4050320250224001",
+ "@dcloudio/vite-plugin-uni": "3.0.0-alpha-4050320250224001",
+ "@egoist/tailwindcss-icons": "^1.9.0",
+ "@iconify/json": "^2.2.315",
"@rollup/plugin-node-resolve": "^16.0.0",
+ "@tailwindcss/vite": "^4.0.12",
"@types/crypto-js": "^4.2.2",
"@types/lodash-es": "^4.17.12",
- "@types/node": "^22.10.2",
+ "@types/node": "^22.13.10",
"@vitejs/plugin-vue": "^5.2.1",
"@vue/runtime-core": "^3.5.13",
- "autoprefixer": "^10.4.20",
+ "autoprefixer": "^10.4.21",
"commit-and-tag-version": "^12.5.0",
- "eslint": "^9.17.0",
- "eslint-plugin-format": "^0.1.3",
- "globals": "^15.14.0",
- "lint-staged": "^15.2.11",
+ "eslint": "^9.22.0",
+ "eslint-plugin-format": "^1.0.1",
+ "globals": "^16.0.0",
+ "lint-staged": "^15.4.3",
"picocolors": "^1.1.1",
- "postcss": "^8.4.49",
- "rollup-plugin-visualizer": "^5.12.0",
- "sass": "^1.83.0",
+ "rollup-plugin-visualizer": "^5.14.0",
+ "sass": "^1.85.1",
"simple-git-hooks": "^2.11.1",
- "tailwindcss": "^3.4.17",
- "tsx": "^4.19.2",
- "typescript": "^5.7.2",
+ "tailwindcss": "^4.0.12",
+ "tsx": "^4.19.3",
+ "typescript": "^5.8.2",
"uni-mini-router": "^0.1.6",
"uni-read-pages-vite": "^0.0.6",
- "unplugin-auto-import": "^0.19.0",
- "vite": "^6.0.5",
+ "unplugin-auto-import": "^19.1.1",
+ "vite": "^6.2.1",
"vite-plugin-restart": "^0.4.2",
- "weapp-tailwindcss": "^3.7.0"
+ "weapp-tailwindcss": "^4.0.11"
},
"simple-git-hooks": {
"pre-commit": "npx lint-staged",
diff --git a/postcss.config.ts b/postcss.config.ts
deleted file mode 100644
index 1f941ac..0000000
--- a/postcss.config.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { AcceptedPlugin } from 'postcss';
-import autoprefixer from 'autoprefixer';
-import tailwindcss from 'tailwindcss';
-import cssMacro from 'weapp-tailwindcss/css-macro/postcss';
-
-const plugins: AcceptedPlugin[] = [tailwindcss(), autoprefixer()];
-
-// 可以使用 postcss-pxtransform 来进行 px 转 rpx 的功能
-
-plugins.push(cssMacro);
-
-export default plugins;
diff --git a/src/.DS_Store b/src/.DS_Store
new file mode 100644
index 0000000..8f58053
Binary files /dev/null and b/src/.DS_Store differ
diff --git a/src/App.vue b/src/App.vue
index 6ee2ae9..9a62c9e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,8 +15,5 @@ onHide(() => {
});
-
diff --git a/src/components/.DS_Store b/src/components/.DS_Store
new file mode 100644
index 0000000..e81f1c9
Binary files /dev/null and b/src/components/.DS_Store differ
diff --git a/src/main.ts b/src/main.ts
index c723877..eb8233f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,6 +2,7 @@ import { createSSRApp } from 'vue';
import App from './App.vue';
import { setupRouter } from './router';
import { setupStore } from './stores';
+import './styles/main.css';
export function createApp() {
const app = createSSRApp(App);
diff --git a/src/pages/.DS_Store b/src/pages/.DS_Store
new file mode 100644
index 0000000..761c01b
Binary files /dev/null and b/src/pages/.DS_Store differ
diff --git a/src/services/.DS_Store b/src/services/.DS_Store
new file mode 100644
index 0000000..53c249c
Binary files /dev/null and b/src/services/.DS_Store differ
diff --git a/src/static/.DS_Store b/src/static/.DS_Store
new file mode 100644
index 0000000..4230501
Binary files /dev/null and b/src/static/.DS_Store differ
diff --git a/src/stores/app.ts b/src/stores/app.ts
index 87a6977..ee4c344 100644
--- a/src/stores/app.ts
+++ b/src/stores/app.ts
@@ -1,11 +1,10 @@
-import { defineStore } from 'pinia';
+// import { defineStore } from 'pinia';
interface AppState {
sys?: string | number
}
-export const useAppStore = defineStore({
- id: 'app-store',
+export const useAppStore = defineStore('app-store', {
state: (): AppState => ({}),
getters: {},
actions: {},
diff --git a/src/stores/modules/user.ts b/src/stores/modules/user.ts
index 9c04945..2ccf512 100644
--- a/src/stores/modules/user.ts
+++ b/src/stores/modules/user.ts
@@ -11,10 +11,10 @@ export const useUserStore = defineStore('UserStore', () => {
const userInfo = ref(null);
// 初始化
- function initUserInfo() {
+ async function initUserInfo() {
if (isLogin()) {
token.value = getToken();
- getUserInfo();
+ await getUserInfo();
}
}
@@ -35,7 +35,7 @@ export const useUserStore = defineStore('UserStore', () => {
}
// 获取用户信息
- const { send: _getUserInfo } = useRequest(getUserInfoApi, { initialData: null, immediate: false });
+ const { send: _getUserInfo } = useRequest(getUserInfoApi, { immediate: false });
async function getUserInfo() {
try {
userInfo.value = await _getUserInfo();
diff --git a/src/styles/main.css b/src/styles/main.css
index e69de29..d4b5078 100644
--- a/src/styles/main.css
+++ b/src/styles/main.css
@@ -0,0 +1 @@
+@import 'tailwindcss';
diff --git a/src/utils/.DS_Store b/src/utils/.DS_Store
new file mode 100644
index 0000000..623b192
Binary files /dev/null and b/src/utils/.DS_Store differ
diff --git a/vite.config.ts b/vite.config.ts
index 43a5c48..240d617 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -9,7 +9,7 @@ import process from 'node:process';
import TransformPages from 'uni-read-pages-vite';
import { defineConfig, loadEnv } from 'vite';
import { createVitePlugins, currentPlatform, resolveProxy } from './build';
-import postcssPlugins from './postcss.config';
+// import postcssPlugins from './postcss.config';
export default defineConfig(async ({ mode }) => {
const root = process.cwd();
@@ -39,9 +39,9 @@ export default defineConfig(async ({ mode }) => {
silenceDeprecations: ['legacy-js-api'],
},
},
- postcss: {
- plugins: postcssPlugins,
- },
+ // postcss: {
+ // plugins: postcssPlugins,
+ // },
},
plugins: createVitePlugins({ isProd }),
// 开发服务器配置