merge

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua

@@ -497,23 +497,32 @@ function M:FillItem(obj, member, refresh, index)
     obj:GetChild("superior_btn_up").onClick:Set(
         function()
             ViewUtil.ShowModalWait(nil)
-            local text = member.parentId
+            local qid = member.parentId
-            local tempNumberList = self.numberMap[2][text]
+            local qnick = member.parentId_nick
-            if tempNumberList == nil then
+            local fgCtr = ControllerManager.GetController(NewGroupController)
-                tempNumberList = {}
+            fgCtr:FG_FindMember(
-                for j = 1, #self.all_member_data do
+                self.group_id,
-                    local number = self.all_member_data[j]
+                qid,
-                    if number.uid == text then
+                function(res)
-                        table.insert(tempNumberList, number)
+                    ViewUtil.CloseModalWait()
+                    if self._is_destroy then
+                        return
                     end
-                end
+                    if res.ReturnCode ~= 0 then
-                self.numberMap[2][text] = tempNumberList
+                        ViewUtil.ErrorTip(res.ReturnCode, '找不到成员')
-            end
+                    else
-            self._view:GetChild('tex_id').text = ''
+                        self._view:GetChild('tex_id').text = ''
-            self._view:GetController('search').selectedIndex = 1
+                        self._ctr_search.selectedIndex = 1
-            ViewUtil.CloseModalWait()
+
-            table.insert(self.backTable, { 2, text })
+                        self.numberMap[2][qid] = res.Data.members
-            self.lst_member_find.numItems = #tempNumberList
+
+                        ViewUtil.CloseModalWait()
+                        table.insert(self.backTable, { 2, qid })
+                        self.lst_member_find.numItems = #res.Data.members
+                    end
+                end,
+                qnick
+            )
         end
     )
     obj:GetChild("super_btn").onClick:Set(

wb_new_ui/.objs/workspace.json

@@ -10,6 +10,9 @@
   "doc.openedDocs": [
     "ui://2d9xdj6zfn7fao",
     "ui://m7iejg4610snh5j",
+    "ui://m7iejg46kwi0hk0",
+    "ui://v0j9abjygq7m8f",
+    "ui://m7iejg46giw8hf7",
     "ui://m7iejg46jiu8hef",
     "ui://m7iejg46kwi0hma",
     "ui://v6yvqp7wf55qwa",
@@ -28,17 +31,30 @@
   "test.device": "720p Phone",
   "canvasColor": 10066329,
   "auxline2": true,
+<<<<<<< HEAD
   "doc.activeDoc": "ui://v6yvqp7wf55qw5",
+=======
+  "doc.activeDoc": "ui://v0j9abjygq7m8f",
+>>>>>>> b23014eefe67e06cde41b68d1c0f5ddd80843723
   "libview.twoColumn": false,
   "libview.expandedNodes": [
-    "2d9xdj6z",
+    "v0j9abjy",
     "/",
+<<<<<<< HEAD
+=======
+    "v0j9abjy",
+    "/Main_style_2/",
+>>>>>>> b23014eefe67e06cde41b68d1c0f5ddd80843723
     "v6yvqp7w",
     "/",
     "v6yvqp7w",
     "/component/",
     "v6yvqp7w",
+<<<<<<< HEAD
     "/component/Main/"
+=======
+    "/image/"
+>>>>>>> b23014eefe67e06cde41b68d1c0f5ddd80843723
   ],
   "auxline1": true,
   "snapToGrid": true,