From 7c06e79a8f2b2eaef9ae42fb9f642325f21723fe Mon Sep 17 00:00:00 2001
From: liaozetao <1107136310@qq.com>
Date: Wed, 19 Jun 2024 11:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistic/UserDetailAdminView.vue | 74 +++++++++++++++------
 1 file changed, 54 insertions(+), 20 deletions(-)

diff --git a/src/views/statistic/UserDetailAdminView.vue b/src/views/statistic/UserDetailAdminView.vue
index 1f731f0..9a24ae8 100644
--- a/src/views/statistic/UserDetailAdminView.vue
+++ b/src/views/statistic/UserDetailAdminView.vue
@@ -11,10 +11,13 @@
                     <input type="hidden" name="phone" id="exportPhone">
                     <input type="hidden" name="startDate" id="exportStartDate">
                     <input type="hidden" name="endDate" id="exportEndDate">
+                    <input type="hidden" name="partitionId" id="exportPartitionId">
+                    <input type="hidden" name="loginType" id="exportLoginType">
+                    <input type="hidden" name="isCharge" id="exportIsCharge">
+                    <input type="hidden" name="firstRoomErBanNo" id="exportFirstRoomErBanNo">
                 </form>
                 <div id="toolbar">
                     <div class="col-lg-12">
-
                         <div class="col-sm-3">
                             <label htmlFor="flowChannelType" class="col-sm-4 control-label">流量渠道:</label>
                             <div class="col-sm-8">
@@ -26,15 +29,12 @@
                                 </select>
                             </div>
                         </div>
-
                         <div class="col-sm-3">
                             <label htmlFor="erbanNo" class="col-sm-4 control-label">平台号:</label>
                             <div class="col-sm-8">
                                 <input type="text" class="input-sm form-control" name="erbanNo" id="erbanNo">
                             </div>
                         </div>
-
-
                         <div class="col-sm-3">
                             <label htmlFor="phone" class="col-sm-4 control-label">手机号:</label>
                             <div class="col-sm-8">
@@ -44,26 +44,55 @@
                         <div class="col-sm-3">
                             <label class="col-sm-4 control-label">开始时间:</label>
                             <div class="col-sm-8">
-                                <input type="text" class="input-sm datetime" name="startDate" id="startDate">
+                                <input type="text" class="input-sm datetime form-control" name="startDate" id="startDate">
                             </div>
                         </div>
                         <div class="col-sm-3">
                             <label class="col-sm-4 control-label">结束时间:</label>
                             <div class="col-sm-8">
-                                <input type="text" class="input-sm datetime" name="endDate" id="endDate">
+                                <input type="text" class="input-sm datetime form-control" name="endDate" id="endDate">
                             </div>
                         </div>
 
                     </div>
                     <div class="col-sm-12">
-                        <label for="partitionId" class="col-sm-1 control-label">地区：</label>
-                        <div class="col-sm-2">
-                            <select name="partitionId" id="partitionId" class="form-control">
-                            </select> 
+                        <div class="col-sm-3">
+                            <label for="partitionId" class="col-sm-4 control-label">地区:</label>
+                            <div class="col-sm-8">
+                                <select name="partitionId" id="partitionId" class="form-control">
+                                </select> 
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <label for="loginType" class="col-sm-4 control-label">注册类型:</label>
+                            <div class="col-sm-8">
+                                <select name="loginType" id="loginType" class="form-control">
+                                    <option value="">全部</option>
+                                    <option value="3">手机号注册</option>
+                                    <option value="5">APPLE注册</option>
+                                    <option value="8">GOOGLE注册</option>
+                                    <option value="9">LINE注册</option>
+                                </select> 
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <label for="isCharge" class="col-sm-4 control-label">是否充值:</label>
+                            <div class="col-sm-8">
+                                <select name="isCharge" id="isCharge" class="form-control">
+                                    <option value="">全部</option>
+                                    <option value="1">是</option>
+                                    <option value="0">否</option>
+                                </select> 
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <label for="firstRoomErBanNo" class="col-sm-4 control-label">首进房ID:</label>
+                            <div class="col-sm-8">
+                                <input type="text" class="input-sm form-control" name="firstRoomErBanNo" id="firstRoomErBanNo">
+                            </div>
                         </div>
                     </div>
-                    
-
+                
                     <div class="col-sm-12">
                         <button id="btnSearch" class="btn btn-default">
                             <i class="glyphicon glyphicon-search"></i>查询
@@ -181,7 +210,8 @@ export default {
                         },
                         columns: [
                             { field: 'uid', title: 'uid', align: 'center', valign: 'middle' },
-                            { field: 'partitionDesc', title: '地区', align: 'center', valign: '15%' },
+                            { field: 'partitionDesc', title: '分区', align: 'center', valign: '15%' },
+                            { field: 'lastLoginRegion', title: '国家', align: 'center', valign: '15%' },
                             { field: 'erbanNo', title: '平台号', align: 'center', valign: '10%' },
                             { field: 'nick', title: '昵称', align: 'center', valign: '15%' },
                             {
@@ -214,8 +244,12 @@ export default {
                                     }
                                 }
                             },
-                            { field: 'registerIp', title: 'ip', align: 'center', valign: '10%' },
-                            { field: 'firstChargeInfo', title: '首充情况', align: 'center', valign: '15%' }
+                            { field: 'registerIp', title: 'IP', align: 'center', valign: '10%' },
+                            { field: 'isChargeStr', title: '是否充值', align: 'center', valign: '10%' },
+                            { field: 'chargeAmount', title: '充值金额', align: 'center', valign: '10%' },
+                            { field: 'firstRoomErBanNo', title: '首进房ID', align: 'center', valign: '10%' },
+                            { field: 'loginTypeStr', title: '注册类型', align: 'center', valign: '10%' },
+                            { field: 'genderStr', title: '性别', align: 'center', valign: '10%' },
                         ]
                     });
                 }
@@ -226,21 +260,21 @@ export default {
                     TableHelper.doRefresh('#table');
                 });
 
-
                 // 导出excel
                 $('#btnExport').on('click', function () {
                     var form = $("#form");
                     form.attr("action", "/admin/stats/userDetail/export");
-
                     $('#exportFlowChannelType').val($('#flowChannelType').val());
                     $('#exportErbanNo').val($('#erbanNo').val());
                     $('#exportPhone').val($('#phone').val());
                     $('#exportStartDate').val($('#startDate').val());
                     $('#exportEndDate').val($('#endDate').val());
+                    $('#exportPartitionId').val($('#partitionId').val());
+                    $('#exportLoginType').val($('#loginType').val());
+                    $('#exportIsCharge').val($('#isCharge').val());
+                    $('#exportFirstRoomErBanNo').val($('#firstRoomErBanNo').val());
                     form.submit();
-                })
-
-
+                });
             });
         },
         initPartition() {