From 14276253992ec76f407e320e937919ace194be20 Mon Sep 17 00:00:00 2001
From: 刘朕 <liuzhen@bronet.cn>
Date: Mon, 28 Oct 2019 14:02:34 +0800
Subject: [PATCH] 新增教师添加学校功能及下单学校、班级选择优化
---
app/portal/controller/OrderpageController.php | 28 ++++++++++------------------
app/portal/controller/SchoolController.php | 23 +++++++++++++++++++++--
public/themes/simpleboot3/portal/orderpage/order_salesman_ty.html | 29 -----------------------------
public/themes/simpleboot3/portal/personalcenter/personal_center.html | 15 +++++++++++++++
public/themes/simpleboot3/portal/school/school.html | 3 +++
public/themes/simpleboot3/portal/school/school_edit.html | 4 +++-
6 files changed, 52 insertions(+), 50 deletions(-)
diff --git a/app/portal/controller/OrderpageController.php b/app/portal/controller/OrderpageController.php
index f3069f8..41846bd 100644
--- a/app/portal/controller/OrderpageController.php
+++ b/app/portal/controller/OrderpageController.php
@@ -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){
diff --git a/app/portal/controller/SchoolController.php b/app/portal/controller/SchoolController.php
index 7f6562a..73766d0 100644
--- a/app/portal/controller/SchoolController.php
+++ b/app/portal/controller/SchoolController.php
@@ -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();
}
diff --git a/public/themes/simpleboot3/portal/orderpage/order_salesman_ty.html b/public/themes/simpleboot3/portal/orderpage/order_salesman_ty.html
index 92fb96d..364f7d0 100755
--- a/public/themes/simpleboot3/portal/orderpage/order_salesman_ty.html
+++ b/public/themes/simpleboot3/portal/orderpage/order_salesman_ty.html
@@ -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;">-->
- <!--<!–<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>–>-->
- <!--</div>-->
- <!--<div class="three_model_school_data there_class banjiadd" style="cursor: pointer;">-->
- <!--<!–<volist name="grade_class_show" id="vo">–>-->
- <!--<!–<div class="three_model_school_name banji">{$vo}</div>–>-->
- <!--<!–</volist>–>-->
- <!--</div>-->
- <!--</div>-->
- <!--</div>-->
- <!--</div>-->
-<!--</div>-->
<div class="log_top_co" style="background-color: white;">
<!-- 顶部 -->
<div class=" order_top log_top_co">
diff --git a/public/themes/simpleboot3/portal/personalcenter/personal_center.html b/public/themes/simpleboot3/portal/personalcenter/personal_center.html
index b34246c..263cd41 100755
--- a/public/themes/simpleboot3/portal/personalcenter/personal_center.html
+++ b/public/themes/simpleboot3/portal/personalcenter/personal_center.html
@@ -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">
diff --git a/public/themes/simpleboot3/portal/school/school.html b/public/themes/simpleboot3/portal/school/school.html
index 5e9e681..285446f 100755
--- a/public/themes/simpleboot3/portal/school/school.html
+++ b/public/themes/simpleboot3/portal/school/school.html
@@ -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">
diff --git a/public/themes/simpleboot3/portal/school/school_edit.html b/public/themes/simpleboot3/portal/school/school_edit.html
index 2c21218..abfcc84 100755
--- a/public/themes/simpleboot3/portal/school/school_edit.html
+++ b/public/themes/simpleboot3/portal/school/school_edit.html
@@ -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();
--
libgit2 0.24.0