Browse Source

[更新]整理模板代码

Anyon 8 years ago
parent
commit
6b928b146d

+ 15 - 36
application/admin/view/auth.apply.html

@@ -1,4 +1,4 @@
-{extend name='extra@admin/content' /}
+{extend name='extra@admin/content'}
 
 {block name="content"}
 
@@ -39,21 +39,14 @@
                 callback: {
                     beforeClick: function (treeId, treeNode) {
                         if (treeNode.children.length < 1) {
-                            window.roleForm.ztree.checkNode(treeNode, !treeNode.checked, null, true);
-                        } else {
-                            window.roleForm.ztree.expandNode(treeNode);
-                        }
-                        return false;
-                    }
-                }
-            };
-            this.listen();
-        }
+                            window.roleForm.ztree.checkNode(treeNode, !treeNode.checked, null, true);} else {
+                            window.roleForm.ztree.expandNode(treeNode);}
+                        return false;}}};
+            this.listen();}
         showTree.prototype = {
             constructor: showTree,
             listen: function () {
-                this.getData(this);
-            },
+                this.getData(this);},
             getData: function (self) {
                 $.msg.loading();
                 jQuery.get('{:url()}?id={$vo.id}', {action: 'getNode'}, function (ret) {
@@ -67,42 +60,28 @@
                             children.name = data[i].title || data[i].node;
                             children.checked = data[i].checked || false;
                             children.children = renderChildren(data[i]._sub_, level + 1);
-                            childrenData.push(children);
-                        }
-                        return childrenData;
-                    }
+                            childrenData.push(children);}
+                        return childrenData;}
                     self.data = renderChildren(ret.data, 1);
-                    self.showTree();
-                }, 'JSON');
-            },
+                    self.showTree();}, 'JSON');},
             showTree: function () {
                 this.ztree = jQuery.fn.zTree.init(jQuery("#zTree"), this.setting, this.data);
                 while (true) {
                     var reNodes = this.ztree.getNodesByFilter(function (node) {
-                        return  (!node.node && node.children.length < 1);
-                    });
+                        return  (!node.node && node.children.length < 1);});
                     if (reNodes.length < 1) {
-                        break;
-                    }
+                        break;}
                     for (var i in reNodes) {
-                        this.ztree.removeNode(reNodes[i]);
-                    }
-                }
-            },
+                        this.ztree.removeNode(reNodes[i]);}}},
             submit: function () {
                 var nodes = [];
                 var data = this.ztree.getCheckedNodes(true);
                 for (var i in data) {
-                    (data[i].node) && nodes.push(data[i].node);
-                }
-                $.form.load('{:url()}?id={$vo.id}&action=save', {nodes: nodes}, 'POST');
-            }
-        };
+                    (data[i].node) && nodes.push(data[i].node);}
+                $.form.load('{:url()}?id={$vo.id}&action=save', {nodes: nodes}, 'POST');}};
         window.roleForm = new showTree();
         $('[data-submit-role]').on('click', function () {
-            window.roleForm.submit();
-        });
-    });
+            window.roleForm.submit();});});
 </script>
 
 {/block}

+ 1 - 1
application/admin/view/auth.index.html

@@ -1,4 +1,4 @@
-{extend name='extra@admin/content' /}
+{extend name='extra@admin/content'}
 
 {block name="button"}
 <div class="nowrap pull-right" style="margin-top:10px">

+ 11 - 13
application/admin/view/config.file.html

@@ -11,7 +11,7 @@
                 {if sysconf('storage_type')!=='qiniu'}
                 <option selected value='local'>本地服务器</option>
                 <option value='qiniu'>七牛云存储</option>
-                {else/}
+                {else}
                 <option value='local'>本地服务器</option>
                 <option selected value='qiniu'>七牛云存储</option>
                 {/if}
@@ -30,24 +30,24 @@
         <label class="col-sm-2 control-label">Region <span class="nowrap">(存储区域)</span></label>
         <div class='col-sm-8'>
             <select class="layui-input" name="storage_qiniu_region" required="required">
-                {if sysconf('storage_qiniu_region') eq '华东' }
+                {if sysconf('storage_qiniu_region') eq '华东'}
                 <option selected value='华东'>华东</option>
-                {else/}
+                {else}
                 <option value='华东'>华东</option>
                 {/if}
-                {if sysconf('storage_qiniu_region') eq '华北' }
+                {if sysconf('storage_qiniu_region') eq '华北'}
                 <option selected value='华北'>华北</option>
-                {else/}
+                {else}
                 <option value='华北'>华北</option>
                 {/if}
-                {if sysconf('storage_qiniu_region') eq '华南' }
+                {if sysconf('storage_qiniu_region') eq '华南'}
                 <option selected value='华南'>华南</option>
-                {else/}
+                {else}
                 <option value='华南'>华南</option>
                 {/if}
-                {if sysconf('storage_qiniu_region') eq '北美' }
+                {if sysconf('storage_qiniu_region') eq '北美'}
                 <option selected value='北美'>北美</option>
-                {else/}
+                {else}
                 <option value='北美'>北美</option>
                 {/if}
             </select>
@@ -62,7 +62,7 @@
                 {if sysconf('storage_qiniu_is_https')!=='1'}
                 <option selected value='0'>HTTP</option>
                 <option value='1'>HTTPS</option>
-                {else/}
+                {else}
                 <option value='0'>HTTP</option>
                 <option selected value='1'>HTTPS</option>
                 {/if}
@@ -127,8 +127,6 @@
 <script>
     $(function () {
         $('[name="storage_type"]').on('change', function () {
-            $("[data-storage-type]").not($("[data-storage-type='" + $(this).val() + "']").show()).hide();
-        }).trigger('change');
-    });
+            $("[data-storage-type]").not($("[data-storage-type='" + $(this).val() + "']").show()).hide();}).trigger('change');});
 </script>
 {/block}

+ 1 - 1
application/admin/view/index.index.html

@@ -1,4 +1,4 @@
-{extend name="extra@admin/main" /}
+{extend name="extra@admin/main"}
 
 {block name='body'}
 {include file="extra@admin/main/top"}

+ 1 - 1
application/admin/view/index.main.html

@@ -1,4 +1,4 @@
-{extend name='extra@admin/content' /}
+{extend name='extra@admin/content'}
 
 {block name="content"}
 <div class="row">

+ 1 - 1
application/admin/view/log.index.html

@@ -1,4 +1,4 @@
-{extend name='extra@admin/content' /}
+{extend name='extra@admin/content'}
 
 {block name="button"}
 <div class="nowrap pull-right" style="margin-top:10px">

+ 3 - 7
application/admin/view/login.index.html

@@ -87,16 +87,12 @@
 {block name="script"}
 <script>
     if (window.location.href.indexOf('#') > -1) {
-        window.location.href = window.location.href.split('#')[0];
-    }
+        window.location.href = window.location.href.split('#')[0];}
     require(['jquery'], function ($) {
         $('[name="password"]').on('focus', function () {
             $('#left-hander').removeClass('initial_left_hand').addClass('left_hand');
-            $('#right-hander').removeClass('initial_right_hand').addClass('right_hand')
-        }).on('blur', function () {
+            $('#right-hander').removeClass('initial_right_hand').addClass('right_hand')}).on('blur', function () {
             $('#left-hander').addClass('initial_left_hand').removeClass('left_hand');
-            $('#right-hander').addClass('initial_right_hand').removeClass('right_hand')
-        });
-    });
+            $('#right-hander').addClass('initial_right_hand').removeClass('right_hand')});});
 </script>
 {/block}

+ 2 - 3
application/admin/view/menu.form.html

@@ -6,7 +6,7 @@
                 <!--{foreach $menus as $menu}-->
                 <!--{eq name='menu.id' value='$vo.pid|default=0'}-->
                 <option selected  value='{$menu.id}'>{$menu.spl}{$menu.title}</option>
-                <!--{else/}-->
+                <!--{else}-->
                 <option  value='{$menu.id}'>{$menu.spl}{$menu.title}</option>
                 <!--{/eq}-->
                 <!--{/foreach}-->
@@ -44,7 +44,6 @@
     <script>
         require(['bootstrap.typeahead'], function () {
             var subjects = JSON.parse('{$nodes|json_encode}');
-            $('.typeahead').typeahead({source: subjects, items: 5});
-        });
+            $('.typeahead').typeahead({source: subjects, items: 5});});
     </script>
 </form>

+ 1 - 1
application/admin/view/menu.index.html

@@ -1,4 +1,4 @@
-{extend name='extra@admin/content' /}
+{extend name='extra@admin/content'}
 
 {block name="button"}
 <div class="nowrap pull-right" style="margin-top:10px">

+ 5 - 10
application/admin/view/node.index.html

