diff --git a/pages.config.ts b/pages.config.ts index afafdbb..f22fa3d 100644 --- a/pages.config.ts +++ b/pages.config.ts @@ -26,10 +26,16 @@ export default defineUniPages({ iconWidth: '20px', spacing: '3px', list: [ + // { + // iconPath: 'static/tabbar/home.png', + // selectedIconPath: 'static/tabbar/homeHL.png', + // pagePath: 'pages/index/index', + // text: '首页', + // }, { - iconPath: 'static/tabbar/home.png', - selectedIconPath: 'static/tabbar/homeHL.png', - pagePath: 'pages/index/index', + iconPath: 'static/tabbar/bank.png', + selectedIconPath: 'static/tabbar/bankHL.png', + pagePath: 'pages/bank/index', text: '首页', }, { @@ -38,12 +44,7 @@ export default defineUniPages({ pagePath: 'pages/invite/index', text: '邀请福利', }, - { - iconPath: 'static/tabbar/bank.png', - selectedIconPath: 'static/tabbar/bankHL.png', - pagePath: 'pages/bank/index', - text: '银行卡', - }, + { iconPath: 'static/tabbar/house.png', selectedIconPath: 'static/tabbar/houseHL.png', diff --git a/src/App.vue b/src/App.vue index 714b811..046f047 100644 --- a/src/App.vue +++ b/src/App.vue @@ -36,7 +36,6 @@ const userStore = useUserStore() /* 覆盖 uniapp 自带rpx效果 */ html { font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 16px !important; } /* stylelint-disable-next-line selector-type-no-unknown */ #app { diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue index 6e82c30..76ad190 100644 --- a/src/components/NavBar.vue +++ b/src/components/NavBar.vue @@ -36,7 +36,6 @@ const handleClickLeft = () => { diff --git a/src/pages-sub/official-community/index.vue b/src/pages-sub/official-community/index.vue index 50af3ee..60e93cb 100644 --- a/src/pages-sub/official-community/index.vue +++ b/src/pages-sub/official-community/index.vue @@ -38,7 +38,7 @@ import VueQrcode from '@chenfengyuan/vue-qrcode' diff --git a/src/pages-sub/team/index.vue b/src/pages-sub/team/index.vue index 09a2bca..e48571e 100644 --- a/src/pages-sub/team/index.vue +++ b/src/pages-sub/team/index.vue @@ -123,7 +123,7 @@ watch( diff --git a/src/pages/register/index.vue b/src/pages/register/index.vue index fbd4eca..c83a3d6 100644 --- a/src/pages/register/index.vue +++ b/src/pages/register/index.vue @@ -153,11 +153,11 @@ onLoad(async (options) => { .register-container { box-sizing: border-box; min-height: 100vh; - padding-bottom: 200rpx; + padding-bottom: 50px; // background-repeat: no-repeat; // background-size: cover; background: - url('@/static/images/brand-person.png') right 40rpx bottom / 60% no-repeat, + url('@/static/images/brand-person.png') right 20px bottom / 60% no-repeat, url('@/static/images/login-bg.jpg') top center / cover no-repeat; } diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index d14c49d..d411cfb 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -4,9 +4,9 @@ // Generated by vite-plugin-uni-pages interface NavigateToOptions { - url: "/pages/index/index" | - "/pages/bank/index" | + url: "/pages/bank/index" | "/pages/edit-password/index" | + "/pages/index/index" | "/pages/invest/index" | "/pages/invite/index" | "/pages/login/index" | @@ -35,7 +35,7 @@ interface NavigateToOptions { interface RedirectToOptions extends NavigateToOptions {} interface SwitchTabOptions { - url: "/pages/index/index" | "/pages/invite/index" | "/pages/bank/index" | "/pages/invest/index" | "/pages/my/index" + url: "/pages/bank/index" | "/pages/invite/index" | "/pages/invest/index" | "/pages/my/index" } type ReLaunchOptions = NavigateToOptions | SwitchTabOptions; diff --git a/vite.config.ts b/vite.config.ts index c9a4551..5fe6bda 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -113,12 +113,16 @@ export default ({ command, mode }) => { css: { postcss: { plugins: [ - autoprefixer(), + autoprefixer({ + overrideBrowserslist: ['Android >= 4.0', 'iOS >= 8'], + }), viewport({ + mobileUnit: 'rem', appSelector: '#app', + // selectorBlackList: ['wd-'], viewportWidth: 375, maxDisplayWidth: 600, - rootContainingBlockSelectorList: ['van-tabbar', 'van-popup'], + // rootContainingBlockSelectorList: ['wd-navbar__title'], border: true, }), ],