4

@@ -37,10 +37,10 @@ class SalesmanorderController extends AdminBaseController{
             if(!empty($_POST['grade'])){
                 $where['grade'] = $_POST['grade'];
             }
-            $data = Db::name('indent') -> where($where) -> paginate(12);
+            $data = Db::name('indent') -> where($where) -> where("state = 2 or state = 3 or state = 5") -> paginate(12);
             $data_arr = $data -> toArray();
         }else{
-            $data = Db::name('indent') -> where('indent_type',2) -> paginate(12);
+            $data = Db::name('indent') -> where('indent_type',2) -> where("state = 2 or state = 3 or state = 5") -> paginate(12);
             $data_arr = $data -> toArray();
         }
         $money = 0;

@@ -497,6 +497,7 @@ class PersonalcenterController extends WeChatBaseController{
 
         $uid = cmf_get_current_user_id();
         $my_user = Db::name('my_user') -> where('uid',$uid) -> find();
+        //搜索老师下级学生用户
         $student = Db::name('my_user') -> alias('a') -> field("a.*,b.user_nickname,b.avatar") -> join("user b","a.uid = b.id",'LEFT') -> where("a.pid",$my_user['id']) -> select() -> toArray();
         foreach ($student as $key => $val){
             $data[$key] = Db::name('indent') -> where('uid',$val['uid']) -> where("state = 2 or state = 3 or state = 5") -> select() -> toArray();
@@ -519,6 +520,18 @@ class PersonalcenterController extends WeChatBaseController{
             $res = null;
         }
         $this -> assign('res',$res);
+        //搜索老师用户
+        $teacher_avatar = Db::name('user') -> where('id',$uid) -> find();
+        $teacher = Db::name('indent') -> where('uid',$uid) -> where("state = 2 or state = 3 or state = 5") -> select() -> toArray();
+        foreach($teacher as $key => $val){
+            $teacher_data[$key]['user_name'] = $teacher_avatar['user_nickname'];
+            $teacher_data[$key]['avatar'] = $teacher_avatar['avatar'];
+            $tea_money_income = Db::name('money_income') -> where("indent_id =".$val['id']." and uid = ".$uid) -> select() -> toArray();
+            $money = 0;
+            foreach ($tea_money_income as $key2 => $val2){
+
+            }
+        }
 
         return $this -> fetch();
 

@@ -38,6 +38,24 @@
                 <div class="recordNum">佣金+{$vo.total_money}</div>
             </li>
         </volist>
+        <volist name="" id="">
+            <li>
+                <div class="recordImg">
+                    <img src="{$vo.avatar}" alt="">
+                </div>
+                <div class="recordTxt">
+                    <div class="recordTxt1 one-txt-cut">{$vo.user_name}</div>
+                    <if condition="$vo.indent_type eq 1">
+                        <div class="recordTxt2">平台订单</div>
+                    </if>
+                    <if condition="$vo.indent_type eq 2">
+                        <div class="recordTxt2">业务员订单</div>
+                    </if>
+                    <p class="recordTxt3">{$vo.create_time|date="Y-m-d H:i:s",###}</p>
+                </div>
+                <div class="recordNum">佣金+{$vo.total_money}</div>
+            </li>
+        </volist>
     </ul>
 </div>
 <!-- 底部更多 -->

@@ -204,7 +204,7 @@ class WeChatBaseController extends BaseController
      */
     public function checkWeChatUserLogin()
     {
-       /* $user = Db::name('user')->where('id',5)->find();
+        /*$user = Db::name('user')->where('id',5)->find();
         cmf_update_current_user($user);*/
         $userId = cmf_get_current_user_id();
         if (empty($userId)) {