商铺列表等修改

application/index/view/houses/edit.html

@@ -15,6 +15,7 @@
 									<div class="form-group">
 										<label for="shangpuType">商铺类型</label>
 										<select class="form-control" name="shangpuType" id="shangpuType" data-alert="请选择商铺类型">
+											<option value="">请选择</option>
 											<option value="0">商场</option>
 											<option value="1">街铺</option>
 										</select>

public/resource/js/houseList.js

@@ -447,7 +447,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 						if(data.data) {
 							$("#modal-anch").hide;
 						}
-						business.getList(1);
 					} else {
 						$("#modal-anch").hide;
 					}
@@ -592,7 +591,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 				dataType: 'json',
 				success: function(data) {
 					if(data.code == 200) {
-				        business.getList(1);
 						console.log(666);
 					}
 				}
@@ -654,7 +652,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 				dataType: 'json',
 				success: function(data) {
 					if(data.code == 200) {
-						business.getList(1);
 						$("#modal-delete").modal('hide');
 					} else {
 						$("#del_msg").html('<span style="color: red">删除失败!</span>');

public/resource/js/shop_edit.js

@@ -280,8 +280,8 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 									_discExternalObj.val(_data['disc']); //对外区
 									_addressInternalObj.val(_data['internal_address']); //对内详细地址
 									_longitudeObj.val(_data['longitude']), //经度
-										_latitudeObj.val(_data['latitude']), //纬度
-										_trafficObj.val(_data['traffic']); //交通
+									_latitudeObj.val(_data['latitude']), //纬度
+									_trafficObj.val(_data['traffic']); //交通
 									_hasMovedObj.val(_data['enter_num']); //已入住
 									_yingyeTimeObj.val(_data['do_business_date']); //营业时间
 									_data['opening_date'] && _kaipanTimeObj.val(_data['opening_date'].split(' ')[0]); //开盘时间
@@ -853,6 +853,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 				var _isBreakFlag = false;
 				//是否给商户公开，是否独家验证是否选择
 				$.each([
+					_shangpuTypeObj, //商铺类型是否选择
 					_showCdObj, //显示给C端用户看
 					_exclusiveTypeObj, //是否独家
 				], function(i, item) {

public/resource/template/house_template_tpl.html

@@ -42,7 +42,7 @@
             待租
             [% } %]
         </td>
-        <td>
+        <!--<td>
             [% if(it[item]["dish_name"] != "") { %]
                 [%= it[item]['dish_name'] %]
             [% } %]
@@ -50,8 +50,16 @@
             [% if(check_auth('index/addHousesAgentsDish')) { %]
                 <a data-toggle="modal" data-id='[%= it[item]["id"] %]' href="#modal-anch" class="btn1 btn-danger add_applies">修改</a>
             [% } %]
-        </td>
+        </td>-->
         <td>
+            [% if(it[item]['auth_edit_house'] || check_auth('index/houseEdit')) { %]
+                <a class="btn1 btn-success " href="#modal_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="#modal_followup" 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>
             [% } %]
@@ -60,9 +68,9 @@
                 <a class="btn1 btn-success is_show" data-toggle="modal" data-id='[%= it[item]["id"] %]'>推荐至首页</a>
             [% } %]
 
-            [% if(check_auth('index/addHousesAgents')) { %]
+            <!--[% 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/editExclusive')) { %]
                 <a class="btn1 btn-success dujia" href="#modal-dujia" data-toggle="modal" data-id='[%= it[item]["id"] %]' >是否独家</a>