diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua
index 8274c59b..b6a83cce 100644
--- a/lua_probject/base_project/Game/Controller/NewGroupController.lua
+++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua
@@ -16,12 +16,6 @@ end
--获取圈列表
function M:FG_GroupList(callback)
local _client = ControllerManager.GroupClient
- if not _client or not _client.send then
- ViewUtil.ShowBannerOnScreenCenter("无法进入亲友圈服务")
- ViewUtil.CloseModalWait()
- end
- printlog("aaaaaaaaaaaaaaaaawwwwwwwwwwwwww", _client)
- -- pt(_client)
_client:send(Protocol.WEB_FG_GROUP_LIST, nil, function(res)
printlog("aaaaaaaaaaaaaaaaawwwwwwwwwwwwww1111111111111")
pt(res)
diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua
index ef495343..eb4842f3 100644
--- a/lua_probject/base_project/Game/View/LobbyView.lua
+++ b/lua_probject/base_project/Game/View/LobbyView.lua
@@ -173,8 +173,8 @@ function M:InitView(url)
if code == 0 then
self.groupMainView._view.visible = true
else
- ViewUtil.ErrorTip(code, "获取牌友圈失败，请检查网络设置！")
- Application.Quit()
+ ViewUtil.ErrorTip(-1, "code！" + code)
+ -- Application.Quit()
printlog("获取圈子数据失败=======>>>>")
end
end
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua
index cead37ed..6ff39d04 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua
@@ -328,7 +328,7 @@ function M:FillItem(obj, member, refresh)
-- end
--上级id
- obj:GetChild('tex_zongchangci').text = member.parentId
+ obj:GetChild('tex_zongchangci').text = member.total_round
obj:GetChild('tex_pername').text = member.parentId_nick or ""
obj:GetChild('tex_ruhui').text = os.date('%Y/%m/%d %H:%M:%S', member.join_time)
@@ -511,6 +511,38 @@ function M:FillItem(obj, member, refresh)
end
)
+ local superBtnUp = obj:GetChild('superior_btn_up')
+ obj:GetChild("superior_btn_up").onClick:Set(
+ function()
+ ViewUtil.ShowModalWait(nil)
+ local qid = member.parentId
+ local qnick = member.parentId_nick
+ local fgCtr = ControllerManager.GetController(NewGroupController)
+ fgCtr:FG_FindMember(
+ self.group_id,
+ qid,
+ function(res)
+ ViewUtil.CloseModalWait()
+ if self._is_destroy then
+ return
+ end
+ if res.ReturnCode ~= 0 then
+ ViewUtil.ErrorTip(res.ReturnCode, '找不到成员')
+ else
+ local item_result = self._view:GetChild('lst_member_find')
+ item_result:RemoveChildrenToPool()
+ self._view:GetController('search').selectedIndex = 1
+ for j = 1, #res.Data.members do
+ local tem = item_result:AddItemFromPool()
+ self:FillItem(tem, res.Data.members[j], true)
+ end
+ end
+ end,
+ qnick
+ )
+ end
+ )
+
obj:GetController('all').selectedIndex = 0
obj:GetChild("all_btn").onClick:Set(
function()
diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info
index a0247861..fc088faa 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info
@@ -3,9 +3,6 @@
"n69_jd7v": {
"hidden": true
},
- "n33_rpaz": {
- "hidden": true
- },
"n142_ufim": {
"hidden": true
},
@@ -15,7 +12,7 @@
"n113_csp4": {
"hidden": true
},
- "n85_t1hq": {
+ "n33_rpaz": {
"hidden": true
},
"n35_rpaz": {
diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info
index 98348b6f..b1901376 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info
@@ -1,9 +1,12 @@
{
"objectStatus": {
+ "n78_iaes": {
+ "hidden": true
+ },
"n67_z384": {
"hidden": true
},
- "n78_iaes": {
+ "n82_avqi": {
"hidden": true
},
"n69_z384": {
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index a60b0811..a79fba65 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -1,30 +1,71 @@
{
- "libview.firstColumnWidth": 297,
+ "libview.firstColumnWidth": 522,
"libview.iconScale": 0,
"doc.openedDocs": [
- "ui://2zlli80mw9te0",
- "ui://v0j9abjygq7m8f",
- "ui://v0j9abjygq7med",
- "ui://m7iejg46f6brhwx",
+ "ui://m7iejg46hsbhhjn",
+ "ui://m7iejg46t1hqhxw",
+ "ui://m7iejg46yvb27ik0",
+ "ui://m7iejg46gojuhh5",
"ui://m7iejg46imp57ihp",
- "ui://m7iejg46jgh8hwv",
- "ui://v6yvqp7wf55qwa",
"ui://m7iejg46f6brhww",
- "ui://v0j9abjynlefsr",
- "ui://v0j9abjya81dsp",
- "ui://9n9stu2eprgzf0",
- "ui://9n9stu2eprgzep"
+ "ui://m7iejg46gdye7ik8",
+ "ui://m7iejg46jgh8hwv",
+ "ui://ppu1wv7699we3y",
+ "ui://442j0uepygxga",
+ "ui://ppu1wv76j4mf9j",
+ "ui://v6yvqp7waen81b0",
+ "ui://m7iejg46yvb27ijw",
+ "ui://v0j9abjygq7ms2",
+ "ui://v6yvqp7wf55qwa",
+ "ui://v6yvqp7wf55qw5",
+ "ui://442j0uepona1bl",
+ "ui://v6yvqp7wcyprwt",
+ "ui://m7iejg46lcv1hwt",
+ "ui://v6yvqp7wlvh412d",
+ "ui://m7iejg46yvb27ijz"
],
"auxline1": true,
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://v6yvqp7wf55qwa",
+ "doc.activeDoc": "ui://v6yvqp7waen81b0",
"libview.twoColumn": false,
"libview.expandedNodes": [
- "parowutd",
+ "ppu1wv76",
"/",
- "lkq9ne9s",
- "/"
+ "v6yvqp7w",
+ "/",
+ "v6yvqp7w",
+ "/component/",
+ "v6yvqp7w",
+ "/component/Main/",
+ "v6yvqp7w",
+ "/component/Main/component/",
+ "v6yvqp7w",
+ "/component/Main/setting/",
+ "v6yvqp7w",
+ "/component/cards/",
+ "v6yvqp7w",
+ "/component/option/",
+ "v6yvqp7w",
+ "/component/option/component/",
+ "v6yvqp7w",
+ "/component/option/component/card/",
+ "m7iejg46",
+ "/",
+ "m7iejg46",
+ "/component/",
+ "m7iejg46",
+ "/component/nav/",
+ "m7iejg46",
+ "/mgr/",
+ "m7iejg46",
+ "/mgr/component/",
+ "m7iejg46",
+ "/mgr/component/member/",
+ "m7iejg46",
+ "/mgr/component/member/partner/",
+ "m7iejg46",
+ "/mgr/component/member/partner/images/"
],
"snapToGrid": true,
"backgroundColor": 6710886,
diff --git a/wb_new_ui/assets/Lobby/package.xml b/wb_new_ui/assets/Lobby/package.xml
index b609ed67..d46a1e76 100644
--- a/wb_new_ui/assets/Lobby/package.xml
+++ b/wb_new_ui/assets/Lobby/package.xml
@@ -682,7 +682,7 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
index 99ac7c88..0386ddf0 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
@@ -24,13 +24,13 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/member/item_member1.xml b/wb_new_ui/assets/NewGroup/mgr/component/member/item_member1.xml
index d761e081..67021b24 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/member/item_member1.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/member/item_member1.xml
@@ -30,19 +30,19 @@
-
+
-
+
-
+
-
+
@@ -57,7 +57,8 @@
-
+
+