@@ -1,4 +1,4 @@
-{extend name='extra@admin/content' /}
+{extend name='extra@admin/content'}
 
 {block name="content"}
 <table class="table table-hover">
@@ -26,7 +26,7 @@
                     {if substr_count($vo['node'],'/')==2}
                     {notempty name='vo.is_auth'}
                     <input name='is_auth.{$vo.node}' checked='checked' class="check-box" type='checkbox' value='1'/>
-                    {else /}
+                    {else}
                     <input name='is_auth.{$vo.node}' class="check-box" type='checkbox' value='1'/>
                     {/notempty}
                     加入权限控制
@@ -37,7 +37,7 @@
                     {if substr_count($vo['node'],'/')==2}
                     {notempty name='vo.is_menu'}
                     <input name='is_menu.{$vo.node}' checked='checked' class='check-box' type='checkbox' value='1'/>
-                    {else/}
+                    {else}
                     <input name='is_menu.{$vo.node}' class='check-box' type='checkbox' value='1'/>
                     {/notempty}
                     可设为菜单
@@ -55,15 +55,10 @@
     $(function () {
         $('input.title-input').on('blur', function () {
             $.form.load('{:url("save")}', {name: this.name, value: this.value}, 'POST', function (ret) {
-                return false;
-            });
-        });
+                return false;});});
         $('input.check-box').on('click', function () {
             $.form.load('{:url("save")}', {name: this.name, value: this.checked ? 1 : 0}, 'POST', function (ret) {
-                return false;
-            });
-        });
-    });
+                return false;});});});
 </script>
 {/if}
 {/block}

+ 8 - 15
application/admin/view/plugs.icon.html

@@ -9,11 +9,11 @@
         <link href="//cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
         <script src="__PUBLIC__/static/plugs/jquery/jquery.min.js" type="text/javascript"></script>
         <style>
-            .bs-glyphicons-list { padding-left: 0; list-style: none }
-            .bs-glyphicons li { float: left; width: 20%; padding: 10px; font-size: 10px; line-height: 1.4; text-align: center; background-color: #f9f9f9; border: 1px solid #fff;cursor: pointer }
-            .bs-glyphicons .glyphicon, .bs-glyphicons .fa { margin-top: 5px; margin-bottom: 10px; font-size: 24px; }
-            .bs-glyphicons .glyphicon-class { display: block; text-align: center; white-space: nowrap; overflow: hidden; }
-            .bs-glyphicons li:hover { color: #fff; background-color: #563d7c }
+            .bs-glyphicons-list { padding-left: 0; list-style: none}
+            .bs-glyphicons li { float: left; width: 20%; padding: 10px; font-size: 10px; line-height: 1.4; text-align: center; background-color: #f9f9f9; border: 1px solid #fff;cursor: pointer}
+            .bs-glyphicons .glyphicon, .bs-glyphicons .fa { margin-top: 5px; margin-bottom: 10px; font-size: 24px;}
+            .bs-glyphicons .glyphicon-class { display: block; text-align: center; white-space: nowrap; overflow: hidden;}
+            .bs-glyphicons li:hover { color: #fff; background-color: #563d7c}
         </style>
     </head>
     <body>
@@ -1908,23 +1908,16 @@
                     /* global top */
                     if (document.all) {
                         document.onselectstart = function () {
-                            return false;
-                        };
-                    } else {
+                            return false;};} else {
                         document.onmouseup = document.onmousedown = function () {
-                            return false;
-                        };
-                    }
+                            return false;};}
                     document.onselectstart = new Function('event.returnValue=false;');
                     $('li').on('click', function () {
                         var className = $(this).find('span.glyphicon,span.fa').get(0).className;
                         if (className) {
                             top.$('[name="{$field}"]').val(className).trigger('change');
                             var index = top.layer.getFrameIndex(window.name);
-                            top.layer.close(index);
-                        }
-                    });
-                });
+                            top.layer.close(index);}});});
             </script>
         </div>
     </body>

+ 85 - 186
application/admin/view/plugs.upfile.html

@@ -45,13 +45,11 @@
                 $('#' + file.id).attr('data-md5', file.md5).attr('data-src', url);
                 /* {if $mode === 'one'} */
                 top.$('[name="{$field}"]').map(function () {
-                    top.$(this).attr('data-srcs', ret.url).attr('data-md5', file.md5).val(url).trigger('change');
-                });
+                    top.$(this).attr('data-srcs', ret.url).attr('data-md5', file.md5).val(url).trigger('change');});
                 //top.$.msg.tips('文件上传成功!');
                 var index = top.layer.getFrameIndex(window.name);
                 top.layer.close(index);
-                /* {/if} {$mode}*/
-            }
+                /* {/if} {$mode}*/}
 
             function confirmSelected() {
                 var srcs = new Array();
@@ -59,26 +57,19 @@
                 $('[data-md5] .success').map(function () {
                     var $li = $(this).parents('[data-md5]');
                     md5s.push($li.attr('data-md5'));
-                    srcs.push($li.attr('data-src'));
-                });
+                    srcs.push($li.attr('data-src'));});
                 if (srcs.length < 1) {
-                    return top.$.msg.tips('还没有选择文件,请勾选需要使用的文件!');
-                }
+                    return top.$.msg.tips('还没有选择文件,请勾选需要使用的文件!');}
                 top.$('[name="{$field}"]').map(function () {
-                    top.$(this).attr('data-srcs', srcs.join('|')).attr('data-md5', md5s.join('|')).val(srcs.join('|')).trigger('change');
-                });
+                    top.$(this).attr('data-srcs', srcs.join('|')).attr('data-md5', md5s.join('|')).val(srcs.join('|')).trigger('change');});
                 var index = top.layer.getFrameIndex(window.name);
-                top.layer.close(index);
-            }
+                top.layer.close(index);}
 
             function completed() {
                 var btnHTML = '完成上传';
                 $('.uploadBtn').on('click', function () {
                     if (this.innerHTML === btnHTML) {
-                        confirmSelected.call(this);
-                    }
-                }).html(btnHTML);
-            }
+                        confirmSelected.call(this);}}).html(btnHTML);}
 
             // 当domReady的时候开始初始化
             $(function () {
@@ -113,33 +104,24 @@
                             var support = true;
                             data.onload = data.onerror = function () {
                                 if (this.width != 1 || this.height != 1) {
-                                    support = false;
-                                }
-                            };
+                                    support = false;}};
                             data.src = "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==";
-                            return support;
-                        }.call(this)),
+                            return support;}.call(this)),
                         /*检测是否已经安装flash,检测flash的版本*/
                         flashVersion = (function () {
                             var version;
                             try {
                                 version = navigator.plugins[ 'Shockwave Flash' ];
-                                version = version.description;
-                            } catch (ex) {
+                                version = version.description;} catch (ex) {
                                 try {
-                                    version = new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version');
-                                } catch (ex2) {
-                                    version = '0.0';
-                                }
-                            }
+                                    version = new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version');} catch (ex2) {
+                                    version = '0.0';}}
                             version = version.match(/\d+/g);
-                            return parseFloat(version[ 0 ] + '.' + version[ 1 ], 10);
-                        })(),
+                            return parseFloat(version[ 0 ] + '.' + version[ 1 ], 10);})(),
                         supportTransition = (function () {
                             var s = document.createElement('p').style, r = 'transition' in s || 'WebkitTransition' in s || 'MozTransition' in s || 'msTransition' in s || 'OTransition' in s;
                             s = null;
-                            return r;
-                        })(),
+                            return r;})(),
                         uploader;
                 if (!WebUploader.Uploader.support('flash') && WebUploader.browser.ie) {
                     /*flash 安装了但是版本过低*/
@@ -155,36 +137,27 @@
                                         break;
                                     default:
                                         alert('安装已成功,请刷新!');
-                                        break;
-                                }
-                                delete window['expressinstallcallback'];
-                            };
+                                        break;}
+                                delete window['expressinstallcallback'];};
                             var swf = '__PUBLIC__/static/plugs/uploader/expressInstall.swf';
                             var html = '<object type="application/' + 'x-shockwave-flash" data="' + swf + '" ';
                             if (WebUploader.browser.ie) {
-                                html += 'classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" ';
-                            }
+                                html += 'classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" ';}
                             html += 'width="100%" height="100%" style="outline:0">' +
                                     '<param name="movie" value="' + swf + '" />' +
                                     '<param name="wmode" value="transparent" />' +
                                     '<param name="allowscriptaccess" value="always" />' +
                                     '</object>';
