diff --git a/mock/api.ts b/mock/api.ts index b35e3e6..ed775d8 100644 --- a/mock/api.ts +++ b/mock/api.ts @@ -114,7 +114,7 @@ export default { 'GET /checklogin': { success: true, data: { - islogin: true, + islogin: false, }, }, }; diff --git a/src/assets/icons/AboutPage/about.svg b/src/assets/icons/UserPage/about.svg similarity index 100% rename from src/assets/icons/AboutPage/about.svg rename to src/assets/icons/UserPage/about.svg diff --git a/src/assets/icons/UserPage/clock.svg b/src/assets/icons/UserPage/clock.svg new file mode 100644 index 0000000..15c9031 --- /dev/null +++ b/src/assets/icons/UserPage/clock.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/UserPage/message.svg b/src/assets/icons/UserPage/message.svg new file mode 100644 index 0000000..1e51511 --- /dev/null +++ b/src/assets/icons/UserPage/message.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/UserPage/user.svg b/src/assets/icons/UserPage/user.svg new file mode 100644 index 0000000..ef24901 --- /dev/null +++ b/src/assets/icons/UserPage/user.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx index 1b9dbb7..4868f0a 100644 --- a/src/pages/user/user.tsx +++ b/src/pages/user/user.tsx @@ -4,7 +4,10 @@ import { View, Picker, Image, Text } from '@tarojs/components'; import Taro from '@tarojs/taro'; import type CustomTabBar from '@/custom-tab-bar'; import PageFooter from '@/components/PageFooter/PageFooter'; -import aboutIcon from '@/assets/icons/AboutPage/about.svg'; +import aboutIcon from '@/assets/icons/UserPage/about.svg'; +import userIcon from '@/assets/icons/UserPage/user.svg'; +import clockIcon from '@/assets/icons/UserPage/clock.svg'; +import messageIcon from '@/assets/icons/UserPage/message.svg'; import pt, { Lang } from '@/plain-text'; import logo from '@/assets/images/UserPage/logo.png'; import { setLocaleData } from '@/service/localeData'; @@ -127,10 +130,7 @@ export default class UserPage extends Component { title={pt.get().userPage.ticketColumn.title} note={pt.get().userPage.ticketColumn.note} arrow='right' - iconInfo={{ - color: '#E69966', - value: 'clock', - }} + thumb={clockIcon} onClick={this.myTicketPage} /> {wechatUser.getAccess() ? ( @@ -140,10 +140,7 @@ export default class UserPage extends Component { title={pt.get().userPage.infoColumn.title} note={pt.get().userPage.infoColumn.note} arrow='right' - iconInfo={{ - color: '#78A4FA', - value: 'user', - }} + thumb={userIcon} onClick={this.informPage} /> )} @@ -153,10 +150,7 @@ export default class UserPage extends Component { note={pt.get().userPage.reportColumn.note} extraText='' arrow='right' - iconInfo={{ - color: '#9ACD32', - value: 'message', - }} + thumb={messageIcon} onClick={this.reportPage} />