商铺列表 vip盘 修改

application/index/view/houses/houseList.html

@@ -293,7 +293,7 @@
 		                                                <option value="0">否</option>
 		                                            </select>
 		                                            <select class="form-control btn2 ld-Marheight" id="is_vip_plate">
-		                                                <option value="">是否VIP盘</option>
+		                                                <option value="-1">是否VIP盘</option>
 		                                                <option value="1">是</option>
 		                                                <option value="0">否</option>
 		                                            </select>
@@ -305,10 +305,10 @@
 		                                            <a href="#modal_modify_user" data-toggle="modal" class="btn btn-info btn3 margin-top-ld"><i class="icon-plus"></i>批量修改盘方</a>
 		                                            <!-- 本人商铺 -->
 		                                            <span class="btn btn-info btn3 ld-Marheight" id="persional_shop" title="点击切换到本人商铺">本人商铺</span>
+		                                            <!-- 生成推广链接 -->
+		                                            <a href="#modal_link" data-toggle="modal" class="btn btn-info btn3 margin-top-ld">生成推广链接</a>
 		                                            <!-- 高级搜索 -->
 		                                            <span class="btn btn-info btn3 ld-Marheight" id="main_select" title="高级搜索">高级搜索</span>
-		                                            <!-- 高级搜索 -->
-		                                            <a href="#modal_link" data-toggle="modal" class="btn btn-info btn3 margin-top-ld">生成推广链接</a>
 		                                        </div>
 	                                            
 	                                        </form>

public/resource/js/houseList.js

@@ -1197,11 +1197,10 @@ if(data.code == 200) {
 			params.internal_title = $('#internal_title').val(); //对内商铺名称
 			params.external_title = $('#internal_title_open').val(); //对外商铺名称
 			params.area = $('#area_id').val(); //面积筛选
-			params.is_lock = $('#is_lock_plate').val(); //面积筛选
-			
+			params.is_lock = $('#is_lock_plate').val(); //锁盘筛选
+			params.vip = $('#is_vip_plate').val(); //VIP盘筛选
 			//添加个人商铺和所有商铺选择功能
 			params.dish_id = business.all_shop ? '' : user_info_obj.id ;
-			
 			if($('#user_city_choose').val() == 310100){
 //			   params.city = '上海市'	;
 			}

public/resource/template/house_template_tpl.html

 <script id="house_list_tpl" type="text/template">
 	[% var sw=function(s){switch(Number(s)){case 2:return"btn-info";case 1:return"btn-default"}}; %]
 	[% var sw2=function(s){switch(Number(s)){case 0:return"btn-info";case 1:return"btn-default"}}; %]
+	[% var sw3=function(s){switch(Number(s)){case 0:return"btn-info";case 1:return"btn-default"}}; %]
 	
     [% if(it&&it.length!=0) { %]
     [% for(var item in it){ %]
@@ -81,10 +82,10 @@
 
             [% 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 ) { %]
+					[%if(it[item]["is_lock"] == 1 ) { %]
 					  已锁盘
+					[% }else{ %]
+					  锁盘
 					[% } %]
 	            </a>
             [% } %]
@@ -97,12 +98,12 @@
             [% if(check_auth('index/houseDel')) { %]
                 <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>
             [% } %]
-            [% if(check_auth('index/lockHouse')) { %]
-	            <a class="btn1 is_vip_plate btn-default-hide-display [%= sw2(it[item]['is_lock']) %]" data-toggle="modal" data-id='[%= it[item]["id"] %]'>
-					[%if(it[item]["is_lock"] == 0) { %]
-					  VIP盘
-					[% }else if(it[item]["is_lock"] == 1 ) { %]
+            [% if(check_auth('index/vipHouse')) { %]
+	            <a class="btn1 is_vip_plate btn-default-hide-display [%= sw3(it[item]['vip']) %]" data-toggle="modal" data-id='[%= it[item]["id"] %]'>
+					[%if(it[item]["vip"] == 1 ) { %]
 					  取消VIP盘
+					[% }else { %]
+					 VIP盘
 					[% } %]
 	            </a>
             [% } %]