修改

application/index/view/member/users_list.html

@@ -532,8 +532,8 @@
 						<label for="inputEmail3" class="col-sm-3 control-label">客户所属城市：</label>
 						<div class="col-sm-9">
 							<select class="form-control btn5" id="user_city_add">
-	                          <option value="" selected="selected">请选择城市</option>
-	                          <option value="310100">上海市</option>
+	                          <!--<option value="" selected="selected">请选择城市</option>-->
+	                          <option value="310100" selected="selected">上海市</option>
 	                          <option value="330100">杭州市</option>
                         	</select>
 	                    	<select class="form-control btn5" id="user_area_add">

application/index/view/performancesubsidiary/performancesubsidiaryList.html

@@ -42,7 +42,7 @@
 												<span class="fore-span margin-left-10">至</span>
 												<input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="maintable_end_time" name="end_date" type="date">
 												<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_internal_address" placeholder="商铺地址" type="text" value="">
-												<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_shop_num" placeholder="商铺号" type="text" value="">
+												<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_shop_num" placeholder="商铺编号" type="text" value="">
 												<!--<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_user_phone" placeholder="客户电话" type="text" value="">-->
                                                 <select name="district_id" class="form-control btn4">
                                                     <option value="">分佣方所在部门</option>

public/resource/js/houseList.js

@@ -730,11 +730,13 @@ 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 = {};
 			// 商铺列表 默认时间显示
 			console.log(type);
+			var  user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));  //读取缓存
+			params.agent_id = user_info_obj.id;
 			params.pageNo = business.pageNo;
 			params.pageSize = business.pageSize;
 			params.is_carefully_chosen = $('#is_carefully_chosen option:selected').val(); //首页显示

public/resource/js/user.js

@@ -856,7 +856,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 			
 			user.pageNo = pageNo;
 			var params = {};
-			params.agents_id=user_info_obj.id;
+			params.agent_id=user_info_obj.id;
 
 			//          并列搜索
 			//           if($("#district_id").val()!=0){

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"}}; %]
+	[% var sw=function(s){switch(Number(s)){case 2:return"btn-info";case 1:return"btn-default"}}; %]
     [% if(it) { %]
     [% for(var item in it){ %]
     <tr class="text-center">
@@ -58,9 +58,12 @@
             <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 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 ) { %]
+
 				  取消收藏
+				    
+				[% }else if(it[item]["is_collect"] == 2 ) { %]
+				  收藏
+                
 				[% } %]
             </a>
             

public/resource/template/performance_subsidiary_template_tpl.html

@@ -7,9 +7,9 @@
         <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]['name'] %]-[%= it[item]['phone'] %]</td>
         <td>[%= it[item]['district_name'] %]-[%= it[item]['store_name'] %]</td>
-        <td>[%= it[item]['scale'] %]</td>
+        <td>[%= it[item]['scale'] %]%</td>
         <td>[%= it[item]['scale_fee'] %]</td>
         <td>[%= it[item]['practical_fee'] %]</td>
         <td>

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"}}; %]
+	    [% var sw=function(s){switch(Number(s)){case 2:return"btn-info";case 1:return"btn-default"}}; %]
 	[% if(it[0]) { %] [% for(var item in it){ %]
 	<tr class="text-center">
 		<td>[%= it[item]['id'] %]</td>
@@ -48,9 +48,9 @@
 			<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) { %]
+            	[% if(it[item]["is_collect"] == 2) { %]
 				    收藏
-				[% }else if(it[item]["is_collect"] == 2 ) { %]
+				[% }else if(it[item]["is_collect"] == 1 ) { %]
 				  取消收藏
 				[% } %]
             </a>