diff --git a/pages.config.ts b/pages.config.ts index 7fec6d8..d502476 100644 --- a/pages.config.ts +++ b/pages.config.ts @@ -16,9 +16,9 @@ export default defineUniPages({ }, }, tabBar: { - color: '#7A7E83', - selectedColor: '#00f', - backgroundColor: '#ffffff', + color: '#999999', + selectedColor: '#018d71', + backgroundColor: '#F8F8F8', borderStyle: 'black', height: '50px', fontSize: '10px', @@ -26,16 +26,22 @@ export default defineUniPages({ spacing: '3px', list: [ { + iconPath: 'static/tabbar/home.png', + selectedIconPath: 'static/tabbar/homeHL.png', pagePath: 'pages/index/index', - iconPath: 'static/tab-icons/extui.png', - selectedIconPath: 'static/tab-icons/extuiHL.png', text: '首页', }, { - pagePath: 'pages/throughout/index', - iconPath: 'static/tab-icons/template.png', - selectedIconPath: 'static/tab-icons/templateHL.png', - text: '通屏', + 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: '我的', }, ], }, diff --git a/src/pages.json b/src/pages.json index 331a3fb..0f4e412 100644 --- a/src/pages.json +++ b/src/pages.json @@ -14,9 +14,9 @@ } }, "tabBar": { - "color": "#7A7E83", - "selectedColor": "#00f", - "backgroundColor": "#ffffff", + "color": "#999999", + "selectedColor": "#018d71", + "backgroundColor": "#F8F8F8", "borderStyle": "black", "height": "50px", "fontSize": "10px", @@ -24,16 +24,22 @@ "spacing": "3px", "list": [ { + "iconPath": "static/tabbar/home.png", + "selectedIconPath": "static/tabbar/homeHL.png", "pagePath": "pages/index/index", - "iconPath": "static/tab-icons/extui.png", - "selectedIconPath": "static/tab-icons/extuiHL.png", "text": "首页" }, { - "pagePath": "pages/throughout/index", - "iconPath": "static/tab-icons/template.png", - "selectedIconPath": "static/tab-icons/templateHL.png", - "text": "通屏" + "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": "我的" } ] }, @@ -46,25 +52,8 @@ } }, { - "path": "pages/demo/clock", - "type": "page", - "style": { - "navigationBarTitleText": "动态时钟" - } - }, - { - "path": "pages/demo/lottery", - "type": "page", - "style": { - "navigationBarTitleText": "九宫格抽奖" - } - }, - { - "path": "pages/demo/lottery2", - "type": "page", - "style": { - "navigationBarTitleText": "大转盘抽奖" - } + "path": "pages/demo/index", + "type": "page" }, { "path": "pages/login/login", @@ -73,20 +62,6 @@ "navigationBarTitleText": "登录" } }, - { - "path": "pages/lottery/big-wheel", - "type": "page", - "style": { - "navigationBarTitleText": "大转盘抽奖" - } - }, - { - "path": "pages/lottery/nine-grid", - "type": "page", - "style": { - "navigationBarTitleText": "九宫格抽奖" - } - }, { "path": "pages/my/index", "type": "page", @@ -95,42 +70,42 @@ } }, { - "path": "pages/throughout/index", + "path": "pages/demo/demo/clock", "type": "page", "style": { - "navigationBarTitleText": "通屏+下拉刷新+自定义导航栏", - "enablePullDownRefresh": true, - "backgroundColor": "#23c09c", - "app-plus": { - "titleNView": { - "type": "transparent" - } - }, - "mp-weixin": { - "navigationStyle": "custom" - } + "navigationBarTitleText": "动态时钟" } }, { - "path": "pages/demo/img-min/index", - "type": "page" - }, - { - "path": "pages/index/demo/component-auto-import", + "path": "pages/demo/demo/component-auto-import", "type": "page", "style": { "navigationBarTitleText": "easycom 自动导入" } }, { - "path": "pages/index/demo/mp-weixin-share", + "path": "pages/demo/demo/lottery", + "type": "page", + "style": { + "navigationBarTitleText": "九宫格抽奖" + } + }, + { + "path": "pages/demo/demo/lottery2", + "type": "page", + "style": { + "navigationBarTitleText": "大转盘抽奖" + } + }, + { + "path": "pages/demo/demo/mp-weixin-share", "type": "page", "style": { "navigationBarTitleText": "微信分享" } }, { - "path": "pages/index/demo/navbar", + "path": "pages/demo/demo/navbar", "type": "page", "style": { "navigationBarTitleText": "自定义导航栏", @@ -138,14 +113,14 @@ } }, { - "path": "pages/index/demo/pages-auto-import", + "path": "pages/demo/demo/pages-auto-import", "type": "page", "style": { "navigationBarTitleText": "pages 自动导入" } }, { - "path": "pages/index/demo/pinia", + "path": "pages/demo/demo/pinia", "type": "page", "layout": "display", "style": { @@ -153,14 +128,14 @@ } }, { - "path": "pages/index/demo/request", + "path": "pages/demo/demo/request", "type": "page", "style": { "navigationBarTitleText": "request请求+请求拦截" } }, { - "path": "pages/index/demo/throughout", + "path": "pages/demo/demo/throughout", "type": "page", "style": { "navigationBarTitleText": "通屏+下拉刷新+自定义导航栏", @@ -177,32 +152,67 @@ } }, { - "path": "pages/index/demo/uni-ui-icons", + "path": "pages/demo/demo/uni-ui-icons", "type": "page", "style": { "navigationBarTitleText": "UniUI Icons 使用" } }, { - "path": "pages/index/demo/uni-ui", + "path": "pages/demo/demo/uni-ui", "type": "page", "style": { "navigationBarTitleText": "UniUI 使用" } }, { - "path": "pages/index/demo/unocss-icons", + "path": "pages/demo/demo/unocss-icons", "type": "page", "style": { "navigationBarTitleText": "UnoCss Icons 使用" } }, { - "path": "pages/index/demo/unocss", + "path": "pages/demo/demo/unocss", "type": "page", "style": { "navigationBarTitleText": "UnoCss 使用" } + }, + { + "path": "pages/demo/demo/img-min/index", + "type": "page" + }, + { + "path": "pages/demo/demo/lottery/big-wheel", + "type": "page", + "style": { + "navigationBarTitleText": "大转盘抽奖" + } + }, + { + "path": "pages/demo/demo/lottery/nine-grid", + "type": "page", + "style": { + "navigationBarTitleText": "九宫格抽奖" + } + }, + { + "path": "pages/demo/demo/throughout/index", + "type": "page", + "style": { + "navigationBarTitleText": "通屏+下拉刷新+自定义导航栏", + "enablePullDownRefresh": true, + "backgroundColor": "#23c09c", + "app-plus": { + "titleNView": { + "type": "transparent" + } + }, + "mp-weixin": { + "navigationStyle": "custom" + } + } } ], "subPackages": [] diff --git a/src/pages/index/components/pages-auto-import.vue b/src/pages/demo/components/pages-auto-import.vue similarity index 100% rename from src/pages/index/components/pages-auto-import.vue rename to src/pages/demo/components/pages-auto-import.vue diff --git a/src/pages/demo/clock.vue b/src/pages/demo/demo/clock.vue similarity index 100% rename from src/pages/demo/clock.vue rename to src/pages/demo/demo/clock.vue diff --git a/src/pages/index/demo/component-auto-import.vue b/src/pages/demo/demo/component-auto-import.vue similarity index 100% rename from src/pages/index/demo/component-auto-import.vue rename to src/pages/demo/demo/component-auto-import.vue diff --git a/src/pages/demo/img-min/after.png b/src/pages/demo/demo/img-min/after.png similarity index 100% rename from src/pages/demo/img-min/after.png rename to src/pages/demo/demo/img-min/after.png diff --git a/src/pages/demo/img-min/before.png b/src/pages/demo/demo/img-min/before.png similarity index 100% rename from src/pages/demo/img-min/before.png rename to src/pages/demo/demo/img-min/before.png diff --git a/src/pages/demo/img-min/bg-1.png b/src/pages/demo/demo/img-min/bg-1.png similarity index 100% rename from src/pages/demo/img-min/bg-1.png rename to src/pages/demo/demo/img-min/bg-1.png diff --git a/src/pages/demo/img-min/index.vue b/src/pages/demo/demo/img-min/index.vue similarity index 100% rename from src/pages/demo/img-min/index.vue rename to src/pages/demo/demo/img-min/index.vue diff --git a/src/pages/demo/lottery.vue b/src/pages/demo/demo/lottery.vue similarity index 100% rename from src/pages/demo/lottery.vue rename to src/pages/demo/demo/lottery.vue diff --git a/src/pages/lottery/big-wheel.vue b/src/pages/demo/demo/lottery/big-wheel.vue similarity index 100% rename from src/pages/lottery/big-wheel.vue rename to src/pages/demo/demo/lottery/big-wheel.vue diff --git a/src/pages/lottery/nine-grid.vue b/src/pages/demo/demo/lottery/nine-grid.vue similarity index 100% rename from src/pages/lottery/nine-grid.vue rename to src/pages/demo/demo/lottery/nine-grid.vue diff --git a/src/pages/lottery/target.png b/src/pages/demo/demo/lottery/target.png similarity index 100% rename from src/pages/lottery/target.png rename to src/pages/demo/demo/lottery/target.png diff --git a/src/pages/demo/lottery2-1.png b/src/pages/demo/demo/lottery2-1.png similarity index 100% rename from src/pages/demo/lottery2-1.png rename to src/pages/demo/demo/lottery2-1.png diff --git a/src/pages/demo/lottery2-2.png b/src/pages/demo/demo/lottery2-2.png similarity index 100% rename from src/pages/demo/lottery2-2.png rename to src/pages/demo/demo/lottery2-2.png diff --git a/src/pages/demo/lottery2.gif b/src/pages/demo/demo/lottery2.gif similarity index 100% rename from src/pages/demo/lottery2.gif rename to src/pages/demo/demo/lottery2.gif diff --git a/src/pages/demo/lottery2.vue b/src/pages/demo/demo/lottery2.vue similarity index 100% rename from src/pages/demo/lottery2.vue rename to src/pages/demo/demo/lottery2.vue diff --git a/src/pages/index/demo/mp-weixin-share.vue b/src/pages/demo/demo/mp-weixin-share.vue similarity index 100% rename from src/pages/index/demo/mp-weixin-share.vue rename to src/pages/demo/demo/mp-weixin-share.vue diff --git a/src/pages/index/demo/navbar.vue b/src/pages/demo/demo/navbar.vue similarity index 100% rename from src/pages/index/demo/navbar.vue rename to src/pages/demo/demo/navbar.vue diff --git a/src/pages/index/demo/pages-auto-import.vue b/src/pages/demo/demo/pages-auto-import.vue similarity index 100% rename from src/pages/index/demo/pages-auto-import.vue rename to src/pages/demo/demo/pages-auto-import.vue diff --git a/src/pages/index/demo/pinia.vue b/src/pages/demo/demo/pinia.vue similarity index 100% rename from src/pages/index/demo/pinia.vue rename to src/pages/demo/demo/pinia.vue diff --git a/src/pages/index/demo/request.vue b/src/pages/demo/demo/request.vue similarity index 100% rename from src/pages/index/demo/request.vue rename to src/pages/demo/demo/request.vue diff --git a/src/pages/index/demo/throughout.vue b/src/pages/demo/demo/throughout.vue similarity index 100% rename from src/pages/index/demo/throughout.vue rename to src/pages/demo/demo/throughout.vue diff --git a/src/pages/throughout/index.vue b/src/pages/demo/demo/throughout/index.vue similarity index 100% rename from src/pages/throughout/index.vue rename to src/pages/demo/demo/throughout/index.vue diff --git a/src/pages/index/demo/uni-ui-icons.vue b/src/pages/demo/demo/uni-ui-icons.vue similarity index 100% rename from src/pages/index/demo/uni-ui-icons.vue rename to src/pages/demo/demo/uni-ui-icons.vue diff --git a/src/pages/index/demo/uni-ui.vue b/src/pages/demo/demo/uni-ui.vue similarity index 100% rename from src/pages/index/demo/uni-ui.vue rename to src/pages/demo/demo/uni-ui.vue diff --git a/src/pages/index/demo/unocss-icons.vue b/src/pages/demo/demo/unocss-icons.vue similarity index 100% rename from src/pages/index/demo/unocss-icons.vue rename to src/pages/demo/demo/unocss-icons.vue diff --git a/src/pages/index/demo/unocss.vue b/src/pages/demo/demo/unocss.vue similarity index 100% rename from src/pages/index/demo/unocss.vue rename to src/pages/demo/demo/unocss.vue diff --git a/src/pages/demo/index.vue b/src/pages/demo/index.vue new file mode 100644 index 0000000..9c5499d --- /dev/null +++ b/src/pages/demo/index.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 932a389..b9bf098 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -4,120 +4,17 @@ style: { navigationBarTitleText: '首页' }, } - - - - + diff --git a/src/static/tab-icons/extui.png b/src/static/tab-icons/extui.png deleted file mode 100644 index 7508e08..0000000 Binary files a/src/static/tab-icons/extui.png and /dev/null differ diff --git a/src/static/tab-icons/extuiHL.png b/src/static/tab-icons/extuiHL.png deleted file mode 100644 index 612b499..0000000 Binary files a/src/static/tab-icons/extuiHL.png and /dev/null differ diff --git a/src/static/tab-icons/template.png b/src/static/tab-icons/template.png deleted file mode 100644 index 409ec9b..0000000 Binary files a/src/static/tab-icons/template.png and /dev/null differ diff --git a/src/static/tab-icons/templateHL.png b/src/static/tab-icons/templateHL.png deleted file mode 100644 index 4018448..0000000 Binary files a/src/static/tab-icons/templateHL.png and /dev/null differ diff --git a/src/static/tabbar/example.png b/src/static/tabbar/example.png new file mode 100644 index 0000000..fd1e942 Binary files /dev/null and b/src/static/tabbar/example.png differ diff --git a/src/static/tabbar/exampleHL.png b/src/static/tabbar/exampleHL.png new file mode 100644 index 0000000..7501011 Binary files /dev/null and b/src/static/tabbar/exampleHL.png differ diff --git a/src/static/tabbar/home.png b/src/static/tabbar/home.png new file mode 100644 index 0000000..8f82e21 Binary files /dev/null and b/src/static/tabbar/home.png differ diff --git a/src/static/tabbar/homeHL.png b/src/static/tabbar/homeHL.png new file mode 100644 index 0000000..26d3761 Binary files /dev/null and b/src/static/tabbar/homeHL.png differ diff --git a/src/static/tabbar/personal.png b/src/static/tabbar/personal.png new file mode 100644 index 0000000..0a569a2 Binary files /dev/null and b/src/static/tabbar/personal.png differ diff --git a/src/static/tabbar/personalHL.png b/src/static/tabbar/personalHL.png new file mode 100644 index 0000000..8c3e66e Binary files /dev/null and b/src/static/tabbar/personalHL.png differ diff --git a/uni-pages.d.ts b/uni-pages.d.ts index d0156e3..164f39b 100644 --- a/uni-pages.d.ts +++ b/uni-pages.d.ts @@ -5,31 +5,32 @@ interface NavigateToOptions { url: "pages/index/index" | - "pages/demo/clock" | - "pages/demo/lottery" | - "pages/demo/lottery2" | + "pages/demo/index" | "pages/login/login" | - "pages/lottery/big-wheel" | - "pages/lottery/nine-grid" | "pages/my/index" | - "pages/throughout/index" | - "pages/demo/img-min/index" | - "pages/index/demo/component-auto-import" | - "pages/index/demo/mp-weixin-share" | - "pages/index/demo/navbar" | - "pages/index/demo/pages-auto-import" | - "pages/index/demo/pinia" | - "pages/index/demo/request" | - "pages/index/demo/throughout" | - "pages/index/demo/uni-ui-icons" | - "pages/index/demo/uni-ui" | - "pages/index/demo/unocss-icons" | - "pages/index/demo/unocss"; + "pages/demo/demo/clock" | + "pages/demo/demo/component-auto-import" | + "pages/demo/demo/lottery" | + "pages/demo/demo/lottery2" | + "pages/demo/demo/mp-weixin-share" | + "pages/demo/demo/navbar" | + "pages/demo/demo/pages-auto-import" | + "pages/demo/demo/pinia" | + "pages/demo/demo/request" | + "pages/demo/demo/throughout" | + "pages/demo/demo/uni-ui-icons" | + "pages/demo/demo/uni-ui" | + "pages/demo/demo/unocss-icons" | + "pages/demo/demo/unocss" | + "pages/demo/demo/img-min/index" | + "pages/demo/demo/lottery/big-wheel" | + "pages/demo/demo/lottery/nine-grid" | + "pages/demo/demo/throughout/index"; } interface RedirectToOptions extends NavigateToOptions {} interface SwitchTabOptions { - url: 'pages/index/index' | 'pages/throughout/index' + url: 'pages/index/index' | 'pages/demo/index' | 'pages/my/index' } type ReLaunchOptions = NavigateToOptions | SwitchTabOptions diff --git a/vite.config.ts b/vite.config.ts index ebab22e..43a9b53 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -46,7 +46,9 @@ export default ({ command, mode }) => { return defineConfig({ envDir: './env', // 自定义env目录 plugins: [ - UniPages({ exclude: ['**/components/**/**.*'] }), + UniPages({ + exclude: ['**/components/**/**.*'], + }), UniLayouts(), UniPlatform(), UniManifest(),