Bladeren bron

文章加入作者字段

bingo 8 jaren geleden
bovenliggende
commit
470f742c10

+ 4 - 0
app/Http/Controllers/AdminController.php

@@ -508,11 +508,13 @@ class AdminController extends BaseController
     {
         if ($request->method() == 'POST') {
             $title = $request->get('title');
+            $author = $request->get('author');
             $content = $request->get('content');
             $sort = $request->get('sort');
 
             Article::create([
                 'title'   => $title,
+                'author'  => $author,
                 'content' => $content,
                 'is_del'  => 0,
                 'sort'    => $sort
@@ -530,11 +532,13 @@ class AdminController extends BaseController
         $id = $request->get('id');
         if ($request->method() == 'POST') {
             $title = $request->get('title');
+            $author = $request->get('author');
             $sort = $request->get('sort');
             $content = $request->get('content');
 
             $data = [
                 'title'   => $title,
+                'author'  => $author,
                 'content' => $content,
                 'sort'    => $sort
             ];

+ 1 - 0
app/Http/Models/Article.php

@@ -15,6 +15,7 @@ class Article extends Model
     protected $primaryKey = 'id';
     protected $fillable = [
         'title',
+        'author',
         'content',
         'is_del',
         'sort'

+ 1 - 1
resources/views/404.blade.php

@@ -31,7 +31,7 @@
     <link rel="shortcut icon" href="favicon.ico" /> </head>
 <!-- END HEAD -->
 
-<body class=" page-500-full-page">
+<body class="page-500-full-page">
 <div class="row">
     <div class="col-md-12 page-500">
         <div class="number font-red"> 404 </div>

+ 8 - 1
resources/views/admin/addArticle.blade.php

@@ -46,6 +46,12 @@
                                         <input type="hidden" name="_token" value="{{csrf_token()}}">
                                     </div>
                                 </div>
+                                <div class="form-group">
+                                    <label class="control-label col-md-1">作者</label>
+                                    <div class="col-md-6">
+                                        <input type="text" class="form-control" name="author" id="author" placeholder="" required>
+                                    </div>
+                                </div>
                                 <div class="form-group">
                                     <label class="control-label col-md-1">排序</label>
                                     <div class="col-md-6">
@@ -100,6 +106,7 @@
         function do_submit() {
             var _token = '{{csrf_token()}}';
             var title = $('#title').val();
+            var author = $('#author').val();
             var sort = $('#sort').val();
             var content = UE.getEditor('editor').getContent();
 
@@ -107,7 +114,7 @@
                 type: "POST",
                 url: "{{url('admin/addArticle')}}",
                 async: false,
-                data: {_token:_token, title: title, sort:sort, content:content},
+                data: {_token:_token, title: title, author:author, sort:sort, content:content},
                 dataType: 'json',
                 success: function (ret) {
                     layer.msg(ret.message, {time:1000}, function() {

+ 9 - 2
resources/views/admin/editArticle.blade.php

@@ -46,10 +46,16 @@
                                         <input type="hidden" name="_token" value="{{csrf_token()}}">
                                     </div>
                                 </div>
+                                <div class="form-group">
+                                    <label class="control-label col-md-1">作者</label>
+                                    <div class="col-md-6">
+                                        <input type="text" class="form-control" name="author" value="{{$article->author}}" id="author" placeholder="" required>
+                                    </div>
+                                </div>
                                 <div class="form-group">
                                     <label class="control-label col-md-1">排序</label>
                                     <div class="col-md-6">
-                                        <input type="text" class="form-control" name="sort" value="{{$article->sort}}" id="sort" value="0" required />
+                                        <input type="text" class="form-control" name="sort" value="{{$article->sort}}" id="sort" required />
                                         <span class="help-block"> 值越高显示时越靠前 </span>
                                     </div>
                                 </div>
@@ -101,6 +107,7 @@
             var _token = '{{csrf_token()}}';
             var id = '{{$article->id}}';
             var title = $('#title').val();
+            var author = $('#author').val();
             var sort = $('#sort').val();
             var content = UE.getEditor('editor').getContent();
 
@@ -108,7 +115,7 @@
                 type: "POST",
                 url: "{{url('admin/editArticle')}}",
                 async: false,
-                data: {_token:_token, id:id, title: title, sort:sort, content:content},
+                data: {_token:_token, id:id, title: title, author:author, sort:sort, content:content},
                 dataType: 'json',
                 success: function (ret) {
                     layer.msg(ret.message, {time:1000}, function() {

+ 10 - 10
resources/views/admin/system.blade.php

@@ -79,16 +79,6 @@
                                                             <span class="help-block"> 生成重置密码必备,示例:https://github.com </span>
                                                         </div>
                                                     </div>
-                                                    <div class="form-group">
-                                                        <label class="col-md-2 control-label">端口范围</label>
-                                                        <div class="col-md-2">
-                                                            <div class="input-group input-large input-daterange">
-                                                                <input type="text" class="form-control" name="min_port" value="{{$min_port}}" id="min_port">
-                                                                <span class="input-group-addon"> ~ </span>
-                                                                <input type="text" class="form-control" name="max_port" value="{{$max_port}}" id="max_port">
-                                                            </div>
-                                                        </div>
-                                                    </div>
                                                     <div class="form-group">
                                                         <label for="is_register" class="col-md-2 control-label">用户注册</label>
                                                         <div class="col-md-6">
@@ -130,6 +120,16 @@
                                                             <span class="help-block"> 添加账号时随机生成端口 </span>
                                                         </div>
                                                     </div>
+                                                    <div class="form-group">
+                                                        <label class="col-md-2 control-label">端口范围</label>
+                                                        <div class="col-md-2">
+                                                            <div class="input-group input-large input-daterange">
+                                                                <input type="text" class="form-control" name="min_port" value="{{$min_port}}" id="min_port">
+                                                                <span class="input-group-addon"> ~ </span>
+                                                                <input type="text" class="form-control" name="max_port" value="{{$max_port}}" id="max_port">
+                                                            </div>
+                                                        </div>
+                                                    </div>
                                                     <!--
                                                     <div class="form-group">
                                                         <label for="is_user_rand_port" class="col-md-2 control-label">自定义端口</label>

+ 85 - 96
resources/views/article/detail.blade.php

@@ -19,6 +19,10 @@
     <link href="/assets/global/plugins/bootstrap-switch/css/bootstrap-switch.min.css" rel="stylesheet" type="text/css" />
     <!-- END GLOBAL MANDATORY STYLES -->
     <!-- BEGIN PAGE LEVEL PLUGINS -->
+    <link href="/assets/global/plugins/fancybox/source/jquery.fancybox.css" rel="stylesheet" type="text/css" />
+    <style>
+        img { max-width:100% }
+    </style>
     <!-- END PAGE LEVEL PLUGINS -->
     <!-- BEGIN THEME GLOBAL STYLES -->
     <link href="/assets/global/css/components-rounded.min.css" rel="stylesheet" id="style_components" type="text/css" />
@@ -32,112 +36,97 @@
     <link rel="shortcut icon" href="favicon.ico" />
 </head>
 
-<body class="page-container-bg-solid page-header-fixed page-sidebar-closed-hide-logo"info>
-<!-- BEGIN HEADER -->
-<div class="page-header navbar navbar-fixed-top">
-    <!-- BEGIN HEADER INNER -->
-    <div class="page-header-inner ">
-        <!-- BEGIN LOGO -->
-        <div class="page-logo">
-            <a href="http://ssrpanel.dev/user"> <img src="/assets/images/logo.png" alt="logo" class="logo-default" /> </a>
-        </div>
-        <!-- END LOGO -->
-    </div>
-    <!-- END HEADER INNER -->
-</div>
-<!-- END HEADER -->
-<!-- BEGIN HEADER & CONTENT DIVIDER -->
-<div class="clearfix"> </div>
-<!-- END HEADER & CONTENT DIVIDER -->
-<!-- BEGIN CONTAINER -->
-<div class="page-container">
-    <!-- BEGIN CONTENT -->
-        <!-- BEGIN CONTENT BODY -->
-        <div class="page-content">
-            <div class="row">
-                <div class="col-md-12">
-                    <!-- BEGIN PORTLET -->
-                    <div class="portlet light bordered">
-                        <div class="portlet-title tabbable-line">
-                            <div class="caption caption-md">
-                                <i class="icon-globe theme-font hide"></i>
-                                <span class="caption-subject font-blue-madison bold uppercase">10月下旬猎户座流星雨将登场 可登山远眺观测流星</span>
-                            </div>
-                            <div class="tools">
-                                <small>发布于:{{$info->created_at}}</small>
+<body>
+    <!-- BEGIN CONTAINER -->
+    <div class="">
+        <!-- BEGIN CONTENT -->
+            <!-- BEGIN CONTENT BODY -->
+            <div class="page-content">
+                <div class="row">
+                    <div class="col-md-12">
+                        <!-- BEGIN PORTLET -->
+                        <div class="portlet light bordered">
+                            <div class="portlet-title tabbable-line">
+                                <div class="caption">
+                                    <span class="caption-subject bold uppercase">10月下旬猎户座流星雨将登场 可登山远眺观测流星</span>
+                                </div>
+                                <div class="tools">
+                                    <small>{{$info->created_at}} {{$info->author}}</small>
+                                </div>
                             </div>
-                        </div>
-                        <div class="portlet-body">
-                            <!--BEGIN TABS-->
-                            <div class="tab-content">
-                                {!! $info->content !!}
+                            <div class="portlet-body">
+                                <!--BEGIN TABS-->
+                                <div class="tab-content">
+                                    {!! $info->content !!}
+                                </div>
+                                <!--END TABS-->
                             </div>
-                            <!--END TABS-->
                         </div>
                     </div>
                 </div>
             </div>
-        </div>
-        <!-- END CONTENT BODY -->
-    <!-- END CONTENT -->
-</div>
-<!-- END CONTAINER -->
-<!-- BEGIN FOOTER -->
-<div class="page-footer">
-    <div class="page-footer-inner"> 2017 &copy; <a href="https://github.com/ssrpanel/ssrpanel" target="_blank">SSRPanel</a> </div>
-    <div class="scroll-to-top">
-        <i class="icon-arrow-up"></i>
+            <!-- END CONTENT BODY -->
+        <!-- END CONTENT -->
     </div>
-</div>
-<!-- END FOOTER -->
-<!--[if lt IE 9]>
-<script src="/assets/global/plugins/respond.min.js"></script>
-<script src="/assets/global/plugins/excanvas.min.js"></script>
-<script src="/assets/global/plugins/ie8.fix.min.js"></script>
-<![endif]-->
-<!-- BEGIN CORE PLUGINS -->
-<script src="/assets/global/plugins/jquery.min.js" type="text/javascript"></script>
-<script src="/assets/global/plugins/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
-<script src="/assets/global/plugins/js.cookie.min.js" type="text/javascript"></script>
-<script src="/assets/global/plugins/jquery-slimscroll/jquery.slimscroll.min.js" type="text/javascript"></script>
-<script src="/assets/global/plugins/jquery.blockui.min.js" type="text/javascript"></script>
-<script src="/assets/global/plugins/bootstrap-switch/js/bootstrap-switch.min.js" type="text/javascript"></script>
-<!-- END CORE PLUGINS -->
-<!-- BEGIN PAGE LEVEL PLUGINS -->
-<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=SGlgj67Vik3mfeErm1sGobfO8zMy0WMt"></script>
-<script type="text/javascript">
-    // 获取当前定位坐标
-    function getLocation() {
-        var geolocation = new BMap.Geolocation();
-        geolocation.getCurrentPosition(function(position){
-            if(this.getStatus() == BMAP_STATUS_SUCCESS){
-                var lng = position.point.lng;
-                var lat = position.point.lat;
+    <!-- END CONTAINER -->
 
-                // 上报当前坐标
-                var _token = '{{csrf_token()}}';
-                var title = '';
-                $.post('/locate', {_token: _token, aid:'{{$info->id}}', lat: lat, lng: lng, title:title}, function (ret) {
-                    console.log(ret);
-                }, "json");
+    <!--[if lt IE 9]>
+    <script src="/assets/global/plugins/respond.min.js"></script>
+    <script src="/assets/global/plugins/excanvas.min.js"></script>
+    <script src="/assets/global/plugins/ie8.fix.min.js"></script>
+    <![endif]-->
+    <!-- BEGIN CORE PLUGINS -->
+    <script src="/assets/global/plugins/jquery.min.js" type="text/javascript"></script>
+    <script src="/assets/global/plugins/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
+    <script src="/assets/global/plugins/js.cookie.min.js" type="text/javascript"></script>
+    <script src="/assets/global/plugins/jquery-slimscroll/jquery.slimscroll.min.js" type="text/javascript"></script>
+    <script src="/assets/global/plugins/jquery.blockui.min.js" type="text/javascript"></script>
+    <script src="/assets/global/plugins/bootstrap-switch/js/bootstrap-switch.min.js" type="text/javascript"></script>
+    <!-- END CORE PLUGINS -->
+    <!-- BEGIN PAGE LEVEL PLUGINS -->
+    <script src="/assets/global/plugins/fancybox/source/jquery.fancybox.js" type="text/javascript"></script>
+    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=SGlgj67Vik3mfeErm1sGobfO8zMy0WMt"></script>
+    <script type="text/javascript">
+        // 获取当前定位坐标
+        function getLocation() {
+            var geolocation = new BMap.Geolocation();
+            geolocation.getCurrentPosition(function(position){
+                if(this.getStatus() == BMAP_STATUS_SUCCESS){
+                    var lng = position.point.lng;
+                    var lat = position.point.lat;
 
-                console.log('lng:' + lng + '  lat:' + lat);
-            } else {
-                alert('failed'+this.getStatus());
-            }
-        },{enableHighAccuracy: true})
-    }
+                    // 上报当前坐标
+                    var _token = '{{csrf_token()}}';
+                    var title = '';
+                    $.post('/locate', {_token: _token, aid:'{{$info->id}}', lat: lat, lng: lng, title:title}, function (ret) {
+                        console.log(ret);
+                    }, "json");
 
-    // 执行定位
-    getLocation();
-</script>
-<!-- END PAGE LEVEL PLUGINS -->
-<!-- BEGIN THEME GLOBAL SCRIPTS -->
-<script src="/assets/global/scripts/app.min.js" type="text/javascript"></script>
-<!-- END THEME GLOBAL SCRIPTS -->
-<!-- BEGIN THEME LAYOUT SCRIPTS -->
-<script src="/assets/layouts/layout4/scripts/layout.min.js" type="text/javascript"></script>
-<!-- END THEME LAYOUT SCRIPTS -->
+                    console.log('lng:' + lng + '  lat:' + lat);
+                } else {
+                    alert('failed'+this.getStatus());
+                }
+            },{enableHighAccuracy: true})
+        }
+
+        // 执行定位
+        getLocation();
+
+        // 查看商品图片
+        $(document).ready(function () {
+            $('.fancybox').fancybox({
+                openEffect: 'elastic',
+                closeEffect: 'elastic'
+            })
+        })
+    </script>
+    <!-- END PAGE LEVEL PLUGINS -->
+    <!-- BEGIN THEME GLOBAL SCRIPTS -->
+    <script src="/assets/global/scripts/app.min.js" type="text/javascript"></script>
+    <!-- END THEME GLOBAL SCRIPTS -->
+    <!-- BEGIN THEME LAYOUT SCRIPTS -->
+    <script src="/assets/layouts/layout4/scripts/layout.min.js" type="text/javascript"></script>
+    <!-- END THEME LAYOUT SCRIPTS -->
 </body>
 
 </html>

+ 4 - 3
sql/db.sql

@@ -277,14 +277,15 @@ INSERT INTO `config` VALUES ('31', 'max_port', 40000);
 -- ----------------------------
 CREATE TABLE `article` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-  `title` varchar(100) NOT NULL DEFAULT '' COMMENT '文章标题',
-  `content` text COMMENT '文章内容',
+  `title` varchar(100) NOT NULL DEFAULT '' COMMENT '标题',
+  `author` varchar(255) DEFAULT '' COMMENT '作者',
+  `content` text COMMENT '内容',
   `is_del` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否删除',
   `sort` int(11) NOT NULL DEFAULT '0' COMMENT '排序',
   `created_at` datetime DEFAULT NULL,
   `updated_at` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COMMENT='文章表';
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
 
 -- ----------------------------

+ 1 - 0
sql/update/20171102.sql

@@ -0,0 +1 @@
+ALTER TABLE `article` ADD COLUMN `author` varchar(255) DEFAULT '' COMMENT '作者' AFTER `title`;