正在显示
2 个修改的文件
包含
15 行增加
和
7 行删除
@@ -606,6 +606,7 @@ class PersonalcenterController extends WeChatBaseController{ | @@ -606,6 +606,7 @@ class PersonalcenterController extends WeChatBaseController{ | ||
606 | 'a.indent_type' => 2, | 606 | 'a.indent_type' => 2, |
607 | 'a.salesman_uid' => $uid | 607 | 'a.salesman_uid' => $uid |
608 | ]; | 608 | ]; |
609 | + | ||
609 | if($res['grade_class'] != ''){ | 610 | if($res['grade_class'] != ''){ |
610 | $school_grade_class = explode(' ',$res['grade_class']); | 611 | $school_grade_class = explode(' ',$res['grade_class']); |
611 | $where['a.school'] = $school_grade_class[0]; | 612 | $where['a.school'] = $school_grade_class[0]; |
@@ -621,6 +622,7 @@ class PersonalcenterController extends WeChatBaseController{ | @@ -621,6 +622,7 @@ class PersonalcenterController extends WeChatBaseController{ | ||
621 | $indent_goods = Db::name('indent') -> alias('a') -> field("a.*,b.indent_id,b.book_name,b.pricing,b.price,b.number,b.thumbnail") -> join('indent_goods b','a.id=b.indent_id','LEFT') -> where($where) -> where("a.state =2 or a.state=3 or a.state=5") -> select(); | 622 | $indent_goods = Db::name('indent') -> alias('a') -> field("a.*,b.indent_id,b.book_name,b.pricing,b.price,b.number,b.thumbnail") -> join('indent_goods b','a.id=b.indent_id','LEFT') -> where($where) -> where("a.state =2 or a.state=3 or a.state=5") -> select(); |
622 | $indent_money = Db::name('indent') -> alias('a') -> field("a.id,b.*") -> join('money_income b','a.id=b.indent_id','LEFT') -> where($where) -> where("a.state =2 or a.state=3 or a.state=5") -> where("b.uid =".$uid) -> select(); | 623 | $indent_money = Db::name('indent') -> alias('a') -> field("a.id,b.*") -> join('money_income b','a.id=b.indent_id','LEFT') -> where($where) -> where("a.state =2 or a.state=3 or a.state=5") -> where("b.uid =".$uid) -> select(); |
623 | }else{ | 624 | }else{ |
625 | + | ||
624 | $indent_goods = Db::name('indent') -> alias('a') -> field("a.*,b.indent_id,b.book_name,b.pricing,b.price,b.number,b.thumbnail") -> join('indent_goods b','a.id=b.indent_id','LEFT') -> where('a.indent_type=2 and a.salesman_uid='.$uid) -> where("a.state =2 or a.state=3 or a.state=5") -> select(); | 626 | $indent_goods = Db::name('indent') -> alias('a') -> field("a.*,b.indent_id,b.book_name,b.pricing,b.price,b.number,b.thumbnail") -> join('indent_goods b','a.id=b.indent_id','LEFT') -> where('a.indent_type=2 and a.salesman_uid='.$uid) -> where("a.state =2 or a.state=3 or a.state=5") -> select(); |
625 | /*$indent_money = Db::name('indent') -> alias('a') -> field("a.id,b.*") -> join('money_income b','a.id=b.indent_id','LEFT') -> where('a.indent_type=2 and a.salesman_uid='.$uid) -> where("a.state =2 or a.state=3 or a.state=5") -> select();*/ | 627 | /*$indent_money = Db::name('indent') -> alias('a') -> field("a.id,b.*") -> join('money_income b','a.id=b.indent_id','LEFT') -> where('a.indent_type=2 and a.salesman_uid='.$uid) -> where("a.state =2 or a.state=3 or a.state=5") -> select();*/ |
626 | $indent_money = Db::name('money_income') -> where("uid =".$uid) -> select(); | 628 | $indent_money = Db::name('money_income') -> where("uid =".$uid) -> select(); |
@@ -632,14 +634,20 @@ class PersonalcenterController extends WeChatBaseController{ | @@ -632,14 +634,20 @@ class PersonalcenterController extends WeChatBaseController{ | ||
632 | } | 634 | } |
633 | $total_money = $total_money-$total_money*0.006; | 635 | $total_money = $total_money-$total_money*0.006; |
634 | $this -> assign('total_money',$total_money); | 636 | $this -> assign('total_money',$total_money); |
637 | + | ||
635 | //显示学校年级 | 638 | //显示学校年级 |
636 | - $school = Db::name('school') -> where('uid',$uid) -> select(); | ||
637 | - $grade_class = Db::name('grade_class') -> where("school_id",$school[0]['id']) -> select(); | ||
638 | - foreach ($grade_class as $key => $val){ | ||
639 | - $class = explode('-',$val['class']); | ||
640 | - for($i=$class[0];$i<=$class[1];$i++){ | ||
641 | - $grade_class_show[] = $val['grade'].' - '.$i."班"; | 639 | + $school = Db::name('school') -> where('uid',$uid) -> select() -> toArray(); |
640 | + if(count($school) != 0){ | ||
641 | + $grade_class = Db::name('grade_class') -> where("school_id",$school[0]['id']) -> select(); | ||
642 | + foreach ($grade_class as $key => $val){ | ||
643 | + $class = explode('-',$val['class']); | ||
644 | + for($i=$class[0];$i<=$class[1];$i++){ | ||
645 | + $grade_class_show[] = $val['grade'].' - '.$i."班"; | ||
646 | + } | ||
642 | } | 647 | } |
648 | + }else{ | ||
649 | + $school = ''; | ||
650 | + $grade_class_show = ''; | ||
643 | } | 651 | } |
644 | $this -> assign('school',$school); | 652 | $this -> assign('school',$school); |
645 | $this -> assign('grade_class_show',$grade_class_show); | 653 | $this -> assign('grade_class_show',$grade_class_show); |
@@ -204,7 +204,7 @@ class WeChatBaseController extends BaseController | @@ -204,7 +204,7 @@ class WeChatBaseController extends BaseController | ||
204 | */ | 204 | */ |
205 | public function checkWeChatUserLogin() | 205 | public function checkWeChatUserLogin() |
206 | { | 206 | { |
207 | - /*$user = Db::name('user')->where('id',6)->find(); | 207 | + /*$user = Db::name('user')->where('id',2)->find(); |
208 | cmf_update_current_user($user);*/ | 208 | cmf_update_current_user($user);*/ |
209 | $userId = cmf_get_current_user_id(); | 209 | $userId = cmf_get_current_user_id(); |
210 | if (empty($userId)) { | 210 | if (empty($userId)) { |
-
请 注册 或 登录 后发表评论