molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

用户中心

Browse Source
This commit is contained in:
molong
2017-06-27 12:08:42 +08:00
parent ee45e010e0
commit 58899ebe05
3 changed files with 18 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/common/controller/User.php
View File

@@ -18,9 +18,9 @@ class User extends Fornt {
$this->redirect('user/login/index');exit(); $this->redirect('user/login/index');exit();
} elseif (is_login()) { } elseif (is_login()) {
$user = model('User')->getInfo(session('user_auth.uid')); $user = model('User')->getInfo(session('user_auth.uid'));
if (!$this->checkProfile($user) && $this->url !== 'user/profile/index') { // if (!$this->checkProfile($user) && $this->url !== 'user/profile/index') {
return $this->error('请补充完个人资料！', url('user/profile/index')); // return $this->error('请补充完个人资料！', url('user/profile/index'));
} // }
$this->assign('user', $user); $this->assign('user', $user);
//设置会员中心菜单 //设置会员中心菜单
@@ -55,9 +55,7 @@ class User extends Fornt {
protected function getContentMenu() { protected function getContentMenu() {
$list = array(); $list = array();
$map = array( $map = array(
'is_user_show' => 1, 'status' => array('gt', 0)
'status' => array('gt', 0),
'extend' => array('gt', 0),
); );
$list = db('Model')->where($map)->field("name,id,title,icon,'' as 'style'")->select(); $list = db('Model')->where($map)->field("name,id,title,icon,'' as 'style'")->select();

2
application/common/model/User.php
View File

@@ -22,7 +22,7 @@ class User extends Base{
'uid' => 'integer', 'uid' => 'integer',
'reg_time' => 'integer' 'reg_time' => 'integer'
); );
protected $insert = array('salt', 'password', 'status', 'reg_time'); protected $insert = array('status', 'reg_time');
protected $update = array(); protected $update = array();
public $editfield = array( public $editfield = array(

46
application/user/controller/Content.php
View File

@@ -131,47 +131,27 @@ class Content extends User {
} }
protected function getField() { protected function getField() {
$field_group = parse_config_attr($this->modelInfo['field_group']); $field_group = parse_config_attr($this->modelInfo['attribute_group']);
$field_sort = json_decode($this->modelInfo['field_sort'], true);
if ($this->modelInfo['extend'] > 1) { $map['model_id'] = $this->modelInfo['id'];
$map['model_id'] = $this->modelInfo['id']; if ($this->request->action() == 'add') {
} else {
$model_id[] = $this->modelInfo['id'];
$model_id[] = 1;
$map['model_id'] = array('IN', $model_id);
}
if (ACTION_NAME == 'add') {
$map['is_show'] = array('in', array('1', '2')); $map['is_show'] = array('in', array('1', '2'));
} elseif (ACTION_NAME == 'edit') { } elseif ($this->request->action() == 'edit') {
$map['is_show'] = array('in', array('1', '3')); $map['is_show'] = array('in', array('1', '3'));
} }
//获得数组的第一条数组 //获得数组的第一条数组
$first_key = array_keys($field_group); $rows = model('Attribute')->getFieldlist($map, 'id');
$fields = model('Attribute')->getFieldlist($map); if (!empty($rows)) {
if (!empty($field_sort)) { foreach ($rows as $key => $value) {
foreach ($field_sort as $key => $value) { $list[$value['group_id']][] = $value;
foreach ($value as $index) {
if (isset($fields[$index])) {
$groupfield[$key][] = $fields[$index];
unset($fields[$index]);
}
}
} }
} foreach ($field_group as $key => $value) {
//未进行排序的放入第一组中 $fields[$value] = isset($list[$key]) ? $list[$key] : array();
$fields[] = array('name' => 'model_id', 'type' => 'hidden'); //加入模型ID值
$fields[] = array('name' => 'id', 'type' => 'hidden'); //加入模型ID值
foreach ($fields as $key => $value) {
$groupfield[$first_key[0]][] = $value;
}
foreach ($field_group as $key => $value) {
if ($groupfield[$key]) {
$data[$value] = $groupfield[$key];
} }
}else{
$fields = array();
} }
return $data; return $fields;
} }
} }