1

application/index/view/officeBuilding/buildingDictionary.html

@@ -341,7 +341,7 @@
 
 <!-- /#新增编辑楼盘字典模态框 -->
 <div class="modal fade" id="modal_add_loupan" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-	<div class="modal-dialog" style="width: 960px;">
+	<div class="modal-dialog" style="width: 960px; height:600px;overflow:scroll" >
 		<div class="modal-content modal-body-new-user">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
@@ -486,7 +486,7 @@
 				</form>
 			</div>
 			<div class="modal-footer">
-				<button type="button" class="btn btn-default"  id="close">关闭
+				<button type="button" class="btn btn-default"  id="close" data-dismiss="modal">关闭
                 </button>
 				<button type="button" class="btn btn-primary btn-guanbi" id="saveBtn">
                     提交

public/resource/js/buildingDictionary.js

@@ -526,7 +526,7 @@ define(['doT', 'text!temp/building_dictionary_list_template_tpl.html','css!style
 				e.stopPropagation();
 				if(confirm('确认删除吗?')){
 					_this.parent().remove();
-					that.spandelList(_this.prev().attr('data-imgid'));
+					business.spandelList(_this.prev().attr('data-imgid'));
 				};
 			});
 			//新增楼盘
@@ -632,7 +632,7 @@ define(['doT', 'text!temp/building_dictionary_list_template_tpl.html','css!style
 			  params.type = $('#shop_type').val();
 			}
 			if($('.shop_city_choose_site_list').val()){
-			  params.city = $('#shop_city_choose_site_list').val();
+			  params.city = $('.shop_city_choose_site_list').val();
 			}
 			if($('#shop_area_id').val()){
 			  params.disc = $('#shop_area_id').val();
@@ -801,6 +801,24 @@ define(['doT', 'text!temp/building_dictionary_list_template_tpl.html','css!style
                     }
                 }
             });
+        },
+        //删除 编辑的图片
+        spandelList: function(id) {
+            $.ajax({
+                url: '/office_index/delBuildingFile',
+                type: 'POST',
+                async: true,
+                data: {
+                    'AuthToken': user_info_obj.AuthToken,
+                    'id': id
+                },
+                dataType: 'json',
+                success: function(data) {
+                    if(data.code == 200 && data.data != null) {
+                    	
+                    }
+                }
+            });
         },
 		//城市 区域 筛选
 		getDistrictStoreList: function(id, fn) {

public/resource/js/officeBuildingList.js

@@ -581,7 +581,7 @@ define(['doT', 'text!temp/office_building_list_template_tpl.html', 'css!style/ho
 				checkLogin();
 				$.ajax({ //推荐至首页
 					'type': 'POST',
-					'url': '/index/carefullyChosen',
+					'url': '/office_index/carefullyChosen',
 					data: {
 						"houses_id": business.id,
 						"is_carefully_chosen": params.type
@@ -1648,7 +1648,7 @@ if(data.code == 200) {
 		},
 		delBusiness: function() {
 			$.ajax({
-				url: '/index/houseDel',
+				url: '/office_index/houseDel',
 				type: 'POST',
 				async: true,
 				data: {

public/resource/template/building_dictionary_list_template_tpl.html

@@ -6,15 +6,15 @@
         <td>
             [% if(it[item]["type"] == 1) { %]
                 写字楼
-            [% }else if (it[item]["status"] == 2){ %]
+            [% }else if (it[item]["type"] == 2){ %]
                 商住两用
-            [% }else if (it[item]["status"] == 3){ %]
+            [% }else if (it[item]["type"] == 3){ %]
                 园区
-            [% }else if (it[item]["status"] == 4){ %]
+            [% }else if (it[item]["type"] == 4){ %]
                 洋房
-            [% }else if(it[item]["status"] == 5){ %]
+            [% }else if(it[item]["type"] == 5){ %]
                 联合办公   
-            [% }else if(it[item]["status"] == 6){ %]
+            [% }else if(it[item]["type"] == 6){ %]
                 厂房  
             [% } %]
         </td>

public/resource/template/office_building_list_template_tpl.html

@@ -50,10 +50,10 @@
             [% } %]
         </td>
          <td>
-        	[%if(it[item]["residue_num"] == 0) { %]
-				  已租
+        	[%if(it[item]["is_rent"] == 0) { %]
+				  未租
 			[% }else{ %]
-				  求租
+				  已租
 			[% } %]
         </td>
          <td>
@@ -92,8 +92,8 @@
                 <a class="btn1 btn-default btn-default-show-caozuo">>>></a>
             
 
-            [% if(check_auth('index/houseEdit')) { %]
-                <!--<a class="btn1 btn-success is_show btn-default-hide-display" data-toggle="modal" data-id='[%= it[item]["id"] %]'> 
+            <!--[% if(check_auth('index/houseEdit')) { %]-->
+                <a class="btn1 btn-success is_show btn-default-hide-display" data-toggle="modal" data-id='[%= it[item]["id"] %]'> 
                 	[% if(it[item]["is_carefully_chosen"] == 0) { %]
 				         推荐至首页
 					[% }else if(it[item]["is_carefully_chosen"] == 1 ) { %]
@@ -101,8 +101,8 @@
 					[% } %]
                 	
                 	
-                </a>-->
-            [% } %]
+                </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"] %]'>
@@ -119,13 +119,13 @@
                 <!--<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>
 -->            [% } %]
 
-            [% if(check_auth('index/houseDel')) { %]
+            <!--[% if(check_auth('index/houseDel')) { %]-->
             	[% if((it[item]["status"] != 3)){ %]
-            		<!--<a data-toggle="modal" data-id='[%= it[item]["id"] %]' href="#modal-delete" class="btn1 btn-danger add_applies del_modal btn-default-hide-display">无效</a>
+            		<a data-toggle="modal" data-id='[%= it[item]["id"] %]' href="#modal-delete" class="btn1 btn-danger add_applies del_modal btn-default-hide-display">无效</a>
             	[% }else{ %]
             		<a data-toggle="modal" data-id='[%= it[item]["id"] %]'  class="btn1 btn-default add_applies del_modal btn-default-hide-display">已无效</a>
-            	[% } %]-->
-           [% } %]
+            	[% } %]
+           <!--[% } %]-->
             [% if(check_auth('index/vipHouse')) { %]
 	            <!--<a class="btn1 is_vip_plate btn-default-hide-display [%= sw3(it[item]['is_vip']) %]" data-toggle="modal" data-id='[%= it[item]["id"] %]'>
 					[%if(it[item]["is_vip"] == 1 ) { %]