修改

application/index/view/collection/getCollection.html

@@ -282,7 +282,7 @@
 										<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>

application/index/view/houses/HouseFollowUp.html

@@ -83,8 +83,8 @@
 												<div class="clear"></div>
 												<select class="form-control btn2 ld-Marheight" id="shop_city_id">
                                                       <option value="" selected="selected">城市筛选</option>
-                                                      <option value="310100">上海</option>
-                                                      <option value="330100">杭州</option>
+                                                      <option value="310100">上海市</option>
+                                                      <option value="330100">杭州市</option>
                                                       
                                                 </select>
 	                                            <select class="form-control btn2 ld-Marheight" id="shop_area_id">

application/index/view/houses/houseList.html

@@ -120,8 +120,8 @@
 	                                            	 <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_title_open" placeholder="对外商铺名称" type="text" value="">
 	                                            	<select class="form-control btn2 ld-Marheight" id="shop_city_id">
                                                       <option value="" selected="selected">城市筛选</option>
-                                                      <option value="310100">上海</option>
-                                                      <option value="330100">杭州</option>
+                                                      <option value="310100">上海市</option>
+                                                      <option value="330100">杭州市</option>
                                                       
                                                     </select>
 	                                            	<select class="form-control btn2 ld-Marheight" id="shop_area_id">

application/index/view/myCollectionShop/myCollectionShopList.html

@@ -76,7 +76,7 @@
 	                                    <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>

application/index/view/myCollectionUser/myCollectionUserList.html

@@ -899,8 +899,8 @@
 								<span class="fore-span ld-Marheight">客户标签:</span>
 								<select class="form-control btn6 fore-span ld-Marheight" id="user_label_edit">
 								<option value=''>请选择</option>
-								<option value="40">是租客也是房东</option>
-								<option value="41">纯房东</option>
+								<option value="1">是租客也是房东</option>
+								<option value="2">纯房东</option>
 							    </select>
 							</td>
 						</tr>

application/index/view/performancesubsidiary/performancesubsidiaryList.html

@@ -21,21 +21,21 @@
 								<thead>
 									<!--三级审核的搜索功能-->
 									<tr>
-										<td colspan="9">
+										<td colspan="10">
 											<form id="maintable_form_search">
 												<!--<span class="fore-span">商铺类型:</span>-->
-												<select class="form-control btn2" name="maintable_shop_type" id="maintable_shop_type">
-													<option value="-1">商铺类型</option>
+												<select class="form-control btn2" name="maintable_shop_type" id="maintable_shop_type_yeji">
+													<option value="">商铺类型</option>
 													<option value="0">商场</option>
 													<option value="1">街铺</option>
 												</select>
 												<!--<span class="fore-span">成交类型:</span>-->
 												<select class="form-control btn2" name="maintable_shop_type" id="maintable_deal_type">
-													<option value="-1">成交类型</option>
-													<option value="0">出租</option>
-													<option value="1">增佣</option>
-													<option value="2">代理费</option>
-													<option value="3">好处费</option>
+													<option value="">成交类型</option>
+													<option value="10">出租</option>
+													<option value="20">增佣</option>
+													<option value="30">代理费</option>
+													<option value="40">好处费</option>
 												</select>
 												<span class="fore-span margin-left-10">提交时间:</span>
 												<input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="maintable_create_time" name="start_date" type="date">
@@ -65,13 +65,14 @@
 									</tr>
 									<tr class="maintable-tr-bar">
 										<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>
+										<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>

application/index/view/remark/remark_follow_index.html

@@ -322,8 +322,8 @@
 												
 												<select class="form-control btn2 ld-Marheight" id="user_city_choose">
                                                       <option value="" selected="selected">城市筛选</option>
-                                                      <option value="310100">上海</option>
-                                                      <option value="330100">杭州</option>
+                                                      <option value="310100">上海市</option>
+                                                      <option value="330100">杭州市</option>
                                                 </select>
                                             	<select class="form-control btn2 ld-Marheight" id="user_area_choose">
                                                   <option value="" selected="selected">区域筛选</option>
