Skip to content

T
tl_estate
Commit 740323cd authored by clone's avatar clone
Browse files
Options

Merge branch 'test'

parents c9935a73 fc7b4548
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 6 deletions
application/api_broker/controller/Shop.php
View file @ 740323cd
...@@ -164,7 +164,7 @@ class Shop extends Basic ...@@ -164,7 +164,7 @@ class Shop extends Basic
} }
//如果有传经纪人id则代表我的商铺不区分状态 //如果有传经纪人id则代表我的商铺不区分状态
if (isset($params['agent_id'])) { if (isset($params['agent_id'])) {
unset($conditions['status']); $conditions['status'] = array( 'in', "1,2" ); //只显示上架或下架的
} }
$result = $this->gHousesModel->getHousesList($pageNo, $pageSize, $order_, $field, $conditions, $spTagArr); $result = $this->gHousesModel->getHousesList($pageNo, $pageSize, $order_, $field, $conditions, $spTagArr);
//获取图片信息 //获取图片信息
...@@ -233,6 +233,7 @@ class Shop extends Basic ...@@ -233,6 +233,7 @@ class Shop extends Basic
} }
$conditions['a.id'] = array( "eq", $params["id"] ); $conditions['a.id'] = array( "eq", $params["id"] );
$conditions['a.status'] = array( "neq", 3 );
$result = $this->gHousesModel->getHouseDetailById($field, $conditions); $result = $this->gHousesModel->getHouseDetailById($field, $conditions);
...@@ -315,7 +316,7 @@ class Shop extends Basic ...@@ -315,7 +316,7 @@ class Shop extends Basic
$house_id = $this->gHousesModel->app_add($this->params, $this->agentId); //添加或编辑商铺 $house_id = $this->gHousesModel->app_add($this->params, $this->agentId); //添加或编辑商铺
if ($house_id) { if ($house_id) {
$result['data']['house_id'] = $house_id['house_id']; $result['data']['house_id'] = $house_id['house_id'];
$result['data']['internal_title'] = $this->params['internal_title']; $result['data']['internal_title'] = empty($this->params['internal_title']) ? "" : $this->params['internal_title'];
} else { } else {
$data['code'] = 101; $data['code'] = 101;
$data['msg'] = 'Add houses failure'; $data['msg'] = 'Add houses failure';
......
application/app_broker/controller/Index.php
View file @ 740323cd
...@@ -100,6 +100,11 @@ class Index ...@@ -100,6 +100,11 @@ class Index
return view('index/customerinfo_customer_add'); return view('index/customerinfo_customer_add');
} }
public function imagebody()
{
return view('index/imagebody');
}
public function xiazai() public function xiazai()
{ {
return view('index/xiazai'); return view('index/xiazai');
......
application/app_broker/view/index/imagebody.html 0 → 100644
View file @ 740323cd
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>福居好房</title>
<meta http-equiv="X-UA-Compatible" content="IE=10" />
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" />
<meta name="Keywords" content="" />
<meta name="Description" content="" />
<link rel="stylesheet" href="/app/css/common.css">
<link rel="stylesheet" href="/app/css/swiper.min.css">
<style type="text/css">
body{
background-color: #222;
}
#pic_box{
width: 100%;
}
img{
display: block;
width: 100%;
height: 100%;
object-fit: contain;
}
.imagebody-back{
position: fixed;
top: 0;
bottom: 0;
left: 0;
display: block;
width: .88rem;
height: .88rem;
background: url('/app/images/left_icon_white@2x.png') no-repeat 0.3rem center!important;
background-size: .12rem .22rem;
z-index: 999999999;
}
</style>
</head>
<body>
<a class="imagebody-back" href="javascript:(history.length>1?history.go(-1):window.location='/');"></a>
<div class="swiper-container" id="pic_box">
<div class="swiper-wrapper">
<div class="swiper-slide">
<div class="swiper-zoom-container">
<img src="" id="imgname">
</div>
</div>
</div>
</div>
<script type="text/javascript" src="/app/js/jquery-1122-min.js"></script>
<script src="/app/js/common.js"></script>
<script src="/app/js/libs/swiper3.4.2.min.js"></script>
<script src="/app/js/imagebody.js"></script>
</body>
</html>
application/model/GHouses.php
View file @ 740323cd
...@@ -809,10 +809,10 @@ class GHouses extends BaseModel ...@@ -809,10 +809,10 @@ class GHouses extends BaseModel
$params['case_id'] = $case_id; $params['case_id'] = $case_id;
} }
if (isset($params['province']) || isset($params['city']) || isset($params['disc'])) { if (!empty($params['province']) || !empty($params['city']) || !empty($params['disc'])) {
$regions = new Regions(); $regions = new Regions();
$code_arr = $regions->getRegionsCodeByName($params['province'], $params['city'], $params['disc']); $code_arr = $regions->getRegionsCodeByName($params['province'], $params['city'], $params['disc']);
$params['code'] = implode('##', $code_arr); $params['code'] = is_array($code_arr) ? implode('##', $code_arr) : '';
} }
if (!empty($params['rent_price'])) { if (!empty($params['rent_price'])) {
...@@ -836,7 +836,7 @@ class GHouses extends BaseModel ...@@ -836,7 +836,7 @@ class GHouses extends BaseModel
} else { } else {
$internal_title = $this->where('id',$params['id'])->where('status','<>',3)->value('internal_title'); $internal_title = $this->where('id',$params['id'])->where('status','<>',3)->value('internal_title');
if (!empty($internal_title)) { if (!empty($internal_title)) {
$params['operation_id'] = $params['userId']; $params['operation_id'] = empty($params['user_id']) ? 0 : $params['user_id'];
$params['status'] = 1; $params['status'] = 1;
$this->allowField(true)->isUpdate(true)->save($params, [ 'id' => $params['id'] ]); $this->allowField(true)->isUpdate(true)->save($params, [ 'id' => $params['id'] ]);
$house_id = $this->id; $house_id = $this->id;
......
application/model/Regions.php
View file @ 740323cd
...@@ -46,6 +46,7 @@ class Regions extends Model ...@@ -46,6 +46,7 @@ class Regions extends Model
* @return mixed * @return mixed
*/ */
public function getRegionsCodeByName($province, $city = '', $disc = '') { public function getRegionsCodeByName($province, $city = '', $disc = '') {
$result = [];
if ($province) { if ($province) {
$result['province_code'] = $this->where('parentCode',100000) $result['province_code'] = $this->where('parentCode',100000)
->where('fullName','LIKE',$province.'%')->value('code'); ->where('fullName','LIKE',$province.'%')->value('code');
......
application/route.php
View file @ 740323cd
...@@ -47,6 +47,7 @@ Route::group('app_broker',[ ...@@ -47,6 +47,7 @@ Route::group('app_broker',[
'timeline_pc' => [ 'app_broker/index/timeline_pc', [ 'method' => 'get' ] ], 'timeline_pc' => [ 'app_broker/index/timeline_pc', [ 'method' => 'get' ] ],
'customerinfo_customer_add' => [ 'app_broker/index/customerinfo_customer_add', [ 'method' => 'get' ] ], 'customerinfo_customer_add' => [ 'app_broker/index/customerinfo_customer_add', [ 'method' => 'get' ] ],
'customerinfo_details_new' => [ 'app_broker/index/customerinfo_details_new', [ 'method' => 'get' ] ], 'customerinfo_details_new' => [ 'app_broker/index/customerinfo_details_new', [ 'method' => 'get' ] ],
'imagebody' => [ 'app_broker/index/imagebody', [ 'method' => 'get' ] ],
'xiazai' => [ 'app_broker/index/xiazai', [ 'method' => 'get' ] ], 'xiazai' => [ 'app_broker/index/xiazai', [ 'method' => 'get' ] ],
]); ]);
......
public/app/js/customerinfo_details_new.js
View file @ 740323cd
...@@ -105,7 +105,7 @@ function loadMain(){ ...@@ -105,7 +105,7 @@ function loadMain(){
'4': obj['price_requirement'], '4': obj['price_requirement'],
'5': obj['area_detail'], '5': obj['area_detail'],
'6': obj['explain'], '6': obj['explain'],
'7': obj['explain_img']?'<ol class="li-img-list"><li><a href="imagebody.html?fullUrl='+obj['img_path']+obj['explain_img']+'"><img src="'+obj['img_path']+obj['explain_img']+'" /></a></li></ol>':'' '7': obj['explain_img']?'<ol class="li-img-list"><li><a href="/app_broker/imagebody?fullUrl='+obj['img_path']+obj['explain_img']+'"><img src="'+obj['img_path']+obj['explain_img']+'" /></a></li></ol>':''
}); });
}; };
var _htmlTemp = ''; var _htmlTemp = '';
......
public/app/js/imagebody.js 0 → 100644
View file @ 740323cd
$(document).ready(function(e){
//如果没有找到上一个页面的链接地址那么就隐藏返回按钮
// if("" == document.referrer){
// $(".ps-back").css('display','none');
// }
var path = "";
var imgFullUrl = getUrlParam('fullUrl');
if(imgFullUrl != null){
path = imgFullUrl;
}
var _box = $("#pic_box");
_box.show().css(
{"height":$(window).height()-_box.offset().top}
);
$("#imgname").attr("src",path);
var swiper = new Swiper('.swiper-container', {
zoom: true
});
});
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