From b135f878f806ee67dbd1b555a168d20322480174 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, 20 Feb 2017 12:50:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E4=BB=B6=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E9=85=8D=E7=BD=AE=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/config.file.html | 82 +++++++++++++++----------
 public/static/admin/app.js              |  3 +-
 public/static/admin/plugs.js            |  3 -
 3 files changed, 52 insertions(+), 36 deletions(-)

diff --git a/application/admin/view/config.file.html b/application/admin/view/config.file.html
index e43c4efb7..3e3cbeb20 100644
--- a/application/admin/view/config.file.html
+++ b/application/admin/view/config.file.html
@@ -9,49 +9,60 @@
                 <div class="layui-field-box" style="padding-right:35px">
 
                     <div class="layui-form-item layui-box">
-                        <label class="layui-form-label">Storage(存储)</label>
+                        <label class="layui-form-label">Storage</label>
                         <div class="layui-input-block">
-                            <select name="storage_type">
+                            <select name="storage_type" lay-filter="storage_type" required="required">
                                 <option {if sysconf('storage_type')!=='qiniu'}selected{/if} value='local'>本地服务器</option>
                                 <option {if sysconf('storage_type')==='qiniu'}selected{/if} value='qiniu'>七牛云存储</option>
                             </select>
+                            <div data-storage-type="qiniu" class="layui-form-mid layui-word-aux">
+                                若还没有帐号，请点击<a target="_blank" href="https://portal.qiniu.com/signup?code=3lhz6nmnwbple">免费申请10G存储空间</a>，申请成功后添加公开bucket空间！
+                            </div>
                         </div>
                     </div>
 
-                    <div class="layui-form-item layui-box">
-                        <label class="layui-form-label">网站域名</label>
+                    <div class="layui-form-item layui-box" data-storage-type="qiniu">
+                        <label class="layui-form-label">https</label>
+                        <div class="layui-input-inline" style='width:50px'>
+                            {if sysconf('storage_qiniu_is_https')==1}
+                            <input type="checkbox" name="storage_qiniu_is_https" lay-skin="switch" checked required="required" title="https" value="1">
+                            {else/}
+                            <input type="checkbox" name="storage_qiniu_is_https" lay-skin="switch" required="required" title="https" value="1">
+                            {/if}
+                        </div>
+                        <div class="layui-form-mid layui-word-aux">是否启用https访问资源！</div>
+                    </div>
+
+                    <div class="layui-form-item layui-box" data-storage-type="qiniu">
+                        <label class="layui-form-label">bucket</label>
                         <div class="layui-input-block">
-                            <input type="text" name="site_domain" required="required" title="请输入网站域名" placeholder="请输入网站域名" value="{:sysconf('site_domain')}" class="layui-input">
+                            <input type="text" name="storage_qiniu_bucket" required="required" title="请输入七牛云 Bucket" placeholder="请输入七牛云 Bucket" value="{:sysconf('storage_qiniu_bucket')}" class="layui-input">
+                        </div>
+                        <div class="layui-form-mid layui-word-aux">填写七牛云bucket名称，如：static</div>
+                    </div>
+
+                    <div class="layui-form-item layui-box" data-storage-type="qiniu">
+                        <label class="layui-form-label">domain</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="storage_qiniu_domain" required="required" title="请输入七牛云 Domain" placeholder="请输入七牛云 Domain" value="{:sysconf('storage_qiniu_domain')}" class="layui-input">
+                            <div class="layui-form-mid layui-word-aux">只需填写域名，如：static.cdn.cuci.cc</div>
                         </div>
                     </div>
 
-                    <div class="layui-form-item layui-box">
-                        <label class="layui-form-label">网站版权</label>
+                    <div class="layui-form-item layui-box" data-storage-type="qiniu">
+                        <label class="layui-form-label">access key</label>
                         <div class="layui-input-block">
-                            <input type="text" name="site_copy" required="required" title="请输入网站版权" placeholder="请输入网站版权" value="{:sysconf('site_copy')}" class="layui-input">
+                            <input type="text" name="storage_qiniu_access_key" required="required" title="请输入七牛云 AccessKey" placeholder="请输入七牛云 AccessKey" value="{:sysconf('storage_qiniu_access_key')}" class="layui-input">
                         </div>
                     </div>
 
