4

@@ -526,7 +526,7 @@ class PersonalcenterController extends WeChatBaseController{
         foreach ($student as $key => $val){
         foreach ($student as $key => $val){
             if(!empty($get['startime']) && !empty($get['endtime'])){
             if(!empty($get['startime']) && !empty($get['endtime'])){
                 $startime = strtotime($get['startime']);
                 $startime = strtotime($get['startime']);
-                $endtime = strtotime($get['endtime']);
+                $endtime = strtotime($get['endtime'])+86400;
                 $data[$key] = Db::name('indent') -> where('uid',$val['uid']) -> where("state = 2 or state = 3 or state = 5") -> where("pay_time>=".$startime." and pay_time<=".$endtime) -> select() -> toArray();
                 $data[$key] = Db::name('indent') -> where('uid',$val['uid']) -> where("state = 2 or state = 3 or state = 5") -> where("pay_time>=".$startime." and pay_time<=".$endtime) -> select() -> toArray();
             }else{
             }else{
                 $data[$key] = Db::name('indent') -> where('uid',$val['uid']) -> where("state = 2 or state = 3 or state = 5") -> select() -> toArray();
                 $data[$key] = Db::name('indent') -> where('uid',$val['uid']) -> where("state = 2 or state = 3 or state = 5") -> select() -> toArray();
@@ -544,7 +544,7 @@ class PersonalcenterController extends WeChatBaseController{
                     foreach ($money_income as $key2 => $val2){
                     foreach ($money_income as $key2 => $val2){
                         $money += $val2['money'];
                         $money += $val2['money'];
                     }
                     }
-                    $data[$key][$key1]['total_money'] = $money;
+                    $data[$key][$key1]['total_money'] = number_format($money,2);
                     $res[] = $data[$key][$key1];
                     $res[] = $data[$key][$key1];
                 }
                 }
             }
             }
@@ -574,7 +574,7 @@ class PersonalcenterController extends WeChatBaseController{
             foreach ($tea_money_income as $key2 => $val2){
             foreach ($tea_money_income as $key2 => $val2){
                 $money += $val2['money'];
                 $money += $val2['money'];
             }
             }
-            $teacher_data[$key]['total_money'] = $money;
+            $teacher_data[$key]['total_money'] = number_format($money,2) ;
             $teacher_data[$key]['indent_type'] = $val['indent_type'];
             $teacher_data[$key]['indent_type'] = $val['indent_type'];
             $teacher_data[$key]['create_time'] = $val['create_time'];
             $teacher_data[$key]['create_time'] = $val['create_time'];
             $my_res[] = $teacher_data[$key];
             $my_res[] = $teacher_data[$key];

@@ -2193,7 +2193,8 @@ body {
 }
 }
 
 
 .recordTxt {
 .recordTxt {
-    width: 4rem;
+    /*width: 4rem;*/
+    width: 3.6rem;
     margin-left: 0.32rem;
     margin-left: 0.32rem;
     cursor: pointer;
     cursor: pointer;
 }
 }

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