From 6cb86c5f0f4e57eb3ba6a37b764aba2669233974 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 14:38:26 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3sysconf?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common.php                 |  2 +-
 application/wechat/view/news.form.html | 33 +++++++++++++++++++-------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/application/common.php b/application/common.php
index 120828764..9376e4c3b 100644
--- a/application/common.php
+++ b/application/common.php
@@ -95,7 +95,7 @@ function sysconf($name, $value = false) {
     static $config = [];
     if ($value !== false) {
         $config = [];
-        return DataService::save('SystemConfig', ['name' => $value], 'name');
+        return DataService::save('SystemConfig', ['name' => $name, 'value' => $value], 'name');
     }
     if (empty($config)) {
         foreach (Db::name('SystemConfig')->select() as $vo) {
diff --git a/application/wechat/view/news.form.html b/application/wechat/view/news.form.html
index 03053bed9..df22c0afb 100644
--- a/application/wechat/view/news.form.html
+++ b/application/wechat/view/news.form.html
@@ -57,19 +57,18 @@
                 <div class="col-md-12">
                     <div class="form-control" style="height:auto">
                         <label style="color:#ccc">图文封面大图片设置</label>
-                        <div class="row">
-                            <div class="col-xs-3">
+                        <div class="row nowrap">
+                            <div class="col-xs-3" style="min-width:145px">
                                 <div class="upload-image-box">
                                     <input value="__PUBLIC__/static/plugs/uploader/theme/image.png" type="hidden"
                                            name="local_url">
                                 </div>
                             </div>
-                            <div class="col-xs-8">
+                            <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>
-                                <br>
-                                <br>
+                                <br><br>
                                 <label style="margin-left:0;padding-left:10px">
                                     <input data-auto-none type="checkbox" value="1" name="show_cover_pic">
                                     在正文显示此图片
@@ -143,11 +142,22 @@
 
                 var $form = $('form[name="news"]');
 
+                $form.validate();
+
                 // 数据提交
                 $form.find('button[data-submit]').on('click', function () {
+                    $form.submit();
+                    if ($form.find('input.validate-error').size() > 0 || (editor.getContent() || '').length < 1) {
+                        if ((editor.getContent() || '').length < 1) {
+                            editor.setContent('文章内容不能留空，请输入内容！')
+                        }
+                        return false;
+                    }
                     var data = [];
                     $('.news-item').map(function () {
-                        data.push($(this).data('item'));
+                        var item = $(this).data('item');
+                        item.content = item.content || '文章内容不能留空，请输入内容！';
+                        data.push(item);
                     });
                     $.form.load('__SELF__', {data: data}, "post");
                 });
@@ -170,11 +180,16 @@
                         var data = {};
                         data.title = $form.find('[name=title]').val();
                         data.local_url = $form.find('[name=local_url]').val();
-                        data.content = editor.getContent();
+                        data.content = editor.getContent() || '';
                         data.author = $form.find('[name=author]').val();
                         data.show_cover_pic = $form.find('[name="show_cover_pic"]').get(0).checked ? 1 : 0;
                         $form.find('[name=local_url]').trigger('change');
-                        $pItem.data('item', data);
+                        $pItem.data('item', data), $form.submit();
+                        if ($form.find('input.validate-error').size() > 0 || data.content.length < 1) {
+                            ((data.content || '').length < 1) && editor.setContent('文章内容不能留空，请输入内容！');
+                            $pItem.addClass('active').siblings().removeClass('active');
+                            return false;
+                        }
                     }
                     // 读取对象数据
                     $item = $('.news-item.active');
@@ -183,7 +198,7 @@
                         data.title = data.title || '';
                         data.local_url = data.local_url || '__PUBLIC__/static/plugs/uploader/theme/image.png';
                         data.content = data.content || '';
-                        data.author = data.author || '小编';
+                        data.author = data.author || '';
                         data.show_cover_pic = data.show_cover_pic || 0;
                         return data;
                     };