diff --git a/miniprogram/src/app.config.js b/miniprogram/src/app.config.js index a70f4d7..ccf2398 100644 --- a/miniprogram/src/app.config.js +++ b/miniprogram/src/app.config.js @@ -1,7 +1,7 @@ export default { pages: [ - 'pages/index/index', 'pages/booking/index', + 'pages/index/index', 'pages/test/index', 'pages/policy/index', 'pages/plan/index', @@ -26,15 +26,13 @@ export default { tabBar: { custom: true, color: '#8a8a93', - selectedColor: '#ffd28a', - backgroundColor: '#000000', - borderStyle: 'black', + selectedColor: '#6284ff', + backgroundColor: '#ffffff', + borderStyle: 'white', list: [ - { pagePath: 'pages/booking/index', text: '活动' }, + { pagePath: 'pages/booking/index', text: '预约' }, { pagePath: 'pages/test/index', text: '测评' }, - { pagePath: 'pages/index/index', text: '首页' }, - { pagePath: 'pages/content/index', text: '资讯' }, - { pagePath: 'pages/mine/index', text: '我的' } + { pagePath: 'pages/park-apply/index', text: '入驻' } ] } }; diff --git a/miniprogram/src/custom-tab-bar/index.jsx b/miniprogram/src/custom-tab-bar/index.jsx index 9109ef0..49444d0 100644 --- a/miniprogram/src/custom-tab-bar/index.jsx +++ b/miniprogram/src/custom-tab-bar/index.jsx @@ -3,18 +3,16 @@ import { View, Text } from '@tarojs/components'; import Taro from '@tarojs/taro'; import './index.scss'; -/* 与 app.config.js tabBar.list 保持一致;首页(index)居中并做特殊凸起按钮 */ +/* 与 app.config.js tabBar.list 保持一致;仅 3 项:预约 / 测评 / 入驻 */ const LIST = [ - { pagePath: '/pages/booking/index', text: '活动', icon: 'book' }, + { pagePath: '/pages/booking/index', text: '预约', icon: 'book' }, { pagePath: '/pages/test/index', text: '测评', icon: 'compass' }, - { pagePath: '/pages/index/index', text: 'OPC', icon: 'star', center: true }, - { pagePath: '/pages/content/index', text: '资讯', icon: 'shield' }, - { pagePath: '/pages/mine/index', text: '我的', icon: 'user' } + { pagePath: '/pages/park-apply/index', text: '入驻', icon: 'shield' } ]; export default class CustomTabBar extends Component { state = { - selected: 2 // 默认首页(居中) + selected: 0 // 默认预约 }; switchTab = (item, index) => { diff --git a/miniprogram/src/pages/index/index.jsx b/miniprogram/src/pages/index/index.jsx index de936d9..dd1ef7a 100644 --- a/miniprogram/src/pages/index/index.jsx +++ b/miniprogram/src/pages/index/index.jsx @@ -25,7 +25,7 @@ export default function Index() { - + diff --git a/miniprogram/src/pages/park-apply/index.jsx b/miniprogram/src/pages/park-apply/index.jsx index 45cec78..57fd57b 100644 --- a/miniprogram/src/pages/park-apply/index.jsx +++ b/miniprogram/src/pages/park-apply/index.jsx @@ -1,5 +1,6 @@ import { View, Text, Input, Textarea, Button, Radio, RadioGroup, Checkbox, CheckboxGroup, Picker } from '@tarojs/components'; import Taro from '@tarojs/taro'; +import { useTabIndex } from '@/utils/tab'; import { useState, useEffect } from 'react'; import { phoneLogin, bindPhone, isAuthed, getUser } from '@/utils/auth'; import { @@ -19,6 +20,7 @@ const EMPTY = () => ({ }); export default function ParkApply() { + useTabIndex(2); const [authed, setAuthed] = useState(isAuthed()); const [gatePhone, setGatePhone] = useState(''); const [gateCode, setGateCode] = useState('');