diff --git a/app/portal/controller/PersonalcenterController.php b/app/portal/controller/PersonalcenterController.php
index 2348873..02e56f0 100644
--- a/app/portal/controller/PersonalcenterController.php
+++ b/app/portal/controller/PersonalcenterController.php
@@ -786,8 +786,14 @@ class PersonalcenterController extends WeChatBaseController{
if(!empty($grade_class)){
foreach ($grade_class as $key => $val){
$class = explode('-',$val['class']);
- for($i=$class[0];$i<=$class[1];$i++){
- $grade_class_show[] = $val['grade'].' - '.$i."班";
+ if($val['grade'] == '学龄前') {
+ foreach ($class as $kc=>$vc) {
+ $grade_class_show[] = $vc;
+ }
+ } else {
+ for($i=$class[0];$i<=$class[1];$i++){
+ $grade_class_show[] = $val['grade'].' - '.$i."班";
+ }
}
}
foreach ($grade_class_show as $key => $val){
diff --git a/app/portal/controller/SchoolController.php b/app/portal/controller/SchoolController.php
index 73766d0..141816b 100644
--- a/app/portal/controller/SchoolController.php
+++ b/app/portal/controller/SchoolController.php
@@ -63,22 +63,28 @@ class SchoolController extends WeChatBaseController{
foreach ($val['grade'] as $key1 => $val1){
//循环传过来的年级
foreach ($class_data as $key2 => $val2){
- $val2 = explode('-',$val2);
- if($val2[0] == $val1['grade']){
- //将班级拆分循环装进数组
- $class_s = explode('-',$val1['class']);
- for($i=$class_s[0];$i<=$class_s[1];$i++){
- $class_db[] = $i;
- }
- //将传过来的班级循环
- for($j=$val2[1];$j<=$val2[2];$j++){
- $class_my[] = $j;
- }
- $result = array_intersect($class_db,$class_my);
- $result = count($result);
- if($result > 0){
+ if($_POST['type'] == '学龄前'){
+ if(in_array($val2,explode('-',$val1['class']))) {
return 5;
}
+ } else {
+ $val2 = explode('-',$val2);
+ if($val2[0] == $val1['grade']){
+ //将班级拆分循环装进数组
+ $class_s = explode('-',$val1['class']);
+ for($i=$class_s[0];$i<=$class_s[1];$i++){
+ $class_db[] = $i;
+ }
+ //将传过来的班级循环
+ for($j=$val2[1];$j<=$val2[2];$j++){
+ $class_my[] = $j;
+ }
+ $result = array_intersect($class_db,$class_my);
+ $result = count($result);
+ if($result > 0){
+ return 5;
+ }
+ }
}
}
}
@@ -94,12 +100,21 @@ class SchoolController extends WeChatBaseController{
return 5;
}
$school_id = Db::name('school') -> insertGetId($school);
- foreach ($class_data as $key => $val){
- $grade_class = explode('-',$val);
+ // 判断是否是学龄前
+ if($_POST['type'] == '学龄前') {
+ $grade_class = implode('-',$class_data);
$grade['school_id'] = $school_id;
- $grade['grade'] = $grade_class[0];
- $grade['class'] = $grade_class[1].'-'.$grade_class[2];
+ $grade['grade'] = $_POST['type'];
+ $grade['class'] = $grade_class;
Db::name('grade_class') -> insert($grade);
+ } else {
+ foreach ($class_data as $key => $val) {
+ $grade_class = explode('-', $val);
+ $grade['school_id'] = $school_id;
+ $grade['grade'] = $grade_class[0];
+ $grade['class'] = $grade_class[1] . '-' . $grade_class[2];
+ Db::name('grade_class')->insert($grade);
+ }
}
if($school_id){
return true;
@@ -132,12 +147,21 @@ class SchoolController extends WeChatBaseController{
$class_data[] = $val;
}
}
- foreach ($class_data as $key => $val){
- $grade_class = explode('-',$val);
+ // 判断是否是学龄前
+ if($_POST['type'] == '学龄前') {
+ $grade_class = implode('-',$class_data);
$grade['school_id'] = $_POST['id'];
- $grade['grade'] = $grade_class[0];
- $grade['class'] = $grade_class[1].'-'.$grade_class[2];
+ $grade['grade'] = $_POST['type'];
+ $grade['class'] = $grade_class;
Db::name('grade_class') -> insert($grade);
+ } else {
+ foreach ($class_data as $key => $val){
+ $grade_class = explode('-',$val);
+ $grade['school_id'] = $_POST['id'];
+ $grade['grade'] = $grade_class[0];
+ $grade['class'] = $grade_class[1].'-'.$grade_class[2];
+ Db::name('grade_class') -> insert($grade);
+ }
}
return true;
}else{
diff --git a/data/conf/database.php b/data/conf/database.php
index ac2fb25..fb0f116 100644
--- a/data/conf/database.php
+++ b/data/conf/database.php
@@ -7,7 +7,7 @@ return [
// 数据库类型
'type' => 'mysql',
// 服务器地址
- 'hostname' => 'rm-m5eblhc9o3515i25n.mysql.rds.aliyuncs.com',
+ 'hostname' => 'rm-m5eblhc9o3515i25neo.mysql.rds.aliyuncs.com',
// 数据库名
'database' => 'xkeasy',
// 用户名
diff --git a/public/themes/simpleboot3/portal/school/add_school.html b/public/themes/simpleboot3/portal/school/add_school.html
index 2b1fa61..74da314 100755
--- a/public/themes/simpleboot3/portal/school/add_school.html
+++ b/public/themes/simpleboot3/portal/school/add_school.html
@@ -94,6 +94,12 @@
<div class="log_four_contant_left">
<img src="__TMPL__/public/assets/images/73.png" alt="" />
</div>
+ <div class="log_four_contant_right">学龄前</div>
+ </div>
+ <div class="log_four_contant_one">
+ <div class="log_four_contant_left">
+ <img src="__TMPL__/public/assets/images/39_0.png" alt="" />
+ </div>
<div class="log_four_contant_right">小学</div>
</div>
<div class="log_four_contant_one">
@@ -115,6 +121,42 @@
<div class="log_four_contants">
<div class=" log_four_contant_ones">
<div class="log_botms">
+ <div class="log_four_contants_left xuelingqian" data-name="小班" data-class="1">
+ <img class="log_Img9" src="__TMPL__/public/assets/images/39_0.png" alt="" />
+ </div>
+ <div class="log_four_contants_right">小班</div>
+ </div>
+ </div>
+ <div class=" log_four_contant_ones">
+ <div class="log_botms">
+ <div class="log_four_contants_left xuelingqian" data-name="中班" data-class="2">
+ <img class="log_Img9" src="__TMPL__/public/assets/images/39_0.png" alt="" />
+ </div>
+ <div class="log_four_contants_right">中班</div>
+ </div>
+ </div>
+ <div class=" log_four_contant_ones">
+ <div class="log_botms">
+ <div class="log_four_contants_left xuelingqian" data-name="大班" data-class="3">
+ <img class="log_Img9" src="__TMPL__/public/assets/images/39_0.png" alt="" />
+ </div>
+ <div class="log_four_contants_right">大班</div>
+ </div>
+ </div>
+ <div class=" log_four_contant_ones">
+ <div class="log_botms">
+ <div class="log_four_contants_left xuelingqian" data-name="学前班" data-class="4">
+ <img class="log_Img9" src="__TMPL__/public/assets/images/39_0.png" alt="" />
+ </div>
+ <div class="log_four_contants_right">学前班</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="log_four_radios" style="display: none">
+ <div class="log_four_contants">
+ <div class=" log_four_contant_ones">
+ <div class="log_botms">
<div class="log_four_contants_left">
<img class="log_Img9" src="__TMPL__/public/assets/images/73.png" alt="" />
</div>
@@ -679,9 +721,9 @@
$('.log_four_radios').on('click','.log_botms',function() {
var root = $(this).parents('.log_four_radios').index();
var index = $(this).parent().index();
- console.log(index)
+ // console.log(index)
index = root == 0?index:root==1?index + 6:index+9
- console.log(index)
+ // console.log(index)
if($(this).find('.log_Img9').attr("src") == '__TMPL__/public/assets/images/39_0.png') {
$(this).find('.log_Img9').attr("src", "__TMPL__/public/assets/images/73.png");
$(this).next('.log_four_contants_input_block').slideDown();
@@ -690,18 +732,28 @@
var tempData = '';
var classes = index == 0 ? '一年级' : index == 1 ? '二年级' : index == 2 ? '三年级' : index == 3 ? '四年级' : index == 4 ? '五年级' : index == 5 ? '六年级' : index == 6 ? '初一' : index == 7 ? '初二' : index == 8 ? '初三' : index == 9 ? '高一' : index == 10 ? '高二' : index == 11 ? '高三' : '';
if($(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img").attr("src") == "__TMPL__/public/assets/images/73.png") {
- if(inputs[0].value && inputs[1].value) {
- tempData = classes + '-' + inputs[0].value + '-' + inputs[1].value
+ if(inputs.length == 0) {
+ var name = $(this).find('.xuelingqian').data('name');
+ var ind = $(this).find('.xuelingqian').data('class');
+ arr[ind-1] = name;
+ } else {
+ if(inputs[0].value && inputs[1].value) {
+ tempData = classes + '-' + inputs[0].value + '-' + inputs[1].value
+ }
+ arr[index] = tempData;
}
- arr[index] = tempData;
-
} else{
arr[index] = ''
}
} else {
$(this).find('.log_Img9').attr("src", '__TMPL__/public/assets/images/39_0.png');
$(this).next('.log_four_contants_input_block').slideUp();
- arr[index] = ''
+ var ind = $(this).find('.xuelingqian').data('class');
+ if(ind) {
+ arr[ind-1] = '';
+ } else {
+ arr[index] = ''
+ }
}
console.log(arr)
});
diff --git a/public/themes/simpleboot3/portal/school/school.html b/public/themes/simpleboot3/portal/school/school.html
index 285446f..6556b7f 100755
--- a/public/themes/simpleboot3/portal/school/school.html
+++ b/public/themes/simpleboot3/portal/school/school.html
@@ -86,7 +86,7 @@
<div class="log_seven_left_one">{$val.school}</div>
<div class="log_seven_left_two">
<volist name="val.class" id="vo">
- <span>{$vo.grade}{$vo.class}班</span>
+ <span>{$vo.grade}{$vo.class}<neq name="val.type" value="学龄前">班</neq></span>
</volist>
</div>
<div class="log_secen_left_three">{$val.region}</div>
diff --git a/public/themes/simpleboot3/portal/school/school_edit.html b/public/themes/simpleboot3/portal/school/school_edit.html
index abfcc84..33132d4 100755
--- a/public/themes/simpleboot3/portal/school/school_edit.html
+++ b/public/themes/simpleboot3/portal/school/school_edit.html
@@ -93,6 +93,16 @@
<div class="log_four_contant">
<div class="log_four_contant_one">
<div class="log_four_contant_left">
+ <if condition="$data.type eq '学龄前'">
+ <img src="__TMPL__/public/assets/images/73.png" alt="" />
+ <else/>
+ <img src="__TMPL__/public/assets/images/39_0.png" alt="" />
+ </if>
+ </div>
+ <div class="log_four_contant_right">学龄前</div>
+ </div>
+ <div class="log_four_contant_one">
+ <div class="log_four_contant_left">
<if condition="$data.type eq '小学'">
<img src="__TMPL__/public/assets/images/73.png" alt="" />
<else/>
@@ -129,6 +139,42 @@
<div class="log_four_contants">
<div class=" log_four_contant_ones">
<div class="log_botms">
+ <div class="log_four_contants_left xuelingqian" data-name="小班" data-class="1">
+ <img class="log_Img9" src="__TMPL__/public/assets/images/39_0.png" alt="" />
+ </div>
+ <div class="log_four_contants_right">小班</div>
+ </div>
+ </div>
+ <div class=" log_four_contant_ones">
+ <div class="log_botms">
+ <div class="log_four_contants_left xuelingqian" data-name="中班" data-class="2">
+ <img class="log_Img9" src="__TMPL__/public/assets/images/39_0.png" alt="" />
+ </div>
+ <div class="log_four_contants_right">中班</div>
+ </div>
+ </div>
+ <div class=" log_four_contant_ones">
+ <div class="log_botms">
+ <div class="log_four_contants_left xuelingqian" data-name="大班" data-class="3">
+ <img class="log_Img9" src="__TMPL__/public/assets/images/39_0.png" alt="" />
+ </div>
+ <div class="log_four_contants_right">大班</div>
+ </div>
+ </div>
+ <div class=" log_four_contant_ones">
+ <div class="log_botms">
+ <div class="log_four_contants_left xuelingqian" data-name="学前班" data-class="4">
+ <img class="log_Img9" src="__TMPL__/public/assets/images/39_0.png" alt="" />
+ </div>
+ <div class="log_four_contants_right">学前班</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="log_four_radios" style="display: none">
+ <div class="log_four_contants">
+ <div class=" log_four_contant_ones">
+ <div class="log_botms">
<div class="log_four_contants_left">
<img class="log_Img9" src="__TMPL__/public/assets/images/73.png" alt="" />
</div>
@@ -632,12 +678,9 @@
$(".log_four_contant_one").each(function() {
$(this).click(function() {
var index = $(this).index();
- console.log(index);
var text1 = $(this).find(".log_four_contant_right").text();
- console.log(text1)
$("#four_inp").attr("placeholder", text1).attr("value",text1);
xcg = $(this).find('.log_four_contant_right').text();
- console.log(xcg)
$(".log_four_contant_one img").eq(index).attr("src", "__TMPL__/public/assets/images/73.png").parents(".log_four_contant_one").siblings().find("img").attr("src", "__TMPL__/public/assets/images/39_0.png");
if($(".log_four_contant_one img").eq(index).attr("src") == "__TMPL__/public/assets/images/73.png") {
$(".log_four_radios").eq(index).css({
@@ -679,7 +722,6 @@
tempData = classes + '-' + inputs[0].value + '-' + inputs[1].value
}
arr[index] = tempData;
- console.log(arr)
} else {
tempData = ""
}
@@ -690,9 +732,7 @@
$('.log_four_radios').on('click','.log_botms',function() {
var root = $(this).parents('.log_four_radios').index();
var index = $(this).parent().index();
- console.log(index)
index = root == 0?index:root==1?index + 6:index+9
- console.log(index)
if($(this).find('.log_Img9').attr("src") == '__TMPL__/public/assets/images/39_0.png') {
$(this).find('.log_Img9').attr("src", "__TMPL__/public/assets/images/73.png");
$(this).next('.log_four_contants_input_block').slideDown();
@@ -701,18 +741,28 @@
var tempData = '';
var classes = index == 0 ? '一年级' : index == 1 ? '二年级' : index == 2 ? '三年级' : index == 3 ? '四年级' : index == 4 ? '五年级' : index == 5 ? '六年级' : index == 6 ? '初一' : index == 7 ? '初二' : index == 8 ? '初三' : index == 9 ? '高一' : index == 10 ? '高二' : index == 11 ? '高三' : '';
if($(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img").attr("src") == "__TMPL__/public/assets/images/73.png") {
- if(inputs[0].value && inputs[1].value) {
- tempData = classes + '-' + inputs[0].value + '-' + inputs[1].value
+ if(inputs.length == 0) {
+ var name = $(this).find('.xuelingqian').data('name');
+ var ind = $(this).find('.xuelingqian').data('class');
+ arr[ind-1] = name;
+ } else {
+ if (inputs[0].value && inputs[1].value) {
+ tempData = classes + '-' + inputs[0].value + '-' + inputs[1].value
+ }
+ arr[index] = tempData;
}
- arr[index] = tempData;
-
} else{
arr[index] = ''
}
} else {
$(this).find('.log_Img9').attr("src", '__TMPL__/public/assets/images/39_0.png');
$(this).next('.log_four_contants_input_block').slideUp();
- arr[index] = ''
+ var ind = $(this).find('.xuelingqian').data('class');
+ if(ind) {
+ arr[ind-1] = '';
+ } else {
+ arr[index] = ''
+ }
}
console.log(arr)
});