Merge branch 'yongxu-dev' into devlop

# Conflicts:
#	miniprogram/pages/profile-edit/profile-edit.js
#	miniprogram/pages/profile-edit/profile-edit.wxml
#	miniprogram/pages/settings/settings.js
#	miniprogram/utils/ruleEngine.js
#	soul-admin/src/pages/distribution/DistributionPage.tsx
#	soul-admin/src/pages/users/UsersPage.tsx
#	soul-api/.env.production
#	soul-api/.gitignore
#	soul-api/internal/handler/db_ckb_leads.go
#	soul-api/internal/handler/miniprogram.go
#	soul-api/internal/handler/referral.go
#	开发文档/1、需求/archive/链接人与事-存客宝同步-需求规划.md
#	开发文档/1、需求/archive/链接人与事-实现方案.md

soul-api/internal/handler/vip.go

@@ -126,7 +126,7 @@ func buildVipProfile(u *model.User) gin.H {
 		"vipName":    getStr(u.VipName),
 		"vipProject": getStr(u.VipProject),
 		"vipContact": getStr(u.VipContact),
-		"vipAvatar":  getStr(u.VipAvatar),
+		"vipAvatar":  resolveAvatarURL(getStr(u.VipAvatar)),
 		"vipBio":     getStr(u.VipBio),
 	}
 }
@@ -195,7 +195,7 @@ func VipProfilePost(c *gin.Context) {
 		updates["vip_contact"] = req.VipContact
 	}
 	if req.VipAvatar != "" {
-		updates["vip_avatar"] = req.VipAvatar
+		updates["vip_avatar"] = avatarToPath(req.VipAvatar)
 	}
 	if req.VipBio != "" {
 		updates["vip_bio"] = req.VipBio
@@ -290,6 +290,7 @@ func formatVipMember(u *model.User, isVip bool) gin.H {
 	if avatar == "" {
 		avatar = getUrlValue(u.VipAvatar)
 	}
+	avatar = resolveAvatarURL(avatar)
 	project := getStringValue(u.VipProject)
 	if project == "" {
 		project = getStringValue(u.ProjectIntro)