Merge branch 'feature/cp-new' into feature/3.9.0

route/cp_r/rank.go

@@ -221,7 +221,14 @@ func CpMy(c *gin.Context) (*mycontext.MyContext, error) {
 	}
 	if relation.UserId2 > 0 {
 		response.User2 = userBases[relation.UserId2]
-		response.Ranking = "99+"
+		response.Ranking = "30+"
+		ranks := cp_m.PageCpDayRank(model, beginDate, endDate, 0, 30)
+		for i, rank := range ranks {
+			if relation.ID == rank.CpId {
+				response.Ranking = fmt.Sprintf("%d", i+1)
+				break
+			}
+		}
 	}
 	resp.ResponseOk(c, response)
 	return myCtx, nil