diff --git a/pages.config.ts b/pages.config.ts index 25797ab..5fccec9 100644 --- a/pages.config.ts +++ b/pages.config.ts @@ -34,14 +34,8 @@ export default defineUniPages({ { iconPath: 'static/tabbar/example.png', selectedIconPath: 'static/tabbar/exampleHL.png', - pagePath: 'pages/demo/index', - text: '示例', - }, - { - iconPath: 'static/tabbar/personal.png', - selectedIconPath: 'static/tabbar/personalHL.png', - pagePath: 'pages/my/index', - text: '我的', + pagePath: 'pages/index/about', + text: '关于', }, ], }, diff --git a/src/locale/README.md b/src/locale/README.md deleted file mode 100644 index 1e77098..0000000 --- a/src/locale/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# 注意事项 - -> 文件夹名字必须为 `locale`, 这是 `uniapp` 官方约定的,如果改为别的,标题将不能正常切换多语言(其他内容还是正常)。 -> -> `xxx.json` 的 `xxx` 多语言标识必须与 `uniapp` 官方约定的一致,否则也会出现 BUG。 -> -> 查看截图 `screenshots/i18n.png`。 - -## 参考文档 - -[uniapp 国际化开发指南](https://uniapp.dcloud.net.cn/tutorial/i18n.html) -[uniapp 国际化-注意事项](https://uniapp.dcloud.net.cn/api/ui/locale.html#onlocalechange) 最下面的注意事项 diff --git a/src/locale/en.json b/src/locale/en.json deleted file mode 100644 index 1973f89..0000000 --- a/src/locale/en.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "weight": "{heavy}KG", - "app.name": "En Title" -} diff --git a/src/locale/index.ts b/src/locale/index.ts deleted file mode 100644 index 5f96737..0000000 --- a/src/locale/index.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { createI18n } from 'vue-i18n' - -import en from './en.json' -import zhHans from './zh-Hans.json' // 简体中文 - -const messages = { - en, - 'zh-Hans': zhHans, // key 不能乱写,查看截图 screenshots/i18n.png -} - -const i18n = createI18n({ - locale: uni.getLocale(), // 获取已设置的语言,fallback 语言需要再 manifest.config.ts 中设置 - messages, -}) - -console.log(uni.getLocale()) -console.log(i18n.global.locale) - -/** - * 非 vue 文件使用这个方法 - * @param { string } localeKey 多语言的key,eg: "app.name" - */ -export const translate = (localeKey: string) => { - if (!localeKey) { - console.error(`[i18n] Function translate(), localeKey param is required`) - return '' - } - const locale = uni.getLocale() - console.log('locale:', locale) - - const message = messages[locale] - if (Object.keys(message).includes(localeKey)) { - return message[localeKey] - } - return localeKey -} -export default i18n diff --git a/src/locale/zh-Hans.json b/src/locale/zh-Hans.json deleted file mode 100644 index bd397a1..0000000 --- a/src/locale/zh-Hans.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "app.name": "中文标题", - "weight": "{heavy}公斤" -} diff --git a/src/main.ts b/src/main.ts index 8f52bb4..927b2a4 100644 --- a/src/main.ts +++ b/src/main.ts @@ -2,7 +2,6 @@ import { createSSRApp } from 'vue' import uvUI from '@climblee/uv-ui' import App from './App.vue' import store from './store' -import i18n from './locale/index' import 'virtual:svg-icons-register' import 'virtual:uno.css' import '@/style/index.scss' @@ -10,7 +9,6 @@ import '@/style/index.scss' export function createApp() { const app = createSSRApp(App) app.use(store) - app.use(i18n) app.use(uvUI) return { app, diff --git a/src/pages/demo/base/auto-import.vue b/src/pages/demo/base/auto-import.vue deleted file mode 100644 index e5784fb..0000000 --- a/src/pages/demo/base/auto-import.vue +++ /dev/null @@ -1,12 +0,0 @@ - -{ - layout: 'demo', - style: { navigationBarTitleText: 'auto import component' }, -} - - diff --git a/src/pages/demo/base/enum.vue b/src/pages/demo/base/enum.vue deleted file mode 100644 index 34b992c..0000000 --- a/src/pages/demo/base/enum.vue +++ /dev/null @@ -1,21 +0,0 @@ - -{ - style: { navigationBarTitleText: 'enum' }, -} - - - - - - - diff --git a/src/pages/demo/base/mp-weixin-share.vue b/src/pages/demo/base/mp-weixin-share.vue deleted file mode 100644 index 9e499e4..0000000 --- a/src/pages/demo/base/mp-weixin-share.vue +++ /dev/null @@ -1,42 +0,0 @@ - -{ - layout: 'demo', - style: { navigationBarTitleText: '微信分享' }, -} - - - - - diff --git a/src/pages/demo/base/navbar.vue b/src/pages/demo/base/navbar.vue deleted file mode 100644 index 7985584..0000000 --- a/src/pages/demo/base/navbar.vue +++ /dev/null @@ -1,19 +0,0 @@ - -{ - style: { navigationBarTitleText: '自定义导航栏', navigationStyle: 'custom' }, -} - - - - - diff --git a/src/pages/demo/base/pinia.vue b/src/pages/demo/base/pinia.vue deleted file mode 100644 index 4ae0c52..0000000 --- a/src/pages/demo/base/pinia.vue +++ /dev/null @@ -1,40 +0,0 @@ - -{ - layout: 'demo', - style: { navigationBarTitleText: 'pinia+持久化' }, -} - - - - - diff --git a/src/pages/demo/base/request.vue b/src/pages/demo/base/request.vue deleted file mode 100644 index 2af78a9..0000000 --- a/src/pages/demo/base/request.vue +++ /dev/null @@ -1,67 +0,0 @@ - -{ - layout: 'demo', - style: { - navigationBarTitleText: '请求', - }, -} - - - - - diff --git a/src/pages/demo/base/throughout.vue b/src/pages/demo/base/throughout.vue deleted file mode 100644 index 10d8c7e..0000000 --- a/src/pages/demo/base/throughout.vue +++ /dev/null @@ -1,145 +0,0 @@ - -{ - style: { - navigationBarTitleText: '通屏+下拉刷新+自定义导航栏', - enablePullDownRefresh: false, - backgroundColor: '#23c09c', // 这个背景色要与页面的.top-section的背景图差不多,这样下拉刷新看起来才比较协调 - 'app-plus': { - titleNView: { - type: 'transparent', - }, - }, - 'mp-weixin': { - navigationStyle: 'custom', - }, - }, -} - - - - - - - diff --git a/src/pages/demo/base/uni-ui-icons.vue b/src/pages/demo/base/uni-ui-icons.vue deleted file mode 100644 index f513674..0000000 --- a/src/pages/demo/base/uni-ui-icons.vue +++ /dev/null @@ -1,16 +0,0 @@ - -{ - layout: 'demo', - style: { navigationBarTitleText: 'UniUI Icons 使用' }, -} - - - diff --git a/src/pages/demo/base/uni-ui.vue b/src/pages/demo/base/uni-ui.vue deleted file mode 100644 index 6fd423d..0000000 --- a/src/pages/demo/base/uni-ui.vue +++ /dev/null @@ -1,14 +0,0 @@ - -{ - layout: 'demo', - style: { navigationBarTitleText: 'UniUI 使用' }, -} - - - diff --git a/src/pages/demo/base/unocss-icons.vue b/src/pages/demo/base/unocss-icons.vue deleted file mode 100644 index 18c583a..0000000 --- a/src/pages/demo/base/unocss-icons.vue +++ /dev/null @@ -1,20 +0,0 @@ - -{ - layout: 'demo', - style: { navigationBarTitleText: 'UnoCss Icons 使用' }, -} - - - diff --git a/src/pages/demo/base/unocss.vue b/src/pages/demo/base/unocss.vue deleted file mode 100644 index 3fd903c..0000000 --- a/src/pages/demo/base/unocss.vue +++ /dev/null @@ -1,15 +0,0 @@ - -{ - layout: 'demo', - style: { navigationBarTitleText: 'UnoCss 使用' }, -} - - - diff --git a/src/pages/demo/base/uv-ui.vue b/src/pages/demo/base/uv-ui.vue deleted file mode 100644 index 7061726..0000000 --- a/src/pages/demo/base/uv-ui.vue +++ /dev/null @@ -1,49 +0,0 @@ - -{ - style: { navigationBarTitleText: 'uv ui' }, -} - - - - - - - diff --git a/src/pages/demo/base/vconsole.vue b/src/pages/demo/base/vconsole.vue deleted file mode 100644 index 072f3e4..0000000 --- a/src/pages/demo/base/vconsole.vue +++ /dev/null @@ -1,22 +0,0 @@ - -{ - layout: 'demo', - style: { navigationBarTitleText: '开启 vConsole' }, -} - - - diff --git a/src/pages/demo/index.vue b/src/pages/demo/index.vue deleted file mode 100644 index 7a940ee..0000000 --- a/src/pages/demo/index.vue +++ /dev/null @@ -1,81 +0,0 @@ - - - - - diff --git a/src/pages/demo/page/clock.vue b/src/pages/demo/page/clock.vue deleted file mode 100644 index d507298..0000000 --- a/src/pages/demo/page/clock.vue +++ /dev/null @@ -1,130 +0,0 @@ - -{ - layout: 'demo', - style: { navigationBarTitleText: '动态时钟' }, -} - - - - - - - diff --git a/src/pages/demo/page/clock2.vue b/src/pages/demo/page/clock2.vue deleted file mode 100644 index 6fc30d8..0000000 --- a/src/pages/demo/page/clock2.vue +++ /dev/null @@ -1,152 +0,0 @@ - -{ - layout: 'demo', - style: { navigationBarTitleText: '动态时钟-抗锯齿' }, -} - - - - - - - diff --git a/src/pages/demo/page/floating-bubble.vue b/src/pages/demo/page/floating-bubble.vue deleted file mode 100644 index 3523408..0000000 --- a/src/pages/demo/page/floating-bubble.vue +++ /dev/null @@ -1,88 +0,0 @@ - -{ - layout: 'default', - style: { navigationBarTitleText: '页面悬浮球' }, -} - - - - - - - diff --git a/src/pages/demo/page/i18n.vue b/src/pages/demo/page/i18n.vue deleted file mode 100644 index d81c964..0000000 --- a/src/pages/demo/page/i18n.vue +++ /dev/null @@ -1,84 +0,0 @@ - -{ - layout: 'demo', - style: { - navigationBarTitleText: '%app.name%', - }, -} - - - - - - - diff --git a/src/pages/demo/page/img-min/index.vue b/src/pages/demo/page/img-min/index.vue deleted file mode 100644 index bcede58..0000000 --- a/src/pages/demo/page/img-min/index.vue +++ /dev/null @@ -1,38 +0,0 @@ - -{ - layout: 'demo', - style: { navigationBarTitleText: '图片压缩' }, -} - - - - - diff --git a/src/pages/demo/page/img-min/test-bg.png b/src/pages/demo/page/img-min/test-bg.png deleted file mode 100644 index bc2aecb..0000000 Binary files a/src/pages/demo/page/img-min/test-bg.png and /dev/null differ diff --git a/src/pages/demo/page/lottery.vue b/src/pages/demo/page/lottery.vue deleted file mode 100644 index 048044d..0000000 --- a/src/pages/demo/page/lottery.vue +++ /dev/null @@ -1,127 +0,0 @@ - -{ - layout: 'demo', - style: { navigationBarTitleText: '九宫格抽奖' }, -} - - - - - - - diff --git a/src/pages/demo/page/lottery/big-wheel.vue b/src/pages/demo/page/lottery/big-wheel.vue deleted file mode 100644 index 397f2af..0000000 --- a/src/pages/demo/page/lottery/big-wheel.vue +++ /dev/null @@ -1,216 +0,0 @@ - -{ - layout: 'demo', - style: { navigationBarTitleText: '大转盘抽奖' }, -} - - - - - - - diff --git a/src/pages/demo/page/lottery/nine-grid.vue b/src/pages/demo/page/lottery/nine-grid.vue deleted file mode 100644 index 6374aa2..0000000 --- a/src/pages/demo/page/lottery/nine-grid.vue +++ /dev/null @@ -1,196 +0,0 @@ - -{ - layout: 'demo', - style: { navigationBarTitleText: '九宫格抽奖' }, -} - - - - - diff --git a/src/pages/demo/page/lottery2.vue b/src/pages/demo/page/lottery2.vue deleted file mode 100644 index 876a1bd..0000000 --- a/src/pages/demo/page/lottery2.vue +++ /dev/null @@ -1,181 +0,0 @@ - -{ - layout: 'demo', - style: { navigationBarTitleText: '大转盘抽奖' }, -} - - - - - - - diff --git a/src/pages/demo/page/sign.vue b/src/pages/demo/page/sign.vue deleted file mode 100644 index 91cc02e..0000000 --- a/src/pages/demo/page/sign.vue +++ /dev/null @@ -1,266 +0,0 @@ - -{ - layout: 'default', - style: { navigationBarTitleText: '签字板' }, -} - - - - - - - diff --git a/src/pages/demo/page/waterfall.vue b/src/pages/demo/page/waterfall.vue deleted file mode 100644 index 3ea2cec..0000000 --- a/src/pages/demo/page/waterfall.vue +++ /dev/null @@ -1,188 +0,0 @@ - -{ - style: { navigationBarTitleText: 'waterfall' }, -} - - - - - - - - diff --git a/src/pages/index/about.vue b/src/pages/index/about.vue new file mode 100644 index 0000000..34f0de9 --- /dev/null +++ b/src/pages/index/about.vue @@ -0,0 +1,21 @@ + +{ + style: { + navigationBarTitleText: '关于', + }, +} + + + + + diff --git a/src/pages/index/i18n.vue b/src/pages/index/i18n.vue deleted file mode 100644 index 098222c..0000000 --- a/src/pages/index/i18n.vue +++ /dev/null @@ -1,82 +0,0 @@ - -{ - "style": { - "navigationBarTitleText": "%app.name%" - } -} - - - - - - - diff --git a/src/pages/index/request.vue b/src/pages/index/request.vue deleted file mode 100644 index b989585..0000000 --- a/src/pages/index/request.vue +++ /dev/null @@ -1,55 +0,0 @@ - -{ - layout: 'demo', - style: { - navigationBarTitleText: '请求', - }, -} - - - - - diff --git a/src/pages/my/components/wx-login.vue b/src/pages/my/components/wx-login.vue deleted file mode 100644 index 30e5ff9..0000000 --- a/src/pages/my/components/wx-login.vue +++ /dev/null @@ -1,39 +0,0 @@ - -{ - style: { navigationBarTitleText: '登录' }, -} - - - - - diff --git a/src/pages/my/index.vue b/src/pages/my/index.vue deleted file mode 100644 index 0d53bd8..0000000 --- a/src/pages/my/index.vue +++ /dev/null @@ -1,35 +0,0 @@ - -{ - style: { navigationBarTitleText: '我的' }, -} - - - -