fnvtk/Mycontent
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'yongpxu-soul' of https://github.com/fnvtk/Mycontent into yongpxu-soul

Browse Source 
# Conflicts:
#	miniprogram/app.js   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/app.json   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/addresses/addresses.js   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/addresses/edit.js   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/agreement/agreement.js   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/chapters/chapters.js   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/index/index.js   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/index/index.wxml   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/match/match.js   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/my/my.js   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/my/my.wxml   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/my/my.wxss   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/privacy/privacy.js   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/purchases/purchases.js   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/read/read.js   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/read/read.wxml   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/referral/referral.js   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/referral/referral.wxml   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/referral/referral.wxss   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/settings/settings.js   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/pages/withdraw-records/withdraw-records.js   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/project.config.json   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/project.private.config.json   resolved by origin/yongpxu-soul(远端) version
#	miniprogram/utils/chapterAccessManager.js   resolved by origin/yongpxu-soul(远端) version
This commit is contained in:
乘风
2026-02-24 14:52:25 +08:00
parent 96c8695ff3 e5e6ffd7b1
commit d14c9617d7
33 changed files with 1967 additions and 1810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
miniprogram/utils/chapterAccessManager.js
View File

@@ -22,22 +22,21 @@ class ChapterAccessManager {
*/
async fetchLatestConfig() {
try {
const res = await app.request('/api/miniprogram/config', { timeout: 3000 })
const res = await app.request({ url: '/api/miniprogram/config', silent: true, timeout: 3000 })
if (res.success && res.freeChapters) {
return {
freeChapters: res.freeChapters,
prices: res.prices || { section: 1, fullbook: 9.9 },
userDiscount: (typeof res.userDiscount === 'number' ? res.userDiscount : 5)
prices: res.prices || { section: 1, fullbook: 9.9 }
}
}
} catch (e) {
console.warn('[AccessManager] 获取配置失败，使用默认配置:', e)
}
// 默认配置
return {
freeChapters: ['preface', 'epilogue', '1.1', 'appendix-1', 'appendix-2', 'appendix-3'],
prices: { section: 1, fullbook: 9.9 },
userDiscount: 5
prices: { section: 1, fullbook: 9.9 }
}
}
@@ -151,10 +150,7 @@ class ChapterAccessManager {
if (res.success && res.data) {
app.globalData.hasFullBook = res.data.hasFullBook || false
app.globalData.purchasedSections = res.data.purchasedSections || []
app.globalData.sectionMidMap = res.data.sectionMidMap || {}
app.globalData.matchCount = res.data.matchCount ?? 0
app.globalData.matchQuota = res.data.matchQuota || null
const userInfo = app.globalData.userInfo || {}
userInfo.hasFullBook = res.data.hasFullBook
userInfo.purchasedSections = res.data.purchasedSections
@@ -162,8 +158,7 @@ class ChapterAccessManager {
console.log('[AccessManager] 购买状态已刷新:', {
hasFullBook: res.data.hasFullBook,
purchasedCount: res.data.purchasedSections.length,
matchCount: res.data.matchCount
purchasedCount: res.data.purchasedSections.length
})
}
} catch (e) {