浏览代码

定时任务

Silent 7 年之前
父节点
当前提交
fb6425ad60

+ 10 - 1
app/Http/Controllers/Admin/SettingController.php

xqd
@@ -33,9 +33,18 @@ class SettingController extends Controller
         $share_text = $this->model->firstOrCreate(['key' => 'share_text'], ['key_show' => '文本标签']);
         $share_text_pos = $this->model->firstOrCreate(['key' => 'share_text_pos'], ['key_show' => '文本位置']);
 
+        if(!empty($share_image) && !empty($share_image->value) && Storage::disk('upload')->exists($share_image->value)) {
+            $image = Image::make(url($share_image->val));
+            $width = $image->width();
+            $height = $image->height();
+        } else {
+            $width = 0;
+            $height = 0;
+        }
+
         list($pre_uri, $model, $model_name) = array($this->pre_uri, $this->model, $this->model_name);
 
-        return view($this->view_path . 'share', compact('pre_uri', 'model', 'model_name', 'share_image', 'share_text', 'share_text_pos'));
+        return view($this->view_path . 'share', compact('pre_uri', 'model', 'model_name', 'share_image', 'share_text', 'share_text_pos', 'width', 'height'));
     }
 
     public function updateShare(Request $request)

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

xqd
@@ -14,6 +14,6 @@ class TestController extends Controller
 {
     public function index(Request $request)
     {
-        $image = Image::make(url('/upload/images/20180704/7d245ff8c1b077986ebc80d477a9e388.png'))->text('nihao', '12', '14');
+
     }
 }

+ 6 - 0
resources/views/admin/settings/share.blade.php

xqd
@@ -30,6 +30,12 @@
                                 </div>
                             </div>
 
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-sm-offset-1 control-label">图片宽高</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" type="text" value="{{ $width . ',' . $height }}" readonly>                                </div>
+                            </div>
+
                             <div class="form-group row">
                                 <label class="col-sm-2 col-sm-offset-1 control-label">文本标签</label>
                                 <div class="col-sm-8">