-                    <div class="layui-form-item layui-box">
-                        <label class="layui-form-label">网站备案号</label>
+                    <div class="layui-form-item layui-box" data-storage-type="qiniu">
+                        <label class="layui-form-label">secret key</label>
                         <div class="layui-input-block">
-                            <input type="text" name="site_beian" title="请输入网站备案号" placeholder="请输入网站备案号" value="{:sysconf('site_beian')}" class="layui-input">
+                            <input type="text" name="storage_qiniu_secret_key" required="required" title="请输入七牛云 SecretKey" placeholder="请输入七牛云 SecretKey" value="{:sysconf('storage_qiniu_secret_key')}" class="layui-input">
                         </div>
                     </div>
 
-                    <div class="layui-form-item layui-box">
-                        <label class="layui-form-label">网站关键字</label>
-                        <div class="layui-input-block">
-                            <input type="text" name="site_keys" title="请输入SEO关键字" placeholder="请输入关键字，多个以英文逗号隔开" value="{:sysconf('site_keys')}" class="layui-input">
-                        </div>
-                    </div>
-
-                    <div class="layui-form-item layui-box">
-                        <label class="layui-form-label">网站描述</label>
-                        <div class="layui-input-block">
-                            <textarea name="site_desc" placeholder="请输入网站描述" class="layui-textarea">{:sysconf('site_desc')}</textarea>
-                        </div>
-                    </div>
                 </div>
                 <div class="layui-form-item layui-box text-center">
                     <button class="layui-btn" type="submit">立即提交</button>
@@ -59,20 +70,27 @@
             </fieldset>
         </form>
     </div>
-
-
-
-
 </div>
 
 {/block}
 
 {block name="script"}
 <script>
-    require(['jquery'], function ($) {
-        $('[name="storage_type"]').on('change', function () {
-            console.log($(this).val());
-        })
+
+    $(function () {
+        // 默认初始化布局
+        initLayout($('[name="storage_type"]').val());
+        // 表单动态渲染
+        window.form.render();
+        /*! 兼听 select 的值变化 */
+        window.form.on('select(storage_type)', function (data) {
+            // 重新初始化布局
+            initLayout(data.value);
+        });
+        // 表单初始化布局
+        function initLayout(storage_type) {
+            $("[data-storage-type]").not($("[data-storage-type='" + storage_type + "']").show()).hide();
+        }
     });
 </script>
 {/block}
\ No newline at end of file
diff --git a/public/static/admin/app.js b/public/static/admin/app.js
index 24ed55101..28c2b7de3 100644
--- a/public/static/admin/app.js
+++ b/public/static/admin/app.js
@@ -48,8 +48,9 @@ window.LAYDATE_PATH = baseUrl + '../plugs/layui/laydate/';
 
 require(['pace', 'jquery', 'layui', 'laydate', 'bootstrap', 'template', 'ueditor', 'jquery.cookies'], function () {
     layui.config({dir: baseUrl + '../plugs/layui/'});
-    layui.use(['layer'], function () {
+    layui.use(['layer', 'form', 'element'], function () {
         window.layer = layui.layer;
+        window.form = layui.form();
         require(['admin.listen']);
     });
 });
diff --git a/public/static/admin/plugs.js b/public/static/admin/plugs.js
index f397b43c3..99ae5954b 100644
--- a/public/static/admin/plugs.js
+++ b/public/static/admin/plugs.js
@@ -262,7 +262,6 @@ define(['zeroclipboard', 'jquery'], function (ZeroClipboard) {
                 });
             });
         });
-        layui.use(['form', 'element']);
         JPlaceHolder.init();
         /* 自动给必填字符加上样式 @zoujingli @by 2016-05-11 */
         $container.find('[required]').parent().prevAll('label').addClass('label-required');
@@ -277,8 +276,6 @@ define(['zeroclipboard', 'jquery'], function (ZeroClipboard) {
      * @param tips 提示消息
      */
     _form.prototype.open = function (url, data, callback, loading, tips) {
-        data && (typeof (data) === 'object') && (data = $.param(data));
-        data && (url += (url.indexOf('?') === -1 ? '?' : '&') + data);
         this.load(url, data, 'GET', function (res) {
             if (typeof (res) === 'object') {
                 return $.msg.auto(res);