bug 修改

application/app_broker/view/index/shop_detail_pc.html

@@ -144,7 +144,7 @@
 									</div>
 								</td>
 							</tr>
-							<tr>
+							<tr v-if="d.is_show_landlord == 1">
 								<td colspan="4">房东备注：{{d.landlord_remark}}</td>
 							</tr>
 							<tr>

public/resource/js/getCollection.js

@@ -389,9 +389,10 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
 			var district_id = $("select[name='district_id'] option:selected").val();
 			var pay_type = $("select[name='maintable_shop_type_2'] option:selected").val();
 			var type = $("select[name='maintable_shop_type_1'] option:selected").val();
+			var agent_name = $("#submit_name").val();
 			
 			window.open('/index/getCollection?' +
-				'excel=' + excel_two + '&user_name=' + user_name + '&start_time=' + start_time + '&end_time=' + end_time + '&internal_address=' + internal_address + '&user_phone=' + user_phone + '&id=' + id + '&store_name=' + store_name + '&report_phone=' + report_phone + '&report_name=' + report_name+ '&store_id=' + store_id+ '&district_id=' + district_id+ '&pay_type=' + pay_type+ '&type=' + type+ '&income_start_time=' + income_start_time+ '&income_end_time=' + income_end_time);
+				'excel=' + excel_two + '&user_name=' + user_name + '&start_time=' + start_time + '&end_time=' + end_time + '&internal_address=' + internal_address + '&user_phone=' + user_phone + '&id=' + id + '&store_name=' + store_name + '&report_phone=' + report_phone + '&report_name=' + report_name+ '&store_id=' + store_id+ '&district_id=' + district_id+ '&pay_type=' + pay_type+ '&type=' + type+ '&income_start_time=' + income_start_time+ '&income_end_time=' + income_end_time+ '&agent_name=' + agent_name);
 		},
 		
 		

public/resource/js/houseList.js

@@ -149,7 +149,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 				}
 				var _shopLink='https://www.tonglianjituan.com/shop_link.html?type=1&city=1' + '&' + 'p_district_id' + '=' + p_district_id + '&' + 'p_store_id' + '=' + p_store_id + '&' + 'p_agent_id' + '=' + p_agent_id;
 				if(p_district_id || p_store_id || p_agent_id){
-					console.log(p_store_id);
 				    $('#link_content').html(_shopLink);
 				}else{
 					$('#link_content').html('进行部门 门店 个人筛选 才会有 推广链接产生');
@@ -488,7 +487,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 				if(valueCurrent != '') {
 					business.resetLoad(1);
 					business.loadMain(valueCurrent, _this.next());
-					console.log(_this.next());
 				} else {
 					business.ldHtml.html('');
 					return false;
@@ -648,7 +646,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 				_this.removeClass('btn-success').addClass('btn-warning');
 				var _id = _this.attr('data-id');
 				business.id=_id;
-				console.log(_id);
 				$('.detail-modal-header-tab>a:nth-of-type(1)').removeClass('btn-default').addClass('btn-info').siblings().removeClass('btn-info').addClass('btn-default');
 				business.detailTabIndex = 0;
 				$('.detail-modal-body-sec:nth-of-type(1)').show().siblings().hide();
@@ -761,7 +758,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 							});
 							$("#liudan_pic_pre").html(img_url);
 					        $('.J_preview').preview();//放大图片
-					        console.log("dujia:"+ $('#sel_dujia').val())
 					        if(check_auth('index/editExclusive')) {
                 				$('.is_dujia').find('input').removeAttr("readonly");
                 				$('.is_dujia_select').find('select').removeAttr("disabled");
@@ -784,7 +780,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 							var file_paths = _data['exclusive_file']; 
                             if(file_paths){
                             	for ( var i = 0 ; i < file_paths.length ; i++ ){
-								console.log(file_paths[i]['file_name'])
 								var _tempArr = file_paths[i]['file_name'].split('/');
 								file_paths[i]['file_name'] && $('#fujian_ul').append('<li class="pdf-pre-li" id='+file_paths[i]['id'] +'><a class="pdf-pre-a" download="{1}" href="{0}" title="点击可下载">{1}</a><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
 									'0': file_paths[i]['file_name'],
@@ -834,7 +829,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 			}
 			var exclusive_file_str= _data.join(',');
 			
-			console.log($("#sel_dujia").val());
 			if($("#sel_dujia").val() == null) {
 				alert("请选择是否独家");
 				return;
@@ -1178,10 +1172,6 @@ if(data.code == 200) {
 		modify_add: function() { //modify_add批量修改客方
 			var old_agents_text = $('.old_agents').val();
 			var new_agents_text = $('.new_agents').val();
-
-			console.log($('.phone_jia1:eq(0)').attr('data-id'));
-			console.log($('.phone_jia1:eq(1)').attr('data-id'));
-
 			if(old_agents_text == '') {
 				alert('请输入经纪人内容为空');
 				return false;
@@ -1203,7 +1193,6 @@ if(data.code == 200) {
 				dataType: 'json',
 				success: function(data) {
 					if(data.code == 200) {
-						console.log(666);
 					}
 				}
 			});
@@ -1213,7 +1202,6 @@ if(data.code == 200) {
 			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;

public/resource/js/shop_edit.js

@@ -424,6 +424,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 							success: function(data) {
 								if(typeof data === 'object') {
 									if(data.code == 200) {
+									$('#business_rong').html('');//置空 商圈列表 重新渲染
 									var tag = "" ;
 										$.each(data.data,function(i,target){
 											tag += '<option value="'+target.id+'">'+target.name+'</option>'