-                            container.html(html);
-                        })($wrap);
-                    } else {
-                        $wrap.html('<a href="http://www.adobe.com/go/getflashplayer" target="_blank" border="0"><img alt="get flash player" src="http://www.adobe.com/macromedia/style_guide/images/160x41_Get_Flash_Player.jpg" /></a>');
-                    }
-                    return;
-                } else if (!WebUploader.Uploader.support()) {
+                            container.html(html);})($wrap);} else {
+                        $wrap.html('<a href="http://www.adobe.com/go/getflashplayer" target="_blank" border="0"><img alt="get flash player" src="http://www.adobe.com/macromedia/style_guide/images/160x41_Get_Flash_Player.jpg" /></a>');}
+                    return;} else if (!WebUploader.Uploader.support()) {
                     alert('Web Uploader 不支持您的浏览器!');
-                    return;
-                }
+                    return;}
 
                 WebUploader.Uploader.register({'before-send-file': 'preupload'}, {preupload: function (file) {
                         var me = this, owner = this.owner, deferred = WebUploader.Deferred();
                         owner.md5File(file.source).fail(function () {
-                            deferred.reject();
-                        }).then(function (md5) {
+                            deferred.reject();}).then(function (md5) {
                             file.md5 = md5;
                             var data = {id: file.id, md5: md5, uptype: '{$uptype}', filename: file.name};
                             $.ajax("{:url('admin/plugs/upstate')}", {dataType: 'json', method: 'post', data: data, success: function (ret) {
@@ -193,38 +166,29 @@
                                         uploaded.call(uploader, ret.data, file);
                                         percentages[file.id] = [file.size, 1];
                                         updateTotalProgress();
-                                        console.log('文件秒传成功 --> ' + file.name);
-                                    } else {
+                                        console.log('文件秒传成功 --> ' + file.name);} else {
                                         file.md5 = md5;
                                         file.token = ret.data.token;
                                         file.key = ret.data.file_url;
-                                        me.options.server = ret.data.server;
-                                    }
-                                    deferred.resolve();
-                                }
-                            });
-                        });
-                        return deferred.promise();
-                    }
-                });
+                                        me.options.server = ret.data.server;}
+                                    deferred.resolve();}});});
+                        return deferred.promise();}});
 
                 // 实例化
                 uploader = WebUploader.create({
                     pick: {
                         id: '#filePicker',
                         label: '点击选择文件',
-                        multiple: false
-                    },
+                        multiple: false},
                     accept: {
                         title: '选择文件',
                         extensions: '{$types}', //'gif,jpg,jpeg,bmp,png',
-                        mimeTypes: '{$mimes}'
-                    },
+                        mimeTypes: '{$mimes}'},
                     formData: {},
                     /*{if $mode === 'one'}*/
                     fileNumLimit: 1,
                     auto: true,
-                    /* {else /} */
+                    /* {else} */
                     auto: false,
                     fileNumLimit: 300,
                     /* {/if} */
@@ -237,8 +201,7 @@
                     server: '{:url("admin/plugs/upload")}',
                     disableGlobalDnd: true,
                     fileSizeLimit: 200 * 1024 * 1024, // 200 M
-                    fileSingleSizeLimit: 200 * 1024 * 1024    // 200 M
-                });
+                    fileSingleSizeLimit: 200 * 1024 * 1024    // 200 M});
 
                 /**
                  * 处理上传后的结果
@@ -248,10 +211,8 @@
                 uploader.on('uploadAccept', function (fieldata, ret) {
                     if (ret.code === 'SUCCESS') {
                         uploaded.call(uploader, ret.data, fieldata.file);
-                        return true;
-                    }
-                    return false;
-                });
+                        return true;}
+                    return false;});
 
                 // 拖拽时不接受 js, txt 文件。
                 uploader.on('dndAccept', function (items) {
@@ -260,11 +221,8 @@
                     for (var i = 0; i < len; i++) {
                         if (~unAllowed.indexOf(items[ i ].type)) {
                             denied = true;
-                            break;
-                        }
-                    }
-                    return !denied;
-                });
+                            break;}}
+                    return !denied;});
 
                 /* 上传开始前的处理 */
                 uploader.on('uploadBeforeSend', function (file, data, header) {
@@ -272,18 +230,15 @@
                     data['allowed_types'] = this.options.accept[0].extensions.split(',').join('|');
                     data['md5'] = file.file.md5;
                     data['key'] = file.file.key;
-                    data['token'] = file.file.token;
-                });
+                    data['token'] = file.file.token;});
 
                 // 添加“添加文件”的按钮,
                 uploader.addButton({
                     id: '#filePicker2',
-                    label: '继续添加'
-                });
+                    label: '继续添加'});
 
                 uploader.on('ready', function () {
-                    window.uploader = uploader;
-                });
+                    window.uploader = uploader;});
 
                 // 当有文件添加进来时执行,负责view的创建
                 function addFile(file) {
@@ -309,72 +264,51 @@
                                         break;
                                     default:
                                         text = '上传失败,请重试';
-                                        break;
-                                }
-                                $info.text(text).appendTo($li);
-                            };
+                                        break;}
+                                $info.text(text).appendTo($li);};
                     if (file.getStatus() === 'invalid') {
-                        showError(file.statusText);
-                    } else {
+                        showError(file.statusText);} else {
                         // @todo lazyload
                         $wrap.text('预览中');
                         uploader.makeThumb(file, function (error, src) {
                             var img;
                             if (error) {
                                 $wrap.text('不能预览');
-                                return;
-                            }
+                                return;}
                             if (isSupportBase64) {
                                 img = $('<img src="' + src + '">');
-                                $wrap.empty().append(img);
-                            } else {
+                                $wrap.empty().append(img);} else {
                                 $.ajax('{"plugs/file/preview"|url}', {method: 'POST', data: src, dataType: 'json'}).done(function (response) {
                                     if (response.result) {
                                         img = $('<img src="' + response.result + '">');
-                                        $wrap.empty().append(img);
-                                    } else {
-                                        $wrap.text("预览出错");
-                                    }
-                                });
-                            }
-                        }, thumbnailWidth, thumbnailHeight);
+                                        $wrap.empty().append(img);} else {
+                                        $wrap.text("预览出错");}});}}, thumbnailWidth, thumbnailHeight);
                         percentages[ file.id ] = [file.size, 0];
                         file.rotation = 0;
-                        $upload.html('开始上传');
-                    }
+                        $upload.html('开始上传');}
 
                     file.on('statuschange', function (cur, prev) {
                         if (prev === 'progress') {
-                            $prgress.hide().width(0);
-                        } else if (prev === 'queued') {
+                            $prgress.hide().width(0);} else if (prev === 'queued') {
                             $li.off('mouseenter mouseleave');
-                            $btns.remove();
-                        }
+                            $btns.remove();}
                         // 成功
                         if (cur === 'error' || cur === 'invalid') {
                             showError(file.statusText);
-                            percentages[ file.id ][ 1 ] = 1;
-                        } else if (cur === 'interrupt') {
-                            showError('interrupt');
-                        } else if (cur === 'queued') {
-                            percentages[ file.id ][ 1 ] = 0;
-                        } else if (cur === 'progress') {
+                            percentages[ file.id ][ 1 ] = 1;} else if (cur === 'interrupt') {
+                            showError('interrupt');} else if (cur === 'queued') {
+                            percentages[ file.id ][ 1 ] = 0;} else if (cur === 'progress') {
                             $info.remove();
-                            $prgress.css('display', 'block');
-                        } else if (cur === 'complete') {
-                            $li.append('<span class="success"></span>');
-                        }
+                            $prgress.css('display', 'block');} else if (cur === 'complete') {
+                            $li.append('<span class="success"></span>');}
 
-                        $li.removeClass('state-' + prev).addClass('state-' + cur);
-                    });
+                        $li.removeClass('state-' + prev).addClass('state-' + cur);});
 
                     $li.on('mouseenter', function () {
-                        $btns.stop().animate({height: 30});
-                    });
+                        $btns.stop().animate({height: 30});});
 
                     $li.on('mouseleave', function () {
-                        $btns.stop().animate({height: 0});
-                    });
+                        $btns.stop().animate({height: 0});});
 
                     $btns.on('click', 'span', function () {
                         var index = $(this).index(), deg;
@@ -387,62 +321,47 @@
                                 break;
                             case 2:
                                 file.rotation -= 90;
-                                break;
-                        }
+                                break;}
                         if (supportTransition) {
                             deg = 'rotate(' + file.rotation + 'deg)';
-                            $wrap.css({'-webkit-transform': deg, '-mos-transform': deg, '-o-transform': deg, 'transform': deg});
-                        } else {
-                            $wrap.css('filter', 'progid:DXImageTransform.Microsoft.BasicImage(rotation=' + (~~((file.rotation / 90) % 4 + 4) % 4) + ')');
-                        }
-                    });
-                    $li.appendTo($queue);
-                }
+                            $wrap.css({'-webkit-transform': deg, '-mos-transform': deg, '-o-transform': deg, 'transform': deg});} else {
+                            $wrap.css('filter', 'progid:DXImageTransform.Microsoft.BasicImage(rotation=' + (~~((file.rotation / 90) % 4 + 4) % 4) + ')');}});
+                    $li.appendTo($queue);}
 
                 // 负责view的销毁
                 function removeFile(file) {
                     var $li = $('#' + file.id);
                     delete percentages[ file.id ];
                     updateTotalProgress();
-                    $li.off().find('.file-panel').off().end().remove();
-                }
+                    $li.off().find('.file-panel').off().end().remove();}
 
                 function updateTotalProgress() {
                     var loaded = 0, total = 0, spans = $progress.children(), percent;
                     $.each(percentages, function (k, v) {
                         total += v[ 0 ];
-                        loaded += v[ 0 ] * v[ 1 ];
-                    });
+                        loaded += v[ 0 ] * v[ 1 ];});
                     percent = total ? loaded / total : 0;
                     spans.eq(0).text(Math.round(percent * 100) + '%');
                     spans.eq(1).css('width', Math.round(percent * 100) + '%');
