From 6c321f732a02df9a87c7fdb8cff333a866b0e571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Mon, 24 Apr 2017 16:24:27 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=BE=AE=E4=BF=A1=E5=A4=9A?=
 =?UTF-8?q?=E5=9B=BE=E6=96=87=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/wechat/view/news.form.html | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/application/wechat/view/news.form.html b/application/wechat/view/news.form.html
index a308a0f84..d02af8289 100644
--- a/application/wechat/view/news.form.html
+++ b/application/wechat/view/news.form.html
@@ -67,7 +67,7 @@
                             <div class="col-xs-8" style="width: 400px">
                                 <br>
                                 <a data-file="one" data-type="jpg,png,jpeg" data-field="local_url" class="btn btn-sm">上传图片</a>
-                                <a data-iframe="{:url('@wechat/news/media')}?field=local_url" class="btn  btn-sm">从图库中选择图片</a>
+                                <a data-iframe="{:url('@wechat/news/media')}?field=local_url" class="btn btn-sm">从图库中选择图片</a>
                                 <br><br>
                                 <label style="margin-left:0;padding-left:10px">
                                     <input data-auto-none type="checkbox" value="1" name="show_cover_pic">
@@ -146,14 +146,12 @@
 
                 // 数据提交
                 $form.find('button[data-submit]').on('click', function () {
+                    var data = [];
                     $form.submit();
-                    if ($form.find('input.validate-error').size() > 0 || (editor.getContent() || '').length < 1) {
-                        if ((editor.getContent() || '').length < 1) {
-                            editor.setContent('文章内容不能留空，请输入内容！')
-                        }
+                    if (!syncEditor($('.news-item.active'))) {
+                        editor.setContent('文章内容不能留空，请输入内容！');
                         return false;
                     }
-                    var data = [];
                     $('.news-item').map(function () {
                         var item = $(this).data('item');
                         item.content = item.content || '文章内容不能留空，请输入内容！';
@@ -173,8 +171,8 @@
                     }
                 });
 
-                /*! 显示编辑器 */
-                function showEditor($pItem) {
+                /*! 同步编辑器 */
+                function syncEditor($pItem) {
                     // 处理上一个编辑器
                     if ($form && $pItem && $pItem.size() > 0) {
                         var data = {};
@@ -191,6 +189,11 @@
                             return false;
                         }
                     }
+                    return true;
+                }
+
+                /*! 显示编辑器 */
+                function showEditor() {
                     // 读取对象数据
                     $item = $('.news-item.active');
                     this.get = function () {
@@ -227,9 +230,10 @@
                     }
                 }).off('click', '.news-item').on('click', '.news-item', function () {
                     /*! 列表选择 */
-                    $item = $('.news-item.active');
-                    $(this).addClass('active').siblings().removeClass('active');
-                    showEditor($item);
+                    if (syncEditor($('.news-item.active'))) {
+                        $(this).addClass('active').siblings().removeClass('active');
+                        showEditor($item);
+                    }
                 }).off('mouseleave').on('mouseleave', '.news-item', function () {
                     /*! 隐藏删除按钮 */
                     $(this).find('.upload-multiple-close').addClass('hide');