修改

public/resource/css/public.css

@@ -11,33 +11,11 @@ body {
     padding-right:0px!important;
 }
 /*适配 不同屏幕*/
-@media (min-width:1920px){
+@media (min-width:1680px){
   body{
     width:1560px !important;
   };
 };
-@media (min-width:1680px){
-  body{
-    width:1460px !important;
-  }
-};
-@media (min-width:1600px){
-  body{
-    width:1460px !important;
-  }
-};
-@media (min-width:1440px){
-  body{
-    width:1200px !important;
-  }
-};
-@media (min-width:1280px){
-  body{
-    width:1160px !important;
-  }
-};
-
-
 html { overflow-y: scroll; }
 a:hover{
     text-decoration:none;

public/resource/template/user_template_tpl.html

@@ -49,21 +49,19 @@
 		<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') && it[item]['vip'] == 0 && it[item]["is_outstrip_twenty_four_hours"]*1)) { %]
 			<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;
-			
-            
-			
-			[% 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 is_show [%= sw(it[item]['is_collect']) %]"  data-id='[%= it[item]["id"] %]' data-cid='[%= it[item]["is_collect"] %]'>
+			<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"] == 2) { %]
 				    收藏
 				[% }else if(it[item]["is_collect"] == 1 ) { %]
 				  取消收藏
 				[% } %]
             </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;
+			[% } %]
+			
+			[% } %]
+  
 		</td>
 	</tr>
 	[% } %] [% }else{ %]