diff --git a/service/Application/Home/Controller/BubbleController.class.php b/service/Application/Home/Controller/BubbleController.class.php deleted file mode 100755 index b8728f184..000000000 --- a/service/Application/Home/Controller/BubbleController.class.php +++ /dev/null @@ -1,481 +0,0 @@ -Is_Login(); - } - - /** - * [Index 冒泡] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-03-02T22:48:35+0800 - */ - public function Index() - { - // 条件 - $where = array(); - if(I('type') == 'own') - { - $where['u.id'] = $this->user['id']; - } - - // 模型 - $m = M('Mood'); - - // 分页 - $number = 10; - $page_param = array( - 'number' => $number, - 'total' => $m->alias('m')->join('__USER__ AS u ON m.user_id=u.id')->where($where)->count(), - 'where' => $_GET, - 'url' => U('Home/Bubble/Index'), - ); - $page = new \My\Page($page_param); - - // 查询字段 - $field = array('m.id', 'm.user_id', 'm.content', 'm.visible', 'm.add_time', 'u.nickname'); - - // 数据处理 - $data = $this->MoodDataHandle($m->alias('m')->join('__USER__ AS u ON m.user_id=u.id')->field($field)->where($where)->limit($page->GetPageStarNumber(), $number)->order('m.id desc')->select()); - $this->assign('data', $data); - - // 分页 - $this->assign('page_html', $page->GetPageHtml()); - - // 基础数据 - $this->assign('common_user_visible_list', L('common_user_visible_list')); - $this->assign('bubble_nav_list', L('bubble_nav_list')); - - $this->display('Index'); - } - - /** - * [MoodDataHandle 说说数据处理] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-04-08T20:14:19+0800 - * @param [array] $data [需要处理的数据] - * @return [array] [处理好的说说数据] - */ - private function MoodDataHandle($data) - { - if(!empty($data) && is_array($data)) - { - $mp = M('MoodPraise'); - $mc = M('MoodComments'); - foreach($data as $k=>&$v) - { - // 昵称 - if(empty($v['nickname'])) - { - $v['nickname'] = L('common_bubble_mood_nickname'); - } - - // 发表时间 - $v['add_time'] = date('m-d H:i', $v['add_time']); - - // 点赞 - $v['praise_count'] = $mp->where(array('mood_id'=>$v['id']))->count(); - - // 用户是否已点赞过 - $v['is_praise'] = ($mp->where(array('mood_id'=>$v['id'], 'user_id'=>$this->user['id']))->getField('id') > 0) ? 'ok' : 'no'; - - // 评论总数 - $v['comments_count'] = $mc->where(array('mood_id'=>$v['id']))->count(); - - // 评论列表 - $v['comments'] = $this->GetMoodComments($v['id']); - } - } - return $data; - } - - /** - * [UserIsStateCheck 用户状态校验] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-04-12T15:29:45+0800 - */ - private function UserIsStateCheck() - { - $state = M('User')->where(array('id'=>$this->user['id']))->getField('state'); - if($state > 0) - { - $this->ajaxReturn(L('common_user_state_list')[$state]['tips'], -10); - } - } - - /** - * [GetMoodComments 获取说说评论] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-04-10T14:38:00+0800 - * @param [int] $mood_id [说说id] - * @return [array] [评论列表] - */ - private function GetMoodComments($mood_id) - { - // 参数 - if(empty($mood_id)) - { - return array(); - } - - // 评论列表 - $m = M('MoodComments'); - $field = array('mc.id', 'mc.user_id', 'mc.content', 'mc.reply_id', 'mc.add_time', 'u.nickname'); - $where = array('m.id'=>$mood_id, 'mc.reply_id'=>0); - $data = $m->alias('mc')->join('__MOOD__ AS m ON mc.mood_id=m.id')->join('__USER__ AS u ON mc.user_id=u.id')->field($field)->where($where)->order('mc.id asc')->select(); - - // 回复列表 - if(!empty($data)) - { - $u = M('User'); - foreach($data as &$v) - { - // 评论时间 - $v['add_time'] = date('m-d H:i', $v['add_time']); - - // 评论内容 - $v['content'] = str_replace("\n", "
", $v['content']); - - $item_where = array('m.id'=>$mood_id, 'mc.parent_id'=>$v['id'], 'reply_id'=>array('gt', 0)); - $item = $m->alias('mc')->join('__MOOD__ AS m ON mc.mood_id=m.id')->join('__USER__ AS u ON mc.user_id=u.id')->field($field)->where($item_where)->order('mc.id asc')->select(); - if(!empty($item)) - { - foreach($item as &$vs) - { - // 评论时间 - $vs['add_time'] = date('m-d H:i', $vs['add_time']); - - // 评论内容 - $vs['content'] = str_replace("\n", "
", $vs['content']); - - // 被回复的用户 - if($vs['reply_id'] > 0) - { - $uid = $m->where(array('id'=>$vs['reply_id']))->getField('user_id'); - if(!empty($uid)) - { - $user = $u->field(array('id AS reply_user_id', 'nickname AS reply_nickname'))->find($uid); - if(empty($user['reply_nickname'])) - { - $user['reply_nickname'] = L('common_bubble_mood_nickname'); - } - $vs = array_merge($vs, $user); - } - } - } - $v['item'] = $item; - } - } - } - return $data; - } - - /** - * [MoodSave 说说保存] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-04-08T13:21:34+0800 - */ - public function MoodSave() - { - // 是否ajax请求 - if(!IS_AJAX) - { - $this->error(L('common_unauthorized_access')); - } - - // 用户状态校验 - $this->UserIsStateCheck(); - - // 说说模型 - $m = D('Mood'); - - // 编辑 - if($m->create($_POST, 1) !== false) - { - $m->user_id = $this->user['id']; - $m->content = I('content'); - $m->add_time = time(); - - // 开启事务 - $m->startTrans(); - - // 更新用户签名 - if(I('is_sign') == 1) - { - $data = array( - 'signature' => $m->content, - 'upd_time' => time(), - ); - $user_state = (M('User')->where(array('id'=>$this->user['id']))->save($data) !== false); - } else { - $user_state = true; - } - - // 添加历史签名 - $mood_state = $m->add(); - - // 状态 - if($user_state && $mood_state > 0) - { - // 提交事务 - $m->commit(); - - // 更新用户session数据 - if(I('is_sign') == 1) - { - $this->UserLoginRecord($this->user['id']); - } - - $this->ajaxReturn(L('common_operation_publish_success')); - } else { - - // 回滚事务 - $m->rollback(); - $this->ajaxReturn(L('common_operation_publish_error'), -100); - } - } else { - $this->ajaxReturn($m->getError(), -1); - } - } - - /** - * [MoodDelete 说说删除] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2016-12-25T22:36:12+0800 - */ - public function MoodDelete() - { - // 是否ajax请求 - if(!IS_AJAX) - { - $this->error(L('common_unauthorized_access')); - } - - // 参数 - $m = M('Mood'); - $id = I('id'); - - // 只能删除自己的说说 - $user_id = $m->where(array('id'=>$id))->getField('user_id'); - if($user_id != $this->user['id']) - { - $this->ajaxReturn(L('bubble_mood_delete_error'), -2); - } - - // 开启事务 - $m->startTrans(); - - // 数据删除[说说,点赞,评论] - $mood_state = $m->where(array('id'=>$id, 'user_id'=>$this->user['id']))->delete(); - $praise_state = M('MoodPraise')->where(array('mood_id'=>$id))->delete(); - $comments_state = M('MoodComments')->where(array('mood_id'=>$id))->delete(); - if($mood_state !== false && $praise_state !== false && $comments_state !== false) - { - // 提交事务 - $m->commit(); - - $this->ajaxReturn(L('common_operation_delete_success')); - } else { - // 回滚事务 - $m->rollback(); - - $this->ajaxReturn(L('common_operation_delete_error'), -100); - } - } - - /** - * [MoodCommentsDelete 说说评论删除] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2016-12-25T22:36:12+0800 - */ - public function MoodCommentsDelete() - { - // 是否ajax请求 - if(!IS_AJAX) - { - $this->error(L('common_unauthorized_access')); - } - - // 模型 - $m = M('MoodComments'); - - // 只能删除自己的评论 - $user_id = $m->where(array('id'=>I('id')))->getField('user_id'); - if($user_id != $this->user['id']) - { - $this->ajaxReturn(L('bubble_comments_delete_error'), -2); - } - - // 开启事务 - $m->startTrans(); - - // 数据删除 - $state = $m->where(array('id'=>I('id'), 'user_id'=>$this->user['id']))->delete(); - $item_state = $m->where(array('parent_id'=>I('id')))->delete(); - $reply_state = $m->where(array('reply_id'=>I('id')))->delete(); - if($state !== false && $item_state !== false && $reply_state !== false) - { - // 提交事务 - $m->commit(); - - $this->ajaxReturn(L('common_operation_delete_success')); - } else { - // 回滚事务 - $m->rollback(); - - $this->ajaxReturn(L('common_operation_delete_error'), -100); - } - } - - /** - * [MoodPraise 说说点赞] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-04-09T12:24:24+0800 - */ - public function MoodPraise() - { - // 是否ajax请求 - if(!IS_AJAX) - { - $this->error(L('common_unauthorized_access')); - } - - // 用户状态校验 - $this->UserIsStateCheck(); - - // 参数 - if(empty($_POST['id'])) - { - $this->ajaxReturn(L('common_param_error'), -1); - } - $id = I('id'); - - // 不能点赞自己的说说 - $mood = M('Mood')->field(array('id', 'user_id'))->find($id); - if(empty($mood)) - { - $this->ajaxReturn(L('bubble_mood_no_exist_error'), -2); - } else { - if($mood['user_id'] == $this->user['id']) - { - $this->ajaxReturn(L('bubble_mood_praise_error'), -3); - } - } - - // 查询数据 - $m = M('MoodPraise'); - $where = array('user_id'=>$this->user['id'], 'mood_id'=>$id); - $temp = $m->where($where)->getField('id'); - - // 数据存在删除, 则添加 - if(empty($temp)) - { - $data = array( - 'mood_id' => $id, - 'user_id' => $this->user['id'], - 'add_time' => time(), - ); - $state = ($m->add($data) > 0); - } else { - $state = ($m->where($where)->delete() !== false); - } - - // 状态 - if($state) - { - $this->ajaxReturn(L('common_operation_success')); - } else { - $this->ajaxReturn(L('common_operation_error'), -100); - } - } - - /** - * [MoodComments 说说评论] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-04-09T18:52:32+0800 - */ - public function MoodComments() - { - // 是否ajax请求 - if(!IS_AJAX) - { - $this->error(L('common_unauthorized_access')); - } - - // 用户状态校验 - $this->UserIsStateCheck(); - - // 说说评论模型 - $m = D('MoodComments'); - - // 编辑 - if($m->create($_POST, 1) !== false) - { - // 不能回复自己的评论 - if($m->reply_id > 0) - { - $user_id = $m->where(array('id'=>$m->reply_id))->getField('user_id'); - if($user_id == $this->user['id']) - { - $this->ajaxReturn(L('bubble_comments_reply_error'), -2); - } - } - - // 额外数据处理 - $m->add_time = time(); - $m->content = I('content'); - $m->user_id = $this->user['id']; - - // 写入数据库 - if($m->add()) - { - $this->ajaxReturn(L('common_operation_comments_success')); - } else { - $this->ajaxReturn(L('common_operation_comments_error'), -100); - } - } else { - $this->ajaxReturn($m->getError(), -1); - } - } -} -?> \ No newline at end of file diff --git a/service/Application/Home/Controller/StudentController.class.php b/service/Application/Home/Controller/StudentController.class.php deleted file mode 100755 index ffc6fcdd0..000000000 --- a/service/Application/Home/Controller/StudentController.class.php +++ /dev/null @@ -1,480 +0,0 @@ -Is_Login(); - } - - /** - * [Index 首页] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-02-22T16:50:32+0800 - */ - public function Index() - { - // 获取列表 - $where = array('us.user_id'=>$this->user['id']); - $list = $this->StudentSetDataHandle(M('UserStudent')->alias('AS us')->join('__STUDENT__ AS s ON s.id=us.student_id ')->field('s.*, us.id AS user_student_id,us.add_time AS bundled_time')->where($where)->select()); - - // 数据列表 - $this->assign('list', $list); - $this->display('Index'); - } - - /** - * [StudentSetDataHandle 数据处理] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2016-12-29T21:27:15+0800 - * @param [array] $data [学生数据] - * @return [array] [处理好的数据] - */ - private function StudentSetDataHandle($data) - { - $result = array(); - if(!empty($data)) - { - $c = M('Class'); - $r = M('Region'); - $s = M('Semester'); - foreach($data as $k=>$v) - { - if(!isset($result[$v['semester_id']])) - { - // 学期 - $result[$v['semester_id']]['id'] = $v['semester_id']; - $result[$v['semester_id']]['name'] = $s->where(array('id'=>$v['semester_id']))->getField('name'); - } - - // 班级 - $tmp_class = $c->field(array('pid', 'name'))->find($v['class_id']); - if(!empty($tmp_class)) - { - $p_name = ($tmp_class['pid'] > 0) ? $c->where(array('id'=>$tmp_class['pid']))->getField('name') : ''; - $v['class_name'] = empty($p_name) ? $tmp_class['name'] : $p_name.'-'.$tmp_class['name']; - } else { - $v['class_name'] = ''; - } - - // 地区 - $v['region_name'] = $r->where(array('id'=>$v['region_id']))->getField('name'); - - // 学期 - $v['semester_text'] = $result[$v['semester_id']]['name']; - - // 出生 - $v['birthday'] = date('Y-m-d', $v['birthday']); - - // 报名时间 - $v['add_time'] = date('Y-m-d H:i:s', $v['add_time']); - - // 更新时间 - $v['upd_time'] = date('Y-m-d H:i:s', $v['upd_time']); - - // 绑定时间 - $v['bundled_time'] = date('Y-m-d H:i:s', $v['bundled_time']); - - // 性别 - $v['gender'] = L('common_gender_list')[$v['gender']]['name']; - - // 状态 - $v['state'] = L('common_student_state_list')[$v['state']]['name']; - - // 缴费状态 - $v['tuition_state_text'] = L('common_tuition_state_list')[$v['tuition_state']]['name']; - - $result[$v['semester_id']]['item'][] = $v; - } - } - return $result; - } - - /** - * [ScoreInfo 成绩查询] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-03-22T22:39:04+0800 - */ - public function ScoreInfo() - { - $id = I('id'); - if(!empty($id)) - { - $field = array('s.username', 's.class_id', 'f.score', 'f.subject_id', 'f.score_id', 'f.comment', 'f.add_time'); - $where = array('us.user_id'=>$this->user['id'], 'us.id'=>$id); - $data = $this->ScoreSetDataHandle(M('UserStudent')->alias('AS us')->join('__STUDENT__ AS s ON us.student_id=s.id')->join('__FRACTION__ AS f ON s.id=f.student_id')->where($where)->field($field)->order('f.score_id ASC')->select()); - $this->assign('data', $data); - $this->assign('student_score_title_list', L('student_score_title_list')); - } - $this->display('ScoreInfo'); - } - - /** - * [ScoreSetDataHandle 数据处理] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2016-12-29T21:27:15+0800 - * @param [array] $data [学生数据] - * @return [array] [处理好的数据] - */ - private function ScoreSetDataHandle($data) - { - $result = array(); - if(!empty($data)) - { - $score = M('Score'); - $subject = M('Subject'); - $class = M('Class'); - $score_level = L('common_fraction_level_list'); - foreach($data as $k=>$v) - { - // 基础资料 - if(!isset($result['username'])) - { - // 姓名 - $result['username'] = $v['username']; - - // 班级 - $tmp_class = $class->field(array('pid', 'name'))->find($v['class_id']); - if(!empty($tmp_class)) - { - $p_name = ($tmp_class['pid'] > 0) ? $class->where(array('id'=>$tmp_class['pid']))->getField('name') : ''; - $result['class_name'] = empty($p_name) ? $tmp_class['name'] : $p_name.'-'.$tmp_class['name']; - } - } - - // 学期key - $score_key = $v['score_id']; - - // 成绩期号 - if(!isset($result['item'][$score_key])) - { - $result['item'][$score_key]['name'] = $score->where(array('id'=>$v['score_id']))->getField('name'); - } - - // 科目 - $v['subject_name'] = $subject->where(array('id'=>$v['subject_id']))->getField('name'); - - // 成绩等级 - foreach($score_level as $level) - { - if($v['score'] >= $level['min'] && $v['score'] <= $level['max']) - { - $v['score_level'] = $level['name']; - } - } - if(!isset($v['score_level'])) - { - $v['score_level'] = ''; - } - - // 添加时间 - $v['add_time'] = date('Y-m-d', $v['add_time']); - - unset($v['username'], $v['class_id'], $v['subject_id'], $v['score_id']); - $result['item'][$score_key]['item'][] = $v; - } - } - return $result; - } - - /** - * [PolyInfo 学生关联-页面] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-03-15T11:22:33+0800 - */ - public function PolyInfo() - { - $this->display('PolyInfo'); - } - - /** - * [Delete 学生关联-解除] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2016-12-25T22:36:12+0800 - */ - public function Delete() - { - if(!IS_AJAX) - { - $this->error(L('common_unauthorized_access')); - } - - // 数据删除 - if(M('UserStudent')->where(array('id'=>I('id'), 'user_id'=>$this->user['id']))->delete()) - { - $this->ajaxReturn(L('common_operation_delete_success')); - } else { - $this->ajaxReturn(L('common_operation_delete_error'), -100); - } - } - - /** - * [Poly 学生关联] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-03-22T16:47:29+0800 - */ - public function Poly() - { - // 是否ajax请求 - if(!IS_AJAX) - { - $this->error(L('common_unauthorized_access')); - } - - // 参数是否有误 - if(empty($_POST['id']) || empty($_POST['accounts']) || empty($_POST['verify'])) - { - $this->ajaxReturn(L('common_param_error'), -1); - } - - // 账户是否存在 - $accounts = I('accounts'); - $field = $this->StudentPolyAccountsCheck($accounts); - - // 验证码校验 - $verify_param = array( - 'key_prefix' => 'student_poly', - 'expire_time' => MyC('common_verify_expire_time'), - 'time_interval' => MyC('common_verify_time_interval'), - ); - if($field == 'email') - { - $obj = new \My\Email($verify_param); - - } else { - $obj = new \My\Sms($verify_param); - } - // 是否已过期 - if(!$obj->CheckExpire()) - { - $this->ajaxReturn(L('common_verify_expire'), -10); - } - // 是否正确 - if(!$obj->CheckCorrect(I('verify'))) - { - $this->ajaxReturn(L('common_verify_error'), -11); - } - - // 查询用户数据 - $where = array('id'=>I('id'), $field=>$accounts, 'semester_id'=>MyC('admin_semester_id')); - $student_id = M('Student')->where($where)->getField('id'); - if(!empty($student_id)) - { - $data = array( - 'student_id' => $student_id, - 'user_id' => $this->user['id'], - 'add_time' => time(), - ); - if(M('UserStudent')->add($data)) - { - // 清除验证码 - $obj->Remove(); - - $this->ajaxReturn(L('common_operation_join_success')); - } - $this->ajaxReturn(L('common_operation_join_error'), -100); - } - $this->ajaxReturn(L('common_student_no_exist_error'), -1000); - } - - /** - * [PolyQuery 学生关联-数据查询] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-03-17T16:58:26+0800 - */ - public function PolyQuery() - { - // 是否ajax请求 - if(!IS_AJAX) - { - $this->error(L('common_unauthorized_access')); - } - - // 参数是否有误 - if(empty($_POST['username']) || empty($_POST['student_number']) || empty($_POST['id_card'])) - { - $this->ajaxReturn(L('common_param_error'), -1); - } - - // 查询用户数据 - $where = array('username'=>I('username'), 'number'=>I('student_number'), 'id_card'=>I('id_card'), 'semester_id'=>MyC('admin_semester_id')); - $data = M('Student')->field(array('id', 'my_mobile', 'parent_mobile', 'email'))->where($where)->find(); - if(!empty($data)) - { - // 是否已关联过 - $temp = M('UserStudent')->where(array('student_id'=>$data['id'], 'user_id'=>$this->user['id']))->getField('id'); - if(!empty($temp)) - { - $this->ajaxReturn(L('student_join_accounts_exist_tips'), -2); - } - - // 封装返回数据 - $result = array('id' => $data['id'], 'contact_list' => array()); - if(!empty($data['my_mobile'])) - { - $result['contact_list'][] = $data['my_mobile']; - } - if(!empty($data['parent_mobile'])) - { - $result['contact_list'][] = $data['parent_mobile']; - } - if(!empty($data['email'])) - { - $result['contact_list'][] = $data['email']; - } - $this->ajaxReturn(L('common_operation_success'), 0, $result); - } - $this->ajaxReturn(L('common_student_no_exist_error'), -1000); - } - - /** - * [PolyVerifyEntry 学生关联-验证码显示] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-03-05T15:10:21+0800 - */ - public function PolyVerifyEntry() - { - $this->CommonVerifyEntry(I('type', 'student_poly')); - } - - /** - * [PolyVerifySend 学生关联-验证码发送] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-03-10T17:35:03+0800 - */ - public function PolyVerifySend() - { - // 是否ajax请求 - if(!IS_AJAX) - { - $this->error(L('common_unauthorized_access')); - } - - // 参数 - $accounts = I('accounts'); - if(empty($accounts)) - { - $this->ajaxReturn(L('common_param_error'), -10); - } - - // 账户是否存在 - $type = $this->StudentPolyAccountsCheck($accounts); - - // 验证码公共基础参数 - $verify_param = array( - 'key_prefix' => 'student_poly', - 'expire_time' => MyC('common_verify_expire_time'), - 'time_interval' => MyC('common_verify_time_interval'), - ); - - // 是否开启图片验证码 - $verify = $this->CommonIsImaVerify($verify_param); - - // 验证码 - $code = GetNumberCode(6); - - // 邮箱 - if($type == 'email') - { - $obj = new \My\Email($verify_param); - $email_param = array( - 'email' => $accounts, - 'content' => MyC('home_email_user_student_binding'), - 'title' => MyC('home_site_name').' - '.L('student_operation_binding_text'), - 'code' => $code, - ); - $state = $obj->SendHtml($email_param); - - // 短信 - } else { - $obj = new \My\Sms($verify_param); - $state = $obj->SendText($accounts, MyC('home_sms_user_student_binding'), $code); - } - - // 状态 - if($state) - { - // 清除验证码 - if(isset($verify) && is_object($verify)) - { - $verify->Remove(); - } - - $this->ajaxReturn(L('common_send_success')); - } else { - $this->ajaxReturn(L('common_send_error').'['.$obj->error.']', -100); - } - } - - /** - * [StudentPolyAccountsCheck 学生是否存在] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-03-22T17:39:56+0800 - * @param [string] $accounts [my_mobile, parent_mobile, email] - * @return [string] [表字段名称 my_mobile, parent_mobile, email] - */ - private function StudentPolyAccountsCheck($accounts) - { - $field = array('my_mobile', 'parent_mobile', 'email'); - $where = array( - array( - 'my_mobile' => $accounts, - 'parent_mobile' => $accounts, - 'email' => $accounts, - '_logic' => 'OR', - ), - 'semester_id' => MyC('admin_semester_id'), - ); - $data = M('Student')->field($field)->where($where)->find(); - if(!empty($data)) - { - $key = array_search($accounts, $data); - return ($key === false) ? '' : $key; - } else { - $this->ajaxReturn(L('common_student_no_exist_error'), -1000); - } - } -} -?> \ No newline at end of file diff --git a/service/Application/Home/View/Default/Bubble/Index.html b/service/Application/Home/View/Default/Bubble/Index.html deleted file mode 100755 index fe6951c0e..000000000 --- a/service/Application/Home/View/Default/Bubble/Index.html +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - -
style="{{$max_width_style}}"> - - - - - -
-
- - - - - -
- -
-
-
- -
- - {{$v.nickname}} - - {{$v.add_time}} -
- -
- -
- -
-
{{$v.content}}
-
- {{$v.comments_count}} - - {{$v.praise_count}} - cr-bluecr-999" data-id="{{$v.id}}" data-uid="{{$v.user_id}}" data-url="{{:U('Home/Bubble/MoodPraise')}}"> -
- -
-
- -
- - {{$vc.nickname}} - {{$vc.add_time}} -
- - - {{:L('common_operation_reply')}} - - - - - {{:L('common_operation_delete')}} - - -
-
{{$vc.content}}
-
- - -
data-comments-reply-{{$v.id}}-{{$vcs.reply_id}}"> - - {{$vcs.nickname}} - {{:L('common_operation_reply')}} - {{$vcs.reply_nickname}} - {{$vcs.add_time}} -
- - - {{:L('common_operation_reply')}} - - - - - {{:L('common_operation_delete')}} - - -
-
{{$vcs.content}}
-
- - - -
- -
-
- -
- - - {{$page_html}} - - - -
-
-
-
- -
-
- {{:L('common_operation_cancel')}} - {{:L('common_operation_comments')}} -
-
-
- - - - - - -
-
- -
- - - - - - - - -
-
- - - - -
-
-
- {{:L('bubble_visible_text')}} - -
- | - -
-
- \ No newline at end of file diff --git a/service/Application/Home/View/Default/Bubble/Nav.html b/service/Application/Home/View/Default/Bubble/Nav.html deleted file mode 100755 index df634a954..000000000 --- a/service/Application/Home/View/Default/Bubble/Nav.html +++ /dev/null @@ -1,22 +0,0 @@ - -
- -
- - - -
-
- \ No newline at end of file diff --git a/service/Application/Home/View/Default/Student/Index.html b/service/Application/Home/View/Default/Student/Index.html deleted file mode 100755 index c51e31a18..000000000 --- a/service/Application/Home/View/Default/Student/Index.html +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - -
style="{{$max_width_style}}"> - - - - - -
-
- -
- {{:L('student_operation_binding_text')}} -
- - - -
- -
-
{{$v.name}}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{:L('student_username_name')}}{{:L('common_view_student_number_text')}}{{:L('common_view_gender_name')}}{{:L('student_class_text')}}{{:L('common_view_student_state_name')}}{{:L('common_more_name')}}{{:L('common_operation_name')}}
{{$vs.username}}{{$vs.number}}{{$vs.gender}}{{$vs.class_name}}{{$vs.state}} - {{:L('common_see_more_name')}} -
-
-
-