-                    updateStatus();
-                }
+                    updateStatus();}
 
                 function updateStatus() {
                     var text = '', stats;
                     if (state === 'ready') {
-                        text = '选中' + fileCount + '个文件,共' + WebUploader.formatSize(fileSize) + '。';
-                    } else if (state === 'confirm') {
+                        text = '选中' + fileCount + '个文件,共' + WebUploader.formatSize(fileSize) + '。';} else if (state === 'confirm') {
                         stats = uploader.getStats();
                         if (stats.uploadFailNum) {
-                            text = '已成功上传' + stats.successNum + '个文件,' + stats.uploadFailNum + '个文件上传失败,<a class="retry" href="#">重新上传</a>失败文件'
-                        }
-                    } else {
+                            text = '已成功上传' + stats.successNum + '个文件,' + stats.uploadFailNum + '个文件上传失败,<a class="retry" href="#">重新上传</a>失败文件'}} else {
                         stats = uploader.getStats();
                         text = '共' + fileCount + '个(' + WebUploader.formatSize(fileSize) + '),已上传' + stats.successNum + '个';
                         if (stats.uploadFailNum) {
-                            text += ',失败' + stats.uploadFailNum + '个';
-                        }
-                    }
-                    $info.html(text);
-                }
+                            text += ',失败' + stats.uploadFailNum + '个';}}
+                    $info.html(text);}
 
                 function setState(val) {
                     var file, stats;
                     if (val === state) {
-                        return;
-                    }
+                        return;}
                     $upload.removeClass('state-' + state);
                     $upload.addClass('state-' + val);
                     state = val;
@@ -476,51 +395,41 @@
                             stats = uploader.getStats();
                             if (stats.successNum && !stats.uploadFailNum) {
                                 setState('finish');
-                                return;
-                            }
+                                return;}
                             break;
                         case 'finish':
                             stats = uploader.getStats();
                             if (stats.successNum) {
-                                completed.call(this);
-                            } else {
+                                completed.call(this);} else {
                                 // 没有成功的文件,重设
                                 state = 'done';
-                                location.reload();
-                            }
-                            break;
-                    }
-                    updateStatus();
-                }
+                                location.reload();}
+                            break;}
+                    updateStatus();}
 
                 uploader.onUploadProgress = function (file, percentage) {
                     var $li = $('#' + file.id), $percent = $li.find('.progress span');
                     $percent.css('width', percentage * 100 + '%');
                     percentages[ file.id ][ 1 ] = percentage;
-                    updateTotalProgress();
-                };
+                    updateTotalProgress();};
 
                 uploader.onFileQueued = function (file) {
                     fileCount++;
                     fileSize += file.size;
                     if (fileCount === 1) {
                         $placeHolder.addClass('element-invisible');
-                        $statusBar.show();
-                    }
+                        $statusBar.show();}
                     addFile(file);
                     setState('ready');
-                    updateTotalProgress();
-                };
+                    updateTotalProgress();};
 
                 uploader.onfieldequeued = function (file) {
                     fileCount--;
                     fileSize -= file.size;
                     if (!fileCount) {
-                        setState('pedding');
-                    }
+                        setState('pedding');}
                     removeFile(file);
-                    updateTotalProgress();
-                };
+                    updateTotalProgress();};
 
                 uploader.on('all', function (type) {
                     switch (type) {
@@ -532,34 +441,24 @@
                             break;
                         case 'stopUpload':
                             setState('paused');
-                            break;
-                    }
-                });
+                            break;}});
 
                 uploader.onError = function (code) {
-                    //alert('Eroor: ' + code);
-                };
+                    //alert('Eroor: ' + code);};
 
                 $upload.on('click', function () {
                     if ($(this).hasClass('disabled')) {
-                        return false;
-                    }
+                        return false;}
                     if (state === 'ready') {
-                        uploader.upload();
-                    } else if (state === 'paused') {
-                        uploader.upload();
-                    } else if (state === 'uploading') {
-                        uploader.stop();
-                    }
-                });
+                        uploader.upload();} else if (state === 'paused') {
+                        uploader.upload();} else if (state === 'uploading') {
+                        uploader.stop();}});
 
                 $info.on('click', '.retry', function () {
-                    uploader.retry();
-                });
+                    uploader.retry();});
 
                 $upload.addClass('state-' + state);
-                updateTotalProgress();
-            });
+                updateTotalProgress();});
 
         </script>
     </body>

+ 2 - 2
application/admin/view/user.auth.html

@@ -5,7 +5,7 @@
         <div class="layui-input-block">
             {if $vo and $vo.username}
             <input type="text" readonly="" disabled="" name="username" value='{$vo.username|default=""}' required="required" title="请输入用户名称" placeholder="请输入用户名称" class="layui-input disabled">
-            {else/}
+            {else}
             <input type="text" name="username" value='{$vo.username|default=""}' required="required" title="请输入用户名称" placeholder="请输入用户名称" class="layui-input">
             {/if}
         </div>
@@ -17,7 +17,7 @@
             {foreach $authorizes as $authorize}
             {if in_array($authorize['id'],$vo['authorize'])}
             <input type="checkbox" checked name="authorize[]" value="{$authorize.id}" title="{$authorize.title}">
-            {else/}
+            {else}
             <input type="checkbox" name="authorize[]" value="{$authorize.id}" title="{$authorize.title}">
             {/if}
             {/foreach}

+ 2 - 2
application/admin/view/user.form.html

@@ -5,7 +5,7 @@
         <div class="layui-input-block">
             {if $vo and isset($vo.username)}
             <input type="text" readonly="" disabled="" name="username" value='{$vo.username|default=""}' required="required" title="请输入用户名称" placeholder="请输入用户名称" class="layui-input disabled">
-            {else/}
+            {else}
             <input type="text" name="username" value='{$vo.username|default=""}' required="required" title="请输入用户名称" placeholder="请输入用户名称" class="layui-input">
             {/if}
         </div>
@@ -32,7 +32,7 @@
             {foreach $authorizes as $authorize}
             {if in_array($authorize['id'],$vo['authorize'])}
             <input type="checkbox" checked name="authorize[]" value="{$authorize.id}" title="{$authorize.title}">
-            {else/}
+            {else}
             <input type="checkbox" name="authorize[]" value="{$authorize.id}" title="{$authorize.title}">
             {/if}
             {/foreach}

+ 1 - 1
application/admin/view/user.index.html

@@ -1,4 +1,4 @@
-{extend name='extra@admin/content' /}
+{extend name='extra@admin/content'}
 
 {block name="button"}
 <div class="nowrap pull-right" style="margin-top:10px">

+ 1 - 1
application/admin/view/user.pass.html

@@ -5,7 +5,7 @@
         <div class="layui-input-block">
             {if $vo and $vo.username}
             <input type="text" readonly="" disabled="" name="username" value='{$vo.username|default=""}' required="required" title="请输入用户名称" placeholder="请输入用户名称" class="layui-input disabled">
-            {else/}
+            {else}
             <input type="text" name="username" value='{$vo.username|default=""}' required="required" title="请输入用户名称" placeholder="请输入用户名称" class="layui-input">
             {/if}
         </div>

+ 1 - 1
application/config.php

@@ -158,7 +158,7 @@ return [
         // 日志保存目录
         'path'        => LOG_PATH,
         // 日志记录级别 log,error,info,sql,notice,alert,debug
-        'level'       => ['error','log','sql','notice','alert','debug'],
+        'level'       => ['error', 'log', 'sql', 'notice', 'alert', 'debug'],
         // error和sql日志单独记录
         'apart_level' => ['error', 'sql'],
     ],

+ 1 - 1
application/extra/view/admin.main.top.html