@@ -737,8 +737,8 @@
 								<span class="fore-span ld-Marheight">客户标签:</span>
 								<select class="form-control btn6 fore-span ld-Marheight" id="user_label_edit">
 								<option value=''>请选择</option>
-								<option value="40">是租客也是房东</option>
-								<option value="41">纯房东</option>
+								<option value="1">是租客也是房东</option>
+								<option value="2">纯房东</option>
 							    </select>
 							</td>
 						</tr>

public/resource/js/RemarkFollowIndex.js

@@ -749,13 +749,24 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'ckfinder', 'ckfinde
 							$("#take_look_id").html(data.data.user_info.user_id); //约带看id
 							if(data.data.user_info.city=='上海市'){
 							   $("#user_city_edit").val(310100); //编辑客方
+							   var city_id=310100;
 							}	
 							if(data.data.user_info.city=='杭州市'){
 							  $("#user_city_edit").val(330100); //编辑客方 
+							   var city_id=330100;
 							}	
+		                    //区域 渲染
+							if(city_id) {
+								user.getCityAreaList(city_id, function(_data) {
+									var _str = '<option value="0">全部</option>';
+									$.each(_data, function(i, item) {
+										_str += '<option value="' + item.fullName + '">' + item.fullName + '</option>';
+									});
+									$("#user_area_edit").html(_str).val(data.data.user_info.disc);
+								});
+							} else {
 
-							$("#user_area_edit").val(data.data.user_info.disc); //编辑区域 
-							
+							};
 							user.agent_id_two = data.data.user_info.agent_id;
 							if(data.data.user_info.source == 10) {
 								$(".source_type").html('APP注册'); //客方
@@ -766,14 +777,14 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'ckfinder', 'ckfinde
 							if(data.data.user_info.source == 30) {
 								$(".source_type").html('老数据报备客户');
 							}
-							if(data.data.user_info.source == 40) {
+							if(data.data.user_info.user_label == 1) {
 								$(".user_details_label").html('是租客也是房东');
-								$("#user_label_edit").val(40);
+								$("#user_label_edit").val(1);
 								
 							}
-							if(data.data.user_info.source == 41) {
+							if(data.data.user_info.user_label == 2) {
 								$(".user_details_label").html('纯房东');
-								$("#user_label_edit").val(41);
+								$("#user_label_edit").val(2);
 								
 							}
 							var caozuo_table = "";

public/resource/js/callPhoneIndex.js

@@ -201,7 +201,7 @@ define(['doT', 'text!temp/callPhone_template_tpl.html', 'ckfinder', 'ckfinderSta
 			});
 
 			$(".close").click(function() {
-				document.getElementById("add_user_form").reset();
+//				document.getElementById("add_user_form").reset();
 				$(".user-ul").empty();
 			});
 
@@ -258,9 +258,12 @@ define(['doT', 'text!temp/callPhone_template_tpl.html', 'ckfinder', 'ckfinderSta
 			//客户列表操作
 			$(document).delegate(".caozuo", "click", function() { //点击操作跟进详情
 				user.user_id = $(this).attr("data-id");
-				if(user.user_id){
+				console.log(user.user_id);
+				if(user.user_id== 'null'){
+//					$("#modal-record").modal('hide');
 					alert('当前用户不存在');
-					return false;
+					
+	
 				}
 				user.user_phone = $(this).attr("data-phone");
 				user.agent_id_infor = $(this).attr("data-agentId");
@@ -795,7 +798,7 @@ define(['doT', 'text!temp/callPhone_template_tpl.html', 'ckfinder', 'ckfinderSta
 							$("input[name=price_demand]").val(data.data.user_info.price_demand * 1);
 							$("input[name=area_demand]").val(data.data.user_info.area_demand * 1);
 							
-//							$(".user_details_label").val(data.data.user_info.source); //客方详情 标签
+//							$(".user_details_label").val(data.data.user_info.user_label); //客方详情 标签
 							$(".user_details_city").html(data.data.user_info.city + data.data.user_info.disc); //客方详情 城市
 							
 							$("#take_look_name").html(data.data.user_info.user_name); //约带看姓名
@@ -820,14 +823,14 @@ define(['doT', 'text!temp/callPhone_template_tpl.html', 'ckfinder', 'ckfinderSta
 							if(data.data.user_info.source == 30) {
 								$(".source_type").html('老数据报备客户');
 							}
-							if(data.data.user_info.source == 40) {
+							if(data.data.user_info.source == 1) {
 								$(".user_details_label").html('是租客也是房东');
-								$("#user_label_edit").val(40);
+								$("#user_label_edit").val(1);
 								
 							}
-							if(data.data.user_info.source == 41) {
+							if(data.data.user_info.source == 2) {
 								$(".user_details_label").html('纯房东');
-								$("#user_label_edit").val(41);
+								$("#user_label_edit").val(2);
 								
 							}
 							var caozuo_table = "";

public/resource/js/houseList.js

@@ -130,10 +130,10 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 					$(this).html('取消收藏');
 				} else if(str == "取消收藏") {
 					$(this).attr('class', 'btn1 btn-info is_show_shoucang');
-					params.type = 0;
+					params.type = 2;
 					$(this).html('收藏');
 				} else {
-					params.type = 2;
+					params.type = 3;
 				}
 			   var  user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));  //读取缓存
 				$.ajax({ //禁用
@@ -730,6 +730,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 		},
 		//==============批量修改客方===========
 		getList: function(pageNo, type) {
+			business.agents_id = business.agent_id;
 			business.pageNo = pageNo;
 			var params = {};
 			// 商铺列表 默认时间显示
@@ -806,12 +807,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 							    str_area += '<option value="' + (item.id*1+1) + '">' + item.value + '</option>';
 							}
 						});
-						//区域筛选
-						$.each(data.data.area[1].disc, function(i, item) {
-							if(item!="全上海市"){
-							    str_district += '<option value="' + item + '">' + item + '</option>';
-							}
-						});
 						//业态筛选
 						$.each(data.data.yetai, function(i, item) {
 							if(item!='全部'){

public/resource/js/myCollectionShopList.js

@@ -84,10 +84,10 @@ define(['doT', 'text!temp/my_collection_shop_template_tpl.html', 'css!style/home
 					$(this).html('取消收藏');
 				} else if(str == "取消收藏") {
 					$(this).attr('class', 'btn1 btn-info is_show_shoucang');
-					params.type = 0;
+					params.type = 2;
 					$(this).html('收藏');
 				} else {
-					params.type = 2;
+					params.type = 3;
 				}
 			   var  user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));  //读取缓存
 				$.ajax({ //禁用

public/resource/js/myCollectionUserList.js

@@ -89,10 +89,10 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'ckfinder', 'ck
 					$(this).html('取消收藏');
 				} else if(str == "取消收藏") {
 					$(this).attr('class', 'btn1 btn-info is_show');
-					params.type = 0;
+					params.type = 2;
 					$(this).html('收藏');
 				} else {
-					params.type = 2;
+					params.type = 3;
 				}
 			   var  user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));  //读取缓存
 				$.ajax({ //禁用
@@ -667,7 +667,7 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'ckfinder', 'ck
 //			params.city = $("#user_city_edit").val();
 			
 			params.disc = $("#user_area_edit").val();
-			params.source = $("#user_label_edit").val();
+			params.user_label = $("#user_label_edit").val();
 			
 			
 			$.ajax({
@@ -799,12 +799,27 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'ckfinder', 'ck
 							$("#take_look_id").html(data.data.user_info.user_id); //约带看id
 							if(data.data.user_info.city=='上海市'){
 							   $("#user_city_edit").val(310100); //编辑客方
+							   var city_id=310100;
 							}	
 							if(data.data.user_info.city=='杭州市'){
 							  $("#user_city_edit").val(330100); //编辑客方 
-							}	
+							   var city_id=330100;
+							  
+							};
+							//区域 渲染
+							if(city_id) {
+								user.getCityAreaList(city_id, function(_data) {
+									var _str = '<option value="0">全部</option>';
+									$.each(_data, function(i, item) {
+										_str += '<option value="' + item.fullName + '">' + item.fullName + '</option>';
+									});
+									$("#user_area_edit").html(_str).val(data.data.user_info.disc);
+								});
+							} else {
 
-							$("#user_area_edit").val(data.data.user_info.disc); //编辑区域 
+							};
+
+//							$("#user_area_edit").val(data.data.user_info.disc); //编辑区域 
 							
 							user.agent_id_two = data.data.user_info.agent_id;
 							if(data.data.user_info.source == 10) {
@@ -816,16 +831,16 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'ckfinder', 'ck
 							if(data.data.user_info.source == 30) {
 								$(".source_type").html('老数据报备客户');
 							}
-							if(data.data.user_info.source == 40) {
+							if(data.data.user_info.user_label == 1) {
 								$(".user_details_label").html('是租客也是房东');
-								$("#user_label_edit").val(40);
+								$("#user_label_edit").val(1);
 								
-							}
-							if(data.data.user_info.source == 41) {
+							};
+							if(data.data.user_info.user_label == 2) {
 								$(".user_details_label").html('纯房东');
-								$("#user_label_edit").val(41);
+								$("#user_label_edit").val(2);
 								
-							}
+							};
 							var caozuo_table = "";
 							$.each(data['data']['user_history'], function(i, item) {
 								caozuo_table += '<tr><td>' + item.remark + '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>';

public/resource/js/performance_subsidiary.js

-define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/reportList_no_edit_template_tpl.html', 'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax, template_maid, template_maid_sub1) {
+define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/reportList_no_edit_template_tpl.html', 'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax) {
 	bargain = {
 		pageNo: 1,
 		/*第几页*/
@@ -1328,26 +1328,22 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r
 		},
 		//获取一级审核，二级审核，三级审核，结单数据列表共用的方法
 		getList: function(pageNo){
-			console.count('bar');
 			var params = {
 				'pageNo': pageNo,
 				'pageSize': bargain.pageSize,
-//				'shop_type': $('#maintable_shop_type').val(),
-				'create_time': $.trim($('#maintable_create_time').val()),
-				'end_time': $.trim($('#maintable_end_time').val()),
-				'internal_address': $.trim($('#maintable_internal_address').val()),
-				'user_phone': $.trim($('#maintable_user_phone').val()),
-				'house_number': $.trim($('#maintable_shop_num').val()),
+				'shop_type': $('#maintable_shop_type_yeji').val(),
+				'trade_type': $('#maintable_deal_type').val(),
+				'create_time_start': $.trim($('#maintable_create_time').val()),
+				'create_time_end': $.trim($('#maintable_end_time').val()),
+				'landmark': $.trim($('#maintable_internal_address').val()),//没有商铺地址 接口
+				'house_id': $.trim($('#maintable_shop_num').val()),
 				'district_id' : $("select[name='district_id'] option:selected").val(),
 				'store_id' : $("select[name='store_id'] option:selected").val(),
-                'agent_name': $.trim($('#agent_name').val()),
-                'agent_phone': $.trim($('#agent_phone').val()),
-                'partial_name': $.trim($('#partical_name').val())
-                
+                'name': $.trim($('#agent_name').val()),
+                'phone': $.trim($('#agent_phone').val())
 			};
 			$.ajax({
 				type: 'GET',
-//				url: bargain.switchUrl(),
 				url: '/index/performanceInfo', //获取业绩明细列表
 				data: params,
 				dataType: 'json',
@@ -1356,7 +1352,8 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r
 					if(typeof data === 'object') {
 						if(data.code == 200) {
 							var doTtmpl = doT.template(document.getElementById('performance_subsidiary_list_tpl').innerHTML);
-							$("#maintable_list").html(doTtmpl(data.data.list));
+							console.log(data.data);
+							$("#maintable_list").html(doTtmpl(data.data));
 							// var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));
 							/*分页代码*/
 							add_page(data.data.total, pageNo, bargain.pageSize, bargain.getList);

public/resource/js/user.js

@@ -89,10 +89,10 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 					$(this).html('取消收藏');
 				} else if(str == "取消收藏") {
 					$(this).attr('class', 'btn1 btn-info is_show');
-					params.type = 0;
+					params.type = 2;
 					$(this).html('收藏');
 				} else {
-					params.type = 2;
+					params.type = 3;
 				}
 			   var  user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));  //读取缓存
 				$.ajax({ //禁用
@@ -786,14 +786,11 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 							$("select[name=industry_type_two]").val(data.data.user_info.industry_type);
 							$("input[name=price_demand]").val(data.data.user_info.price_demand * 1);
 							$("input[name=area_demand]").val(data.data.user_info.area_demand * 1);
-							
-//							$(".user_details_label").val(data.data.user_info.source); //客方详情 标签
-							$(".user_details_city").html(data.data.user_info.city + data.data.user_info.disc); //客方详情 城市
-							
+							$(".user_details_label").val(data.data.user_info.user_label); //客方详情 标签
+//							$(".user_details_city").html(data.data.user_info.city + data.data.user_info.disc); //客方详情 城市
 							$("#take_look_name").html(data.data.user_info.user_name); //约带看姓名
 							$("#take_look_phone").html(data.data.user_info.user_phone); //约带看手机号
 							$("#take_look_id").html(data.data.user_info.user_id); //约带看id
-							
 							if(data.data.user_info.city=='上海市'){
 							   $("#user_city_edit").val(310100); //编辑客方
 							   var city_id=310100;
@@ -816,8 +813,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 
 							};
 
-//							$("#user_area_edit").val(data.data.user_info.disc); //编辑区域 
-							
 							user.agent_id_two = data.data.user_info.agent_id;
 							if(data.data.user_info.source == 10) {
 								$(".source_type").html('APP注册'); //客方
@@ -857,8 +852,11 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 		},
 		//筛选
 		getList: function(pageNo) {
+			var  user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));  //读取缓存
+			
 			user.pageNo = pageNo;
 			var params = {};
+			params.agents_id=user_info_obj.id;
 
 			//          并列搜索
 			//           if($("#district_id").val()!=0){
@@ -980,6 +978,16 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 			params.disc = $("#user_area_add").val();
 			params.user_label = $("#user_label_add").val();
 			
+			if(params.city == '') {
+				alert('请选择城市');
+				$('#user_city_add').focus();
+				return;
+			}
+			if(params.user_name == '') {
+				alert('请选择城市');
+				$("#user_area_add").focus();
+				return;
+			}
 			if(params.user_name == '') {
 				alert('姓名不能为空');
 				$("input[name='user_name']").focus();

public/resource/template/followHouseUp_template_tpl.html

@@ -17,12 +17,8 @@
         </td>
         <td>
         	 <a class="btn1 [%= (it[item]['is_look'] && it[item]['auth_edit_house'] == 0)?'btn-warning':'btn-success' %]" href="#modal_shop_detail" data-id='[%= it[item]["house_id"] %]' data-toggle="modal">跟进/查看</a>
+        	 
         </td>
-        <!--<td>
-            <a class="btn1 btn-info" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["report_id"] %]'>查看商铺</a>
-            <a class="btn1 btn-info" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["report_id"] %]'>商铺跟进</a>
-            
-        </td>-->
     </tr>
     [% } %]
     [% }else{ %]

public/resource/template/get_collection_template_tpl.html

@@ -8,6 +8,7 @@
         <td>[%= it[item]['store_name'] %]</td>
         <td>[%= it[item]['money'] %]</td>
         <td>[%= it[item]['real_money'] %]</td>
+        <!--<td>[%= it[item]['transaction_fee'] %]</td>-->
         <td>[%= it[item]['type'] %]</td>
         <td>[%= it[item]['pay_type'] %]</td>
         <td>[%= it[item]['internal_address'] %]</td>

public/resource/template/house_template_tpl.html

 <script id="house_list_tpl" type="text/template">
+	[% var sw=function(s){switch(Number(s)){case 1:return"btn-info";case 2:return"btn-default"}}; %]
     [% if(it) { %]
     [% for(var item in it){ %]
     <tr class="text-center">
@@ -55,7 +56,13 @@
         </td>-->
         <td>
             <a class="btn1 [%= (it[item]['is_look'] && it[item]['auth_edit_house'] == 0)?'btn-warning':'btn-success' %]" href="#modal_shop_detail" data-id='[%= it[item]["id"] %]' data-toggle="modal">跟进/查看</a>
-            <a class="btn1 btn-info is_show_shoucang" data-toggle="modal" data-id='[%= it[item]["id"] %]'>收藏</a>
+            <a class="btn1 is_show_shoucang [%= sw(it[item]['is_collect']) %]" data-toggle="modal" data-id='[%= it[item]["id"] %]'>
+            	[%if(it[item]["is_collect"] == 1) { %]
+				    收藏
+				[% }else if(it[item]["is_collect"] == 2 ) { %]
+				  取消收藏
+				[% } %]
+            </a>
             
             [% if(it[item]['auth_edit_house'] || check_auth('index/houseEdit')) { %]
                 <a class="btn1 btn-success" href="/admin.php/index/houseEdit?id=[%= it[item]['id']%]" data-toggle="modal" >编辑</a>

public/resource/template/my_collection_shop_template_tpl.html

@@ -2,34 +2,36 @@
     [% if(it&&it.length!=0) { %]
     [% for(var item in it){ %]
     <tr class="text-center">
-    	<!--<th class="text-center">编号</th>
-        <th class="text-center">类型</th>
-        <th class="text-center">区域0</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>-->
         <td>[%= it[item]['id'] %]</td>
-        <td>[%= it[item]['shop_type'] %]</td>
+        <td>
+            [% if(it[item]["shop_type"] == 0) { %]
+            商场
+            [% }else{ %]
+            街铺
+            [% } %]
+        </td>
         <td>[%= it[item]['title'] %]</td>
-        <td>[%= it[item]['rent_price'] %]</td>
-        <td>[%= it[item]['shop_area_start'] %]</td>
-        <td>[%= it[item]['industry_type'] %]</td>
-        <!--<td>[%= it[item]['status'] %]</td>-->
         <td>
-        	[% if(it[item]["status"] != null) { %]
-        	    [%= hideStr(it[item]['status']) %]
-        	    
+            [% if (it[item]['rent_type'] == 1) { %]
+				[%= it[item]["rent_price"] / 100 %] 元
+            [% } else if (it[item]['rent_type'] == 2) { %]
+                [%= it[item]["rent_price"] / 100 %] %
+            [% }else{ %]
+                [%= it[item]["rent_price"] / 100 %] 元/天/㎡
             [% } %]
-        	
         </td>
+        <td>
+            [% if(it[item]["shop_type"] == 0) { %]
+          		[%= it[item]["shop_area_start"] + '-' + it[item]["shop_area_end"] %]㎡
+            [% }else{ %]
+            	[%= it[item]["shop_area_start"] %]㎡
+            [% } %]
+        </td>
+        <td>[%= it[item]['industry_type'] %]</td>
         
         <td>
         	 <a class="btn1 [%= (it[item]['is_look'] && it[item]['auth_edit_house'] == 0)?'btn-warning':'btn-success' %]" href="#modal_shop_detail" data-id='[%= it[item]["id"] %]' data-toggle="modal">跟进/查看</a>
-            <a class="btn1 btn-info is_show_shoucang" data-toggle="modal" data-id='[%= it[item]["id"] %]'>收藏</a>
+            <a class="btn1 btn-default is_show_shoucang" data-toggle="modal" data-id='[%= it[item]["id"] %]'>取消收藏</a>
         	 
         </td>
         <!--<td>

public/resource/template/my_collection_user_template_tpl.html

@@ -6,7 +6,7 @@
         <td>[%= it[item]["user_id"] %]</td>
         <td>[%= it[item]["user_name"] %]</td>
         <td>[%= it[item]["user_phone"] %]</td>
-        <td>[%= it[item]["user_status"] %]</td>
+	    <td>[% if(it[item]["user_status"] == 0) { %] 求租 [% }else if(it[item]["user_status"] == 1) { %] 已租 [% }else{ %] 无效 [% } %]</td>
         <td>[%= it[item]["industry_type"] %]</td>
         <td>[%= it[item]["price_demand"] %]</td>
         <td>[%= it[item]["area_demand"] %]</td>
@@ -14,8 +14,11 @@
 			[% 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/useraction_search') ) { %]
 				
 			<a class="btn1 caozuo genj_ure btn-success" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["user_id"] %]' data-agentId='[%= it[item]["agent_id"] %]' data-name='[%= it[item]["user_name"] %]'>详情/跟进</a>&nbsp;
-            <a class="btn1 btn-info is_show"  data-id='[%= it[item]["user_id"] %]'>收藏</a>
-			<a class="btn1 btn-success caozuo" href="#modal-record-edit" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["user_id"] %]'>客户编辑</a>&nbsp;
+            <a class="btn1 btn-default is_show"  data-id='[%= it[item]["user_id"] %]'>取消收藏</a>
+            
+			[% if(it[item]['agent_id'] == it[item]['current_agent_id'] || check_auth('index/pcEditClient')) { %]
+				<a class="btn1 btn-success caozuo" href="#modal-record-edit" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>客户编辑</a>&nbsp;
+			[% } %]
 			
 			[% } %]
 

public/resource/template/performance_subsidiary_template_tpl.html

 <script id="performance_subsidiary_list_tpl" type="text/template">
     [% if(it) { %]
+    [% var sw=function(s){switch(Number(s)){case 10:return"出租";case 20:return"增佣";case 30:return"代理";case 40:return"好处费";default:return s}}; %]
     [% for(var item in it){ %]
-    <tr class="text-center" data-id="[%= it[item]['bargain_id'] %]" data-orderid="[%= it[item]['order_id'] %]" data-fatherid="[%= it[item]['father_id'] %]">
-        <td>[%= it[item]['operation_date'] %]</td>
-        <td>[%= it[item]['district_store'] %]</td>
+    <tr class="text-center" data-id="[%= it[item]['id'] %]" data-orderid="[%= it[item]['order_id'] %]" data-fatherid="[%= it[item]['father_id'] %]">
+        <td>[%= it[item]['create_time'] %]</td>
+        <td>[%= sw(it[item]['trade_type']) %]</td>
+        <td>[%= it[item]['landmark'] %]</td>
+        <td>[%= it[item]['house_id'] %]</td>
         <td>[%= it[item]['name'] %]</td>
-        <td>[%= it[item]['internal_address'] %]</td>
-        <td>[%= it[item]['house_number'] %]</td>
-        <td>[%= it[item]['fee'] %]</td>
+        <td>[%= it[item]['district_name'] %]-[%= it[item]['store_name'] %]</td>
+        <td>[%= it[item]['scale'] %]</td>
+        <td>[%= it[item]['scale_fee'] %]</td>
+        <td>[%= it[item]['practical_fee'] %]</td>
         <td>
             <a class="btn1 btn-success details-btn" href="#modal_detail" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
-            <a class="btn1 btn-success timeline"  href="#modal-time" data-toggle="modal" data-id='[%= it[item]["id"] %]'>时间轴</a>
+            <a class="btn1 btn-success timeline"  href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
         </td>
     </tr>
     [% } %]
     [% }else{ %]
     <tr>
-        <td colspan="8" style="text-align:center;"> 暂无数据</td>
+        <td colspan="10" style="text-align:center;"> 暂无数据</td>
     </tr>
     [% } %]
 </script> 

public/resource/template/remark_follow_template_tpl.html

@@ -33,11 +33,10 @@
 			[% 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/useraction_search') ) { %]
 						<a class="btn1 caozuo genj_ure  btn-success" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]' data-agentId='[%= it[item]["agent_id"] %]' data-name='[%= it[item]["user_name"] %]'>详情/跟进</a>&nbsp;
 			
-			<a class="btn1 btn-success caozuo" href="#modal-record-edit" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>客户编辑</a>&nbsp;
-			
-			<!--<a class="btn1 btn-success genj_ure" href="#modal-add" data-toggle="modal" data-id='[%= it[item]["id"] %]'>跟进</a>&nbsp;-->
+			[% if(it[item]['agent_id'] == it[item]['current_agent_id'] || check_auth('index/pcEditClient')) { %]
+				<a class="btn1 btn-success caozuo" href="#modal-record-edit" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>客户编辑</a>&nbsp;
+			[% } %]
 			
-			<!--<a class="btn1 btn-success take-look" href="#modal-takeLook" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-name='[%= it[item]["user_name"] %]' data-phone='[%= it[item]["user_phone"] %]'>约带看</a>-->
 			[% } %]
 
 			<!--<a class="btn1 btn-danger " href="#modal-delete" data-toggle="modal" onclick="delete_user(this)" data-id='[%= it[item]["id"] %]'>-->

public/resource/template/user_template_tpl.html

 <script id="user_list_tpl" type="text/template">
+	    [% var sw=function(s){switch(Number(s)){case 1:return"btn-info";case 2:return"btn-default"}}; %]
 	[% if(it[0]) { %] [% for(var item in it){ %]
 	<tr class="text-center">
 		<td>[%= it[item]['id'] %]</td>
@@ -44,13 +45,20 @@
 		</td>
 		<td width="16%">
 			[% 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/useraction_search') ) { %]
-			<a class="btn1 btn-success caozuo genj_ure" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>详情/跟进</a>&nbsp;
+			<a class="btn1 caozuo genj_ure caozuo-add-color [%= getLoaclId(it[item]['id']) %]" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>详情/跟进</a>&nbsp;
+			
+            <a class="btn1 is_show [%= sw(it[item]['is_collect']) %]"  data-id='[%= it[item]["id"] %]' data-cid='[%= it[item]["is_collect"] %]'>
+            	[% if(it[item]["is_collect"] == 1) { %]
+				    收藏
+				[% }else if(it[item]["is_collect"] == 2 ) { %]
+				  取消收藏
+				[% } %]
+            </a>
+			
 			[% if(it[item]['agent_id'] == it[item]['current_agent_id'] || check_auth('index/pcEditClient')) { %]
 				<a class="btn1 btn-success caozuo" href="#modal-record-edit" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>客户编辑</a>&nbsp;
 			[% } %]
-			<!--<a class="btn1 btn-success genj_ure" href="#modal-add" data-toggle="modal" data-id='[%= it[item]["id"] %]'>跟进</a>&nbsp;-->
 			
-			<a class="btn1 btn-success take-look" href="#modal-takeLook" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-name='[%= it[item]["user_name"] %]' data-phone='[%= it[item]["user_phone"] %]'>约带看</a>
 			[% } %]
 
 			<!--<a class="btn1 btn-danger " href="#modal-delete" data-toggle="modal" onclick="delete_user(this)" data-id='[%= it[item]["id"] %]'>-->