# Conflicts:
# miniprogram/app.js resolved by origin/devlop(远端) version
# miniprogram/pages/read/read.wxml resolved by origin/devlop(远端) version
# miniprogram/project.private.config.json resolved by origin/devlop(远端) version
# soul-admin/dist/index.html resolved by origin/devlop(远端) version
# soul-admin/src/App.tsx resolved by origin/devlop(远端) version
# soul-admin/src/pages/content/ContentPage.tsx resolved by origin/devlop(远端) version
# soul-admin/src/pages/users/UsersPage.tsx resolved by origin/devlop(远端) version
# soul-admin/tsconfig.tsbuildinfo resolved by origin/devlop(远端) version
# soul-api/internal/router/router.go resolved by origin/devlop(远端) version
# soul-api/master.py resolved by origin/devlop(远端) version
# soul-api/wechat/info.log resolved by origin/devlop(远端) version
# Conflicts:
# .cursor/agent/小程序开发工程师/evolution/索引.md resolved by origin/main(远端) version
# .cursor/agent/开发助理/项目索引/产品.md resolved by origin/main(远端) version
# .cursor/agent/开发助理/项目索引/助理橙子.md resolved by origin/main(远端) version
# .cursor/agent/开发助理/项目索引/后端.md resolved by origin/main(远端) version
# .cursor/agent/开发助理/项目索引/团队.md resolved by origin/main(远端) version
# .cursor/agent/开发助理/项目索引/小程序.md resolved by origin/main(远端) version
# .cursor/agent/开发助理/项目索引/测试.md resolved by origin/main(远端) version
# .cursor/agent/开发助理/项目索引/管理端.md resolved by origin/main(远端) version
# .cursor/meeting/README.md resolved by origin/main(远端) version
# .cursor/scripts/create-offline-bundle.sh resolved by origin/main(远端) version
# .cursor/scripts/gitea-sync.sh resolved by origin/main(远端) version
# .cursor/skills/assistant-doc-sync/sync-log.md resolved by origin/main(远端) version
# miniprogram/app.js resolved by origin/main(远端) version
# miniprogram/pages/avatar-nickname/avatar-nickname.js resolved by origin/main(远端) version
# miniprogram/pages/avatar-nickname/avatar-nickname.wxml resolved by origin/main(远端) version
# miniprogram/pages/avatar-nickname/avatar-nickname.wxss resolved by origin/main(远端) version
# miniprogram/pages/match/match.js resolved by origin/main(远端) version
# miniprogram/pages/match/match.wxml resolved by origin/main(远端) version
# miniprogram/pages/read/read.js resolved by origin/main(远端) version
# miniprogram/pages/read/read.wxml resolved by origin/main(远端) version
# miniprogram/pages/read/read.wxss resolved by origin/main(远端) version
# miniprogram/project.private.config.json resolved by origin/main(远端) version
# miniprogram/utils/contentParser.js resolved by origin/main(远端) version
# miniprogram/utils/mpPagePopups.js resolved by origin/main(远端) version
# new-soul/miniprogram/pages/referral/referral.wxss.broken resolved by origin/main(远端) version
# new-soul/soul-admin/deploy_admin.py resolved by origin/main(远端) version
# scripts/miniprogram_upload.sh resolved by origin/main(远端) version
# soul-admin/deploy_admin.py resolved by origin/main(远端) version
# soul-admin/dist/index.html resolved by origin/main(远端) version
# soul-admin/master.py resolved by origin/main(远端) version
# soul-admin/src/App.tsx resolved by origin/main(远端) version
# soul-admin/src/components/RichEditor.tsx resolved by origin/main(远端) version
# soul-admin/src/pages/content/ContentPage.tsx resolved by origin/main(远端) version
# soul-admin/src/pages/dashboard/DashboardPage.tsx resolved by origin/main(远端) version
# soul-admin/src/pages/settings/SettingsPage.tsx resolved by origin/main(远端) version
# soul-admin/src/pages/users/UsersPage.tsx resolved by origin/main(远端) version
# soul-admin/tsconfig.tsbuildinfo resolved by origin/main(远端) version
# soul-api/.env.production resolved by origin/main(远端) version
# soul-api/devloy.py resolved by origin/main(远端) version
# soul-api/internal/config/config.go resolved by origin/main(远端) version
# soul-api/internal/database/database.go resolved by origin/main(远端) version
# soul-api/internal/handler/autolink.go resolved by origin/main(远端) version
# soul-api/internal/handler/book.go resolved by origin/main(远端) version
# soul-api/internal/handler/chapter_preview.go resolved by origin/main(远端) version
# soul-api/internal/handler/db_link_tag.go resolved by origin/main(远端) version
# soul-api/internal/handler/db_person.go resolved by origin/main(远端) version
# soul-api/internal/handler/miniprogram.go resolved by origin/main(远端) version
# soul-api/internal/handler/user.go resolved by origin/main(远端) version
# soul-api/internal/handler/vip_members_admin.go resolved by origin/main(远端) version
# soul-api/internal/model/chapter.go resolved by origin/main(远端) version
# soul-api/internal/router/router.go resolved by origin/main(远端) version
# soul-api/master.py resolved by origin/main(远端) version
# soul-api/soul-api-new resolved by origin/main(远端) version
# soul-api/wechat/info.log resolved by origin/main(远端) version
# 开发文档/10、项目管理/运营与变更.md resolved by origin/main(远端) version
# 开发文档/10、项目管理/项目落地推进表.md resolved by origin/main(远端) version
# 开发文档/6、后端/miniprogram接口补全说明.md resolved by origin/main(远端) version
# 开发文档/6、后端/管理端鉴权设计.md resolved by origin/main(远端) version
# 开发文档/8、部署/商家转账.md resolved by origin/main(远端) version
# 开发文档/8、部署/宝塔反向代理说明.md resolved by origin/main(远端) version
# 开发文档/8、部署/提现功能完整技术文档.md resolved by origin/main(远端) version
# 开发文档/8、部署/订阅消息.md resolved by origin/main(远端) version
# 开发文档/8、部署/部署总览.md resolved by origin/main(远端) version
# 开发文档/README.md resolved by origin/main(远端) version
- Improved the price retrieval logic to handle multiple data types (float64, int, int64, json.Number, string) for better flexibility.
- Updated comments to clarify the source of pricing configurations and ensure consistency with frontend settings.
- Adjusted default pricing values for the "match" product type to align with new business requirements.
- Enhanced content parsing logic to better handle image sources and improve resolution.
- Updated API base URL for seamless transitions between development and production environments.
- Refactored navigation on the OpenPlatformPage to ensure accurate access to settings and API documentation.
- Streamlined ContentPage to include additional webhook configuration retrieval.
- Optimized DashboardPage for improved user interaction efficiency.
- Cleaned up unused imports and improved readability in AdminLayout.
- Added new entries for meetings discussing work progress and requirement synchronization across various project components.
- Updated the last modified date to April 2, 2026, in multiple project index files.
- Documented changes in the sync log for assistant-doc-sync regarding the meeting outcomes.
- Changed the daily free match limit to a lifetime limit, aligning with backend configurations.
- Updated the match price display to include original pricing for better user clarity.
- Refactored match quota handling to sync with the server, ensuring accurate match counts and purchase statuses.
- Enhanced UI messages to reflect changes in match availability and pricing.
- Removed deprecated logic related to daily match counts, streamlining the matching process.
- Added 'name' parameter to the data payload in the restart_via_bt_api function across multiple files to ensure compatibility with different versions of the Go project plugin.
- Updated comments to clarify the necessity of including both 'project_name' and 'name' parameters for API requests.
- Introduced a mandatory profile guide for new users to complete their avatar and nickname before proceeding.
- Updated the avatar-nickname page to ensure fields are empty on entry, preventing auto-fill issues.
- Implemented checks to ensure users cannot navigate away without completing their profile.
- Removed deprecated privacy modal handling, streamlining the user experience.
- Adjusted UI elements to indicate required fields for new users.
- Added new entries for meetings discussing the integration of the "超级个体" and "@" lists across various project components.
- Updated the last modified date to March 31, 2026, in multiple project index files.
- Enhanced the read page functionality to include user phone number in navigation to other mini-programs.
- Documented changes in the sync log for assistant-doc-sync regarding the meeting outcomes.
- Changed API base URL from localhost:8080 to https://soulapi.quwanzhi.com for production.
- Added new read page configuration for "阅读详情" with specific query parameters.
- Implemented a fallback mechanism for read page UI to handle cases where cloud data is unavailable.
- Updated read page content and clipboard text formatting for better user experience.
- Removed deprecated gift sharing UI elements to streamline the interface.
# Conflicts:
# miniprogram/pages/read/read.js resolved by devlop version
# miniprogram/pages/read/read.wxml resolved by devlop version
# miniprogram/project.private.config.json resolved by devlop version
# miniprogram/utils/mpPagePopups.js resolved by devlop version
# soul-admin/dist/assets/index-BRyXRtx1.js resolved by devlop version
# soul-admin/dist/assets/index-CZFUM7K_.js resolved by devlop version
# soul-admin/dist/assets/index-i0PBc3Gp.js resolved by devlop version
# soul-admin/dist/index.html resolved by devlop version
# soul-admin/src/pages/settings/MpUiPopupTableSection.tsx resolved by devlop version
# soul-admin/src/pages/settings/mpUiCopyConfig.ts resolved by devlop version
# soul-api/internal/handler/book.go resolved by devlop version
# soul-api/internal/handler/db.go resolved by devlop version
# Conflicts:
# miniprogram/app.js resolved by devlop version
# miniprogram/pages/chapters/chapters.js resolved by devlop version
# miniprogram/pages/match/match.js resolved by devlop version
# miniprogram/pages/member-detail/member-detail.js resolved by devlop version
# miniprogram/pages/my/my.js resolved by devlop version
# miniprogram/pages/read/read.js resolved by devlop version
# miniprogram/pages/referral/referral.js resolved by devlop version
# soul-api/internal/model/person.go resolved by devlop version
# Conflicts:
# .cursor/skills/miniprogram-dev/SKILL.md resolved by devlop version
# miniprogram/pages/index/index.js resolved by devlop version
# miniprogram/pages/index/index.wxml resolved by devlop version
# miniprogram/pages/my/my.wxml resolved by devlop version
# miniprogram/pages/read/read.wxml resolved by devlop version
# miniprogram/pages/read/read.wxss resolved by devlop version
# soul-admin/dist/index.html resolved by devlop version
# soul-admin/src/pages/content/ChapterTree.tsx resolved by devlop version
# soul-admin/src/pages/content/ContentPage.tsx resolved by devlop version
# soul-admin/src/pages/distribution/DistributionPage.tsx resolved by devlop version
# soul-api/internal/handler/book.go resolved by devlop version
# soul-api/internal/handler/ckb.go resolved by devlop version
# soul-api/internal/handler/db_book.go resolved by devlop version
# soul-api/internal/handler/db_ckb_leads.go resolved by devlop version
# soul-api/internal/handler/db_person.go resolved by devlop version
# soul-api/internal/model/chapter.go resolved by devlop version
