后台优化

application/app_broker/view/index/shop_detail_pc.html

@@ -72,7 +72,7 @@
 							</tr>
 							<tr>
 								<td colspan="2">目前证照经营范围:{{d.business_scope}}</td>
-								<td colspan="2">交付装修：{{d.decoration?'是':'否'}}</td>
+								<td colspan="2">交付装修：{{switchDecoration(d.decoration)}}</td>
 							</tr>
 							<tr class="tr-seat">
 								<td colspan="4"></td>

application/index/view/houses/houseList.html

@@ -457,13 +457,15 @@
                     ×
                 </button>
                 <h4 class="modal-title detail-modal-header-tab" >
-                   <a href="javascript:;" class="btn btn-default">商铺跟进</a>
                    <a href="javascript:;" class="btn btn-info">查看商铺</a>
+                   <a href="javascript:;" class="btn btn-default">商铺跟进</a>
                    <a href="javascript:;" class="btn btn-info">操作记录</a>
                 </h4>
             </div>
             <div class="modal-body modal-body-one">
-            	
+            	<div class="detail-modal-body-sec">
+            		<iframe class="iframe-shop-detail"></iframe>
+            	</div>
             	<div class="detail-modal-body-sec">
             		<div class="followup-modal-list-area">
 	            		<table class="table table-striped table-bordered table-hover table-condensed">
@@ -488,9 +490,7 @@
 	            	</div>
 	            	
             	</div>
-            	<div class="detail-modal-body-sec">
-            		<iframe class="iframe-shop-detail"></iframe>
-            	</div>
+            	
             	<!--操作记录-->
             	<div class="detail-modal-body-sec iframe-shop-detail-scroll">
             		<table class="table table-striped table-bordered table-hover table-condensed">

application/index/view/notice/add_notice_view.html

@@ -284,7 +284,7 @@
 													<div class="col-sm-9">
 														<div class="file-upload-area">
 															<div class="btn-area">
-																<input type="file" id="file_input" class="" data-limittop="1" />
+																<input type="file" id="file_input" class="" data-limittop="5" />
 																<button class="btn btn-default">选择附件</button>
 															</div>
 															<ul class="img-pre-ul" id="fujian_ul"></ul>

public/app/js/detaila_tl.js

@@ -114,16 +114,23 @@
 					};
 					if(response.data.exhaust_fume == 0){
 						$('.exhaust-fume-details-li').hide();
-					}
+					};
 					//面宽 进深
-					var has_decoration = response.data.decoration == 0 ? '否' : '是';
+
+					function switchDecoration(t){
+		            	switch(Number(t)){
+			            	case 1:return"毛坯";
+			            	case 2:return"现状";
+			            	case 3:return"简单装修";
+			            	case 4:return"精装修";
+			            	};
+		           };
+					var has_decoration = switchDecoration(response.data.decoration);
 					$('.area-width-details').html(response.data.area_width+'米');
 					$('.depth-details').html(response.data.depth+'米');
 					$('.business-scope-details').html(response.data.business_scope);
 					$('.decoration-details').html(has_decoration);
 					
-					
-
 					var lp_img = response.data.images; //轮播图
 					var lp_img1 = response.data.plan_images; //楼层平面图
 					var img_item_ul = "";

public/app/js/shop_detail_pc.js

@@ -209,6 +209,14 @@ require(['vue', 'css!style/shop_detail_pc.css', 'jquery0325', 'common'], functio
 	            	
 	            	};
             },
