Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
e96459e0
Commit
e96459e0
authored
Jun 14, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
f7fd99c7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
Shop.php
application/api_broker/controller/Shop.php
+3
-2
AppChat.php
application/chat/controller/AppChat.php
+3
-3
No files found.
application/api_broker/controller/Shop.php
View file @
e96459e0
...
@@ -279,7 +279,8 @@ class Shop extends Basic
...
@@ -279,7 +279,8 @@ class Shop extends Basic
$param
[
"img_type"
]
=
2
;
$param
[
"img_type"
]
=
2
;
$result
[
"images"
]
=
$this
->
gHousesImgModel
->
getHouseImages
(
$param
,
15
);
$result
[
"images"
]
=
$this
->
gHousesImgModel
->
getHouseImages
(
$param
,
15
);
$param
[
"img_type"
]
=
3
;
//图片类型:1效果图,2实景图,3样板图,4户型图,5交通图
$param
[
"img_type"
]
=
3
;
//图片类型:1效果图,2实景图,3样板图,4户型图,5交通图
$result
[
"plan_images"
]
=
$this
->
gHousesImgModel
->
getHouseImages
(
$param
,
1
);
// $result["plan_images"] = $this->gHousesImgModel->getHouseImages($param, 1);
$result
[
"plan_images"
]
=
[];
// $result['landlord_phone'] = json_decode ($result['landlord_phone'], true);
// $result['landlord_phone'] = json_decode ($result['landlord_phone'], true);
$result
[
'create_time'
]
=
date
(
'Y-m-d'
,
strtotime
(
$result
[
'create_time'
]));
$result
[
'create_time'
]
=
date
(
'Y-m-d'
,
strtotime
(
$result
[
'create_time'
]));
if
(
$result
[
'status'
]
==
0
)
{
if
(
$result
[
'status'
]
==
0
)
{
...
@@ -306,7 +307,7 @@ class Shop extends Basic
...
@@ -306,7 +307,7 @@ class Shop extends Basic
// 计数开始
// 计数开始
if
(
$params
[
"site_area"
]
==
3
&&
$result
)
{
if
(
$params
[
"site_area"
]
==
3
&&
$result
)
{
$lookShopArr
=
$this
->
lookShopService_
->
countLookShopNum
((
int
)
$this
->
agentId
,
(
int
)
$params
[
"id"
]);
$lookShopArr
=
$this
->
lookShopService_
->
countLookShopNum
((
int
)
$this
->
agentId
,
(
int
)
$params
[
"id"
]);
//判断看铺数量是否上限
//判断看铺数量是否上限
if
(
$lookShopArr
)
{
if
(
$lookShopArr
)
{
...
...
application/chat/controller/AppChat.php
View file @
e96459e0
...
@@ -258,7 +258,7 @@ class AppChat extends Basic
...
@@ -258,7 +258,7 @@ class AppChat extends Basic
if
(
$params
[
"from"
]
==
"C"
)
{
if
(
$params
[
"from"
]
==
"C"
)
{
$field
=
"id,external_title as title,shop_area_start,shop_area_end,rent_type,rent_price,shop_type"
;
$field
=
"id,external_title as title,shop_area_start,shop_area_end,rent_type,rent_price,shop_type"
;
}
else
{
}
else
{
$field
=
"id,
in
ternal_title as title,shop_area_start,shop_area_end,rent_type,rent_price,shop_type"
;
$field
=
"id,
ex
ternal_title as title,shop_area_start,shop_area_end,rent_type,rent_price,shop_type"
;
}
}
$result
=
$gHousesModel
->
getHouseInfoById
(
$field
,
$conditions
);
$result
=
$gHousesModel
->
getHouseInfoById
(
$field
,
$conditions
);
...
@@ -277,13 +277,13 @@ class AppChat extends Basic
...
@@ -277,13 +277,13 @@ class AppChat extends Basic
$message
=
""
;
$message
=
""
;
switch
(
$result
[
'rent_type'
])
{
switch
(
$result
[
'rent_type'
])
{
case
1
:
case
1
:
$message
=
'月租金:'
.
$result
[
'rent_price'
]
.
'元/月'
;
$message
=
'月租金:'
.
$result
[
'rent_price'
]
*
0.01
.
'元/月'
;
break
;
break
;
case
2
:
case
2
:
$message
=
'营业额扣点:'
.
$result
[
'rent_price'
]
*
0.01
.
'%'
;
$message
=
'营业额扣点:'
.
$result
[
'rent_price'
]
*
0.01
.
'%'
;
break
;
break
;
case
3
:
case
3
:
$message
=
'每平方米租金:'
.
$result
[
'rent_price'
]
.
'元/天/㎡'
;
$message
=
'每平方米租金:'
.
$result
[
'rent_price'
]
*
0.01
.
'元/天/㎡'
;
break
;
break
;
}
}
$result
[
'price'
]
=
$message
;
$result
[
'price'
]
=
$message
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment