diff --git a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua
index c9ddc1b1..aaf9e6cf 100644
--- a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua
+++ b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua
@@ -144,6 +144,7 @@ end
-- end
function M:OnRenderItem(index, obj)
+ local group = DataManager.groups:get(self.group_id)
local data = self.members_log[index + 1]
--pt(data)
obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick)
@@ -176,23 +177,31 @@ function M:OnRenderItem(index, obj)
self:getRewardsLog(0)
end)
-
+ if group.lev == 1 then
+ obj:GetController('win_diaodu_ismengzhu').selectedIndex = 0
+ else
+ obj:GetController('win_diaodu_ismengzhu').selectedIndex = 1
+ end
local btn_detail_tiaoduzjM = obj:GetChild("btn_detail_tiaoduzjM")
- btn_detail_tiaoduzjM.onClick:Set(function()
- ViewUtil.ShowModalWait()
- ControllerManager.GetController(NewGroupController):FG_GetBanMemberHB(self.group_id, data.uid, function(res)
- ViewUtil.CloseModalWait()
- --pt(res)
- if res.ReturnCode == 0 then
- local diaoduView=GroupSetMemberInfoDiaoduView.new(self.group_id, data.uid)
- diaoduView:SetCurrentState(res.Data.group_black+1,res.Data)
- else
- ViewUtil.ErrorTip(res.ReturnCode,"获取整组调度失败!")
- end
-
- end)
- end)
+ if btn_detail_tiaoduzjM then
+ btn_detail_tiaoduzjM.visible = true
+ btn_detail_tiaoduzjM.onClick:Set(function()
+ ViewUtil.ShowModalWait()
+ ControllerManager.GetController(NewGroupController):FG_GetBanMemberHB(self.group_id, data.uid, function(res)
+ ViewUtil.CloseModalWait()
+ --pt(res)
+ if res.ReturnCode == 0 then
+ local diaoduView=GroupSetMemberInfoDiaoduView.new(self.group_id, data.uid)
+ diaoduView:SetCurrentState(res.Data.group_black+1,res.Data)
+ else
+ ViewUtil.ErrorTip(res.ReturnCode,"获取整组调度失败!")
+ end
+
+ end)
+ end)
+ end
+
local btn_member_detail = obj:GetChild("btn_member_detail")
btn_member_detail.onClick:Set(function()
diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json
index 1bf0f3ca..3e7684ea 100644
--- a/fk101/wb_new_ui/.objs/workspace.json
+++ b/fk101/wb_new_ui/.objs/workspace.json
@@ -9,18 +9,30 @@
"ui://m7iejg46qlxihsm",
"ui://m7iejg46kwi0hld",
"ui://m7iejg46kwi0hmb",
- "ui://m7iejg46f6brhww"
+ "ui://m7iejg46f6brhww",
+ "ui://m7iejg46nwgkhx0",
+ "ui://m7iejg46nwgkhx1"
],
"test.device": "Xiaomi 9",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://m7iejg46f6brhww",
+ "doc.activeDoc": "ui://m7iejg46nwgkhx0",
"libview.twoColumn": false,
"libview.expandedNodes": [
+ "27vd145b",
+ "/",
+ "27vd145b",
+ "/buttons/",
"m7iejg46",
"/",
"m7iejg46",
- "/mgr/"
+ "/mgr/",
+ "m7iejg46",
+ "/mgr/component/",
+ "m7iejg46",
+ "/mgr/component/member/",
+ "m7iejg46",
+ "/mgr/component/member/partner/"
],
"auxline1": true,
"snapToGrid": true,
diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_partner_stat_member.xml b/fk101/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_partner_stat_member.xml
index 891ee009..2b815c93 100644
--- a/fk101/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_partner_stat_member.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_partner_stat_member.xml
@@ -1,6 +1,7 @@
+
@@ -30,8 +31,9 @@
-
+
+
diff --git a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes
index 19678acb..c10fed03 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes differ