Merge branch 'test'

application/api_broker/controller/User.php

@@ -124,17 +124,17 @@ class User extends Basic
         if (empty($userList)) {
             return $this->response("200", "此条件没有找到数据");
         }
-        $clientService = new ClientService();
+  /*      $clientService = new ClientService();
         $list          = [];
         foreach ($userList as $k => $v) {
             $is_show = $clientService->dialTotal($v["user_id"]);
             if ($is_show) {
                 array_push($list, $v);
             }
-        }
+        }*/
         $vip_services        = new VipService();
         $data['examine_vip'] = $vip_services->vip($this->agentId);
-        $data['user_date']   = $list;
+        $data['user_date']   = $userList;
         return $this->response("200", 'request success', $data);
     }
 

application/app_broker/view/index/customerinfo_details_new.html

@@ -157,8 +157,8 @@
 		</div>
 
 		<script type="text/javascript" src="/app/js/jquery-1122-min.js"></script>
-		<script src="/app/js/common.js?new40" charset="utf-8"></script>
-		<script src="/app/js/customerinfo_details_new.js?new47"></script>
+		<script src="/app/js/common.js?new41" charset="utf-8"></script>
+		<script src="/app/js/customerinfo_details_new.js?new48"></script>
 
 	</body>