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
0e102d16
Commit
0e102d16
authored
Nov 19, 2018
by
zw
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test'
parents
0cfc0160
ee8acb2e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
Shop.php
application/api/controller/Shop.php
+1
-0
details_tl.css
public/app/css/details_tl.css
+1
-1
No files found.
application/api/controller/Shop.php
View file @
0e102d16
...
...
@@ -224,6 +224,7 @@ class Shop extends Basic
$result
[
$key
][
"images"
]
=
count
(
$res
)
>
0
?
$res
:
[];
}
}
else
{
$result
[
$key
][
"api_path"
]
=
CK_IMG_URL
.
'images/'
;
$house_img_where
[
"house_id"
]
=
$val
[
"id"
];
$house_img_where
[
"img_type"
]
=
2
;
//默认主图 产品盼盼于11.16号修改
$result
[
$key
][
"images"
]
=
$this
->
gHousesImgModel
->
getHouseImages
(
$house_img_where
,
1
);
...
...
public/app/css/details_tl.css
View file @
0e102d16
...
...
@@ -335,7 +335,7 @@
.supporting-facilities
{
width
:
100%
;
margin-bottom
:
1.2
rem
;
margin-bottom
:
2.3
rem
;
}
.supporting-facilities
>
li
{
...
...
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