Merge branch 'test'

application/index/view/global/footer_tpl.html

-<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=20190614888222' charset='utf-8'></script>
+<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=2019061488811' charset='utf-8'></script>

public/resource/template/office_building_list_template_tpl.html

@@ -67,8 +67,6 @@
         <td width="10%">[%= it[item]['create_time'] %]</td>
        
         <td>
-        	
-        	[% if(it[item]["is_lock"] == 0 || check_auth('index/lockHouse') || it[item]["auth_edit_exclusive"] == 1 || it[item]["auth_edit_house"] == 1) { %]
                 <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) { %]
@@ -77,7 +75,6 @@
 				  收藏
 				[% } %]
             </a>
-            [% } %]
 
             [% if(it[item]["is_vip"] == 1) { %]
                 [% if (check_auth('index/vipHouse') || it[item]['auth_edit_house']) { %]