{{:L('common_detail_content')}}

- × -
-
-
-
{{:L('student_username_name')}}
-
{{$vs.username}}
- -
{{:L('common_view_student_number_text')}}
-
{{$vs.number}}
- -
{{:L('common_view_id_card_text')}}
-
{{$vs.id_card}}
- -
{{:L('common_address_text')}}
-
{{$vs.region_name}} {{$vs.address}}
- -
{{:L('common_view_gender_name')}}
-
{{$vs.gender}}
- -
{{:L('student_birthday_text')}}
-
{{$vs.birthday}}
- -
{{:L('common_view_tel_name')}}
-
{{$vs.tel}}
- -
{{:L('student_my_mobile_name')}}
-
{{$vs.my_mobile}}
- -
{{:L('common_view_parent_mobile_name')}}
-
{{$vs.parent_mobile}}
- -
{{:L('common_email_name')}}
-
{{$vs.email}}
- -
{{:L('student_class_text')}}
-
{{$vs.class_name}}
- -
{{:L('student_semester_text')}}
-
{{$vs.semester_text}}
- -
{{:L('student_tuition_state_text')}}
-
{{$vs.tuition_state_text}}
- -
{{:L('common_view_student_state_name')}}
-
{{$vs.state}}
- -
{{:L('student_sign_up_name')}}
-
{{$vs.add_time}}
- -
{{:L('common_upd_time_name')}}
-
{{$vs.upd_time}}
- -
{{:L('common_bundled_time_name')}}
-
{{$vs.bundled_time}}
-
-
-
-
- 		- - - - -
{{:L('common_not_data_tips')}}
- -
-
- -
- - - - - - {{$page_html}} - - -
-
- -
- - - - - - - - \ No newline at end of file diff --git a/service/Application/Home/View/Default/Student/PolyInfo.html b/service/Application/Home/View/Default/Student/PolyInfo.html deleted file mode 100755 index 4522a5955..000000000 --- a/service/Application/Home/View/Default/Student/PolyInfo.html +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - -
style="{{$max_width_style}}"> - - - - - -
-
- -
- - {{:L('student_operation_binding_text')}} - {{:L('common_operation_back')}} - -
- - -
-
- - -
-
- - -
-
- -
-
- - - -
-
-
-

