Merge branch 'yongxu' into devlop
# Conflicts: # .cursor/meeting/README.md resolved by yongxu version # .gitignore resolved by yongxu version # miniprogram/pages/index/index.js resolved by yongxu version # miniprogram/pages/read/read.js resolved by yongxu version # miniprogram/pages/read/read.wxml resolved by yongxu version # soul-admin/dist/index.html resolved by yongxu version # soul-admin/src/App.tsx resolved by yongxu version # soul-admin/src/components/RichEditor.css resolved by yongxu version # soul-admin/src/components/RichEditor.tsx resolved by yongxu version # soul-admin/src/components/modules/user/UserDetailModal.tsx resolved by yongxu version # soul-admin/src/layouts/AdminLayout.tsx resolved by yongxu version # soul-admin/src/pages/chapters/ChaptersPage.tsx resolved by yongxu version # soul-admin/src/pages/content/ContentPage.tsx resolved by yongxu version # soul-admin/src/pages/dashboard/DashboardPage.tsx resolved by yongxu version # soul-admin/src/pages/find-partner/FindPartnerPage.tsx resolved by yongxu version # soul-admin/src/pages/find-partner/tabs/CKBConfigPanel.tsx resolved by yongxu version # soul-admin/src/pages/find-partner/tabs/CKBStatsTab.tsx resolved by yongxu version # soul-admin/src/pages/find-partner/tabs/FindPartnerTab.tsx resolved by yongxu version # soul-admin/src/pages/find-partner/tabs/MatchPoolTab.tsx resolved by yongxu version # soul-admin/src/pages/find-partner/tabs/MatchRecordsTab.tsx resolved by yongxu version # soul-admin/src/pages/find-partner/tabs/MentorBookingTab.tsx resolved by yongxu version # soul-admin/src/pages/find-partner/tabs/MentorTab.tsx resolved by yongxu version # soul-admin/src/pages/find-partner/tabs/ResourceDockingTab.tsx resolved by yongxu version # soul-admin/src/pages/find-partner/tabs/TeamRecruitTab.tsx resolved by yongxu version # soul-admin/src/pages/mentors/MentorsPage.tsx resolved by yongxu version # soul-admin/src/pages/referral-settings/ReferralSettingsPage.tsx resolved by yongxu version # soul-admin/src/pages/settings/SettingsPage.tsx resolved by yongxu version # soul-admin/src/pages/users/UsersPage.tsx resolved by yongxu version # soul-admin/tsconfig.tsbuildinfo resolved by yongxu version # soul-api/internal/database/database.go resolved by yongxu version # soul-api/internal/handler/admin_dashboard.go resolved by yongxu version # soul-api/internal/handler/book.go resolved by yongxu version # soul-api/internal/handler/ckb.go resolved by yongxu version # soul-api/internal/handler/db_book.go resolved by yongxu version # soul-api/internal/handler/db_person.go resolved by yongxu version # soul-api/internal/handler/match_records.go resolved by yongxu version # soul-api/internal/handler/user.go resolved by yongxu version # soul-api/internal/model/chapter.go resolved by yongxu version # soul-api/internal/model/person.go resolved by yongxu version # soul-api/internal/router/router.go resolved by yongxu version # 开发文档/10、项目管理/运营与变更.md resolved by yongxu version # 开发文档/1、需求/需求汇总.md resolved by yongxu version # 开发文档/README.md resolved by yongxu version
This commit is contained in:
@@ -101,6 +101,22 @@ func GetPublicDBConfig(c *gin.Context) {
|
||||
if _, has := out["userDiscount"]; !has {
|
||||
out["userDiscount"] = float64(5)
|
||||
}
|
||||
// 链接标签列表(小程序 onLinkTagTap 需要知道 type,用于 ckb/miniprogram 的特殊处理)
|
||||
var linkTagRows []model.LinkTag
|
||||
if err := db.Order("label ASC").Find(&linkTagRows).Error; err == nil {
|
||||
tags := make([]gin.H, 0, len(linkTagRows))
|
||||
for _, t := range linkTagRows {
|
||||
tags = append(tags, gin.H{
|
||||
"tagId": t.TagID,
|
||||
"label": t.Label,
|
||||
"url": t.URL,
|
||||
"type": t.Type,
|
||||
"pagePath": t.PagePath,
|
||||
"appId": t.AppID,
|
||||
})
|
||||
}
|
||||
out["linkTags"] = tags
|
||||
}
|
||||
c.JSON(http.StatusOK, out)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user