+            switchDecoration(t){
+            	switch(Number(t)){
+	            	case 1:return"毛坯";
+	            	case 2:return"现状";
+	            	case 3:return"简单装修";
+	            	case 4:return"精装修";
+	            	};
+            },
             showModal1(t) {
 				let _this = this;
 				_this.activeLandlord = t;

public/resource/js/houseList.js

@@ -321,10 +321,10 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 				_this.removeClass('btn-default').addClass('btn-info').siblings().removeClass('btn-info').addClass('btn-default');
 				business.detailTabIndex = _this.index();
 				$('.detail-modal-body-sec:nth-of-type('+(business.detailTabIndex+1)+')').show().siblings().hide();
-				if(business.detailTabIndex  == 1){
+				if(business.detailTabIndex  == 0){
 				    checkLogin();
 				    $('.iframe-shop-detail').attr('src', '/app_broker/shop_detail_pc?shop_id='+business.id);
-				}else if(business.detailTabIndex  == 0){
+				}else if(business.detailTabIndex  == 1){
 				    checkLogin();
 					$('.followup-modal-comment-area>textarea').val('');//清空跟进框内容
 				      business.getFollowupList();
@@ -544,8 +544,8 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 				$('.followup-modal-comment-area>textarea').val('');//清空跟进框内容
 				business.house_id = $(this).attr("data-id");
 				checkLogin();
-				business.getFollowupList();
-//				$('.iframe-shop-detail').attr('src', '/app_broker/shop_detail_pc?shop_id='+_id);
+//				business.getFollowupList();
+				$('.iframe-shop-detail').attr('src', '/app_broker/shop_detail_pc?shop_id='+_id);
 			});
 			//是否独家 下载附件 附件上传处理事件
 			$("#file_input").change(function() {

public/resource/template/house_template_tpl.html

@@ -57,10 +57,10 @@
             [% } %]
         </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 [%= (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) { %]
 				  取消收藏
@@ -72,9 +72,6 @@
             [% if(it[item]['auth_edit_house'] || check_auth('index/houseEdit')) { %]
                 <a class="btn1 btn-success" href="/admin.php/index/houseEdit?id=[%= it[item]['id']%]" data-toggle="modal" >编辑</a>
             [% } %]
-            <!--[% if(check_auth('broker/addShopFollowUp')) { %]
-                <a class="btn1 btn-success " href="#modal_followup" data-id='[%= it[item]["id"] %]' data-toggle="modal" >跟进</a>
-            [% } %]-->
             
                 <a class="btn1 btn-default btn-default-show-caozuo">>>></a>
             
@@ -95,14 +92,16 @@
             <!--[% if(check_auth('index/addHousesAgents')) { %]
                 <a class="btn1 btn-success anch" data-target="#modal-anch" data-toggle="modal" data-id='[%= it[item]["id"] %]'>设置案场权限人</a>
             [% } %]-->
+            [% if(check_auth('/index/lockHouse')) { %]
+	            <a class="btn1 is_show_lock_plate btn-default-hide-display [%= sw2(it[item]['is_lock']) %]" data-toggle="modal" data-id='[%= it[item]["id"] %]'>
+					[%if(it[item]["is_lock"] == 0) { %]
+					  锁盘
+					[% }else if(it[item]["is_lock"] == 1 ) { %]
+					  已锁盘
+					[% } %]
+	            </a>
+            [% } %]
             
-            <a class="btn1 is_show_lock_plate btn-default-hide-display [%= sw2(it[item]['is_lock']) %]" data-toggle="modal" data-id='[%= it[item]["id"] %]'>
-				[%if(it["item"]["is_lock"] == 0) { %]
-				  锁盘
-				[% }else if(it["item"]["is_lock"] == 1 ) { %]
-				  已锁盘
-				[% } %]
-            </a>
             
             [% if(check_auth("index/editExclusive") || it[item]["is_exclusive_type"] == 0 || it[item]["auth_edit_exclusive"] == 1) { %]
                 <a class="btn1 btn-success dujia btn-default-hide-display" href="#modal-dujia" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-exclusive='[%= it[item]["auth_edit_exclusive"] %]'>是否独家</a>

public/resource/template/user_template_tpl.html

@@ -50,6 +50,7 @@
 		<td width="16%">
 			[% if((check_auth('auth_vip') &&  it[item]['vip']*1) || (it[item]['agent_id']*1 == 0) || (it[item]['agent_id']*1 == it[item]['current_agent_id']*1) || (check_auth('index/useraction_search') && it[item]['vip']*1 == 0)) { %]
 			<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"] %]' data-baohu='[%= it[item]["is_outstrip_twenty_four_hours"] %]' data-agent='[%= it[item]["agent_id"] %]'>详情/跟进</a>&nbsp;
+			
 			<a class="btn1 is_show [%= sw(it[item]['is_collect']) %]"  data-id='[%= it[item]["id"] %]' data-cid='[%= it[item]["is_collect"] %]' data-baohu='[%= it[item]["is_outstrip_twenty_four_hours"] %]' data-agent='[%= it[item]["agent_id"] %]'>
             	[% if(it[item]["is_collect"] == 2) { %]
 				    收藏
@@ -57,13 +58,18 @@
 				  取消收藏
 				[% } %]
             </a>&nbsp;
+            
 			[% if(it[item]['agent_id'] == it[item]['current_agent_id'] || check_auth('index/pcEditClient')) { %]
 				<a class="btn1 btn-success caozuo cao-zuo-record" href="#modal-record-edit" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>客户编辑</a>
 			[% } %]
 			
-			   <a class="btn1 is_invalid [%= sw3(it[item]['user_status']) %]" href="" data-id='[%= it[item]["id"] %]' data-status='[%= it[item]["user_status"] %]'>无效</a>
+			[% } %]
 			
+			[% if(check_auth('/index/updateUserStatus')) { %]
+			    <a class="btn1 is_invalid [%= sw3(it[item]['user_status']) %]" href="" data-id='[%= it[item]["id"] %]' data-status='[%= it[item]["user_status"] %]'>无效</a>
 			[% } %]
+			
+			
 		</td>
 	</tr>
 	[% } %] [% }else{ %]