From 95dd4f5e6b6914670e6bdfd094aca00f10eb1a0a Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Thu, 14 Apr 2022 17:28:49 +0800
Subject: [PATCH] 1

---
 web/pages/search.html            |  2 +-
 web/pages/userinfo.html          |  2 +-
 web/pages/userinfolist.html      | 54 +++++++++++++-------------------
 web/src/x.min.js                 | 25 +++++++++++----
 web/srczip/logic/search.js       | 10 +++---
 web/srczip/logic/userinfo.js     |  6 ++++
 web/srczip/logic/userinfolist.js |  9 ++++--
 web/static/css/style.css         |  6 ++--
 8 files changed, 66 insertions(+), 48 deletions(-)

diff --git a/web/pages/search.html b/web/pages/search.html
index 8010218..e8ac639 100644
--- a/web/pages/search.html
+++ b/web/pages/search.html
@@ -28,7 +28,7 @@
     </div>
     <div class="more_data-box">
         <div class="more_data">
-            <a class="ajax-content" href="userinfolist" data-id="conetnt">查看用户列表（<span></span>）</a>
+           <p>查看用户列表（<span></span>）</p>
         </div>
     </div>
 </div>
diff --git a/web/pages/userinfo.html b/web/pages/userinfo.html
index 6b07716..eee994f 100644
--- a/web/pages/userinfo.html
+++ b/web/pages/userinfo.html
@@ -4,7 +4,7 @@
 
     <div class="userinfolist-page-header-box">
         <div class="userinfolist-page-header">
-            <span style="color: #4f5276;">用户搜索</span> / <span style="color: #4f5276;">用户列表</span>  / <span>用户行为序列</span>
+            <span style="color: #4f5276;">用户搜索</span> / <span class="touserinfo" style="color: #4f5276;">用户列表</span>  / <span>用户行为序列</span>
         </div>
     </div>
 
diff --git a/web/pages/userinfolist.html b/web/pages/userinfolist.html
index 0b15f20..557d231 100644
--- a/web/pages/userinfolist.html
+++ b/web/pages/userinfolist.html
@@ -28,22 +28,10 @@
         </div>
 
         <div class="userinfolist-page_table">
-            <table id="dataTableMul-userlist" class="table table-bordered table-fenxi-box">
-                <thead class="userinfolist-title-box">
-                    
-                </thead>
-                
-                <tbody class="table-fenxi-td userinfolist-list-box">
-    
-                    <tr>
-                        <td title="{{itemss}}">111223</td>
-
-                    </tr>
-    
-                </tbody>
-    
-            </table>
-
+            <div class="userinfolist-table-box">
+               
+            </div>
+            <!-- 分页 -->
             <div id="laypages" style="float: right;"></div>
         </div>
 
@@ -52,22 +40,24 @@
 
 </div>
 