@@ -12,7 +12,7 @@
                class="topbar-home-link topbar-btn topbar-left">
                 <span>{notempty name='$pmenu.icon'}<i class="{$pmenu.icon}"></i>{/notempty} {$pmenu.title}</span>
             </a>
-            {else/}
+            {else}
             <a data-menu-target='m-{$pmenu.id}' class="topbar-home-link topbar-btn topbar-left">
                 <span>{notempty name='$pmenu.icon'}<i class="{$pmenu.icon}"></i>{/notempty} {$pmenu.title}</span>
             </a>

+ 7 - 11
application/wechat/view/config.index.html

@@ -1,14 +1,12 @@
 {extend name="extra@admin/content"}
 
 {block name="content"}
-<form onsubmit="return false;" action="__SELF__" data-auto="true" method="post"
-      class='form-horizontal' style='padding-top:20px'>
+<form onsubmit="return false;" action="__SELF__" data-auto="true" method="post" class='form-horizontal' style='padding-top:20px'>
 
     <div class="form-group">
         <label class="col-sm-2 control-label">URL <span class="nowrap">(服务器地址)</span></label>
         <div class="col-sm-8">
-            <input onmouseenter="this.select()" class="layui-input" readonly="readonly"
-                   value="{:url('@wechat/api','',true,true)}"/>
+            <input onmouseenter="this.select()" class="layui-input" readonly="readonly" value="{:url('@wechat/api','',true,true)}"/>
             <p class="help-block">
                 请复制此URL地址填写在公众号平台 [ 开发 >> 基本配置 ] 中 [ URL ( 服务器地址 ) ]
                 <br/><b>注意</b>:URL主域名必需备案,微信服务接口只支持 80 端口 ( http ) 和 443 端口 ( https )
@@ -21,9 +19,8 @@
     <div class="form-group">
         <label class="col-sm-2 control-label">AppID <span class="nowrap">(应用ID)</span></label>
         <div class='col-sm-8'>
-            <input type="text" name="wechat_appid" title="请输入以wx开头的18位公众号APPID"
-                   pattern="^wx[0-9a-z]{16}$" maxlength="18" required="required"
-                   placeholder="公众号APPID(必填)" value="{:sysconf('wechat_appid')}" class="layui-input">
+            <input type="text" name="wechat_appid" title="请输入以wx开头的18位公众号APPID"  placeholder="公众号APPID(必填)"
+                   pattern="^wx[0-9a-z]{16}$" maxlength="18" required="required" value="{:sysconf('wechat_appid')}" class="layui-input">
             <p class="help-block">
                 公众号应用ID是所有接口必要参数,可以在公众号平台 [ 开发 >> 基本配置 ] 页面获取。
             </p>
@@ -36,8 +33,7 @@
         <div class='col-sm-8'>
             <input type="password" name="wechat_appsecret" required="required" title="请输入32位公众号AppSecret"
                    placeholder="公众号AppSecret(必填)" value="{:sysconf('wechat_appsecret')}"
-                   maxlength="32" pattern="^[0-9a-z]{32}$"
-                   class="layui-input">
+                   maxlength="32" pattern="^[0-9a-z]{32}$" class="layui-input">
             <p class="help-block">
                 公众号应用密钥是所有接口必要参数,可以在公众号平台 [ 开发 >> 基本配置 ] 页面授权后获取。
             </p>
@@ -49,8 +45,7 @@
         <label class="col-sm-2 control-label">Token <span class="nowrap">(令牌)</span></label>
         <div class='col-sm-8'>
             <input type="text" name="wechat_token" required="required" title="请输入接口Token(令牌)"
-                   placeholder="Token(令牌)" value="{:sysconf('wechat_token')}"
-                   class="layui-input">
+                   placeholder="Token(令牌)" value="{:sysconf('wechat_token')}" class="layui-input">
             <p class="help-block">
                 公众号平台与系统对接认证Token,请优先填写此参数并保存,然后再在微信公众号平台操作对接。
             </p>
@@ -77,6 +72,7 @@
             <button class="layui-btn" type="submit">保存配置</button>
         </div>
     </div>
+
 </form>
 
 {/block}

+ 11 - 28
application/wechat/view/config.pay.html

@@ -5,13 +5,11 @@
     .pay-qrc-test {
         height: 248px;
         width: 248px;
-        background: url('__PUBLIC__/static/plugs/layui/css/modules/layer/default/loading-2.gif') no-repeat center center
-    }
+        background: url('__PUBLIC__/static/plugs/layui/css/modules/layer/default/loading-2.gif') no-repeat center center}
 
     .refund-qrc-test {
         text-align: center;
-        padding: 8px
-    }
+        padding: 8px}
 </style>
 {/block}
 
@@ -55,7 +53,7 @@
                         type="button" class="layui-btn layui-btn-primary">
                     {if file_exists(sysconf('wechat_cert_key'))}
                     已上传 apiclient_key.pem
-                    {else/}
+                    {else}
                     请上传 apiclient_key.pem
                     {/if}
                 </button>
@@ -63,7 +61,7 @@
                         type="button" class="layui-btn layui-btn-primary">
                     {if file_exists(sysconf('wechat_cert_cert'))}
                     已上传 apiclient_cert.pem
-                    {else/}
+                    {else}
                     请上传 apiclient_cert.pem
                     {/if}
                 </button>
@@ -93,8 +91,7 @@
         /*! 证书上传动作 */
         $('[name="wechat_cert_key_md5"],[name="wechat_cert_cert_md5"]').on('change', function () {
             this.value = $(this).attr('data-md5');
-            $('[data-field="' + this.name + '"]').html('已选择 ' + this.title);
-        });
+            $('[data-field="' + this.name + '"]').html('已选择 ' + this.title);});
 
         var isShow = false;
         var timer = null;
@@ -105,11 +102,9 @@
                 if (ret.code === 1 || ret.code === 2) {
                     if (ret.code === 2) {
                         ret.url = '__PUBLIC__/static/theme/default/img/wechat/qrc_payed.jpg';
-                        timer && window.clearInterval(timer), timer = null;
-                    }
+                        timer && window.clearInterval(timer), timer = null;}
                     if (isShow) {
-                        $('.pay-qrc-test').attr('src', ret.url)
-                    } else {
+                        $('.pay-qrc-test').attr('src', ret.url)} else {
                         layer.open({
                             type: 1, title: false, closeBtn: 1, shadeClose: true,
                             content: '<img class="pay-qrc-test" src="' + ret.url + '"/>'
@@ -117,19 +112,12 @@
                             + '<p class="refund-qrc-test"><a class="btn btn-xs btn-warning">退款测试</a></p>',
                             end: function () {
                                 timer && window.clearInterval(timer), timer = null;
-                                isShow = false;
-                            },
+                                isShow = false;},
                             success: function (layero, index) {
                                 isShow = true;
                                 layIndex = index;
-                                timer = setInterval(payTest, 3000);
-                            }
-                        });
-                    }
-                }
-                return false;
-            }, !isShow);
-        }
+                                timer = setInterval(payTest, 3000);}});}}
+                return false;}, !isShow);}
 
         $('[data-pay-test]').on('click', payTest);
 
@@ -139,12 +127,7 @@
                 if (ret.code === 1) {
                     timer && window.clearInterval(timer), timer = null;
                     return $.msg.success(ret.msg, 3, function () {
-                        layer.close(layIndex);
-                    }), false;
-                }
-            });
-        });
-    });
+                        layer.close(layIndex);}), false;}});});});
 
 </script>
 {/block}

+ 1 - 1
application/wechat/view/fans.back.html

@@ -1,4 +1,4 @@
-{extend name='extra@admin/content' /}
+{extend name='extra@admin/content'}
 
 {block name="button"}
 

+ 2 - 3
application/wechat/view/fans.index.html

@@ -1,4 +1,4 @@
-{extend name='extra@admin/content' /}
+{extend name='extra@admin/content'}
 
 {block name="button"}
 
@@ -141,7 +141,6 @@
     $('body').on('click', '[data-add-tag]', function () {
         var fans_id = this.getAttribute('data-add-tag');
         var used_id = this.getAttribute('data-used-id');
-        alert(used_id);
-    });
+        alert(used_id);});
 </script>
 {/block}

+ 10 - 22
application/wechat/view/keys.form.html

@@ -1,4 +1,4 @@
-{extend name='extra@admin/content' /}
+{extend name='extra@admin/content'}
 
 {block name="style"}
 <style>
