商铺管理

application/index/view/houses/houseList.html

@@ -366,9 +366,7 @@
                 </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">
@@ -390,6 +388,10 @@
 	            	<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
                     <button type="button" class="btn btn-primary" id="modal_followup_submit_btn">提交</button>
             	</div>
+            	<div class="detail-modal-body-sec">
+            		<iframe class="iframe-shop-detail"></iframe>
+            	</div>
+            	
             </div>
         </div>
     </div>

public/resource/js/houseList.js

@@ -122,9 +122,9 @@ 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  == 0){
+				if(business.detailTabIndex  == 1){
 				    $('.iframe-shop-detail').attr('src', '/app_broker/shop_detail_pc?shop_id='+business.id);
-				}else if(business.detailTabIndex  == 1){
+				}else if(business.detailTabIndex  == 0){
 					$('.followup-modal-comment-area>textarea').val('');//清空跟进框内容
 				      business.getFollowupList();
 				}
@@ -315,7 +315,9 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 				$('.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();
-				$('.iframe-shop-detail').attr('src', '/app_broker/shop_detail_pc?shop_id='+_id);
+				$('.followup-modal-comment-area>textarea').val('');//清空跟进框内容
+				business.getFollowupList();
+//				$('.iframe-shop-detail').attr('src', '/app_broker/shop_detail_pc?shop_id='+_id);
 			});
 
 		},

public/resource/template/house_template_tpl.html

@@ -46,7 +46,8 @@
             [% } %]
         </td>-->
         <td>
-            <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>
+            
             [% 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>
             [% } %]