修复积分记录

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

@@ -32,6 +32,8 @@ function M:init(url)
         self:Destroy()
     end)
 
+
+
     for i = 1, 8 do
         local tem = math.pow(2, i - 1)
         local btn_filter = self._view:GetChild("btn_filter" .. tem)
@@ -40,24 +42,12 @@ function M:init(url)
                 self.hp_log = {}
                 self.m_index = 0
                 self.lst_fag.numItems = 0
-                local filter = self:GetFilter()
-                local btn_all = self._view:GetChild("btn_all")
-                if btn_all then
-                    btn_all.selected = filter == 251
-                end
                 self:GetData(0)
             end)
         end
     end
 
     self._view:GetChild('btn_all').onClick:Set(function()
-        for i = 1, 8 do
-            local tem = math.pow(2, i - 1)
-            local btn_filter = self._view:GetChild("btn_filter" .. tem)
-            if btn_filter then
-                btn_filter.selected = true
-            end
-        end
         self:GetData(0)
     end)
 
@@ -106,6 +96,7 @@ end
 -- 获取过滤值,根据多选框计算
 function M:GetFilter()
     local filter = 0
+    local btn_all = self._view:GetChild('btn_all')
     for i = 1, 8 do
         local tem = math.pow(2, i - 1)
         --print("aaaaaaaaaaaaaaaaaaaaaaaa    ",tem)
@@ -114,7 +105,7 @@ function M:GetFilter()
             filter = filter + tem
         end
     end
-    return filter
+    return btn_all.selected and 251 or filter
 end
 
 -- 显示原因文本

wb_new_ui/assets/NewGroup/images/jifen/btn_filter1.xml

@@ -11,5 +11,5 @@
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
-  <Button mode="Check"/>
+  <Button mode="Radio"/>
 </component>

wb_new_ui/assets/NewGroup/images/jifen/btn_filter16.xml

@@ -11,5 +11,5 @@
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
-  <Button mode="Check"/>
+  <Button mode="Radio"/>
 </component>

wb_new_ui/assets/NewGroup/images/jifen/btn_filter2.xml

@@ -11,5 +11,5 @@
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
-  <Button mode="Check"/>
+  <Button mode="Radio"/>
 </component>

wb_new_ui/assets/NewGroup/images/jifen/btn_filter64.xml

@@ -11,5 +11,5 @@
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
-  <Button mode="Check"/>
+  <Button mode="Radio"/>
 </component>

wb_new_ui/assets/NewGroup/mgr/Win_MemberFagLog.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1334,750">
-  <controller name="manager" pages="0,,1," selected="1"/>
+  <controller name="manager" pages="0,,1," selected="0"/>
   <controller name="index" pages="0,,1," selected="0"/>
+  <controller name="top" pages="0,,1,,2,,3,,4," selected="0"/>
   <displayList>
     <image id="n95_xt5s" name="n95" src="xt5s7iit" fileName="images/jifen/Rectangle 424.png" xy="36,36">
       <relation target="" sidePair="width-width%,height-height%"/>
@@ -68,44 +69,44 @@
       <item/>
       <item/>
     </list>
-    <text id="n39_gltd" name="n39" xy="65,609" size="52,34" group="n40_gltd" visible="false" font="Microsoft YaHei" fontSize="24" color="#f7ffff" text="筛选"/>
+    <text id="n39_gltd" name="n39" xy="81,608" size="52,34" group="n40_gltd" visible="false" font="Microsoft YaHei" fontSize="24" color="#f7ffff" text="筛选"/>
-    <component id="n36_gltd" name="btn_filter1__" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="32,664" size="159,68" group="n40_gltd">
+    <component id="n36_gltd" name="btn_filter1__" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="111,664" size="159,68" group="n40_gltd">
       <gearDisplay controller="manager" pages="0,1"/>
-      <gearXY controller="manager" pages="0,1" values="95,665|32,664"/>
+      <gearXY controller="manager" pages="0,1" values="111,664|32,664"/>
       <relation target="" sidePair="center-center%"/>
       <Button checked="true" title="积分变化"/>
     </component>
-    <component id="n37_gltd" name="btn_filter2__" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="219,664" size="158,68" group="n40_gltd">
+    <component id="n37_gltd" name="btn_filter2__" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="297,664" size="158,68" group="n40_gltd">
-      <gearXY controller="manager" pages="0,1" values="281,665|219,664"/>
+      <gearXY controller="manager" pages="0,1" values="297,664|219,664"/>
       <relation target="" sidePair="center-center%"/>
       <Button checked="true" title="操作增减" titleFontSize="24"/>
     </component>
-    <component id="n41_nyna" name="btn_filter8" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="999,663" size="174,68" group="n40_gltd" visible="false">
+    <component id="n41_nyna" name="btn_filter8" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="1015,662" size="174,68" group="n40_gltd" visible="false">
       <gearDisplay controller="manager" pages="1"/>
       <relation target="" sidePair="center-center%"/>
