diff --git a/.gitignore b/.gitignore index 321aa95a..8050feeb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,4 @@ soul-api/wechat/info.log next-project soul-admin/node_modules soul-api -soul-api.exe -soul-api +soul-api.exe \ No newline at end of file diff --git a/miniprogram/pages/my/my.js b/miniprogram/pages/my/my.js index e51f432d..b1a3889e 100644 --- a/miniprogram/pages/my/my.js +++ b/miniprogram/pages/my/my.js @@ -616,6 +616,11 @@ Page({ wx.navigateTo({ url: '/pages/about/about' }) }, + // 跳转到匹配 + goToMatch() { + wx.switchTab({ url: '/pages/match/match' }) + }, + // 跳转到推广中心 goToReferral() { if (!this.data.isLoggedIn) { @@ -627,10 +632,6 @@ Page({ // 跳转到找伙伴页面 goToMatch() { - if (!this.data.matchEnabled) { - wx.showToast({ title: '该功能暂未开放', icon: 'none' }) - return - } wx.switchTab({ url: '/pages/match/match' }) }, diff --git a/miniprogram/pages/my/my.wxml b/miniprogram/pages/my/my.wxml index 180f68c1..6fad4513 100644 --- a/miniprogram/pages/my/my.wxml +++ b/miniprogram/pages/my/my.wxml @@ -1,11 +1,11 @@ - + + 我的 - 我的 @@ -45,15 +45,15 @@ - + {{readCount}} 已读章节 - + {{referralCount}} 推荐好友 - + {{earnings === '-' ? '--' : earnings}} 我的收益 @@ -70,7 +70,7 @@ 阅读统计 - + {{readCount}} 已读章节 @@ -80,7 +80,7 @@ {{totalReadTime}} 阅读分钟 - + {{matchHistory}} 匹配伙伴 diff --git a/miniprogram/pages/my/my.wxss b/miniprogram/pages/my/my.wxss index 88346dd3..125731fb 100644 --- a/miniprogram/pages/my/my.wxss +++ b/miniprogram/pages/my/my.wxss @@ -9,18 +9,18 @@ padding-bottom: calc(220rpx + env(safe-area-inset-bottom, 0px)); } -/* ===== 导航栏(设置放左侧避让右上角胶囊) ===== */ +/* ===== 导航栏(避让右上角系统胶囊) ===== */ .nav-bar { position: fixed; top: 0; left: 0; right: 0; z-index: 100; background: rgba(18,18,18,0.9); backdrop-filter: blur(8rpx); display: flex; align-items: center; min-height: 44px; - padding: 0 32rpx 0 24rpx; /* 右侧留白给胶囊,左侧紧凑 */ + padding: 0 120rpx 0 32rpx; /* 右侧避让胶囊 */ border-bottom: 1rpx solid rgba(255,255,255,0.05); } -.nav-settings { width: 64rpx; height: 64rpx; display: flex; align-items: center; justify-content: center; flex-shrink: 0; margin-right: 16rpx; } -.nav-settings-icon { width: 44rpx; height: 44rpx; opacity: 0.7; } .nav-title { font-size: 40rpx; font-weight: bold; color: #4FD1C5; flex: 1; } +.nav-settings { width: 64rpx; height: 64rpx; display: flex; align-items: center; justify-content: center; margin-right: 16rpx; } +.nav-settings-icon { width: 44rpx; height: 44rpx; opacity: 0.7; } .nav-placeholder { width: 100%; } /* ===== 未登录 ===== */ @@ -79,8 +79,7 @@ display: flex; justify-content: space-around; margin-top: 32rpx; padding-top: 24rpx; border-top: 1rpx solid #374151; } -.profile-stat { text-align: center; padding: 8rpx 0; } -.profile-stat:active { opacity: 0.8; } +.profile-stat { text-align: center; } .profile-stat-val { display: block; font-size: 36rpx; font-weight: bold; color: #4FD1C5; } .profile-stat-label { display: block; font-size: 22rpx; color: #6B7280; margin-top: 8rpx; } @@ -118,7 +117,6 @@ display: flex; flex-direction: column; align-items: center; justify-content: center; min-height: 140rpx; } -.stat-box:active { opacity: 0.85; } .stat-icon { font-size: 40rpx; margin-bottom: 8rpx; color: #4FD1C5; flex-shrink: 0; } .stat-icon-img { width: 44rpx; height: 44rpx; margin-bottom: 8rpx; flex-shrink: 0; display: block; } .stat-num { font-size: 36rpx; font-weight: bold; color: #fff; line-height: 1.2; }