anyv / xkeasy · 提交

转到一个项目

作者 刘朕
提交 14276253992ec76f407e320e937919ace194be20 1 个父辈 e96b4740
1 个管道 的构建 通过 耗费 24 秒

新增教师添加学校功能及下单学校、班级选择优化

内嵌 并排对比
正在显示 6 个修改的文件 包含 52 行增加 和 50 行删除
... ... @@ -97,23 +97,6 @@ class OrderpageController extends WeChatBaseController{
$this -> assign('courier',$courier);
$this -> assign('indent_id',$indet_id['indet_id']);
//查询这个用户下添加的学校
$school = Db::name('school') -> where("uid",!empty($salesman['uid']) ? $salesman['uid'] : 0) -> select() -> toArray();
if(!empty($school)){
$grade_class = Db::name('grade_class') -> where("school_id",$school[0]['id']) -> select();
foreach ($grade_class as $key => $val){
$class = explode('-',$val['class']);
for($i=$class[0];$i<=$class[1];$i++){
$grade_class_show[] = $val['grade'].' - '.$i."班";
}
}
}
$this -> assign('school',$school);
$this -> assign('grade_class_show',!empty($grade_class_show) ? $grade_class_show : '');
return $this -> fetch();
}
... ... @@ -338,8 +321,17 @@ class OrderpageController extends WeChatBaseController{
if(empty($area)){
$this->error('缺少必要参数');
}
//查询这个用户下添加的学校
$school_uids = [];
$school_uids[] = !empty($my_user2['uid']) ? $my_user2['uid'] : 0;
if($my_user['status'] == 3){
$school_uids[] = $user_id;
}
if($my_user['status'] == 4){
$school_uids[] = $my_user3['uid'];
}
$where['region'] = ['like',"%$area%"];
$where['uid'] = ['eq',$my_user2['uid']];
$where['uid'] = ['in',$school_uids];
$data = Db::name('school')->where($where)->select()->toArray();
//循环组建新数据
foreach ($data as $key=>$val){
... ...
... ... @@ -18,9 +18,21 @@ class SchoolController extends WeChatBaseController{
public function school(){
$uid = cmf_get_current_user_id();
$school = Db::name('school') -> where(["uid"=>$uid]) -> order('id desc') -> select() -> toArray();
// 获取用户身份
$my_user = Db::name('my_user')->where('uid',$uid)->find();
// 如果为业务员，获取所有下线老师
$ids = [];
if($my_user['status'] == 2) {
$ids = Db::name('my_user')->where('pid',$my_user['id'])->column('uid');
}
$ids[] = $uid;
$school = Db::name('school') -> whereIn("uid",$ids) -> order('id desc') -> select() -> toArray();
foreach ($school as $key => $val){
$school[$key]['class'] = Db::name('grade_class') -> where('school_id',$val['id']) -> select() -> toArray();
$school[$key]['create_user'] = '';
if($val['uid'] != $uid) {
$school[$key]['create_user'] = Db::name('user')->where('id',$val['uid'])->value('user_nickname');
}
}
$this -> assign('school',$school);
return $this -> fetch();
... ... @@ -132,7 +144,14 @@ class SchoolController extends WeChatBaseController{
$id = $this -> request -> param();
$data = Db::name('school') -> where('id',$id['id']) -> find();
$data_class = Db::name('grade_class') -> where('school_id',$id['id']) -> select();
$this -> assign('data',$data);
$classes_str = '';
if($data_class) {
foreach ($data_class as $k=>$v) {
$classes_str .= $v['grade'].'-'.$v['class'].',';
}
}
$this->assign('data',$data);
$this->assign('classes_str',$classes_str);
return $this -> fetch();
}
... ...
... ... @@ -30,35 +30,6 @@
</head>
<body style="background-color: #F7F7F7;">
<!--<div class="tx_mask_school">-->
<!--<div class="tx_maskCon_school">-->
<!--<div class="three_model_school">-->
<!--<div class="three_model_school_title">-->
<!--选择学校-班级-->
<!--</div>-->
<!--<div class="three_model_school_tab">-->
<!--<div class="three_model_school_left three_model_school_hover word_color" style="cursor: pointer;">-->
<!--学校-->
<!--</div>-->
<!--<div class="three_model_school_left" style="cursor: pointer;">-->
<!--班级-->
<!--</div>-->
<!--</div>-->
<!--<div>-->
<!--<div class="three_model_school_data there_university" style="display: block;cursor: pointer;">-->
<!--&lt;!&ndash;<volist name="school" id="vo">-->
<!--<div class="three_model_school_name <eq name='key' value='0'>there_unActive</eq>" onclick="click_school({$vo.id})" style="cursor: pointer;">{$vo.school}</div>-->
<!--</volist>&ndash;&gt;-->
<!--</div>-->
<!--<div class="three_model_school_data there_class banjiadd" style="cursor: pointer;">-->
<!--&lt;!&ndash;<volist name="grade_class_show" id="vo">&ndash;&gt;-->
<!--&lt;!&ndash;<div class="three_model_school_name banji">{$vo}</div>&ndash;&gt;-->
<!--&lt;!&ndash;</volist>&ndash;&gt;-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div class="log_top_co" style="background-color: white;">
<!-- 顶部 -->
<div class=" order_top log_top_co">
... ...
... ... @@ -195,6 +195,21 @@
</div>
</a>
<if condition="$status eq 3">
<a href="{:url('School/school')}">
<div class="log_one_list_one">
<div class="log_one_list_left">
<div class="log_one_list_img">
<img src="__TMPL__/public/assets/images/school.png" alt="" />
</div>
<div class="log_one_list_word">
学校管理
</div>
</div>
<div class="log_one_list_right">
<img src="__TMPL__/public/assets/images/29.png" alt="" />
</div>
</div>
</a>
<a href="{:url('Personalcenter/my_wallet')}">
<div class="log_one_list_one">
<div class="log_one_list_left">
... ...
... ... @@ -90,6 +90,9 @@
</volist>
</div>
<div class="log_secen_left_three">{$val.region}</div>
<notempty name="val.create_user">
<div class="log_secen_left_three">由{$val.create_user}添加</div>
</notempty>
</div>
<div class="log_seven_right">
<div class="log_seven_right_one">
... ...
... ... @@ -579,7 +579,9 @@
region = $('#city_text').val();
str = '';
for(var i=0;i<arr.length;i++){
str += arr[i]+',';
if(arr[i]) {
str += arr[i]+',';
}
}
id = $('#idee').val();
... ...