Merge branch 'chat_0705' of https://gitee.com/zwyjjc/tl_estate into chat_0705

application/index/view/member/users_list.html

@@ -390,11 +390,11 @@
 										<th class="text-center">客户电话</th>
 										<th class="text-center">创建时间</th>
 										<th class="text-center">最后跟进时间</th>
-										<th class="text-center">App状态</th>
-										<th class="text-center">下载登录</th>
-										<th class="text-center">昵称</th>
-										<th class="text-center">注册时间</th>
-										<th class="text-center">首次登陆时间</th>
+										<th class="text-center">客户状态</th>
+										<th class="text-center">业态</th>
+										<th class="text-center">价格</th>
+										<th class="text-center">面积</th>
+										<th class="text-center">产生类型</th>
 										<th class="text-center">操作</th>
 									</tr>
 								</thead>
@@ -403,7 +403,7 @@
 								</tbody>
 							</table>
 						</div>
-						<!-- /#page-content-wrapper -->
+						<!-- /#page-content-wrapper 
 						<!--  <div class="text-left">
                                每页显示<span id="page">15</span>条  |  共<span id="total_page"></span>条
                            </div>  -->

public/resource/js/user.js

@@ -678,7 +678,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 			params.phone = $("input[name='phone']").val();
 			params.id = $("input[name='userID']").val();
 //			user_vip_select
-//			params.id = $("#user_vip_select").val();//vip筛选
+			params.vip = $("#user_vip_select").val();//vip筛选
 			params.phone = $("input[name='phone']").val();
 			params.invite_phone = $("input[name='invite_phone']").val();
 			params.start_date = $("#start_date").val();

public/resource/template/user_template_tpl.html

@@ -14,6 +14,12 @@
 			[% if(it[item]["follow_time"] != null) { %] [%= it[item]["follow_time"] %] [% } %]
 		</td>
 		<td>
+			[% if(it[item]["industry_type"] != null) { %] [%= it[item]["industry_type"] %] [% } %]
+		</td>
+		<td>
+			[% if(it[item]["industry_type"] != null) { %] [%= it[item]["industry_type"] %] [% } %]
+		</td>
+		<!--<td>
 			[% if(it[item]["status"] == -1) { %] 未注册 [% }else if(it[item]["status"] == 0) { %] 注册 [% }else{ %] 删除 [% } %]
 		</td>
 		<td>
@@ -24,15 +30,15 @@
             [% }else{ %]
                 否
             [% } %]
-		</td>
+		</td>-->
 		<td>
-			[% if (it[item]['user_nick'] != null){ %] [%= it[item]["user_nick"] %] [% } %]
+			[% if (it[item]['price_demand'] != null){ %] [%= it[item]["price_demand"] %] [% } %]
 		</td>
 		<td>
-			[% if (it[item]['registration_time'] != null){ %] [%= it[item]["registration_time"] %] [% } %]
+			[% if (it[item]['area_demand'] != null){ %] [%= it[item]["area_demand"] %] [% } %]
 		</td>
 		<td>
-			[% if (it[item]['first_login_time'] != null){ %] [%= it[item]["first_login_time"] %] [% } %]
+			[% if (it[item]['source'] != null){ %] [%= it[item]["source"] %] [% } %]
 		</td>
 		<td>
 			[% if((check_auth('auth_vip') &&  it[item]['vip']) || (it[item]['agent_id'] == 0) || (it[item]['agent_id'] == it[item]['current_agent_id']) || check_auth('index/pcEditClient') ) { %]