From fad009d09018ecfd84fb22603ff8d383b438953c Mon Sep 17 00:00:00 2001
From: Bretton <867057410@qq.com>
Date: Fri, 8 Nov 2019 12:17:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 原来的Markdown展示不知道如何正确在前端显示，改为summernote；
2. 推送消息的源输入为Markdown，现在加入了编辑器既上面退下下来的Markdown；
---
 resources/views/admin/addArticle.blade.php   | 10 ++++------
 resources/views/admin/editArticle.blade.php  | 10 ++++------
 resources/views/marketing/pushList.blade.php |  7 ++++++-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/resources/views/admin/addArticle.blade.php b/resources/views/admin/addArticle.blade.php
index c40e545a..896ac1bb 100644
--- a/resources/views/admin/addArticle.blade.php
+++ b/resources/views/admin/addArticle.blade.php
@@ -1,8 +1,7 @@
 @extends('admin.layouts')
 @section('css')
     <link rel="stylesheet" href="/assets/global/vendor/dropify/dropify.min.css">
-    <link rel="stylesheet" href="/assets/global/vendor/bootstrap-markdown/bootstrap-markdown.min.css">
-    <link rel="stylesheet" href="/assets/global/fonts/font-awesome/font-awesome.min.css">
+    <link rel="stylesheet" href="/assets/global/vendor/summernote/summernote.min.css">
 @endsection
 @section('content')
     <div class="page-content container">
@@ -81,7 +80,7 @@
                     </div>
                     <div class="form-group row">
                         <label class="col-form-label col-md-2" for="content">内容</label>
-                        <textarea class="col-md-10" name="content" data-provide="markdown" data-iconlibrary="fa" rows="15"> </textarea>
+                        <textarea class="col-md-10" name="content" id="summernote" data-plugin="summernote" rows="15"> </textarea>
                     </div>
                     <div class="form-actions">
                         <button type="submit" class="btn btn-success">提交</button>
@@ -93,8 +92,7 @@
 @endsection
 @section('script')
     <script src="/assets/global/vendor/dropify/dropify.min.js"></script>
+    <script src="/assets/global/vendor/summernote/summernote.min.js"></script>
     <script src="/assets/global/js/Plugin/dropify.js"></script>
-    <script src="/assets/global/vendor/bootstrap-markdown/bootstrap-markdown.js"></script>
-    <script src="/assets/global/vendor/marked/marked.js"></script>
-    <script src="/assets/global/vendor/to-markdown/to-markdown.js"></script>
+    <script src="/assets/global/js/Plugin/summernote.js"></script>
 @endsection
diff --git a/resources/views/admin/editArticle.blade.php b/resources/views/admin/editArticle.blade.php
index fbe44895..ff620d7c 100644
--- a/resources/views/admin/editArticle.blade.php
+++ b/resources/views/admin/editArticle.blade.php
@@ -1,8 +1,7 @@
 @extends('admin.layouts')
 @section('css')
     <link rel="stylesheet" href="/assets/global/vendor/dropify/dropify.min.css">
-    <link rel="stylesheet" href="/assets/global/vendor/bootstrap-markdown/bootstrap-markdown.min.css">
-    <link rel="stylesheet" href="/assets/global/fonts/font-awesome/font-awesome.min.css">
+    <link rel="stylesheet" href="/assets/global/vendor/summernote/summernote.min.css">
 @endsection
 @section('content')
     <div class="page-content container">
@@ -98,7 +97,7 @@
                     @endif
                     <div class="form-group row">
                         <label class="col-form-label col-md-2">内容</label>
-                        <textarea class="col-md-10" name="content" data-provide="markdown" data-iconlibrary="fa" rows="15">{!! $article->content !!} </textarea>
+                        <textarea class="col-md-10" name="content" id="summernote" data-plugin="summernote" rows="15"> </textarea>
                     </div>
                     <div class="form-actions">
                         <button type="submit" class="btn btn-success">提交</button>
@@ -111,8 +110,7 @@
 @endsection
 @section('script')
     <script src="/assets/global/vendor/dropify/dropify.min.js"></script>
+    <script src="/assets/global/vendor/summernote/summernote.min.js"></script>
     <script src="/assets/global/js/Plugin/dropify.js"></script>
-    <script src="/assets/global/vendor/bootstrap-markdown/bootstrap-markdown.js"></script>
-    <script src="/assets/global/vendor/marked/marked.js"></script>
-    <script src="/assets/global/vendor/to-markdown/to-markdown.js"></script>
+    <script src="/assets/global/js/Plugin/summernote.js"></script>
 @endsection
diff --git a/resources/views/marketing/pushList.blade.php b/resources/views/marketing/pushList.blade.php
index 6e01d144..c0725b49 100644
--- a/resources/views/marketing/pushList.blade.php
+++ b/resources/views/marketing/pushList.blade.php
@@ -1,6 +1,8 @@
 @extends('admin.layouts')
 @section('css')
 	<link rel="stylesheet" href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css">
+	<link rel="stylesheet" href="/assets/global/vendor/bootstrap-markdown/bootstrap-markdown.min.css">
+	<link rel="stylesheet" href="/assets/global/fonts/font-awesome/font-awesome.min.css">
 @endsection
 @section('content')
 	<div class="page-content container-fluid">
@@ -103,7 +105,7 @@
 								<div class="row">
 									<label for="content" class="col-md-2 control-label"> 内容 </label>
 									<div class="col-md-10">
-										<textarea class="form-control" rows="6" name="content" id="content"></textarea>
+										<textarea class="form-control" rows="6" name="content" id="content" data-provide="markdown" data-iconlibrary="fa"></textarea>
 										<span class="help-block"> 内容支持<a href="https://maxiang.io/" target="_blank">Markdown语法</a> </span>
 									</div>
 								</div>
@@ -122,6 +124,9 @@
 @section('script')
 	<script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
 	<script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
+	<script src="/assets/global/vendor/bootstrap-markdown/bootstrap-markdown.js"></script>
+	<script src="/assets/global/vendor/marked/marked.js"></script>
+	<script src="/assets/global/vendor/to-markdown/to-markdown.js"></script>
 	<script type="text/javascript">
         // 发送通道消息
         function send() {