Silent il y a 6 ans
Parent
commit
4efc5bdbfd

+ 4 - 1
app/Console/Kernel.php

xqd xqd xqd
@@ -6,6 +6,7 @@ use App\Models\CheckCard;
 use Carbon\Carbon;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use Illuminate\Support\Facades\Log;
 
 class Kernel extends ConsoleKernel
 {
@@ -32,6 +33,8 @@ class Kernel extends ConsoleKernel
             $begin = Carbon::today()->toDateTimeString();
             $end = Carbon::tomorrow()->toDateTimeString();
 
+            Log::info('定时器已经执行');
+
             $items = CheckCard::where([
                 ['begin_date_time', '>=', $begin],
                 ['begin_date_time', '<', $end],
@@ -41,7 +44,7 @@ class Kernel extends ConsoleKernel
                 $item->end_date_time = Carbon::createFromTimestamp(strtotime($item->begin_date_time))->addHours(2)->toDateTimeString();
                 $item->save();
             }
-        })->dailyAt('23:50');
+        })->dailyAt('21:00');
     }
 
     /**

+ 1 - 1
app/Http/Controllers/TestController.php

xqd
@@ -16,6 +16,6 @@ class TestController extends Controller
     public function index(Request $request)
     {
         $student = Student::find(7);
-        dd($student->getTodayCheckCardMinutes());
+        dd($student->save());
     }
 }

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

xqd
@@ -255,7 +255,10 @@ class ApiController extends Controller
             return response()->json(['status' => 'fail', 'info' => '找不到打卡记录']);
         }
 
-        $item->end_date_time = Carbon::now()->toDateTimeString();
+        if(!empty($item->end_date_time)) {
+            $item->end_date_time = Carbon::now()->toDateTimeString();
+        }
+
         if(!$item->save()) {
             return response()->json(['status' => 'fail', 'info' => '打卡失败']);
         }

+ 25 - 32
wechat/pages/index/index.js

xqd xqd
@@ -90,41 +90,33 @@ Page({
       }
     })
 
-    this.updateShareInfo();
-  },
-  updateShareInfo() {
-    var pt_student = wx.getStorageSync('pt_student')
-    if (pt_student) {
-      wx.request({
-        url: api.getShareInfoUrl,
-        method: 'GET',
-        data: {
-          'student_id': pt_student.id
-        },
-        success: res => {
-          if (res.data.status == 'success') {
-            this.setData({
-              shareCanvasWidth: res.data.width,
-              shareCanvasHeight: res.data.height,
-              shareImage: res.data.shareImage,
-              shareText: res.data.shareText,
-              shareTextPosX: res.data.shareTextPosX,
-              shareTextPosY: res.data.shareTextPosY,
-            })
-            if (!this.data.shareImage) {
-              wx.downloadFile({
-                url: res.data.shareImage,
-                success: res => {
-                  this.setData({
-                    shareImage: res.tempFilePath
-                  })
-                }
+    wx.request({
+      url: api.getShareInfoUrl,
+      method: 'GET',
+      data: {
+        'student_id': pt_student.id
+      },
+      success: res => {
+        if (res.data.status == 'success') {
+          this.setData({
+            shareCanvasWidth: res.data.width,
+            shareCanvasHeight: res.data.height,
+            shareImage: res.data.shareImage,
+            shareText: res.data.shareText,
+            shareTextPosX: res.data.shareTextPosX,
+            shareTextPosY: res.data.shareTextPosY,
+          })
+          wx.downloadFile({
+            url: res.data.shareImage,
+            success: res => {
+              this.setData({
+                shareImage: res.tempFilePath
               })
             }
-          }
+          })
         }
-      })
-    }
+      }
+    })
   },
   validLocation(latitude, longitude) {
     let res = api.isTest ? true : false;
@@ -284,6 +276,7 @@ Page({
             let width = this.data.shareCanvasWidth
             let height = this.data.shareCanvasHeight
             let image = this.data.shareImage
+            console.log(image)
             let text = res.data.shareText
             let text_x = this.data.shareTextPosX
             let text_y = this.data.shareTextPosY