diff --git a/src/static/userInfo/ball.svg b/src/static/userInfo/ball.svg new file mode 100644 index 0000000..fefdde4 --- /dev/null +++ b/src/static/userInfo/ball.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/static/userInfo/birthday.svg b/src/static/userInfo/birthday.svg new file mode 100644 index 0000000..eaf7696 --- /dev/null +++ b/src/static/userInfo/birthday.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/static/userInfo/business.svg b/src/static/userInfo/business.svg new file mode 100644 index 0000000..25e6c16 --- /dev/null +++ b/src/static/userInfo/business.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/static/userInfo/gender.svg b/src/static/userInfo/gender.svg new file mode 100644 index 0000000..6546084 --- /dev/null +++ b/src/static/userInfo/gender.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/static/userInfo/introduce.svg b/src/static/userInfo/introduce.svg new file mode 100644 index 0000000..589eb4d --- /dev/null +++ b/src/static/userInfo/introduce.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/static/userInfo/phone.svg b/src/static/userInfo/phone.svg new file mode 100644 index 0000000..ae37ac9 --- /dev/null +++ b/src/static/userInfo/phone.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/static/userInfo/user.svg b/src/static/userInfo/user.svg new file mode 100644 index 0000000..03cb710 --- /dev/null +++ b/src/static/userInfo/user.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/static/userInfo/wallet.svg b/src/static/userInfo/wallet.svg new file mode 100644 index 0000000..12fd9d2 --- /dev/null +++ b/src/static/userInfo/wallet.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/user_pages/edit/index.config.ts b/src/user_pages/edit/index.config.ts index a951369..7f8c559 100644 --- a/src/user_pages/edit/index.config.ts +++ b/src/user_pages/edit/index.config.ts @@ -5,4 +5,5 @@ export default definePageConfig({ backgroundColor: '#f5f5f5', enablePullDownRefresh: false, disableScroll: false, + navigationStyle: 'custom', }) \ No newline at end of file diff --git a/src/user_pages/edit/index.scss b/src/user_pages/edit/index.scss index b9d3061..99c75ce 100644 --- a/src/user_pages/edit/index.scss +++ b/src/user_pages/edit/index.scss @@ -7,6 +7,46 @@ box-sizing: border-box; } +.custom-navbar { + height: 56px; + /* 通常与原生导航栏高度一致 */ + display: flex; + align-items: center; + justify-content: center; + // background-color: #fff; + color: #000; + padding-top: 44px; + /* 适配状态栏 */ + position: sticky; + top: 0; + z-index: 100; + overflow: hidden; + background-color: rgb(238, 255, 220); +} + +.detail-navigator { + height: 30px; + width: 80px; + border-radius: 15px; + position: absolute; + left: 12px; + box-sizing: border-box; + display: flex; + align-items: center; + + .detail-navigator-back { + height: 32px; + width: 50%; + display: flex; + justify-content: center; + + &>.detail-navigator-back-icon { + width: 32px; + height: 32px; + } + } +} + // 导航栏 .navbar { position: fixed; @@ -84,7 +124,7 @@ align-items: center; gap: 12px; margin-bottom: 48px; - margin-top: 98px; + // margin-top: 98px; .avatar_container { position: relative; diff --git a/src/user_pages/edit/index.tsx b/src/user_pages/edit/index.tsx index 7bb01fc..f2c7a19 100644 --- a/src/user_pages/edit/index.tsx +++ b/src/user_pages/edit/index.tsx @@ -7,6 +7,7 @@ import { UserService } from '@/services/userService'; import { clear_login_state } from '@/services/loginService'; import { convert_db_gender_to_display } from '@/utils/genderUtils'; import { EditModal } from '@/components'; +import img from "@/config/images"; const EditProfilePage: React.FC = () => { // 用户信息状态 @@ -264,7 +265,6 @@ const EditProfilePage: React.FC = () => { }); return; } - console.log('用户手机号信息aaa：', e) try { const phone = await UserService.parse_phone(e.detail.code); handle_field_edit('phone', phone); @@ -281,7 +281,16 @@ const EditProfilePage: React.FC = () => { return ( {/* 导航栏 */} - + + + { Taro.navigateBack() }}> + + + + {/* 主要内容 */} {loading ? ( @@ -311,7 +320,7 @@ const EditProfilePage: React.FC = () => { handle_open_edit_modal('nickname')}> - + 名字 @@ -332,7 +341,7 @@ const EditProfilePage: React.FC = () => { > - + 性别 @@ -355,7 +364,7 @@ const EditProfilePage: React.FC = () => { > - + 生日 @@ -372,7 +381,7 @@ const EditProfilePage: React.FC = () => { handle_open_edit_modal('personal_profile')}> - + 简介 @@ -391,7 +400,7 @@ const EditProfilePage: React.FC = () => { {/* 地区 */} - + 地区 @@ -410,7 +419,7 @@ const EditProfilePage: React.FC = () => { {/* NTRP水平 */} - + NTRP 水平 @@ -430,7 +439,7 @@ const EditProfilePage: React.FC = () => { {/* 职业 */} - + 职业 @@ -452,7 +461,7 @@ const EditProfilePage: React.FC = () => { - + 手机 @@ -472,6 +481,13 @@ const EditProfilePage: React.FC = () => { + {/* 注销账号 */} + + + 注销账号 + + + {/* 退出登录 */} diff --git a/src/user_pages/myself/index.tsx b/src/user_pages/myself/index.tsx index 1d76c67..d9d92e5 100644 --- a/src/user_pages/myself/index.tsx +++ b/src/user_pages/myself/index.tsx @@ -177,15 +177,15 @@ const MyselfPage: React.FC = () => { className="action_icon" src={require("@/static/userInfo/order_btn.svg")} /> - 我的订单 + 球局订单 - 收藏 + 钱包 diff --git a/src/user_pages/other/index.config.ts b/src/user_pages/other/index.config.ts index 5dcd237..bc1e99b 100644 --- a/src/user_pages/other/index.config.ts +++ b/src/user_pages/other/index.config.ts @@ -1,3 +1,4 @@ export default definePageConfig({ navigationBarTitleText: '用户主页', + navigationStyle: 'custom', }) \ No newline at end of file diff --git a/src/user_pages/other/index.tsx b/src/user_pages/other/index.tsx index a1dc8ed..87fab8d 100644 --- a/src/user_pages/other/index.tsx +++ b/src/user_pages/other/index.tsx @@ -1,7 +1,8 @@ import React, { useState, useEffect } from "react"; -import { View, Text, ScrollView } from "@tarojs/components"; +import { View, Text, ScrollView, Image } from "@tarojs/components"; import ListContainer from "@/container/listContainer"; import Taro from "@tarojs/taro"; +import img from "@/config/images"; import "./index.scss"; // import GuideBar from "@/components/GuideBar"; import { @@ -163,6 +164,16 @@ const OtherUserPage: React.FC = () => { return ( + + + { Taro.navigateBack() }}> + + + + {/* 主要内容 */} {/* 用户信息区域 */}