@@ -222,9 +222,7 @@
         /*! 取消编辑 */
         $('[data-cancel-edit]').on('click', function () {
             $.msg.confirm('确定取消编辑吗?', function () {
-                history.back();
-            });
-        });
+                history.back();});});
 
         /*! 默认类型事件 */
         $('body').off('change', 'select[name=type]').on('change', 'select[name=type]', function () {
@@ -243,28 +241,22 @@
                 case 'music':
                     return $('[name="music_url"]').trigger('change');
                 case 'voice':
-                    return $('[name="voice_url"]').trigger('change');
-            }
-        });
+                    return $('[name="voice_url"]').trigger('change');}});
 
         function showReview(params) {
-            $('#phone-preview').attr('src', '{:url("@wechat/review")}?' + $.param(params || {}));
-        }
+            $('#phone-preview').attr('src', '{:url("@wechat/review")}?' + $.param(params || {}));}
 
         // 图文显示预览
         $('body').off('change', '[name="news_id"]').on('change', '[name="news_id"]', function () {
-            showReview({type: 'news', content: this.value});
-        });
+            showReview({type: 'news', content: this.value});});
 
         // 文字显示预览
         $('body').off('change', '[name="content"]').on('change', '[name="content"]', function () {
-            showReview({type: 'text', content: this.value});
-        });
+            showReview({type: 'text', content: this.value});});
 
         // 图片显示预览
         $('body').off('change', '[name="image_url"]').on('change', '[name="image_url"]', function () {
-            showReview({type: 'image', content: this.value});
-        });
+            showReview({type: 'image', content: this.value});});
 
         // 音乐显示预览
         var musicSelector = '[name="music_url"],[name="music_title"],[name="music_desc"],[name="music_image"]';
@@ -274,8 +266,7 @@
             params.url = $parent.find('[name="music_url"]').val();
             params.image = $parent.find('[name="music_image"]').val();
             params.desc = $parent.find('[name="music_desc"]').val();
-            showReview(params);
-        });
+            showReview(params);});
 
         // 视频显示预览
         var videoSelector = '[name="video_title"],[name="video_url"],[name="video_desc"]';
@@ -284,13 +275,10 @@
             params.title = $parent.find('[name="video_title"]').val();
             params.url = $parent.find('[name="video_url"]').val();
             params.desc = $parent.find('[name="video_desc"]').val();
-            showReview(params);
-        });
+            showReview(params);});
 
         // 默认事件触发
         $('select[name=type]').map(function () {
-            $(this).trigger('change');
-        });
-    });
+            $(this).trigger('change');});});
 </script>
 {/block}

+ 10 - 24
application/wechat/view/keys.index.html

@@ -1,4 +1,4 @@
-{extend name='extra@admin/content' /}
+{extend name='extra@admin/content'}
 
 {block name="button"}
 <div class="nowrap pull-right" style="margin-top:10px">
@@ -127,27 +127,21 @@
                 case 'music':
                     return $('[name="music_url"]').trigger('change');
                 case 'voice':
-                    return $('[name="voice_url"]').trigger('change');
-            }
-        });
+                    return $('[name="voice_url"]').trigger('change');}});
 
         function showReview(params) {
             params = params || {};
-            $('#phone-preview').attr('src', '{"@wechat/review"|app_url}&' + $.param(params));
-        }
+            $('#phone-preview').attr('src', '{"@wechat/review"|app_url}&' + $.param(params));}
 
         // 图文显示预览
         $('body').off('change', '[name="news_id"]').on('change', '[name="news_id"]', function () {
-            showReview({type: 'news', content: this.value});
-        });
+            showReview({type: 'news', content: this.value});});
         // 文字显示预览
         $('body').off('change', '[name="content"]').on('change', '[name="content"]', function () {
-            showReview({type: 'text', content: this.value});
-        });
+            showReview({type: 'text', content: this.value});});
         // 图片显示预览
         $('body').off('change', '[name="image_url"]').on('change', '[name="image_url"]', function () {
-            showReview({type: 'image', content: this.value});
-        });
+            showReview({type: 'image', content: this.value});});
         // 音乐显示预览
         var musicSelector = '[name="music_url"],[name="music_title"],[name="music_desc"],[name="music_image"]';
         $('body').off('change', musicSelector).on('change', musicSelector, function () {
@@ -156,8 +150,7 @@
             params.url = $parent.find('[name="music_url"]').val();
             params.image = $parent.find('[name="music_image"]').val();
             params.desc = $parent.find('[name="music_desc"]').val();
-            showReview(params);
-        });
+            showReview(params);});
         // 视频显示预览
         var videoSelector = '[name="video_title"],[name="video_url"],[name="video_desc"]';
         $('body').off('change', videoSelector).on('change', videoSelector, function () {
@@ -165,13 +158,11 @@
             params.title = $parent.find('[name="video_title"]').val();
             params.url = $parent.find('[name="video_url"]').val();
             params.desc = $parent.find('[name="video_desc"]').val();
-            showReview(params);
-        });
+            showReview(params);});
 
         // 默认事件触发
         $('select[name=type]').map(function () {
-            $(this).trigger('change');
-        });
+            $(this).trigger('change');});
 
         /*! 删除关键字 */
         $('[data-delete]').on('click', function () {
@@ -180,11 +171,6 @@
             $.msg.confirm('确定要删除这条记录吗?', function () {
                 $.form.load(url, {id: id}, 'POST', function (ret) {
                     if (ret.code === "SUCCESS") {
-                        window.location.reload();
-                    }
-                });
-            })
-        });
-    });
+                        window.location.reload();}});})});});
 </script>
 {/block}

+ 36 - 72
application/wechat/view/menu.index.html

@@ -1,13 +1,13 @@
-{extend name='extra@admin/content' /}
+{extend name='extra@admin/content'}
 
 {block name="style"}
 <style>
-    .mobile-preview { -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; -khtml-user-select: none; user-select: none; }
-    .menu-editor { left: 317px; display: block; max-width: 500px; width: 500px; height: 580px; border-radius: 0; border-color: #e7e7eb; box-shadow: none }
-    .menu-editor .arrow { top: auto !important; bottom: 15px }
-    .menu-editor .popover-title { margin-top: 0 }
-    .menu-delete { font-weight: 400; font-size: 12px; }
-    .menu-submit { margin-right: 10px }
+    .mobile-preview { -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; -khtml-user-select: none; user-select: none;}
+    .menu-editor { left: 317px; display: block; max-width: 500px; width: 500px; height: 580px; border-radius: 0; border-color: #e7e7eb; box-shadow: none}
+    .menu-editor .arrow { top: auto !important; bottom: 15px}
+    .menu-editor .popover-title { margin-top: 0}
+    .menu-delete { font-weight: 400; font-size: 12px;}
+    .menu-submit { margin-right: 10px}
 </style>
 {/block}
 
@@ -121,8 +121,7 @@
         var menu = function () {
             this.version = '1.0';
             this.$btn;
-            this.listen();
-        };
+            this.listen();};
         /**
          * 控件默认事件
          * @returns {undefined}
@@ -131,17 +130,12 @@
             var self = this;
             $('.mobile-footer').on('click', 'li a', function () {
                 self.$btn = $(this);
-                self.$btn.parent('li').hasClass('menu-add') ? self.add() : self.checkShow();
-            }).find('li:first a:first').trigger('click');
+                self.$btn.parent('li').hasClass('menu-add') ? self.add() : self.checkShow();}).find('li:first a:first').trigger('click');
             $('.menu-delete').on('click', function () {
                 var index = $.msg.confirm('删除后菜单下设置的内容将被删除!', function () {
-                    self.del(), $.msg.close(index);
-                });
-            });
+                    self.del(), $.msg.close(index);});});
             $('.menu-submit').on('click', function () {
-                self.submit();
-            });
-        };
+                self.submit();});};
         /**
          * 添加一个菜单
          * @returns {undefined}
@@ -151,12 +145,9 @@
             if ($ul.hasClass('mobile-footer')) { /* 添加一级菜单 */
                 var $li = $('<li class="parent-menu"><a class="active"><i class="icon-sub hide"></i> <span>一级菜单</span></a></li>').insertBefore($add);
                 this.$btn = $li.find('a');
-                $('<div class="sub-menu text-center hide"><ul><li class="menu-add"><a><i class="icon-add"></i></a></li></ul><i class="arrow arrow_out"></i><i class="arrow arrow_in"></i></div>').appendTo($li);
-            } else { /* 添加二级菜单 */
-                this.$btn = $('<li><a class="bottom-border"><span>二级菜单</span></a></li>').prependTo($ul).find('a');
-            }
-            this.checkShow();
-        };
+                $('<div class="sub-menu text-center hide"><ul><li class="menu-add"><a><i class="icon-add"></i></a></li></ul><i class="arrow arrow_out"></i><i class="arrow arrow_in"></i></div>').appendTo($li);} else { /* 添加二级菜单 */
+                this.$btn = $('<li><a class="bottom-border"><span>二级菜单</span></a></li>').prependTo($ul).find('a');}
+            this.checkShow();};
         /**
          * 数据校验显示
          * @returns {unresolved}
@@ -165,8 +156,7 @@
             var $li = this.$btn.parent('li'), $ul = $li.parent('ul');
             /* 选中一级菜单时显示二级菜单 */
             if ($li.hasClass('parent-menu')) {
-                $('.parent-menu .sub-menu').not(this.$btn.parent('li').find('.sub-menu').removeClass('hide')).addClass('hide');
-            }
+                $('.parent-menu .sub-menu').not(this.$btn.parent('li').find('.sub-menu').removeClass('hide')).addClass('hide');}
 
             /* 一级菜单添加按钮 */
             var $add = $('li.parent-menu:last');
