Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
fenzhan_zsb
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
esf
fenzhan_zsb
Commits
86c6b91c
Commit
86c6b91c
authored
Aug 24, 2020
by
zhangkuanguang
Browse files
Options
Browse Files
Download
Plain Diff
合并分支 'admin_check_fix' 到 'release_preview'
修复图片审核未进审核biao 查看合并请求
!2
parents
cd50884a
944f563e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
sell.php
new_admincp/applications/zsb/controllers/sell.php
+5
-4
No files found.
new_admincp/applications/zsb/controllers/sell.php
View file @
86c6b91c
...
@@ -1086,11 +1086,11 @@ class Sell extends MY_Controller {
...
@@ -1086,11 +1086,11 @@ class Sell extends MY_Controller {
$pic_check_arr
[
$key
][
'dateline'
]
=
$nowtime
;
$pic_check_arr
[
$key
][
'dateline'
]
=
$nowtime
;
//进入审核附属表待夜间JOB过滤入库
//进入审核附属表待夜间JOB过滤入库
$this
->
admin_check
->
insert_check_pic_sub
(
$pic_check_arr
[
$key
]);
$this
->
admin_check
->
insert_check_pic_sub
(
$pic_check_arr
[
$key
]);
//来自设备的图片只入待审核库、不入审核库
/*
//来自设备的图片只入待审核库、不入审核库
if($pic_check_arr[$key]['surface'] == 0 && $pic_check_arr[$key]['from_device'] == 1)
if($pic_check_arr[$key]['surface'] == 0 && $pic_check_arr[$key]['from_device'] == 1)
{
{
unset($pic_check_arr[$key]);
unset($pic_check_arr[$key]);
}
}
*/
unset
(
$pic_check_arr
[
$key
][
'from_device'
]);
unset
(
$pic_check_arr
[
$key
][
'from_device'
]);
//封面图入审核表
//封面图入审核表
/*if($pic_check_arr[$key]['surface'] == 1)
/*if($pic_check_arr[$key]['surface'] == 1)
...
@@ -1099,10 +1099,11 @@ class Sell extends MY_Controller {
...
@@ -1099,10 +1099,11 @@ class Sell extends MY_Controller {
}*/
}*/
$functionSwitch
=
$this
->
config
->
item
(
'functionSwitch'
);
$functionSwitch
=
$this
->
config
->
item
(
'functionSwitch'
);
if
(
!
empty
(
$functionSwitch
[
'commonImageJoinCheck'
])
||
$pic_check_arr
[
$key
][
'surface'
]
==
1
)
/*
if(!empty($functionSwitch['commonImageJoinCheck']) || $pic_check_arr[$key]['surface'] == 1)
{
{
$this->admin_check->insert_check_pic($pic_check_arr[$key]);
$this->admin_check->insert_check_pic($pic_check_arr[$key]);
}
}*/
$this
->
admin_check
->
insert_check_pic
(
$pic_check_arr
[
$key
]);
}
}
}
}
}
}
...
...
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