From c21fb8b5e433d620186b2b6a2ee88bf3ea323884 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Tue, 19 Nov 2019 10:41:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=B8=BACKEDITOR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/bootstrap/author/announce_edit.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/application/views/bootstrap/author/announce_edit.php b/application/views/bootstrap/author/announce_edit.php
index 9e3d44ad..56f76b22 100644
--- a/application/views/bootstrap/author/announce_edit.php
+++ b/application/views/bootstrap/author/announce_edit.php
@@ -1,13 +1,11 @@
+<script type="text/javascript" src="/wysiwyg/ckeditor.js"></script>
 <script type="text/javascript">
 var editor;
 $(document).ready(function(){
-	KindEditor.ready(function(K) {
-		editor = K.create('textarea[name="announce"]', {
-			resizeType : 1,
-			height:'450px',
-			allowPreviewEmoticons : false
+	editor =  CKEDITOR.replace('announce', {
+			  width: '100%',
+			  height: '560px'
 		});
-	});
 });
 
 </script>
@@ -31,7 +29,7 @@ $(document).ready(function(){
 				<textarea name="announce" id="announce" class="span12" ><?php if(isset($announce->ta_content)) echo $announce->ta_content;?></textarea>
 				<label></label>
 				<input type="hidden" name="announce_id" value="<?php if(isset($announce->ta_id)) echo $announce->ta_id;?>">
-				<button type="button" onclick="editor.sync();submitForm('form_announce_add');" class="btn btn-primary pull-right offset1">　提　交　</button>
+				<button type="button" onclick="submitForm('form_announce_add');" class="btn btn-primary pull-right offset1">　提　交　</button>
 			</fieldset>
 			</form>	
 	    </div>

From 227271037e6bed89308b8a7c296c2e5689afc5ad Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Tue, 19 Nov 2019 11:39:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=89=8D=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=85=88=E6=9B=B4=E6=96=B0=E7=BC=96=E8=BE=91=E7=9A=84?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/bootstrap/author/announce_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/bootstrap/author/announce_edit.php b/application/views/bootstrap/author/announce_edit.php
index 56f76b22..37fdf6b5 100644
--- a/application/views/bootstrap/author/announce_edit.php
+++ b/application/views/bootstrap/author/announce_edit.php
@@ -29,7 +29,7 @@ $(document).ready(function(){
 				<textarea name="announce" id="announce" class="span12" ><?php if(isset($announce->ta_content)) echo $announce->ta_content;?></textarea>
 				<label></label>
 				<input type="hidden" name="announce_id" value="<?php if(isset($announce->ta_id)) echo $announce->ta_id;?>">
-				<button type="button" onclick="submitForm('form_announce_add');" class="btn btn-primary pull-right offset1">　提　交　</button>
+				<button type="button" onclick="editor.updateElement();submitForm('form_announce_add');" class="btn btn-primary pull-right offset1">　提　交　</button>
 			</fieldset>
 			</form>	
 	    </div>