@@ -174,19 +164,16 @@
             /* 二级菜单添加按钮 */
             $add.siblings('li').map(function () {
                 var $add = $(this).find('ul li:last');
-                $add.siblings('li').size() >= 5 ? $add.addClass('hide') : $add.removeClass('hide');
-            });
+                $add.siblings('li').size() >= 5 ? $add.addClass('hide') : $add.removeClass('hide');});
             /* 处理一级菜单 */
             var parentWidth = 100 / $('li.parent-menu:visible').size() + '%';
             $('li.parent-menu').map(function () {
                 var $icon = $(this).find('.icon-sub');
-                $(this).width(parentWidth).find('ul li').size() > 1 ? $icon.removeClass('hide') : $icon.addClass('hide');
-            });
+                $(this).width(parentWidth).find('ul li').size() > 1 ? $icon.removeClass('hide') : $icon.addClass('hide');});
             /* 更新选择中状态 */
             $('.mobile-footer a.active').not(this.$btn.addClass('active')).removeClass('active');
             this.renderEdit();
-            return $ul;
-        };
+            return $ul;};
         /**
          * 删除当前菜单
          * @returns {undefined}
@@ -195,20 +182,15 @@
             var $li = this.$btn.parent('li'), $ul = $li.parent('ul');
             var $default = function () {
                 if ($li.prev('li').size() > 0) {
-                    return $li.prev('li');
-                }
+                    return $li.prev('li');}
                 if ($li.next('li').size() > 0 && !$li.next('li').hasClass('menu-add')) {
-                    return $li.next('li');
-                }
+                    return $li.next('li');}
                 if ($ul.parents('li.parent-menu').size() > 0) {
-                    return $ul.parents('li.parent-menu');
-                }
-                return $('null');
-            }.call(this);
+                    return $ul.parents('li.parent-menu');}
+                return $('null');}.call(this);
             $li.remove();
             this.$btn = $default.find('a:first');
-            this.checkShow();
-        };
+            this.checkShow();};
         /**
          * 显示当前菜单的属性值
          * @returns {undefined}
@@ -219,14 +201,11 @@
             if ($li.find('ul li').size() > 1) { /*父菜单*/
                 $html = $($('.menu-editor-parent-tpl').html());
                 $html.find('input[name="menu-name"]').val($span.text()).on('change keyup', function () {
-                    $span.text(this.value || ' ');
-                });
-                $('.menu-editor .menu-content').html($html);
-            } else {
+                    $span.text(this.value || ' ');});
+                $('.menu-editor .menu-content').html($html);} else {
                 $html = $($('.menu-editor-content-tpl').html());
                 $html.find('input[name="menu-name"]').val($span.text()).on('change keyup', function () {
-                    $span.text(this.value || ' ');
-                });
+                    $span.text(this.value || ' ');});
                 $('.menu-editor .menu-content').html($html);
                 var type = $span.attr('data-type') || 'text';
                 $html.find('input[name="menu-type"]').on('click', function () {
@@ -248,27 +227,18 @@
                                     'pic_sysphoto': '弹出系统拍照发图',
                                     'pic_photo_or_album': '弹出拍照或者相册发图',
                                     'pic_weixin': '弹出微信相册发图器',
-                                    'location_select': '弹出地理位置选择器'
-                                };
+                                    'location_select': '弹出地理位置选择器'};
                                 var select = [], tpl = '<div><label class="font-noraml"><input class="cuci-radio" name="content" type="radio" {checked} value="{value}"> {title}</label></div>';
                                 if (!(options[content] || false)) {
                                     content = 'scancode_push';
-                                    $span.data('content', content);
-                                }
+                                    $span.data('content', content);}
                                 for (var i in options) {
-                                    select.push(tpl.replace('{value}', i).replace('{title}', options[i]).replace('{checked}', (i === content) ? 'checked' : ''));
-                                }
-                                return select.join('');
-                        }
-                    }.call(this);
+                                    select.push(tpl.replace('{value}', i).replace('{title}', options[i]).replace('{checked}', (i === content) ? 'checked' : ''));}
+                                return select.join('');}}.call(this);
                     var $html = $(html), $input = $html.find('input,textarea');
                     $input.on('change keyup click', function () {
-                        $span.data('content', $(this).val() || $(this).html());
-                    });
-                    $('.editor-content-input').html($html);
-                }).filter('input[value="{type}"]'.replace('{type}', type)).trigger('click');
-            }
-        };
+                        $span.data('content', $(this).val() || $(this).html());});
+                    $('.editor-content-input').html($html);}).filter('input[value="{type}"]'.replace('{type}', type)).trigger('click');}};
         /**
          * 提交数据
          * @returns {undefined}
@@ -281,8 +251,7 @@
                 menudata.name = $span.text();
                 menudata.type = $span.attr('data-type');
                 menudata.content = $span.data('content') || '';
-                return menudata;
-            }
+                return menudata;}
 
             $('li.parent-menu').map(function (index, item) {
                 if (!$(item).hasClass('menu-add')) {
@@ -297,16 +266,11 @@
                         submenudata.index = (index + 1) + '' + (ii + 1);
                         submenudata.pindex = menudata.index;
                         submenudata.sort = ii;
-                        data.push(submenudata);
-                    });
-                }
-            });
-            $.form.load('{:url("$classuri/edit")}', {data: data}, 'POST');
-        };
+                        data.push(submenudata);});}});
+            $.form.load('{:url("$classuri/edit")}', {data: data}, 'POST');};
         /**
          * 实例菜单控件
          */
-        new menu();
-    });
+        new menu();});
 </script>
 {/block}

+ 19 - 43
application/wechat/view/news.form.html

@@ -1,4 +1,4 @@
-{extend name='extra@admin/content' /}
+{extend name='extra@admin/content'}
 
 {block name='content'}
 
@@ -115,13 +115,11 @@
         var editDdata = {$vo.articles | default = [] | json_encode};
 
         for (var i in editDdata) {
-            $('.news-item').eq(i).data('item', editDdata[i]);
-        }
+            $('.news-item').eq(i).data('item', editDdata[i]);}
 
         $('body').on('change', '.upload-image-box input', function () {
             $('.news-item.active').css('background-image', 'url(' + this.value + ')');
-            $(this).parent('.upload-image-box').css('background-image', 'url(' + this.value + ')');
-        });
+            $(this).parent('.upload-image-box').css('background-image', 'url(' + this.value + ')');});
 
         require(['ueditor'], function () {
 
@@ -144,22 +142,17 @@
                     $form.submit();
                     if (!syncEditor($('.news-item.active'))) {
                         editor.setContent('文章内容不能留空,请输入内容!');
-                        return false;
-                    }
+                        return false;}
                     $('.news-item').map(function () {
                         var item = $(this).data('item');
                         item.content = item.content || '文章内容不能留空,请输入内容!';
-                        data.push(item);
-                    });
-                    $.form.load('__SELF__', {data: data}, "post");
-                });
+                        data.push(item);});
+                    $.form.load('__SELF__', {data: data}, "post");});
 
                 /*! 输入标题显示 */
                 $form.find('[name="title"]').on('keyup', function () {
                     if ($item) {
-                        $item.find('.news-title').html(this.value).show();
-                    }
-                });
+                        $item.find('.news-title').html(this.value).show();}});
 
                 /*! 同步编辑器 */
                 function syncEditor($pItem) {
@@ -176,11 +169,8 @@
                         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;
-                        }
-                    }
-                    return true;
-                }
+                            return false;}}
+                    return true;}
 
                 /*! 显示编辑器 */
                 function showEditor() {
@@ -193,60 +183,46 @@
                         data.content = data.content || '';
                         data.author = data.author || '';
                         data.show_cover_pic = data.show_cover_pic || 0;
-                        return data;
-                    };
+                        return data;};
                     // 重置表单
                     $form.get(0).reset();
                     // 获取当前数据
                     var data = this.get();
                     for (var i in data) {
                         if (i !== 'content' && i !== 'show_cover_pic') {
-                            $form.find('[name="' + i + '"]').val(data[i]).trigger('change');
-                        }
-                    }
+                            $form.find('[name="' + i + '"]').val(data[i]).trigger('change');}}
                     if (parseInt(data.show_cover_pic) === 1) {
-                        $form.find('[name="show_cover_pic"]').get(0).checked = true;
-                    }
-                    editor.setContent(data.content);
-                }
+                        $form.find('[name="show_cover_pic"]').get(0).checked = true;}
+                    editor.setContent(data.content);}
 
                 /*! 添加新图文 */
                 $body.off('click', '.news-box .article-add').on('click', '.news-box .article-add', function () {
                     var $html = $('<div class="news-item transition" style="background-image:url(__PUBLIC__/static/plugs/uploader/theme/image.png)"><span class="news-title"></span></div><hr />');
                     $html.insertBefore(this).trigger('click');
-                    $('.news-item').size() >= 7 && $(this).hide();
-                });
+                    $('.news-item').size() >= 7 && $(this).hide();});
 
                 /*! 列表选择 */
                 $body.off('click', '.news-item').on('click', '.news-item', function () {
                     if (syncEditor($('.news-item.active'))) {
                         $(this).addClass('active').siblings().removeClass('active');
-                        showEditor($item);
-                    }
-                });
+                        showEditor($item);}});
 
                 /*! 隐藏删除按钮 */
                 $body.off('mouseleave').on('mouseleave', '.news-item', function () {
-                    $(this).find('.upload-multiple-close').addClass('hide');
-                });
+                    $(this).find('.upload-multiple-close').addClass('hide');});
 
                 /*! 显示删除按钮 */
                 $body.off('mouseenter', '.news-item').on('mouseenter', '.news-item', function () {
                     $('.upload-multiple-close').addClass('hide');
-                    $(this).find('.upload-multiple-close').removeClass('hide');
-                });
+                    $(this).find('.upload-multiple-close').removeClass('hide');});
 
                 /*! 删除操作图文 */
                 $body.off('click', '.upload-multiple-close').on('click', '.upload-multiple-close', function () {
                     $(this).parents('.news-item').remove();
-                    $('.news-item').size() < 7 && $('.news-box .article-add').show();
-                });
+                    $('.news-item').size() < 7 && $('.news-box .article-add').show();});
 
                 /*! 默认显示第一个 */
