diff --git a/src/components/UserInfo/index.tsx b/src/components/UserInfo/index.tsx index 65b3432..2497df4 100644 --- a/src/components/UserInfo/index.tsx +++ b/src/components/UserInfo/index.tsx @@ -289,6 +289,12 @@ export const UserInfoCard: React.FC = ({ return defaultOptions; }; + const previewAvatar = (url) => { + wx.previewImage({ + urls: [url], + }); + }; + return ( {/* 头像和基本信息 */} @@ -298,6 +304,9 @@ export const UserInfoCard: React.FC = ({ className="avatar" src={user_info.avatar_url || ""} mode="aspectFill" + onClick={() => { + previewAvatar(user_info.avatar_url || ""); + }} /> diff --git a/src/user_pages/edit/index.scss b/src/user_pages/edit/index.scss index 25a36cf..3ef8a4c 100644 --- a/src/user_pages/edit/index.scss +++ b/src/user_pages/edit/index.scss @@ -178,7 +178,7 @@ // 表单区域 .form_section { margin-bottom: 16px; - border: 1px solid rgba(0, 0, 0, 0.12); + border: 0.5pt solid rgba(0, 0, 0, 0.06); border-radius: 12px; // box-shadow: 0px 4px 36px 0px rgba(0, 0, 0, 0.06); diff --git a/src/user_pages/myself/index.scss b/src/user_pages/myself/index.scss index 0049aed..766a93a 100644 --- a/src/user_pages/myself/index.scss +++ b/src/user_pages/myself/index.scss @@ -41,7 +41,7 @@ flex: 1; margin-top: 0; box-sizing: border-box; - padding: 0px 15px 15px 15px; + padding-bottom: 15px; padding-top: 98px; // 用户信息区域 @@ -49,6 +49,7 @@ display: flex; flex-direction: column; gap: 16px; + padding: 0 15px; // 加载状态 .loading_container { @@ -168,12 +169,17 @@ } } + .test-entry-card-box { + padding: 0 15px; + } + // 球局类型标签页 .game_tabs_section { + margin-bottom: 0; .tab_container { display: flex; gap: 16px; - padding: 12px 0; + padding: 12px 15px; .tab_item { padding: 12px 0; diff --git a/src/user_pages/myself/index.tsx b/src/user_pages/myself/index.tsx index af9d3f7..639b8c8 100644 --- a/src/user_pages/myself/index.tsx +++ b/src/user_pages/myself/index.tsx @@ -169,14 +169,14 @@ const MyselfPage: React.FC = () => { // 处理钱包 const handle_wallet = () => { Taro.navigateTo({ - url: "/user_pages/wallet/index", - // url: "/user_pages/other/index?userid=16" + // url: "/user_pages/wallet/index", + url: "/user_pages/other/index?userid=16", }); }; const handleOnTab = (tab) => { - setActiveTab(tab) - } + setActiveTab(tab); + }; return ( @@ -213,7 +213,9 @@ const MyselfPage: React.FC = () => { - + + + {/* 球局类型标签页 */} @@ -225,8 +227,9 @@ const MyselfPage: React.FC = () => { 我主办的 setActiveTab("participated")} > 我参与的 @@ -248,7 +251,7 @@ const MyselfPage: React.FC = () => { btnImg="ICON_ADD" reload={goPublish} isShowNoData={game_records.length === 0} - loadMoreMatches={() => { }} + loadMoreMatches={() => {}} collapse={true} style={{ paddingBottom: 0, overflow: "hidden" }} defaultShowNum={3} @@ -275,7 +278,7 @@ const MyselfPage: React.FC = () => { error={null} errorImg="ICON_LIST_EMPTY" isShowNoData={ended_game_records.length === 0} - loadMoreMatches={() => { }} + loadMoreMatches={() => {}} collapse={true} style={{ paddingBottom: "90px", overflow: "hidden" }} defaultShowNum={3} diff --git a/src/user_pages/other/index.scss b/src/user_pages/other/index.scss index ce7cd78..4690dde 100644 --- a/src/user_pages/other/index.scss +++ b/src/user_pages/other/index.scss @@ -67,7 +67,7 @@ margin-top: 11px; box-sizing: border-box; overflow-y: auto; - padding: 15px 15px 15px; + padding-bottom: 15px; // 用户信息区域 .user_info_section { @@ -75,6 +75,8 @@ flex-direction: column; gap: 16px; margin-bottom: 16px; + padding: 0 15px; + // margin-top: 98px; // 基本信息 @@ -282,7 +284,7 @@ // 球局类型标签页 .game_tabs_section { - margin-bottom: 16px; + margin-bottom: 0; .tab_container { display: flex; diff --git a/src/user_pages/queryTransactions/index.scss b/src/user_pages/queryTransactions/index.scss index b9510ed..17a6242 100644 --- a/src/user_pages/queryTransactions/index.scss +++ b/src/user_pages/queryTransactions/index.scss @@ -46,7 +46,7 @@ font-size: 20px; letter-spacing: 0.38px; - &>.detail-navigator-back-icon { + & > .detail-navigator-back-icon { width: 32px; height: 32px; } @@ -258,10 +258,11 @@ padding: 4px; background-color: rgba(#ff9500, 0.1); border: solid 1px #ff9500; + margin-right: 4px; &.success { color: #000; - background-color: rgba(0, 0, 0, .1); + background-color: rgba(0, 0, 0, 0.1); border-color: #000; } } @@ -296,4 +297,4 @@ padding: 20px 0 40px; background: #fff; } -} \ No newline at end of file +} diff --git a/src/user_pages/queryTransactions/index.tsx b/src/user_pages/queryTransactions/index.tsx index dc78ddd..d91c09f 100644 --- a/src/user_pages/queryTransactions/index.tsx +++ b/src/user_pages/queryTransactions/index.tsx @@ -374,7 +374,11 @@ const QueryTransactions = () => { - + {transaction.type_text} diff --git a/src/user_pages/wallet/index.tsx b/src/user_pages/wallet/index.tsx index 8073226..21814f2 100644 --- a/src/user_pages/wallet/index.tsx +++ b/src/user_pages/wallet/index.tsx @@ -160,29 +160,27 @@ const WalletPage: React.FC = () => { // 页面显示时加载数据 useDidShow(() => { - const currentPage = Taro.getCurrentInstance().page - const updateList = currentPage.data.updateList + const currentPage = Taro.getCurrentInstance().page; + const updateList = currentPage.data.updateList; if (updateList) { - set_transactions([]) + set_transactions([]); // 直接使用新参数调用加载方法 const newParams = { ...load_transactions_params, - page: 1 - } - set_load_transactions_params(newParams) - load_transactions() // 立即调用 + page: 1, + }; + set_load_transactions_params(newParams); + load_transactions(); // 立即调用 // 清除标记 - currentPage.setData({ updateList: null }) + currentPage.setData({ updateList: null }); } - load_wallet_data() - check_password_status() + load_wallet_data(); + check_password_status(); }); - - const modify_load_transactions_params = () => { set_transactions([]); const { type, transaction_sub_type } = filterParams; @@ -613,7 +611,11 @@ const WalletPage: React.FC = () => { - + {transaction.type_text}