Silent 6 年之前
父节点
当前提交
d85675efb4
共有 2 个文件被更改,包括 14 次插入5 次删除
  1. 13 4
      app/Http/Controllers/WeChat/ApiController.php
  2. 1 1
      wechat/pages/rate/rate.js

+ 13 - 4
app/Http/Controllers/WeChat/ApiController.php

xqd
@@ -457,12 +457,21 @@ class ApiController extends Controller
         }
 
         foreach($teachers as $teacher) {
-            $remark_time = RemarkDetail::where([
+            $remark = Remark::where([
                 ['student_id', '=', $student->id],
                 ['teacher_id', '=', $teacher->id],
-            ])->orderBy('updated_at', 'desc')->first();
-            $teacher->remark_time = empty($remark_time) ? '' : substr($remark_time->updated_at, 0, 10);
-            $teacher->average_score = $student->getThisWeekAverageScore($teacher);
+            ])->first();
+            if(!empty($remark)) {
+                $remark_time = RemarkDetail::where([
+                    ['remark_id', '=', $remark->id],
+                    ['teacher_id', '=', $teacher->id],
+                ])->orderBy('updated_at', 'desc')->first();
+                $teacher->remark_time = empty($remark_time) ? '' : substr($remark_time->updated_at, 0, 10);
+                $teacher->average_score = $student->getThisWeekAverageScore($teacher);
+            } else {
+                $teacher->remark_time = '';
+                $teacher->average_score = 0;
+            }
         }
 
         return response()->json(['status' => 'success', 'titles' => [], 'teachers' => $teachers, 'is_new' => $is_new]);

+ 1 - 1
wechat/pages/rate/rate.js

xqd
@@ -23,7 +23,7 @@ Page({
       },
       method: 'GET',
       success: res => {
-        console.log(res)
+        console.log(res.data)
         that.setData({
           is_new: res.data.is_new,
           titles: res.data.titles,