Skip to content

T
tl_estate
Commit 1d7b6f06 authored by clone's avatar clone
Browse files
Options

Merge branch '0830-v2.9.0' of https://gitee.com/zwyjjc/tl_estate into 0830-v2.9.0

parents d6b11851 02591cb9
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 22 deletions
application/app/view/index/share_detail.html
View file @ 1d7b6f06
......@@ -87,12 +87,12 @@
配套设施
</p>
<ul class="b4_font2 supporting-facilities">
<li><span class="icon-bg-facilities"><img src="/app/images/icon_200w@2x.png" class="supporting-facilities-img"/></span><span class="">200W</span></li>
<li><span class="icon-bg-facilities"><img src="/app/images/icon380v@2x.png" class="supporting-facilities-img"/></span><span class="">380V</span></li>
<li><span class="icon-bg-facilities"><img src="/app/images/icon_gas@2x.png" class="supporting-facilities-img"/></span><span class="">燃气</span></li>
<li><span class="icon-bg-facilities"><img src="/app/images/icon_piping@2x.png" class="supporting-facilities-img"/></span><span class="">烟管道</span></li>
<li><span class="icon-bg-facilities"><img src="/app/images/icon_upper@2x.png" class="supporting-facilities-img"/></span><span class="">上水</span></li>
<li><span class="icon-bg-facilities"><img src="/app/images/icon_sewer@2x.png" class="supporting-facilities-img"/></span><span class="">下水</span></li>
<li><span class="icon-bg-facilities"><img src="/app/images/icon_200w@2x.png" class="supporting-facilities-img"/></span><span class="electric-quantity-details">200W</span></li>
<li><span class="icon-bg-facilities"><img src="/app/images/icon380v@2x.png" class="supporting-facilities-img"/></span><span class="voltage-details">380V</span></li>
<li class="meiqi-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_gas@2x.png" class="supporting-facilities-img"/></span><span class="meiqi">燃气</span></li>
<li class="exhaust-fume-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_piping@2x.png" class="supporting-facilities-img"/></span><span class="exhaust-fume-details">烟管道</span></li>
<li class="running-water-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_upper@2x.png" class="supporting-facilities-img"/></span><span class="running-water-details">上水</span></li>
<li class="downriver-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_sewer@2x.png" class="supporting-facilities-img"/></span><span class="downriver-details">下水</span></li>
</ul>
</div>
<p class="line_hr"></p>
......@@ -105,22 +105,49 @@
营业时间:
<span class="b4_span1 gw yingye-time">
</span>
<span class="zhaoshang-time-p right">
</p>
<p class="b4_font2 zhaoshang-time-p">
<span class="zhaoshang-time-p">
招商时间:
<span class="b4_span1 gw zhaoshang-time">
</span>
</span>
</p>
<p class="b4_font2">
是否有燃气:
<span class="b4_span1 gw meiqi">
</span>
<span class="kaiye-time-p right">
开业时间:
<span class="b4_span1 gw kaiye-time">
</span>
</span>
</p>
<!--面宽 进深 -->
<!--electric_quantity double 电量
voltage double 电压
exhaust_fume int 烟管道 0 无 1有
running_water int 上水 0无 1有
downriver int 下水 0无 1有
business_scope string 经营范围文字
decoration int 交付装修 0否 1是-->
<p class="b4_font2">
面宽:
<span class="b4_span1 gw area-width-details">122米
</span>
<span class="right">
进深:
<span class="b4_span1 gw depth-details">120米
</span>
</span>
</p>
<p class="b4_font2">
目前证照经营范围：
<span class="b4_span1 gw business-scope-details">餐饮
</span>
</p>
<p class="b4_font2">
交付装修：
<span class="b4_span1 gw decoration-details">简单装修
</span>
</p>
<p class="b4_font2">
对内地址:
<span class="b4_span1 gw duinei">
......
application/index/controller/BusinessDistrict.php
View file @ 1d7b6f06
......@@ -86,7 +86,7 @@ class BusinessDistrict extends Basic
/**
* 获取商圈列表
*
* @return mixed
* @return \think\Response|\think\response\View
*/
public function getBusiness() {
......@@ -94,24 +94,89 @@ class BusinessDistrict extends Basic
$data['status'] = 200;
$data['msg'] = '';
$params = $this->request->param();
$pageNo = empty($params['pageNo']) ? 1 : $params['pageNo'];
$pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
$auth_group = New GBusinessDistrict();
$where = 'is_del = 0';
if ($params['name'] != NULL) {
$where .= ' and name like "' . $params['name'] . '%"';
$where['is_del'] = 0;
if ($this->params['name'] != NULL) {
$where['name'] = ['LIKE', '%'.$this->params['name'].'%'];
}
if (!empty($this->params['province'])) {
$where['province'] = $this->params['province'];
}
if (!empty($this->params['city'])) {
$where['city'] = $this->params['city'];
}
if (!empty($this->params['disc'])) {
$where['disc'] = $this->params['disc'];
}
$fields = 'id,name,province,city,disc,status,create_time';
$data['list'] = $auth_group->getList($pageNo, $pageSize, 'id desc', $fields, $where);
$data['total'] = $auth_group->getTotal($where);
try {
$auth_group = New GBusinessDistrict();
$data['list'] = $auth_group->getList($pageNo, $pageSize, 'id desc', $fields, $where);
$data['total'] = $auth_group->getTotal($where);
} catch (\Exception $e) {
$data['list'] = [];
$data['total'] = 0;
$data['status'] = 101;
$data['msg'] = $e->getMessage();
}
return $this->response(200, '', $data);
} else {
return view('business_district/index');
}
}
/**
* 获取全部商圈列表
*
* @return \think\Response
*/
public function getBusinessAll() {
$code = 200;
$msg = '';
$where['is_del'] = 0;
if ($this->params['name'] != NULL) {
$where['name'] = ['LIKE', '%'.$this->params['name'].'%'];
}
if (!empty($this->params['province'])) {
$where['province'] = $this->params['province'];
}
if (empty($this->params['city'])) {
$where['city'] = '上海市';
} else {
$where['city'] = $this->params['city'];
}
if (!empty($this->params['disc'])) {
$where['disc'] = $this->params['disc'];
}
$fields = 'id,name,province,city,disc,status,create_time';
try {
$auth_group = New GBusinessDistrict();
$data = $auth_group->getList(1, 1000, 'id desc', $fields, $where);
} catch (\Exception $e) {
$code = 101;
$msg = $e->getMessage();
$data = [];
}
return $this->response($code, $msg, $data);
}
/**
* 获取省市区数据
*
......
application/index/controller/Houses.php
View file @ 1d7b6f06
......@@ -395,6 +395,10 @@ class Houses extends Basic
}
}
if (!empty($this->params['business_id'])) {
$where['business_id'] = $this->params['business_id'];
}
$data['data']['list'] = $this->house->getHouseListDish($pageNo, $pageSize, 'id DESC', $fields, $where, $this->userId);
$data['data']['total'] = $this->house->getHouseListDishTotal($where);
......
application/index/extend/Basic.php
View file @ 1d7b6f06
......@@ -53,7 +53,8 @@ class Basic extends Controller
'index/getDistrict',
'index/getAgentDistrictStore',
'index/agentsUnBind',
'index/checkLogin'
'index/checkLogin',
'index/getBusinessAll'
);
/**
......
application/route.php
View file @ 1d7b6f06
......@@ -156,7 +156,8 @@ Route::group('index', [
'delBusinessDistrict' => [ 'index/BusinessDistrict/del', [ 'method' => 'post' ] ], //删除商圈列表
//商铺
'BusinessList' => [ 'index/BusinessDistrict/getBusiness', [ 'method' => 'get' ] ], //获取商铺列表数据
'BusinessList' => [ 'index/BusinessDistrict/getBusiness', [ 'method' => 'get' ] ], //获取商圈
'getBusinessAll' => [ 'index/BusinessDistrict/getBusinessAll', [ 'method' => 'get' ] ], //获取商圈，不带分页
'houseEdit' => [ 'index/Houses/editV2', [ 'method' => 'get|post' ] ], //编辑商铺
'houseAdd' => [ 'index/Houses/editV2', [ 'method' => 'get' ] ], //新增商铺
'houseDel' => [ 'index/Houses/del', [ 'method' => 'post' ] ], //删除商铺
......
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