-      <Button checked="true" title="系统衰减" titleFontSize="26"/>
+      <Button title="系统衰减" titleFontSize="26"/>
     </component>
-    <component id="n42_gls1" name="btn_filter16__" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="468,663" size="154,68" group="n40_gltd">
+    <component id="n42_gls1" name="btn_filter16__" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="484,662" size="154,68" group="n40_gltd">
       <gearDisplay controller="manager" pages="1"/>
       <relation target="" sidePair="center-center%"/>
       <Button checked="true" title="推广奖励" titleFontSize="26"/>
     </component>
-    <component id="n43_hsbh" name="btn_filter32" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="659,664" size="122,68" group="n40_gltd">
+    <component id="n43_hsbh" name="btn_filter32" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="490,664" size="122,68" group="n40_gltd">
-      <gearXY controller="manager" pages="0,1" values="474,665|659,664"/>
+      <gearXY controller="manager" pages="0,1" values="490,664|659,664"/>
       <relation target="" sidePair="center-center%"/>
-      <Button checked="true" title="转账" titleFontSize="26"/>
+      <Button title="转账" titleFontSize="26"/>
     </component>
-    <component id="n44_qlxi" name="btn_filter64__" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="876,663" size="110,68" group="n40_gltd">
+    <component id="n44_qlxi" name="btn_filter64__" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="892,662" size="110,68" group="n40_gltd">
       <gearDisplay controller="manager" pages="1"/>
       <relation target="" sidePair="center-center%"/>
       <Button checked="true" title="提取" titleFontSize="26"/>
     </component>
-    <component id="n89_j68v" name="btn_filter128" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="997,663" size="110,68" group="n40_gltd" visible="false">
+    <component id="n89_j68v" name="btn_filter128" src="m16m7iji" fileName="component/create_room/Btn_mul_checkbox3.xml" pkg="27vd145b" xy="1013,662" size="110,68" group="n40_gltd" visible="false">
       <gearDisplay controller="manager" pages="1"/>
       <relation target="" sidePair="center-center%"/>
-      <Button checked="true" title="洗牌" titleFontSize="26"/>
+      <Button title="洗牌" titleFontSize="26"/>
     </component>
-    <group id="n40_gltd" name="n40" xy="32,609" size="1141,123" group="n45_kkrh" visible="false" advanced="true">
+    <group id="n40_gltd" name="n40" xy="81,608" size="1108,124" group="n45_kkrh" visible="false" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
     <component id="n73_s9vt" name="btn_date2" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="418,637" size="290,59" group="n75_s9vt"/>
@@ -116,7 +117,7 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
     <image id="n81_7b4q" name="n81" pkg="m7iejg46" src="7b4q7i20" fileName="images/main/img_xian.png" xy="327,655" size="945,28" group="n45_kkrh" visible="false"/>
-    <group id="n45_kkrh" name="index0" xy="32,143" size="1239,588" advanced="true">
+    <group id="n45_kkrh" name="index0" xy="67,143" size="1205,589" advanced="true">
       <gearDisplay controller="index" pages="0"/>
     </group>
     <image id="n49_kkrh" name="n49" src="ivzcchb" fileName="font/images/win/dbt.png" pkg="27vd145b" xy="322,137" size="1111,15" group="n55_kkrh" visible="false"/>
@@ -147,19 +148,19 @@
     </text>
     <image id="n82_et16" name="n82" pkg="m7iejg46" src="et167i3a" fileName="积分详情11_PxCook.png" xy="-216,0" pivot="0.5,0" visible="false" alpha="0.5"/>
     <component id="n105_xt5s" name="btn_all" src="xt5s7iix" fileName="images/jifen/btn_all.xml" xy="167,64" group="n103_xt5s">
-      <Button checked="true"/>
+      <Button checked="true" controller="top" page="0"/>
     </component>
     <component id="n106_xt5s" name="btn_filter1" src="xt5s7iiy" fileName="images/jifen/btn_filter1.xml" xy="367,64" group="n103_xt5s">
-      <Button checked="true"/>
+      <Button controller="top" page="1"/>
     </component>
     <component id="n107_xt5s" name="btn_filter2" src="xt5s7ij2" fileName="images/jifen/btn_filter2.xml" xy="567,64" group="n103_xt5s">
-      <Button checked="true"/>
+      <Button controller="top" page="2"/>
     </component>
     <component id="n108_xt5s" name="btn_filter16" src="xt5s7ij3" fileName="images/jifen/btn_filter16.xml" xy="767,64" group="n103_xt5s">
-      <Button checked="true"/>
+      <Button controller="top" page="3"/>
     </component>
     <component id="n109_xt5s" name="btn_filter64" src="xt5s7ij4" fileName="images/jifen/btn_filter64.xml" xy="967,64" group="n103_xt5s">
-      <Button checked="true"/>
+      <Button controller="top" page="4"/>
     </component>
     <group id="n103_xt5s" name="newFillter" xy="167,64" size="1000,56" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>