Merge branch 'test'

application/index/view/global/footer_tpl.html

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

public/resource/js/houseList.js

@@ -318,9 +318,9 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 			});
 			//收藏 取消收藏
 			$(document).delegate(".is_show_shoucang", "click", function() { //点击禁用
-				if(!confirm('是否继续？')) {
-					return;
-				}
+//				if(!confirm('是否继续？')) {
+//					return;
+//				}
 				business.house_id = $(this).attr("data-id");
 				var params = {
 

public/resource/js/user.js

@@ -248,9 +248,9 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 			   var  user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));  //读取缓存
 				user.baohu = $(this).attr("data-baohu");
 				user.agentbaohu = $(this).attr("data-agent");
-				if(!confirm('是否继续？')) {
-					return;
-				}
+//				if(!confirm('是否继续？')) {
+//					return;
+//				}
 				if((user_info_obj.id*1 == user.agentbaohu*1) || user.baohu*1){
 						user.id = $(this).attr("data-id");
 						var params = {