diff --git a/src/pages/auth/code-login.vue b/src/pages-core/auth/code-login.vue similarity index 98% rename from src/pages/auth/code-login.vue rename to src/pages-core/auth/code-login.vue index 659b19e..ffeb330 100644 --- a/src/pages/auth/code-login.vue +++ b/src/pages-core/auth/code-login.vue @@ -54,7 +54,6 @@ diff --git a/src/pages/auth/styles/auth.scss b/src/pages-core/auth/styles/auth.scss similarity index 100% rename from src/pages/auth/styles/auth.scss rename to src/pages-core/auth/styles/auth.scss diff --git a/src/pages/error/404.vue b/src/pages-core/error/404.vue similarity index 100% rename from src/pages/error/404.vue rename to src/pages-core/error/404.vue diff --git a/src/pages/error/pc-only.vue b/src/pages-core/error/pc-only.vue similarity index 100% rename from src/pages/error/pc-only.vue rename to src/pages-core/error/pc-only.vue diff --git a/src/pages/user/contact/index.vue b/src/pages-core/user/contact/index.vue similarity index 92% rename from src/pages/user/contact/index.vue rename to src/pages-core/user/contact/index.vue index 469f8f9..1bf90af 100644 --- a/src/pages/user/contact/index.vue +++ b/src/pages-core/user/contact/index.vue @@ -55,7 +55,7 @@ import { ref } from 'vue' import { useToast } from 'wot-design-uni' import { navigateBackPlus } from '@/utils' -import { saveImageToAlbum } from '@/utils/download' +import { saveImageToAlbum, staticUrl } from '@/utils/download' definePage({ style: { @@ -66,7 +66,7 @@ definePage({ const toast = useToast() -const qrCodeUrl = ref('/static/images/qrcode.png') // 客服二维码图片地址 +const qrCodeUrl = ref(staticUrl('/static/qrcode.png')) // 客服二维码图片地址 const servicePhone = ref('18818818818') // 客服电话号码 /** 返回上一页 */ @@ -78,7 +78,7 @@ function handleBack() { function handleCallPhone() { uni.makePhoneCall({ phoneNumber: servicePhone.value, - fail: (err) => { + fail: (_err) => { toast.show('拨打失败') }, }) diff --git a/src/pages/user/faq/data.ts b/src/pages-core/user/faq/data.ts similarity index 100% rename from src/pages/user/faq/data.ts rename to src/pages-core/user/faq/data.ts diff --git a/src/pages/user/faq/index.vue b/src/pages-core/user/faq/index.vue similarity index 100% rename from src/pages/user/faq/index.vue rename to src/pages-core/user/faq/index.vue diff --git a/src/pages/user/feedback/index.vue b/src/pages-core/user/feedback/index.vue similarity index 100% rename from src/pages/user/feedback/index.vue rename to src/pages-core/user/feedback/index.vue diff --git a/src/pages/user/profile/components/form.vue b/src/pages-core/user/profile/components/form.vue similarity index 100% rename from src/pages/user/profile/components/form.vue rename to src/pages-core/user/profile/components/form.vue diff --git a/src/pages/user/profile/index.vue b/src/pages-core/user/profile/index.vue similarity index 100% rename from src/pages/user/profile/index.vue rename to src/pages-core/user/profile/index.vue diff --git a/src/pages/user/security/components/password-form.vue b/src/pages-core/user/security/components/password-form.vue similarity index 100% rename from src/pages/user/security/components/password-form.vue rename to src/pages-core/user/security/components/password-form.vue diff --git a/src/pages/user/security/index.vue b/src/pages-core/user/security/index.vue similarity index 100% rename from src/pages/user/security/index.vue rename to src/pages-core/user/security/index.vue diff --git a/src/pages/user/settings/agreement/index.vue b/src/pages-core/user/settings/agreement/index.vue similarity index 100% rename from src/pages/user/settings/agreement/index.vue rename to src/pages-core/user/settings/agreement/index.vue diff --git a/src/pages/user/settings/index.vue b/src/pages-core/user/settings/index.vue similarity index 96% rename from src/pages/user/settings/index.vue rename to src/pages-core/user/settings/index.vue index 9ae6169..854197f 100644 --- a/src/pages/user/settings/index.vue +++ b/src/pages-core/user/settings/index.vue @@ -125,12 +125,12 @@ function handleClearCache() { /** 跳转到用户协议 */ function handleGoAgreement() { - uni.navigateTo({ url: '/pages/user/settings/agreement/index' }) + uni.navigateTo({ url: '/pages-core/user/settings/agreement/index' }) } /** 跳转到隐私协议 */ function handleGoPrivacy() { - uni.navigateTo({ url: '/pages/user/settings/privacy/index' }) + uni.navigateTo({ url: '/pages-core/user/settings/privacy/index' }) } /** 初始化 */ diff --git a/src/pages/user/settings/privacy/index.vue b/src/pages-core/user/settings/privacy/index.vue similarity index 100% rename from src/pages/user/settings/privacy/index.vue rename to src/pages-core/user/settings/privacy/index.vue diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue index 36abfa6..5efe4de 100644 --- a/src/pages/user/index.vue +++ b/src/pages/user/index.vue @@ -102,32 +102,32 @@ onMounted(async () => { /** 跳转到个人资料 */ function handleGoProfile() { - uni.navigateTo({ url: '/pages/user/profile/index' }) + uni.navigateTo({ url: '/pages-core/user/profile/index' }) } /** 跳转到账号安全 */ function handleGoSecurity() { - uni.navigateTo({ url: '/pages/user/security/index' }) + uni.navigateTo({ url: '/pages-core/user/security/index' }) } /** 跳转到常见问题 */ function handleGoFaq() { - uni.navigateTo({ url: '/pages/user/faq/index' }) + uni.navigateTo({ url: '/pages-core/user/faq/index' }) } /** 跳转到意见反馈 */ function handleGoFeedback() { - uni.navigateTo({ url: '/pages/user/feedback/index' }) + uni.navigateTo({ url: '/pages-core/user/feedback/index' }) } /** 跳转联系客服 */ function handleGoContact() { - uni.navigateTo({ url: '/pages/user/contact/index' }) + uni.navigateTo({ url: '/pages-core/user/contact/index' }) } /** 跳转到应用设置 */ function handleGoSettings() { - uni.navigateTo({ url: '/pages/user/settings/index' }) + uni.navigateTo({ url: '/pages-core/user/settings/index' }) } /** 退出登录 */ diff --git a/src/router/config.ts b/src/router/config.ts index 9082fc8..0cbe650 100644 --- a/src/router/config.ts +++ b/src/router/config.ts @@ -9,11 +9,11 @@ export const LOGIN_STRATEGY = LOGIN_STRATEGY_MAP.DEFAULT_NEED_LOGIN // edit by export const isNeedLoginMode = LOGIN_STRATEGY === LOGIN_STRATEGY_MAP.DEFAULT_NEED_LOGIN -export const LOGIN_PAGE = '/pages/auth/login' // edit by 芋艿:自定义了登录页路径 -export const REGISTER_PAGE = '/pages/auth/register' // edit by 芋艿:自定义了注册页路径 -export const CODE_LOGIN_PAGE = '/pages/auth/code-login' // edit by 芋艿:自定义了短信登录页路径 -export const FORGET_PASSWORD_PAGE = '/pages/auth/forget-password' // edit by 芋艿:自定义了忘记密码页路径 -export const NOT_FOUND_PAGE = '/pages/error/404' // edit by 芋艿:调整 404 页面路径 +export const LOGIN_PAGE = '/pages-core/auth/login' // edit by 芋艿:自定义了登录页路径 +export const REGISTER_PAGE = '/pages-core/auth/register' // edit by 芋艿:自定义了注册页路径 +export const CODE_LOGIN_PAGE = '/pages-core/auth/code-login' // edit by 芋艿:自定义了短信登录页路径 +export const FORGET_PASSWORD_PAGE = '/pages-core/auth/forget-password' // edit by 芋艿:自定义了忘记密码页路径 +export const NOT_FOUND_PAGE = '/pages-core/error/404' // edit by 芋艿:调整 404 页面路径 // TODO @芋艿:【优化】貌似 unibest 这个变量没用?! export const LOGIN_PAGE_LIST = [ diff --git a/src/static/images/qrcode.png b/src/static/images/qrcode.png deleted file mode 100644 index 1bb38df..0000000 Binary files a/src/static/images/qrcode.png and /dev/null differ diff --git a/vite.config.ts b/vite.config.ts index 66fb3b5..b404002 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -73,7 +73,7 @@ export default defineConfig(({ command, mode }) => { // pages 目录为 src/pages,分包目录不能配置在pages目录下!! // 是个数组,可以配置多个,但是不能为pages里面的目录!! subPackages: [ - 'src/pages-fg', // 这个是相对必要的路由,尽量留着(登录页、注册页、404页等) + 'src/pages-core', // 这个是相对必要的路由,尽量留着(登录页、注册页、404页等) 'src/pages-system', // “系统管理”模块 'src/pages-infra', // “基础设施”模块 'src/pages-bpm', // “工作流程”模块