{{:L('student_operation_binding_text')}}

- × -
-
-
-
- - -
-
- - -
-
- - -
-
- - -
- -
- - - - -
-
- - -
-
-
-
-
- - - -
-
-
- × -
-
-
- -
- - {{:L('common_img_verify_submit_text')}} -
-
- -
-
-
- -
-
- -
- - - - - - - - - - \ No newline at end of file diff --git a/service/Application/Home/View/Default/Student/ScoreInfo.html b/service/Application/Home/View/Default/Student/ScoreInfo.html deleted file mode 100755 index c519cbc78..000000000 --- a/service/Application/Home/View/Default/Student/ScoreInfo.html +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - -
style="{{$max_width_style}}"> - - - - - -
-
- - {{:L('student_operation_score')}} - {{:L('common_operation_back')}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{$data.username}}{{$title}}
{{$data.class_name}}
{{$v.name}}{{$vs.subject_name}}{{$vs.score}}{{$vs.score_level}}{{$vs.add_time}}{{$vs.comment}}
- - - - -
-
- -
- - - - - - - - \ No newline at end of file diff --git a/service/Public/Home/Default/Css/Index.css b/service/Public/Home/Default/Css/Index.css index cce997adb..6c91e40db 100755 --- a/service/Public/Home/Default/Css/Index.css +++ b/service/Public/Home/Default/Css/Index.css @@ -353,7 +353,7 @@ text-align: center;float:none} .member-login{overflow: hidden;height:25px;text-align: center;} .member-logout { position: absolute; top: 33px; left: 60px; font-size: 12px; color: #f4546b; } .member-center { overflow: hidden; } - .member-center a {float: left;margin-left: -1px;width:50px;text-align: center;border-left: 1px solid #EEE;font-size: 12px; } + .member-center a {float: left;margin-left: -1px;width:50px;text-align: center;border-left: 1px solid #EEE;font-size: 12px; text-decoration: none; } .member-center a strong {height: 18px;display: block;font-size: 14px;color: #F40;} /*第二套各类活动*/ diff --git a/service/Public/Home/Default/Js/Common.js b/service/Public/Home/Default/Js/Common.js index 5c190e368..937c71761 100755 --- a/service/Public/Home/Default/Js/Common.js +++ b/service/Public/Home/Default/Js/Common.js @@ -121,8 +121,8 @@ $(function() { if($(window).width() > 625) { - // 防止导航浮动 $('.nav-search').css('position','relative'); + $('body').css('padding-top','0'); } });