Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
sunac-quanmin
Overview
Overview
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
HTML5-李恒逸
sunac-quanmin
Commits
a453ef1b
Commit
a453ef1b
authored
Jun 28, 2017
by
HTML5-侯张振
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
channeladmin 冲突提交
parent
03b78cb0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletions
+4
-1
channeladmin.php
html/application/controllers/admin/channeladmin.php
+3
-0
distributorAdd.php
html/application/views/admin/sales/distributorAdd.php
+1
-1
No files found.
html/application/controllers/admin/channeladmin.php
View file @
a453ef1b
...
...
@@ -137,6 +137,9 @@ class Channeladmin extends CI_Controller
$parentId
=
$this
->
input
->
post
();
$edit_channel
=
$this
->
channel
->
get
(
array
(
'id'
=>
$channelId
));
$user
=
$this
->
manager
->
get
(
array
(
'id'
=>
$edit_channel
[
'manager_id'
]));
$user_data
=
$this
->
session
->
userdata
;
$this
->
data
[
'data'
]
=
$user
;
if
(
!
empty
(
$parentId
)){
if
(
$parentId
[
'parent_id'
]
==
''
&&
$parentId
[
'manager_pwd'
]
==
''
&&
$parentId
[
'ag_pwd'
]
==
''
&&
$parentId
[
'region_id'
]
==
''
&&
$parentId
[
'building_id'
]
==
''
){
...
...
html/application/views/admin/sales/distributorAdd.php
View file @
a453ef1b
...
...
@@ -89,7 +89,7 @@
<div
class=
"col-md-8"
>
<?php
if
(
$buildings
)
{
foreach
(
$buildings
as
$key
=>
$build
)
{
?>
<label
style=
"width: 24%;float:
righ
t;"
>
<label
style=
"width: 24%;float:
lef
t;"
>
<input
type=
"checkbox"
class=
"building_id"
name=
"building_id[]"
value=
"
<?php
echo
$build
[
'id'
];
?>
"
<?php
if
(
$key
==
0
)
{
?>
checked=
"checked"
<?php
}
?>
>
<?php
echo
$build
[
'building_title'
];
?>
</label>
<?php
}
...
...
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