Skip to content

T
tl_estate
Commit b7c57e88 authored by xishifeng's avatar xishifeng
Browse files
Options

商铺列表等修改

parent 1a80e4cd
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 96 deletions
application/index/view/houses/edit.html
View file @ b7c57e88
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<div class="form-group"> <div class="form-group">
<label for="shangpuType">商铺类型</label> <label for="shangpuType">商铺类型</label>
<select class="form-control" name="shangpuType" id="shangpuType" data-alert="请选择商铺类型"> <select class="form-control" name="shangpuType" id="shangpuType" data-alert="请选择商铺类型">
<option value="">请选择</option>
<option value="0">商场</option> <option value="0">商场</option>
<option value="1">街铺</option> <option value="1">街铺</option>
</select> </select>
......
application/index/view/houses/houseList.html
View file @ b7c57e88
...@@ -58,94 +58,74 @@ ...@@ -58,94 +58,74 @@
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-bordered table-hover table-condensed"> <table class="table table-striped table-bordered table-hover table-condensed">
<thead> <thead>
<tr> <tr>
<td colspan="9"> <td colspan="9">
<form id="form_search"> <form id="form_search">
<select class="form-control btn2" id="is_carefully_chosen"> <select class="form-control btn2" id="is_carefully_chosen">
<option value="-1"">是否显示在首页</option> <option value="-1"">是否显示在首页</option>
<option value="0">是</option> <option value="0">是</option>
<option value="1">否</option> <option value="1">否</option>
</select> </select>
<select class="form-control btn2" id="is_show"> <select class="form-control btn2" id="is_show">
<option value="-1">C端是否显示</option> <option value="-1">C端是否显示</option>
<option value="0">是</option> <option value="0">是</option>
<option value="1">否</option> <option value="1">否</option>
</select> </select>
<select class="form-control btn2" id="shop_type"> <select class="form-control btn2" id="shop_type">
<option value="-1">商铺类型</option> <option value="-1">商铺类型</option>
<option value="0">商场</option> <option value="0">商场</option>
<option value="1">街铺</option> <option value="1">街铺</option>
</select> </select>
<select class="form-control btn2" id="leased"> <select class="form-control btn2" id="leased">
<option value="-1">商铺状态</option> <option value="-1">商铺状态</option>
<option value="0">已租</option> <option value="0">已租</option>
<option value="1">待租</option> <option value="1">待租</option>
</select> </select>
<select class="form-control btn2" id="rent_price"> <select class="form-control btn2" id="rent_price">
<option value="-1">月租金</option> <option value="-1">月租金</option>
<option value="1">10000以下</option> <option value="1">10000以下</option>
<option value="2" >10000-30000</option> <option value="2" >10000-30000</option>
<option value="3">30000以上</option> <option value="3">30000以上</option>
</select> </select>
<select class="form-control btn2" id="is_exclusive_type"> <select class="form-control btn2" id="is_exclusive_type">
<option value="-1">是否独家</option> <option value="-1">是否独家</option>
<option value="1">是</option> <option value="1">是</option>
<option value="0">否</option> <option value="0">否</option>
</select> </select>
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="internal_title" placeholder="商铺名称" type="text" value=""> <input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="internal_title" placeholder="商铺名称" type="text" value="">
<div class="row"> <div class="row">
</div> </div>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="industry_type" placeholder="业态" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="industry_type" placeholder="业态" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish" placeholder="盘方" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish" placeholder="盘方" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="id" placeholder="店铺编号" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="id" placeholder="店铺编号" type="text" value="">
<span class="fore-span ld-Marheight">上传时间:</span> <span class="fore-span ld-Marheight">上传时间:</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date" type="date"> <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date" type="date">
<span class="fore-span ld-Marheight">-</span> <span class="fore-span ld-Marheight">-</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date" type="date"> <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date" type="date">
<span class="btn btn-default btn3 ld-Marheight" id="search">搜索</span> <span class="btn btn-default btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-default btn3 ld-Marheight" id="reset">重置</span> <span class="btn btn-default btn3 ld-Marheight" id="reset">重置</span>
<!-- 批量修改客方 --> <!-- 批量修改客方 -->
<a href="#modal_modify_user" data-toggle="modal" class="btn btn-info btn3 margin-top-ld"><i class="icon-plus"></i> <a href="#modal_modify_user" data-toggle="modal" class="btn btn-info btn3 margin-top-ld"><i class="icon-plus"></i>
批量修改盘方</a> 批量修改盘方</a>
</form> </form>
</td> </td>
</tr> </tr>
<tr> <tr>
<th class="text-center">编号</th> <th class="text-center">编号</th>
<th class="text-center">类型</th> <th class="text-center">类型</th>
<th class="text-center">名称</th> <th class="text-center">名称</th>
<th class="text-center">月租金</th> <th class="text-center">月租金</th>
<th class="text-center">C端是否显示</th> <th class="text-center">C端是否显示</th>
<th class="text-center">上传时间</th> <th class="text-center">上传时间</th>
<th class="text-center">状态</th> <th class="text-center">状态</th>
<th class="text-center">盘方</th> <!--<th class="text-center">盘方</th>-->
<th class="text-center">操作</th> <th class="text-center">操作</th>
</tr> </tr>
</thead> </thead>
<tbody class="text-center" id="business_list"> <tbody class="text-center" id="business_list"></tbody>
<!--<tr>-->
<!--<td>212</td>-->
<!--<td>商场</td>-->
<!--<td>长兴</td>-->
<!--<td>1000</td>-->
<!--<td>是</td>-->
<!--<td>2018-01-16 17:02:00</td>-->
<!--<td>已租</td>-->
<!--<td>张娜张-->
<!--<a data-toggle="modal" data-id="77" href="#modal-watch" class="btn1 btn-danger add_applies">修改</a>-->
<!--</td>-->
<!--<td>-->
<!--<a class="btn1 btn-success " href="#modal-process" data-toggle="modal" data-id="77" onclick="alertFollow(this)">编辑</a>-->
<!--<a class="btn1 btn-success " href="#modal-process" data-toggle="modal" data-id="77" onclick="alertFollow(this)">推荐至首页</a>-->
<!--<a class="btn1 btn-success " href="#modal-process" data-toggle="modal" data-id="77" onclick="alertFollow(this)">设置案场权限人</a>-->
<!--<a class="btn1 btn-success " href="#modal-process" data-toggle="modal" data-id="77" onclick="alertFollow(this)">是否独家</a>-->
<!--<a class="btn1 btn-success " href="#modal-process" data-toggle="modal" data-id="77" onclick="alertFollow(this)">操作记录</a>-->
<!--<a data-toggle="modal" data-id="77" href="#modal-watch" class="btn1 btn-danger add_applies" onclick="delete_house(4720)">删除</a>-->
<!--</td>-->
<!--</tr>-->
</table> </table>
</div> </div>
...@@ -341,4 +321,47 @@ ...@@ -341,4 +321,47 @@
</div> </div>
</div><!-- /.modal-content --> </div><!-- /.modal-content -->
</div><!-- /.modal --> </div><!-- /.modal -->
</div>
<!-- #查看-->
<div class="modal fade" id="modal_detail" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-one">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times;
</button>
<h4 class="modal-title" >
商铺详情
</h4>
</div>
<div class="modal-body modal-body-one">
</div>
</div>
</div>
</div>
<!-- #跟进-->
<div class="modal fade" id="modal_followup" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-one">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times;
</button>
<h4 class="modal-title" >
跟进
</h4>
</div>
<div class="modal-body modal-body-one">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
<button type="button" class="btn btn-primary" id="modify_add" data-dismiss="modal">
提交
</button>
</div>
</div>
</div>
</div> </div>
\ No newline at end of file
public/resource/js/houseList.js
View file @ b7c57e88
...@@ -447,7 +447,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin ...@@ -447,7 +447,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
if(data.data) { if(data.data) {
$("#modal-anch").hide; $("#modal-anch").hide;
} }
business.getList(1);
} else { } else {
$("#modal-anch").hide; $("#modal-anch").hide;
} }
...@@ -592,7 +591,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin ...@@ -592,7 +591,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
dataType: 'json', dataType: 'json',
success: function(data) { success: function(data) {
if(data.code == 200) { if(data.code == 200) {
business.getList(1);
console.log(666); console.log(666);
} }
} }
...@@ -654,7 +652,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin ...@@ -654,7 +652,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
dataType: 'json', dataType: 'json',
success: function(data) { success: function(data) {
if(data.code == 200) { if(data.code == 200) {
business.getList(1);
$("#modal-delete").modal('hide'); $("#modal-delete").modal('hide');
} else { } else {
$("#del_msg").html('<span style="color: red">删除失败!</span>'); $("#del_msg").html('<span style="color: red">删除失败!</span>');
......
public/resource/js/shop_edit.js
View file @ b7c57e88
...@@ -280,8 +280,8 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function ...@@ -280,8 +280,8 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
_discExternalObj.val(_data['disc']); //对外区 _discExternalObj.val(_data['disc']); //对外区
_addressInternalObj.val(_data['internal_address']); //对内详细地址 _addressInternalObj.val(_data['internal_address']); //对内详细地址
_longitudeObj.val(_data['longitude']), //经度 _longitudeObj.val(_data['longitude']), //经度
_latitudeObj.val(_data['latitude']), //纬度 _latitudeObj.val(_data['latitude']), //纬度
_trafficObj.val(_data['traffic']); //交通 _trafficObj.val(_data['traffic']); //交通
_hasMovedObj.val(_data['enter_num']); //已入住 _hasMovedObj.val(_data['enter_num']); //已入住
_yingyeTimeObj.val(_data['do_business_date']); //营业时间 _yingyeTimeObj.val(_data['do_business_date']); //营业时间
_data['opening_date'] && _kaipanTimeObj.val(_data['opening_date'].split(' ')[0]); //开盘时间 _data['opening_date'] && _kaipanTimeObj.val(_data['opening_date'].split(' ')[0]); //开盘时间
...@@ -853,6 +853,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function ...@@ -853,6 +853,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
var _isBreakFlag = false; var _isBreakFlag = false;
//是否给商户公开，是否独家验证是否选择 //是否给商户公开，是否独家验证是否选择
$.each([ $.each([
_shangpuTypeObj, //商铺类型是否选择
_showCdObj, //显示给C端用户看 _showCdObj, //显示给C端用户看
_exclusiveTypeObj, //是否独家 _exclusiveTypeObj, //是否独家
], function(i, item) { ], function(i, item) {
......
public/resource/template/house_template_tpl.html
View file @ b7c57e88
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
待租 待租
[% } %] [% } %]
</td> </td>
<td> <!--<td>
[% if(it[item]["dish_name"] != "") { %] [% if(it[item]["dish_name"] != "") { %]
[%= it[item]['dish_name'] %] [%= it[item]['dish_name'] %]
[% } %] [% } %]
...@@ -50,8 +50,16 @@ ...@@ -50,8 +50,16 @@
[% if(check_auth('index/addHousesAgentsDish')) { %] [% if(check_auth('index/addHousesAgentsDish')) { %]
<a data-toggle="modal" data-id='[%= it[item]["id"] %]' href="#modal-anch" class="btn1 btn-danger add_applies">修改</a> <a data-toggle="modal" data-id='[%= it[item]["id"] %]' href="#modal-anch" class="btn1 btn-danger add_applies">修改</a>
[% } %] [% } %]
</td> </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')) { %] [% 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> <a class="btn1 btn-success " href="/admin.php/index/houseEdit?id=[%= it[item]['id']%]" data-toggle="modal" >编辑</a>
[% } %] [% } %]
...@@ -60,9 +68,9 @@ ...@@ -60,9 +68,9 @@
<a class="btn1 btn-success is_show" data-toggle="modal" data-id='[%= it[item]["id"] %]'>推荐至首页</a> <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> <a class="btn1 btn-success anch" data-target="#modal-anch" data-toggle="modal" data-id='[%= it[item]["id"] %]'>设置案场权限人</a>
[% } %] [% } %]-->
[% if(check_auth('index/editExclusive')) { %] [% if(check_auth('index/editExclusive')) { %]
<a class="btn1 btn-success dujia" href="#modal-dujia" data-toggle="modal" data-id='[%= it[item]["id"] %]' >是否独家</a> <a class="btn1 btn-success dujia" href="#modal-dujia" data-toggle="modal" data-id='[%= it[item]["id"] %]' >是否独家</a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment