jingyuzhi 4 vuotta sitten
vanhempi
commit
e48b34ca4a

+ 26 - 0
app/Admin/Controllers/Api/ApiController.php

xqd
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Admin\Controllers\Api;
+
+use Encore\Admin\Controllers\AdminController;
+
+class ApiController extends AdminController
+{
+    /**
+     * 后台上传图片
+     * @return string
+     */
+
+    public function upload()
+    {
+        $url = "error|服务器端错误";
+
+        foreach (request()->file() as $file) {
+            $url = "upload/images/".uniqid().rand(9000,100000).'.'.$file->getClientOriginalExtension();
+            file_put_contents($url,file_get_contents($file->getRealPath()));
+        }
+
+        return env('APP_URL').'/'.$url;
+    }
+
+}

+ 2 - 2
app/Admin/Controllers/NoticeDoctorController.php

xqd xqd
@@ -8,7 +8,7 @@ use Encore\Admin\Form;
 use Encore\Admin\Grid;
 use Encore\Admin\Show;
 
-class NoticeUserController extends AdminController
+class NoticeDoctorController extends AdminController
 {
     /**
      * Title for current resource.
@@ -51,7 +51,7 @@ class NoticeUserController extends AdminController
         $form = new Form(new Notice());
 
         $form->text('title', __('标题'))->rules('required|min:3|max:255',['required'=>'请填写标题','min'=>'标题字符不能少于3个','max'=>'标题长度过长']);
-        $form->textarea('content', __('内容'))->rules('required' ,['required'=>'请填写内容!']);
+        $form->editor('content', __('内容'))->rules('required' ,['required'=>'请填写内容!']);
         $form->url('url', __('链接'))->rules('required',['required'=>'请填写链接']);
         $form->hidden('type', __('分类'))->default('2');
         $status = [

+ 1 - 1
app/Admin/Controllers/NoticeUserController.php

xqd
@@ -51,7 +51,7 @@ class NoticeUserController extends AdminController
         $form = new Form(new Notice());
 
         $form->text('title', __('标题'))->rules('required|min:3|max:255',['required'=>'请填写标题','min'=>'标题字符不能少于3个','max'=>'标题长度过长']);
-        $form->textarea('content', __('内容'))->rules('required' ,['required'=>'请填写内容!']);
+        $form->editor('content', __('内容'))->rules('required' ,['required'=>'请填写内容!']);
         $form->url('url', __('链接'))->rules('required',['required'=>'请填写链接']);
         $form->hidden('type', __('分类'))->default('1');
         $status = [

+ 5 - 1
app/Admin/routes.php

xqd xqd
@@ -13,6 +13,7 @@ Route::group([
     $router->get('/', 'HomeController@index')->name('home');
     $router->get('/api/getCity', 'ApiController@getCity');
     $router->get('/api/getArea', 'ApiController@getArea');
+    $router->post('/img_upload', 'Api\ApiController@upload');
     $router->resource('/cdms_user', CdmsController::class);
     $router->resource('/organizations', OrganizationController::class);
     $router->resource('/docters', DocterController::class);
@@ -44,9 +45,12 @@ Route::group([
     //图标DIV
     $router->resource('icons_user', IconsUserController::class);
     $router->resource('icons_doctor', IconsDoctorController::class);
-    //公告管理->用户->医生
+    //公告管理->用户&医生
     $router->resource('notices_user', NoticeUserController::class);
     $router->resource('notices_doctor', NoticeDoctorController::class);
+    //小程序->用户端->底部菜单
+    $router->resource('menubars', MenubarController::class);
+
     $router->resource('/setting', 'Config\ConfigController');
     $router->get('/setting_form', 'Config\FormController@form');
     $router->post('/setting_form_save', 'Config\FormController@setting_form_save');

+ 11 - 0
app/Models/Menubar.php

xqd
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Menubar extends Model
+{
+    //
+    protected $table = 'menubar';
+}

+ 3 - 2
composer.json

xqd
@@ -11,12 +11,13 @@
         "php": "^7.2",
         "encore/laravel-admin": "1.*",
         "fideloper/proxy": "^4.0",
+        "jxlwqq/wang-editor2": "^1.0",
         "laravel-admin-ext/multitenancy": "^2.1",
         "laravel/framework": "^6.0",
         "laravel/tinker": "^1.0",
+        "maatwebsite/excel": "^3.1",
         "overtrue/wechat": "^4.0",
-        "sven/artisan-view": "^3.3",
-        "maatwebsite/excel": "^3.1"
+        "sven/artisan-view": "^3.3"
     },
     "require-dev": {
         "filp/whoops": "^2.0",

+ 63 - 1
composer.lock

xqd xqd
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "418bc0dda52cb02116262b36b99e5be4",
+    "content-hash": "fc6e57f3eeb15c03a65075f447c88400",
     "packages": [
         {
             "name": "dnoegel/php-xdg-base-dir",
@@ -1097,6 +1097,68 @@
             "abandoned": "php-parallel-lint/php-console-highlighter",
             "time": "2018-09-29T18:48:56+00:00"
         },
+        {
+            "name": "jxlwqq/wang-editor2",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel-admin-extensions/wangEditor2.git",
+                "reference": "46622fe683c076718e6bee1e5bb9b8ad842fd0cd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel-admin-extensions/wangEditor2/zipball/46622fe683c076718e6bee1e5bb9b8ad842fd0cd",
+                "reference": "46622fe683c076718e6bee1e5bb9b8ad842fd0cd",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "encore/laravel-admin": "~1.6",
+                "php": ">=7.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~6.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Jxlwqq\\WangEditor2\\WangEditor2ServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Jxlwqq\\WangEditor2\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "jxlwqq",
+                    "email": "jxlwqq@gmail.com"
+                }
+            ],
+            "description": "wang-editor2 for laravel-admin",
+            "homepage": "https://github.com/jxlwqq/wangEditor2",
+            "keywords": [
+                "extension",
+                "laravel-admin"
+            ],
+            "support": {
+                "issues": "https://github.com/jxlwqq/wangEditor2/issues",
+                "source": "https://github.com/jxlwqq/wangEditor2/tree/master"
+            },
+            "time": "2018-12-04T04:15:44+00:00"
+        },
         {
             "name": "laravel-admin-ext/multitenancy",
             "version": "v2.1.7",

+ 42 - 0
config/admin.php

xqd
@@ -430,6 +430,48 @@ return [
         ],
         'multitenancy' => [
             'tenancy' => config_path('tenancy.php'),
+        ],
+        'wang-editor2' => [
+            // 如果要关掉这个扩展,设置为false
+            'enable' => true,
+            // 编辑器的配置
+            'config' => [
+                'uploadImgFileName' => 'up_image', //这个应该wangEditor的上传方法名字,不要乱改
+                'uploadImgUrl' => '/admin/upload', //注意这里是上传的路由地址
+                'menus' => [
+                    'source',
+                    '|',
+                    'bold',
+                    'underline',
+                    'italic',
+                    'strikethrough',
+                    'eraser',
+                    'forecolor',
+                    'bgcolor',
+                    '|',
+                    'quote',
+                    'fontfamily',
+                    'fontsize',
+                    'head',
+                    'unorderlist',
+                    'orderlist',
+                    'alignleft',
+                    'aligncenter',
+                    'alignright',
+                    '|',
+                    'link',
+                    'unlink',
+                    'table',
+                    '|',
+                    'img',
+                    'video',
+                    'insertcode',
+                    '|',
+                    'undo',
+                    'redo',
+                    'fullscreen'
+                ],
+            ]
         ]
     ],
 ];