Browse Source

分享图片

Silent 6 years ago
parent
commit
fcc36626d6

+ 7 - 2
app/Http/Controllers/WeChat/ApiController.php

@@ -122,14 +122,19 @@ class ApiController extends Controller
         return response()->json(['status' => 'success', 'info' => '打卡成功']);
         return response()->json(['status' => 'success', 'info' => '打卡成功']);
     }
     }
 
 
-    public function getShareImageSize(Request $request)
+    public function getShareInfo(Request $request)
     {
     {
         $share_image = Setting::where('key', 'share_image')->first();
         $share_image = Setting::where('key', 'share_image')->first();
         if(empty($share_image) || empty($share_image->value) || !Storage::disk('upload')->exists($share_image->value)) {
         if(empty($share_image) || empty($share_image->value) || !Storage::disk('upload')->exists($share_image->value)) {
             return response()->json(['status' => 'fail', 'info' => '没有分享图片的信息!']);
             return response()->json(['status' => 'fail', 'info' => '没有分享图片的信息!']);
         }
         }
+        if(empty($request->input('student_id')) || empty($student = Student::find($request->input('student_id')))) {
+            return response()->json(['status' => 'fail', 'info' => '找不到用户信息!']);
+        }
 
 
-        $image = Image::make(url($share_image->value));
+        $image_url = url($share_image->value);
+        $image = Image::make($image_url);
+        $items = CheckCard::where('student_id', $student->id)->whereNotNull('begin_date_time')->whereNotNull('end_date_time')->get();
 
 
         return response()->json(['status' => 'success', 'width' => $image->width(), 'height' => $image->height()]);
         return response()->json(['status' => 'success', 'width' => $image->width(), 'height' => $image->height()]);
     }
     }

+ 1 - 1
app/Models/CheckCard.php

@@ -33,7 +33,7 @@ class CheckCard extends Model
             $end_time = strtotime($this['end_date_time']);
             $end_time = strtotime($this['end_date_time']);
             if($end_time > $begin_time) {
             if($end_time > $begin_time) {
                 $diff_time = $end_time - $begin_time;
                 $diff_time = $end_time - $begin_time;
-                $tmp = $diff_time / 3600;
+                $tmp = floor($diff_time / 3600);
                 $diff_time = $diff_time % 3600;
                 $diff_time = $diff_time % 3600;
                 if(!empty($tmp)) {
                 if(!empty($tmp)) {
                     $res .= $tmp . '小时';
                     $res .= $tmp . '小时';

+ 1 - 1
routes/wechat.php

@@ -5,4 +5,4 @@ Route::post('login', 'ApiController@login');
 Route::get('checkPosition', 'ApiController@checkPosition');
 Route::get('checkPosition', 'ApiController@checkPosition');
 Route::get('startCheckCard', 'ApiController@startCheckCard');
 Route::get('startCheckCard', 'ApiController@startCheckCard');
 Route::get('endCheckCard', 'ApiController@endCheckCard');
 Route::get('endCheckCard', 'ApiController@endCheckCard');
-Route::get('getShareImageSize', 'ApiController@getShareImageSize');
+Route::get('getShareInfo', 'ApiController@getShareInfo');

+ 16 - 2
wechat/pages/index/index.js

@@ -15,8 +15,7 @@ Page({
     startTime: null,        //开始时间
     startTime: null,        //开始时间
     clock: '00:00:00',      //计时
     clock: '00:00:00',      //计时
     shareCanvasWidth: 200,
     shareCanvasWidth: 200,
-    shareCanvasHeight: 280,
-
+    shareCanvasHeight: 280
   },
   },
   onLoad: function () {
   onLoad: function () {
     wx.getSystemInfo({
     wx.getSystemInfo({
@@ -29,6 +28,21 @@ Page({
         })
         })
       }
       }
     })
     })
+
+    wx.request({
+      url: api.getShareImageSizeUrl,
+      method: 'GET',
+      success: res => {
+        if(res.data.status == 'success') {
+          console.log(res)
+          this.setData({
+            shareCanvasWidth: res.data.width,
+            shareCanvasHeight: res.data.height
+          })
+        }
+      }
+    })
+
     var pt_student = wx.getStorageSync('pt_student')
     var pt_student = wx.getStorageSync('pt_student')
     
     
     if (!pt_student) {
     if (!pt_student) {

+ 2 - 1
wechat/utils/api.js

@@ -6,5 +6,6 @@ module.exports = {
   loginUrl: headUrl + 'login',
   loginUrl: headUrl + 'login',
   checkPositionUrl: headUrl + 'checkPosition',
   checkPositionUrl: headUrl + 'checkPosition',
   startCheckCardUrl: headUrl + 'startCheckCard',
   startCheckCardUrl: headUrl + 'startCheckCard',
-  endCheckCardUrl: headUrl + 'endCheckCard'
+  endCheckCardUrl: headUrl + 'endCheckCard',
+  getShareImageSizeUrl: headUrl + 'getShareImageSize',
 }
 }