diff --git a/web/addon/.gitignore b/web/addon/.gitignore new file mode 100644 index 000000000..e69de29bb diff --git a/web/app.vue b/web/app.vue index c5dfb750f..4c2b583a5 100644 --- a/web/app.vue +++ b/web/app.vue @@ -32,7 +32,7 @@ const configStore = useConfigStore() configStore.getLoginConfig() // 查询站点信息 -systemStore.getSitenfo() +systemStore.getSiteInfoFn() // 如果已登录 getToken() && useMemberStore().setToken(getToken()) diff --git a/web/env/.env.dev b/web/env/.env.dev index f87f9324f..1b5fe40c5 100644 --- a/web/env/.env.dev +++ b/web/env/.env.dev @@ -1,11 +1,11 @@ -# api请求地址 +# api请求地址 VITE_APP_BASE_URL='' # 图片服务器地址 VITE_IMG_DOMAIN='' # 本地开发时站点id -VITE_SITE_ID = 100000 +VITE_SITE_ID = '' # 本地存储时token的参数名 VITE_REQUEST_STORAGE_TOKEN_KEY='webToken' @@ -17,4 +17,4 @@ VITE_REQUEST_HEADER_TOKEN_KEY='token' VITE_REQUEST_HEADER_SITEID_KEY='site-id' # 请求时header中来源场景的参数名 -VITE_REQUEST_HEADER_CHANNEL_KEY='channel' +VITE_REQUEST_HEADER_CHANNEL_KEY='channel' \ No newline at end of file diff --git a/web/env/.env.product b/web/env/.env.product index f87f9324f..1b5fe40c5 100644 --- a/web/env/.env.product +++ b/web/env/.env.product @@ -1,11 +1,11 @@ -# api请求地址 +# api请求地址 VITE_APP_BASE_URL='' # 图片服务器地址 VITE_IMG_DOMAIN='' # 本地开发时站点id -VITE_SITE_ID = 100000 +VITE_SITE_ID = '' # 本地存储时token的参数名 VITE_REQUEST_STORAGE_TOKEN_KEY='webToken' @@ -17,4 +17,4 @@ VITE_REQUEST_HEADER_TOKEN_KEY='token' VITE_REQUEST_HEADER_SITEID_KEY='site-id' # 请求时header中来源场景的参数名 -VITE_REQUEST_HEADER_CHANNEL_KEY='channel' +VITE_REQUEST_HEADER_CHANNEL_KEY='channel' \ No newline at end of file diff --git a/web/package-lock.json b/web/package-lock.json index 4dd7ab607..e5899a62a 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -20,6 +20,7 @@ "@types/qrcode": "^1.5.0", "nuxt": "^3.4.1", "nuxt-windicss": "^2.6.0", + "qs": "6.7.0", "sass": "^1.60.0", "vite-plugin-top-level-await": "^1.3.1", "vue-i18n": "^9.2.2" @@ -6887,6 +6888,15 @@ "node": ">=6" } }, + "node_modules/qs": { + "version": "6.7.0", + "resolved": "https://registry.npmmirror.com/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "dev": true, + "engines": { + "node": ">=0.6" + } + }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz", diff --git a/web/package.json b/web/package.json index b66e04077..8c626053b 100644 --- a/web/package.json +++ b/web/package.json @@ -16,7 +16,8 @@ "nuxt-windicss": "^2.6.0", "sass": "^1.60.0", "vue-i18n": "^9.2.2", - "vite-plugin-top-level-await": "^1.3.1" + "vite-plugin-top-level-await": "^1.3.1", + "qs": "6.7.0" }, "dependencies": { "@vueuse/core": "^9.13.0", diff --git a/web/stores/system.ts b/web/stores/system.ts index 754c5a01c..b3d77b939 100644 --- a/web/stores/system.ts +++ b/web/stores/system.ts @@ -18,15 +18,13 @@ const useSystemStore = defineStore('system', { } }, actions: { - async getSitenfo() { - await getSiteInfo() - .then((res: any) => { - this.site = res.data - if (this.site.status == 3) navigateTo('/site/close', { replace: true }) - }) - .catch((err) => { - navigateTo('/site/nosite', { replace: true }) - }) + async getSiteInfoFn() { + await getSiteInfo().then((res: any) => { + this.site = res.data + if (this.site.status == 3) navigateTo('/site/close', {replace: true}) + }).catch((err) => { + navigateTo('/site/nosite', {replace: true}) + }) } } }) diff --git a/web/utils/request.ts b/web/utils/request.ts index 829b09b6c..2c83bc78f 100644 --- a/web/utils/request.ts +++ b/web/utils/request.ts @@ -1,6 +1,7 @@ import { breakpointsTailwind } from '@vueuse/core' import { ElMessage } from 'element-plus' import useMemberStore from '@/stores/member' +import qs from 'qs' interface ConfigOption { showErrorMessage?: boolean @@ -60,7 +61,8 @@ class Http { } public get(url: string, query = {}, config: ConfigOption = {}) { - return this.request(url, 'GET', { query }, config) + url += '?' + qs.stringify(query) + return this.request(url, 'GET', {}, config) } public post(url: string, body = {}, config: ConfigOption = {}) { diff --git a/web/utils/test.ts b/web/utils/test.ts index a12f15745..2d1aaf857 100644 --- a/web/utils/test.ts +++ b/web/utils/test.ts @@ -209,7 +209,7 @@ const test = { */ image(value: string) { const newValue = value.split('?')[0] - const IMAGE_REGEXP = /\.(jpeg|jpg|gif|png|svg|webp|jfif|bmp|dpg)/i + const IMAGE_REGEXP = /\.(jpeg|jpg|gif|png|svg|jfif|bmp|dpg)/i // todo 暂不支持webp格式 return IMAGE_REGEXP.test(newValue) }, /**