Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo

# Conflicts:
#	Assets/Scripts/Apis/Models/MapCompetition.cs

Assets/Scripts/Apis/MapCompetitionApi.cs

@@ -60,6 +60,16 @@ namespace Assets.Scripts.Apis
                 data = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MapCompetitionModel>>(JsonConvert.SerializeObject(list.data))
             };
         }
+        public async Task<JsonResult<List<MapCompetition>>> GetCompetitionListV2(string name, int pageIndex, int pageSize, string status = "", int order = 1, bool self = false)
+        {
+            var list = await GetAsync<JsonResult<dynamic>>($"/MapCompetition/v2/GetList?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&status={ status }&order={order}&self={self}");
+            return new JsonResult<List<MapCompetition>>
+            {
+                result = list.result,
+                errMsg = list.errMsg,
+                data = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MapCompetition>>(JsonConvert.SerializeObject(list.data))
+            };
+        }
         //查询比赛详情
         public JsonResult<MapCompetitionDetailModel> GetCompetitionDetail(int id)
         {

Assets/Scripts/Apis/Models/MapCompetition.cs

@@ -32,7 +32,7 @@ namespace Assets.Scripts.Apis.Models
         //public string EndTimeVlaue { get; set; }
 
         public int Status { get; set; }
-        public object StatusVlaue { get; set; }
+        public string StatusVlaue { get; set; }
         public string Title { get; set; }
         public double TotalDistance { get; set; }
         public bool applyed { get; set; }
@@ -58,6 +58,13 @@ namespace Assets.Scripts.Apis.Models
         public int MaxMembers { get; set; }
         //报名参赛的选手
         public List<CompetitionPlayer> UserList  {get;set; }
+        public double Distance { get; set; }
+        public double AverageGrade { get; set; }
+        public double EleDifference { get; set; }
+        public double? TotalClimb { get; set; }
+        public double MaxElevation { get; set; }
+        public string AltitudeGraph { get; set; }
+        public string RouteCover { get; set; }
         //简版赛事详情
         public string ShortPreview { get; set; }
         //活动banner