-<script id="userinfolist-title-box-dot" type="text/html">
-    <tr>
-        {{#  layui.each(d, function(index, item){ }}
-            <th>{{item}}</th>
-        {{#  }); }}
-    </tr>
+<script id="userinfolist-table-box-dot" type="text/html">
+    <table id="dataTableMul-userlist" class="table table-bordered table-fenxi-box">
+        <thead class="userinfolist-title-box">
+            <tr>
+                {{#  layui.each(d.details_data.new_columns, function(index, item){ }}
+                    <th>{{item}}</th>
+                {{#  }); }}
+            </tr>
+        </thead>
 
-</script>
-
-<script id="userinfolist-list-box-dot" type="text/html">
-    {{#  layui.each(d, function(index, item){ }}
-        <tr>
-            {{#  layui.each(item, function(indexs, items){ }}
-                <td title="{{items}}" data-id="{{items}}">{{items}}</td>
+        <tbody class="table-fenxi-td userinfolist-list-box">
+            {{#  layui.each(d.details_data.new_values, function(index, item){ }}
+                <tr>
+                    {{#  layui.each(item, function(indexs, items){ }}
+                        <td title="{{items}}" data-id="{{items}}">{{items}}</td>
+                    {{#  }); }}
+                </tr>
             {{#  }); }}
-        </tr>
-    {{#  }); }}
+        </tbody>
+    </table>
 </script>
-
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 601967e..d4f529f 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -14116,8 +14116,6 @@ var X = window.X || {
                 'pages': 1
             }
 
-            
-
             var filter_props,filter_maparr;
                 
             X.api("data_mana/game_user_event_list","post",{cat:'user'},function(d){
@@ -14145,7 +14143,6 @@ var X = window.X || {
 
                     X.laytpldata("#judge-box-dot",filter_maparr[filter_props[0]['category'][0]['data_type']],'.judge_box');
 
-
                 });
             });
 
@@ -14186,6 +14183,12 @@ var X = window.X || {
                 X['DATA']['search-user-id'] = $(this).attr("data-id");
                 X.gourl('userinfo','conetnt');
             });
+
+            
+            $(document).off("click",'.more_data p').on('click','.more_data p',function(){
+                // X['DATA']['search-user-id'] = $(this).attr("data-id");
+                X.gourl('userinfolist','conetnt');
+            });
             
             //渲染日期选择器
             X.daterender(".timechoice",function(start,end,label){
@@ -14201,7 +14204,6 @@ var X = window.X || {
                 var judgetitle = $('.judge_box option:selected').text();
                 data['comparator_title'] = judgetitle;
                 data['comparator_id'] = judgeid;
-
             });
 
             // 搜索按钮单击事件
@@ -15033,6 +15035,12 @@ var X = window.X || {
                 }
                
             });
+
+            $(document).off('click','.touserinfo').on('click','.touserinfo',function(){
+
+                X.gourl('userinfolist','conetnt');
+
+            });
             
             X.api("ck/event_list","get",{},function(d){
                 event_list = d;
@@ -15208,10 +15216,15 @@ var X = window.X || {
             
             function updatauserlist(){
                 X.api('ck/seek_user','post', data ,function (val){
-                    X.laytpldata("#userinfolist-title-box-dot",val.details_data.new_columns,".userinfolist-title-box");
-                    X.laytpldata("#userinfolist-list-box-dot",val.details_data.new_values,".userinfolist-list-box",function(){
+                    $("#userinfolist-table-box").html("");
+                    X.laytpldata("#userinfolist-table-box-dot",val,".userinfolist-table-box",function(){
                         var tableMul = new FixedTable("dataTableMul-userlist", 1);
                     });
+
+                    // X.laytpldata("#userinfolist-title-box-dot",val.details_data.new_columns,".userinfolist-title-box");
+                    // X.laytpldata("#userinfolist-list-box-dot",val.details_data.new_values,".userinfolist-list-box",function(){
+                    //     var tableMul = new FixedTable("dataTableMul-userlist", 1);
+                    // });
                 });
             
             };
diff --git a/web/srczip/logic/search.js b/web/srczip/logic/search.js
index 9df1127..eb8f042 100644
--- a/web/srczip/logic/search.js
+++ b/web/srczip/logic/search.js
@@ -15,8 +15,6 @@
                 'pages': 1
             }
 
-            
-
             var filter_props,filter_maparr;
                 
             X.api("data_mana/game_user_event_list","post",{cat:'user'},function(d){
@@ -44,7 +42,6 @@
 
                     X.laytpldata("#judge-box-dot",filter_maparr[filter_props[0]['category'][0]['data_type']],'.judge_box');
 
-
                 });
             });
 
@@ -85,6 +82,12 @@
                 X['DATA']['search-user-id'] = $(this).attr("data-id");
                 X.gourl('userinfo','conetnt');
             });
+
+            
+            $(document).off("click",'.more_data p').on('click','.more_data p',function(){
+                // X['DATA']['search-user-id'] = $(this).attr("data-id");
+                X.gourl('userinfolist','conetnt');
+            });
             
             //渲染日期选择器
             X.daterender(".timechoice",function(start,end,label){
@@ -100,7 +103,6 @@
                 var judgetitle = $('.judge_box option:selected').text();
                 data['comparator_title'] = judgetitle;
                 data['comparator_id'] = judgeid;
-
             });
 
             // 搜索按钮单击事件
diff --git a/web/srczip/logic/userinfo.js b/web/srczip/logic/userinfo.js
index c67d764..8b4b40c 100644
--- a/web/srczip/logic/userinfo.js
+++ b/web/srczip/logic/userinfo.js
@@ -24,6 +24,12 @@
                 }
                
             });
+
+            $(document).off('click','.touserinfo').on('click','.touserinfo',function(){
+
+                X.gourl('userinfolist','conetnt');
+
+            });
             
             X.api("ck/event_list","get",{},function(d){
                 event_list = d;
diff --git a/web/srczip/logic/userinfolist.js b/web/srczip/logic/userinfolist.js
index 879a986..f6d4f82 100644
--- a/web/srczip/logic/userinfolist.js
+++ b/web/srczip/logic/userinfolist.js
@@ -33,10 +33,15 @@
             
             function updatauserlist(){
                 X.api('ck/seek_user','post', data ,function (val){
-                    X.laytpldata("#userinfolist-title-box-dot",val.details_data.new_columns,".userinfolist-title-box");
-                    X.laytpldata("#userinfolist-list-box-dot",val.details_data.new_values,".userinfolist-list-box",function(){
+                    $("#userinfolist-table-box").html("");
+                    X.laytpldata("#userinfolist-table-box-dot",val,".userinfolist-table-box",function(){
                         var tableMul = new FixedTable("dataTableMul-userlist", 1);
                     });
+
+                    // X.laytpldata("#userinfolist-title-box-dot",val.details_data.new_columns,".userinfolist-title-box");
+                    // X.laytpldata("#userinfolist-list-box-dot",val.details_data.new_values,".userinfolist-list-box",function(){
+                    //     var tableMul = new FixedTable("dataTableMul-userlist", 1);
+                    // });
                 });
             
             };
diff --git a/web/static/css/style.css b/web/static/css/style.css
index 468c264..cd8c87f 100644
--- a/web/static/css/style.css
+++ b/web/static/css/style.css
@@ -211,7 +211,8 @@
 .search_data_con:hover span { color: #3d90ff; }
 .search_data_con img { position: relative; top: -2px; }
 .search_pop .more_data-box { display: none; }
-.search_pop .more_data { margin-top: -1px; display: flex; align-items: center; justify-content: center; height: 50px; color: #3d90ff; font-size: 16px; border-top: 1px solid #d9d9d9; cursor: pointer; }
+.search_pop .more_data { margin-top: -1px; display: flex; align-items: center; justify-content: center; height: 50px; color: #3d90ff; font-size: 16px; border-top: 1px solid #d9d9d9; }
+.search_pop .more_data p { cursor: pointer; }
 
 .judge_box_con { display: none; width: 150px; border-radius: 4px; color: #67729d; position: absolute; top: 45px; left: 92px; background-color: #ffffff;}
 .judge_box_con div{ padding: 6px 6px; margin: 4px 6px 0 6px; cursor: pointer; }
@@ -1165,5 +1166,6 @@ input.editable-select {
 .userinfo-data-box { overflow-y: auto; overflow-x: hidden; height: calc(100% - 50px); }
 .userinfo-event-list-time-box { margin: 5px 0; color: #42546d; height: 20px; font-weight: 500; margin-right: 5px; }
 .userinfo-pie-echarts { width: 400px; height: 350px; padding: 10px; padding-top: 20px; border-left: 1px solid #f0f2f5; display: none; }
-
+.touserinfo { cursor: pointer; }
+.search_data-zwsj { text-align: center; }