-                $('.news-box .news-item:first').trigger('click');
-            });
-        });
-    });
+                $('.news-box .news-item:first').trigger('click');});});});
 </script>
 {/block}
 

+ 5 - 12
application/wechat/view/news.index.html

@@ -1,4 +1,4 @@
-{extend name='extra@admin/content' /}
+{extend name='extra@admin/content'}
 
 {block name="button"}
 <div class="nowrap pull-right" style="margin-top:10px">
@@ -42,10 +42,8 @@
 <script>
 
     $('body').on('mouseenter', '.news_item', function () {
-        $(this).find('.news_tools').removeClass('hide');
-    }).on('mouseleave', '.news_item', function () {
-        $(this).find('.news_tools').addClass('hide');
-    });
+        $(this).find('.news_tools').removeClass('hide');}).on('mouseleave', '.news_item', function () {
+        $(this).find('.news_tools').addClass('hide');});
 
     require(['jquery.masonry'], function (Masonry) {
         var container = document.querySelector('#news_box');
@@ -58,13 +56,8 @@
                     if (ret.code) {
                         $(self).parents('.news_item').remove();
                         msnry.layout();
-                        return $.msg.success(ret.msg), false;
-                    }
-                    return $.msg.error(ret.msg), false;
-                });
-            });
-        });
-    });
+                        return $.msg.success(ret.msg), false;}
+                    return $.msg.error(ret.msg), false;});});});});
 
 </script>
 {/block}

+ 20 - 30
application/wechat/view/news.push.html

@@ -27,7 +27,7 @@
             <script id="push" type="text/template">
                 {{if data}}
                 {{each data as value key}}
-                {{if key <= 200 }}
+                {{if key <= 200}}
                 <label>{{value}}</label>
                 {{/if}}
                 {{/each}}
@@ -46,40 +46,30 @@
                         var check_status = check_checked();
                         /*重置和全选数据变化处理*/
                         $('input[name*=fans_tags]').map(function () {
-                            this.checked = !check_status;
-                        });
+                            this.checked = !check_status;});
                         check_checked();
-                        postpush();
-                    });
+                        postpush();});
                     /*重置和全选的效果处理*/
                     function check_checked() {
                         var allcheck = true;
                         $('input[name*=fans_tags]').map(function () {
-                            (!this.checked) && (allcheck = false);
-                        });
-                        return ((allcheck) ? $allbtn.html('重置') : $allbtn.html('全选')), allcheck;
-                    }
+                            (!this.checked) && (allcheck = false);});
+                        return ((allcheck) ? $allbtn.html('重置') : $allbtn.html('全选')), allcheck;}
 
                     /*点击每一个选项都触发事件*/
                     $('input[name*=fans_tags]').on('click', function () {
                         check_checked();
-                        postpush();
-                    });
+                        postpush();});
                     /*数据异步获取并显示出来*/
                     function postpush() {
                         var inp = $('input[name*=fans_tags]');
                         var group = [];
                         for (var i = 0; i < inp.length; i++) {
                             if (inp[i].checked === true) {
-                                group.push(inp[i].value);
-                            }
-                        }
+                                group.push(inp[i].value);}}
                         $.post("{:url('wechat/news/push')}?action=getuser", {group: group.join(',')}, function (ret) {
                             var html = template('push', ret);
-                            document.getElementById('push-tags').innerHTML = html;
-                        });
-                    }
-                });
+                            document.getElementById('push-tags').innerHTML = html;});}});
             </script>
         </div>
         <div id='push-tags' class="list-item"></div>
@@ -94,18 +84,18 @@
 </form>
 
 <style>
-    body { min-width: 500px }
+    body { min-width: 500px}
     #push-tags{height:300px;overflow:auto}
-    .bottom-btn { display: block; background: #F7F7F7; padding: 10px; position: absolute; position: fixed; bottom: 0; width: 100% }
-    .news-container { width: 200px; padding-right: 8px }
-    .list-container { width: 578px; padding-right: 8px; padding-left: 0 }
-    .list-container h5 a { font-size: 12px; float: right }
-    .list-container .list-item { border: 1px solid #eee; padding: 8px }
-    .list-container .list-item:after { content: ''; display: block; clear: both; width: 100% }
-    .list-container .list-item label { display: block; width: 25%; float: left; white-space: nowrap; overflow: hidden; text-overflow: ellipsis }
-    .news-container .news-box { border: 1px solid #eee; padding: 8px }
-    .news-container .news-box hr { margin: 4px }
-    .news-container .news-box .news-item { position: relative; border: 1px solid #cecece; border-radius: 2px; overflow: hidden; cursor: pointer }
+    .bottom-btn { display: block; background: #F7F7F7; padding: 10px; position: absolute; position: fixed; bottom: 0; width: 100%}
+    .news-container { width: 200px; padding-right: 8px}
+    .list-container { width: 578px; padding-right: 8px; padding-left: 0}
+    .list-container h5 a { font-size: 12px; float: right}
+    .list-container .list-item { border: 1px solid #eee; padding: 8px}
+    .list-container .list-item:after { content: ''; display: block; clear: both; width: 100%}
+    .list-container .list-item label { display: block; width: 25%; float: left; white-space: nowrap; overflow: hidden; text-overflow: ellipsis}
+    .news-container .news-box { border: 1px solid #eee; padding: 8px}
+    .news-container .news-box hr { margin: 4px}
+    .news-container .news-box .news-item { position: relative; border: 1px solid #cecece; border-radius: 2px; overflow: hidden; cursor: pointer}
     .news-container .news-box .news-image {background-position:center center;background-size:100%;height:90px}
-    .news-container .news-box .news-title { position: absolute; background: rgba(0, 0, 0, 0.5); color: #fff; padding: 2px; margin: 0; bottom: 0; left: 0; right: 0; text-align: right; white-space: nowrap; text-overflow: ellipsis; overflow: hidden }
+    .news-container .news-box .news-title { position: absolute; background: rgba(0, 0, 0, 0.5); color: #fff; padding: 2px; margin: 0; bottom: 0; left: 0; right: 0; text-align: right; white-space: nowrap; text-overflow: ellipsis; overflow: hidden}
 </style>

+ 1 - 3
application/wechat/view/review.index.html

@@ -170,9 +170,7 @@
         <script>
             $(function () {
                 $('[data-href]').on('click', function () {
-                    window.location.href = this.getAttribute('data-href');
-                });
-            });
+                    window.location.href = this.getAttribute('data-href');});});
         </script>
         {/if}
     </body>

+ 1 - 1
application/wechat/view/tags.index.html

@@ -1,4 +1,4 @@
-{extend name='extra@admin/content' /}
+{extend name='extra@admin/content'}
 
 {block name="button"}
 <div class="nowrap pull-right" style="margin-top:10px">