diff --git a/miniprogram/app.js b/miniprogram/app.js
index 319dbf3e..3d8c47ba 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -13,9 +13,9 @@ const DEFAULT_WITHDRAW_TMPL_ID = 'u3MbZGPRkrZIk-I7QdpwzFxnO_CeQPaCWF2FkiIablE'
App({
globalData: {
// API 基础地址：开发时修改下面一行切换环境
- // baseUrl: "https://soulapi.quwanzhi.com",
+ baseUrl: "https://soulapi.quwanzhi.com",
// baseUrl: 'http://localhost:8080', // 开发
- baseUrl: 'https://souldev.quwanzhi.com', // 测试
+ // baseUrl: 'https://souldev.quwanzhi.com', // 测试
// 小程序配置 - 真实AppID
appId: DEFAULT_APP_ID,
@@ -60,6 +60,7 @@ App({
systemInfo: null,
statusBarHeight: 44,
navBarHeight: 88,
+ capsuleRightPadding: 96, // 胶囊右侧留白(px)，getSystemInfo 会按 menuButton 计算
// TabBar相关
currentTab: 0,
@@ -282,10 +283,12 @@ App({
this.globalData.isSinglePageMode = true
}
- // 计算导航栏高度
+ // 计算导航栏高度与胶囊避让
const menuButton = wx.getMenuButtonBoundingClientRect()
if (menuButton) {
this.globalData.navBarHeight = (menuButton.top - systemInfo.statusBarHeight) * 2 + menuButton.height + systemInfo.statusBarHeight
+ // 胶囊右侧留白（px），供自定义导航栏避开胶囊
+ this.globalData.capsuleRightPadding = (systemInfo.windowWidth || 375) - menuButton.left + 8
}
} catch (e) {
console.error('获取系统信息失败:', e)
diff --git a/miniprogram/components/icon/icon.js b/miniprogram/components/icon/icon.js
index 91676abc..bfbcfd03 100644
--- a/miniprogram/components/icon/icon.js
+++ b/miniprogram/components/icon/icon.js
@@ -122,6 +122,7 @@ Component({
'image': s + '',
'gift': s + '',
'lock': s + '',
+ 'lock-open': s + '',
'sparkles': s + '',
'save': s + '',
'globe': s + '',
diff --git a/miniprogram/pages/about/about.wxml b/miniprogram/pages/about/about.wxml
index 5966329f..2987434e 100644
--- a/miniprogram/pages/about/about.wxml
+++ b/miniprogram/pages/about/about.wxml
@@ -1,7 +1,7 @@
- ←
+
关于作者
diff --git a/miniprogram/pages/addresses/addresses.wxml b/miniprogram/pages/addresses/addresses.wxml
index 5c5105ee..9dd04f9d 100644
--- a/miniprogram/pages/addresses/addresses.wxml
+++ b/miniprogram/pages/addresses/addresses.wxml
@@ -3,7 +3,7 @@
- ‹
+
收货地址
diff --git a/miniprogram/pages/addresses/edit.wxml b/miniprogram/pages/addresses/edit.wxml
index ceb915f9..2c788574 100644
--- a/miniprogram/pages/addresses/edit.wxml
+++ b/miniprogram/pages/addresses/edit.wxml
@@ -3,7 +3,7 @@
- ‹
+
{{isEdit ? '编辑地址' : '新增地址'}}
diff --git a/miniprogram/pages/agreement/agreement.wxml b/miniprogram/pages/agreement/agreement.wxml
index a1987185..a737d0c2 100644
--- a/miniprogram/pages/agreement/agreement.wxml
+++ b/miniprogram/pages/agreement/agreement.wxml
@@ -1,7 +1,7 @@
- ←
+
用户协议
diff --git a/miniprogram/pages/avatar-nickname/avatar-nickname.wxml b/miniprogram/pages/avatar-nickname/avatar-nickname.wxml
index 5f225f9e..05982d52 100644
--- a/miniprogram/pages/avatar-nickname/avatar-nickname.wxml
+++ b/miniprogram/pages/avatar-nickname/avatar-nickname.wxml
@@ -1,7 +1,7 @@
- ‹
+
完善资料
diff --git a/miniprogram/pages/chapters/chapters.wxml b/miniprogram/pages/chapters/chapters.wxml
index b4a3a189..2578a9b5 100644
--- a/miniprogram/pages/chapters/chapters.wxml
+++ b/miniprogram/pages/chapters/chapters.wxml
@@ -91,7 +91,10 @@
- {{section.isFree || isVip || (!section.isPremium && hasFullBook) || purchasedSections.indexOf(section.id) > -1 ? '○' : '●'}}
+
+
+
+
{{section.id}} {{section.title}}
NEW
diff --git a/miniprogram/pages/chapters/chapters.wxss b/miniprogram/pages/chapters/chapters.wxss
index c7e3f11f..dfcd4a12 100644
--- a/miniprogram/pages/chapters/chapters.wxss
+++ b/miniprogram/pages/chapters/chapters.wxss
@@ -471,6 +471,14 @@
flex-shrink: 0;
}
+.section-lock-wrap {
+ min-width: 32rpx;
+ flex-shrink: 0;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
.lock-open {
color: #00CED1;
}
diff --git a/miniprogram/pages/gift-pay/detail.wxml b/miniprogram/pages/gift-pay/detail.wxml
index 36d4fd74..2c1239b3 100644
--- a/miniprogram/pages/gift-pay/detail.wxml
+++ b/miniprogram/pages/gift-pay/detail.wxml
@@ -3,7 +3,7 @@
- ←
+
{{isInitiator ? '代付分享' : (detail.action === 'redeem' ? '免费领取' : '代付详情')}}
diff --git a/miniprogram/pages/gift-pay/list.wxml b/miniprogram/pages/gift-pay/list.wxml
index c9ff0d86..0de9243f 100644
--- a/miniprogram/pages/gift-pay/list.wxml
+++ b/miniprogram/pages/gift-pay/list.wxml
@@ -3,7 +3,7 @@
- ←
+
我发起的代付
diff --git a/miniprogram/pages/gift-pay/redemption-detail.wxml b/miniprogram/pages/gift-pay/redemption-detail.wxml
index edc15aec..8fd54205 100644
--- a/miniprogram/pages/gift-pay/redemption-detail.wxml
+++ b/miniprogram/pages/gift-pay/redemption-detail.wxml
@@ -3,7 +3,7 @@
- ←
+
领取详情
diff --git a/miniprogram/pages/link-preview/link-preview.wxml b/miniprogram/pages/link-preview/link-preview.wxml
index 36696e10..27469b5f 100644
--- a/miniprogram/pages/link-preview/link-preview.wxml
+++ b/miniprogram/pages/link-preview/link-preview.wxml
@@ -3,7 +3,7 @@
- ←
+
{{title}}
diff --git a/miniprogram/pages/member-detail/member-detail.wxml b/miniprogram/pages/member-detail/member-detail.wxml
index b96e244c..88dc8b73 100644
--- a/miniprogram/pages/member-detail/member-detail.wxml
+++ b/miniprogram/pages/member-detail/member-detail.wxml
@@ -3,7 +3,7 @@
- ‹
+
个人资料
diff --git a/miniprogram/pages/mentor-detail/mentor-detail.wxml b/miniprogram/pages/mentor-detail/mentor-detail.wxml
index a587b372..eea50000 100644
--- a/miniprogram/pages/mentor-detail/mentor-detail.wxml
+++ b/miniprogram/pages/mentor-detail/mentor-detail.wxml
@@ -1,7 +1,7 @@
- ‹
+
导师详情
diff --git a/miniprogram/pages/mentors/mentors.wxml b/miniprogram/pages/mentors/mentors.wxml
index 0962dda1..cf895c99 100644
--- a/miniprogram/pages/mentors/mentors.wxml
+++ b/miniprogram/pages/mentors/mentors.wxml
@@ -1,7 +1,7 @@
- ‹
+
选择导师
diff --git a/miniprogram/pages/privacy/privacy.wxml b/miniprogram/pages/privacy/privacy.wxml
index 6e4f7a26..7c698e7f 100644
--- a/miniprogram/pages/privacy/privacy.wxml
+++ b/miniprogram/pages/privacy/privacy.wxml
@@ -1,7 +1,7 @@
- ←
+
隐私政策
diff --git a/miniprogram/pages/profile-show/profile-show.wxml b/miniprogram/pages/profile-show/profile-show.wxml
index ff845f8e..36b75104 100644
--- a/miniprogram/pages/profile-show/profile-show.wxml
+++ b/miniprogram/pages/profile-show/profile-show.wxml
@@ -1,7 +1,7 @@
- ‹
+
个人资料
⋯
diff --git a/miniprogram/pages/purchases/purchases.wxml b/miniprogram/pages/purchases/purchases.wxml
index bc5a1a08..b350aa20 100644
--- a/miniprogram/pages/purchases/purchases.wxml
+++ b/miniprogram/pages/purchases/purchases.wxml
@@ -1,7 +1,7 @@
- ←
+
我的订单
diff --git a/miniprogram/pages/read/read.wxml b/miniprogram/pages/read/read.wxml
index 5324cf49..f5c035fe 100644
--- a/miniprogram/pages/read/read.wxml
+++ b/miniprogram/pages/read/read.wxml
@@ -10,7 +10,7 @@
- ←
+
{{section.title || chapterTitle}}
diff --git a/miniprogram/pages/search/search.js b/miniprogram/pages/search/search.js
index 83b1ac4f..449b89c2 100644
--- a/miniprogram/pages/search/search.js
+++ b/miniprogram/pages/search/search.js
@@ -8,6 +8,8 @@ const { trackClick } = require('../../utils/trackClick')
Page({
data: {
statusBarHeight: 44,
+ navBarHeight: 88,
+ capsuleRightPadding: 96,
keyword: '',
results: [],
loading: false,
@@ -28,7 +30,9 @@ Page({
onLoad() {
wx.showShareMenu({ withShareTimeline: true })
this.setData({
- statusBarHeight: app.globalData.statusBarHeight || 44
+ statusBarHeight: app.globalData.statusBarHeight || 44,
+ navBarHeight: app.globalData.navBarHeight || 88,
+ capsuleRightPadding: app.globalData.capsuleRightPadding || 96
})
// 加载热门章节
this.loadHotChapters()
diff --git a/miniprogram/pages/search/search.wxml b/miniprogram/pages/search/search.wxml
index 56c4d588..ee6d808f 100644
--- a/miniprogram/pages/search/search.wxml
+++ b/miniprogram/pages/search/search.wxml
@@ -1,11 +1,11 @@
-
+
-
+
- ←
+
@@ -18,14 +18,14 @@
confirm-type="search"
focus="{{true}}"
/>
- ×
+
搜索
-
+
diff --git a/miniprogram/pages/search/search.wxss b/miniprogram/pages/search/search.wxss
index 1f67a348..20556f54 100644
--- a/miniprogram/pages/search/search.wxss
+++ b/miniprogram/pages/search/search.wxss
@@ -20,7 +20,7 @@
display: flex;
align-items: center;
padding: 8rpx 24rpx;
- height: 88rpx;
+ /* height、padding-right 由 wxml 内联传入，以避开胶囊 */
}
.back-btn {
diff --git a/miniprogram/pages/settings/settings.wxml b/miniprogram/pages/settings/settings.wxml
index 1202f073..857879c3 100644
--- a/miniprogram/pages/settings/settings.wxml
+++ b/miniprogram/pages/settings/settings.wxml
@@ -2,7 +2,7 @@
- ‹
+
设置
diff --git a/miniprogram/pages/vip/vip.wxml b/miniprogram/pages/vip/vip.wxml
index 3644710d..81fa1453 100644
--- a/miniprogram/pages/vip/vip.wxml
+++ b/miniprogram/pages/vip/vip.wxml
@@ -2,7 +2,7 @@
- ‹
+
卡若创业派对
diff --git a/miniprogram/pages/wallet/wallet.wxml b/miniprogram/pages/wallet/wallet.wxml
index 3453bb30..e496e674 100644
--- a/miniprogram/pages/wallet/wallet.wxml
+++ b/miniprogram/pages/wallet/wallet.wxml
@@ -2,7 +2,7 @@
- ‹
+
我的余额
diff --git a/miniprogram/pages/withdraw-records/withdraw-records.wxml b/miniprogram/pages/withdraw-records/withdraw-records.wxml
index def185dc..79a92468 100644
--- a/miniprogram/pages/withdraw-records/withdraw-records.wxml
+++ b/miniprogram/pages/withdraw-records/withdraw-records.wxml
@@ -1,6 +1,6 @@
- ←
+
提现记录