diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua index 0ae272d0..1458a984 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua @@ -253,7 +253,13 @@ function M:GetRecordData(index) self:RecursionGetPropLog(members, 0) else for i = 1, #members do - self.record_data[#self.record_data + 1] = members[i] + if members[i].uid == DataManager.SelfUser.account_id then + self.record_data[#self.record_data + 1] = members[i] + end + end + if not members or #members == 0 then + ViewUtil.ErrorTip(nil, "你不是合伙人") + return end self:NewRecordTable(0) -- self.lst_record.numItems = #self.record_data @@ -444,7 +450,7 @@ function M:OnRenderRecordItemNew(obj, mainRecord, root_id) ViewUtil.ShowModalWait("正在获取成员中") self:RecursionGetNumberRecordForLev1(0, mainRecord.uid, {}) else - self:RecursionGetNumberRecord(mainRecord.uid, root_id, 0) + self:RecursionGetNumberRecord(mainRecord.uid, root_id or mainRecord.uid, 0) end end) end @@ -462,15 +468,18 @@ function M:MoreChanged(context, id) pt(myInfo, id, self.group_id) if myInfo then ViewUtil:ShowModalWait() - if myInfo.lev == 1 then + if myInfo.lev == 1 or not myInfo.father then fgCtr:FG_GetPartnerStat(self.group_id, 0, 6, time_type, self.begin_time, self.end_time, function(res) ViewUtil.CloseModalWait() if res.ReturnCode == 0 then local members = res.Data.members for i = 1, #members do - self.record_data[#self.record_data + 1] = members[i] + if members[i].uid ~= id then + self.record_data[#self.record_data + 1] = members[i] + end end + if not members or #members == 0 then return end self:RecursionGetRecordData(6, 0, id) end end) @@ -500,6 +509,7 @@ function M:MoreChanged(context, id) self.record_data[#self.record_data + 1] = members[i] end end + if not members or #members == 0 then return end self:RecursionGetAllRecordData(6, id, myInfo.father) end end) diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 06e7f8d3..247db340 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -11,6 +11,11 @@ "ui://2d9xdj6zfn7fao", "ui://m7iejg4610snh5j", "ui://m7iejg46kwi0hma", + "ui://27vd145bm16m7iji", + "ui://m7iejg46xt5s7ij4", + "ui://m7iejg46xt5s7ij3", + "ui://m7iejg46xt5s7ij2", + "ui://m7iejg46xt5s7iiy", "ui://m7iejg46gltdhc9", "ui://m7iejg46irlqi02", "ui://m7iejg46imp57ih2", @@ -26,6 +31,7 @@ "ui://m7iejg46ilon7ibc", "ui://m7iejg46imp57ihp", "ui://9n9stu2eprgzf0", + "ui://9n9stu2ethxkcis", "ui://v0j9abjygq7ms2", "ui://v0j9abjygq7m8f", "ui://v0j9abjygq7m8l",