Merge branch 'devlop' into yongxu-dev

# 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
This commit is contained in:
Alex-larget
2026-03-27 20:28:44 +08:00
35 changed files with 2756 additions and 437 deletions

View File

@@ -11,8 +11,8 @@ const DEFAULT_APP_ID = 'wxb8bbb2b10dec74aa'
const DEFAULT_MCH_ID = '1318592501'
const DEFAULT_WITHDRAW_TMPL_ID = 'u3MbZGPRkrZIk-I7QdpwzFxnO_CeQPaCWF2FkiIablE'
// baseUrl 手动切换(注释方式):
// const API_BASE_URL = 'http://localhost:8080'
const API_BASE_URL = 'https://soulapi.quwanzhi.com'
const API_BASE_URL = 'http://localhost:8080'
// const API_BASE_URL = 'https://soulapi.quwanzhi.com'
const CONFIG_CACHE_KEY = 'mpConfigCacheV1'
// 与上传版本号对齐;设置页展示优先用 wx.getAccountInfoSync().miniProgram.version正式版否则用本字段
const APP_DISPLAY_VERSION = '1.7.2'