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
0ebc45a7
Commit
0ebc45a7
authored
Oct 15, 2018
by
zw
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test'
parents
a045da31
6c8d4994
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
Finance.php
application/index/controller/Finance.php
+1
-0
GHouses.php
application/model/GHouses.php
+1
-1
No files found.
application/index/controller/Finance.php
View file @
0ebc45a7
...
@@ -730,6 +730,7 @@ class Finance extends Basic
...
@@ -730,6 +730,7 @@ class Finance extends Basic
$bargain_id_string
=
implode
(
','
,
$bargain_id
);
$bargain_id_string
=
implode
(
','
,
$bargain_id
);
$where
[]
=
[
'EXP'
,
'b.id in ('
.
$bargain_id_string
.
') or b.father_id in ('
.
$bargain_id_string
.
')'
];
$where
[]
=
[
'EXP'
,
'b.id in ('
.
$bargain_id_string
.
') or b.father_id in ('
.
$bargain_id_string
.
')'
];
}
}
$select
=
1
;
}
else
{
}
else
{
return
$this
->
response
(
101
,
'内部错误:'
.
$bargain_arr
[
'msg'
]);
return
$this
->
response
(
101
,
'内部错误:'
.
$bargain_arr
[
'msg'
]);
}
}
...
...
application/model/GHouses.php
View file @
0ebc45a7
...
@@ -742,7 +742,7 @@ class GHouses extends BaseModel
...
@@ -742,7 +742,7 @@ class GHouses extends BaseModel
$save_data
[
'create_time'
]
=
date
(
'Y-m-d H:i:s'
);
$save_data
[
'create_time'
]
=
date
(
'Y-m-d H:i:s'
);
//C端随机图片
//C端随机图片
if
(
empty
(
$data
[
'is_show'
])
&&
!
empty
(
$save_data
[
'industry_type'
]))
{
if
(
!
empty
(
$save_data
[
'industry_type'
]))
{
$industry_type
=
explode
(
','
,
$save_data
[
'industry_type'
]);
$industry_type
=
explode
(
','
,
$save_data
[
'industry_type'
]);
$image
=
new
ImageDepotService
();
$image
=
new
ImageDepotService
();
$save_data
[
'external_image_id'
]
=
$image
->
getImage
(
$industry_type
[
0
]);
$save_data
[
'external_image_id'
]
=
$image
->
getImage
(
$industry_type
[
0
]);
...
...
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