Update admin.js

app/admin/view/menu/form.html

@@ -12,7 +12,7 @@
                     <option value='{$menu.id}'>{$menu.spl|raw}{$menu.title}</option>
                     {/eq}{/foreach}
                 </select>
-                <p class="help-block"><b>必选</b>，请选择上级菜单或顶级菜单（目前最多支持三级菜单）</p>
+                <p class="help-block"><b>必选</b>，请选择上级菜单或顶级菜单 ( 目前最多支持三级菜单 )</p>
             </div>
         </div>
 
@@ -20,7 +20,7 @@
             <label class="layui-form-label">菜单名称</label>
             <div class="layui-input-block">
                 <input name="title" value='{$vo.title|default=""}' required placeholder="请输入菜单名称" class="layui-input">
-                <p class="help-block"><b>必选</b>，请填写菜单名称（如：系统管理），建议字符不要太长，一般4-6个汉字</p>
+                <p class="help-block"><b>必选</b>，请填写菜单名称 ( 如：系统管理 )，建议字符不要太长，一般 4-6 个汉字</p>
             </div>
         </div>
 
@@ -29,8 +29,8 @@
             <div class="layui-input-block">
                 <input onblur="this.value=this.value === ''?'#':this.value" name="url" required placeholder="请输入菜单链接" value="{$vo.url|default='#'}" class="layui-input">
                 <p class="help-block">
-                    <b>必选</b>，请填写链接地址或选择系统节点（如：https://domain.com/admin/user/index.html 或 admin/user/index）
-                    <br>当填写链接地址时，以下面的“权限节点”来判断菜单自动隐藏或显示，注意未填写“权限节点”时将不会隐藏该菜单哦
+                    <b>必选</b>，请填写链接地址或选择系统节点 ( 如：https://domain.com/admin/user/index.html 或 admin/user/index )
+                    <br>当填写链接地址时，以下面的 “权限节点” 来判断菜单自动隐藏或显示，注意未填写 “权限节点” 时将不会隐藏该菜单哦
                 </p>
             </div>
         </div>
@@ -39,7 +39,7 @@
             <label class="layui-form-label">链接参数</label>
             <div class="layui-input-block">
                 <input name="params" placeholder="请输入链接参数" value="{$vo.params|default=''}" class="layui-input">
-                <p class="help-block">可选，设置菜单链接的GET访问参数（如：name=1&age=3）</p>
+                <p class="help-block"><b>可选</b>，设置菜单链接的 GET 访问参数 ( 如：name=1&age=3 )</p>
             </div>
         </div>
 
@@ -47,7 +47,7 @@
             <label class="layui-form-label">权限节点</label>
             <div class="layui-input-block">
                 <input name="node" placeholder="请输入权限节点" value="{$vo.node|default=''}" class="layui-input">
-                <p class="help-block">可选，请填写系统权限节点（如：admin/user/index），未填写时默认解释"菜单链接"判断是否拥有访问权限；</p>
+                <p class="help-block"><b>可选</b>，请填写系统权限节点 ( 如：admin/user/index )，未填写时默认解释"菜单链接"判断是否拥有访问权限；</p>
             </div>
         </div>
 
@@ -61,7 +61,7 @@
                     <i style="font-size:1.2em;margin:0;float:none" class='{$vo.icon|default=""}'></i>
                 </span>
                 <button data-icon='icon' type='button' class='layui-btn layui-btn-primary'>选择图标</button>
-                <p class="help-block">可选，设置菜单选项前置图标，目前支持 layui 字体图标及 iconfont 定制字体图标。</p>
+                <p class="help-block"><b>可选</b>，设置菜单选项前置图标，目前支持 layui 字体图标及 iconfont 定制字体图标。</p>
             </div>
         </div>
 
@@ -76,26 +76,22 @@
     </div>
 </form>
 
-{block name='script'}
 <script>
     require(['jquery.autocompleter'], function () {
         $('[name="icon"]').on('change', function () {
             $(this).parent().next().find('i').get(0).className = this.value
-        });
-        $('input[name=url]').autocompleter({
+        }), $('input[name=url]').autocompleter({
             limit: 6, highlightMatches: true, template: '{{ label }} <span> {{ title }} </span>', callback: function (node) {
                 $('input[name=node]').val(node);
             }, source: (function (subjects, data) {
                 for (var i in subjects) data.push({value: subjects[i].node, label: subjects[i].node, title: subjects[i].title});
                 return data;
             })(JSON.parse('{$nodes|raw|json_encode}'), [])
-        });
-        $('input[name=node]').autocompleter({
+        }), $('input[name=node]').autocompleter({
             limit: 5, highlightMatches: true, template: '{{ label }} <span> {{ title }} </span>', source: (function (subjects, data) {
                 for (var i in subjects) data.push({value: subjects[i].node, label: subjects[i].node, title: subjects[i].title});
                 return data;
             })(JSON.parse('{$auths|raw|json_encode}'), [])
         });
     });
-</script>
-{/block}
+</script>

app/admin/view/table.html

@@ -1,11 +1,13 @@
 <div class="layui-card">
     {block name='style'}{/block}
-    {block name='header'}{notempty name='title'}
+    {block name='header'}
+    {notempty name='title'}
     <div class="layui-card-header">
         <span class="layui-icon font-s10 color-desc margin-right-5">&#xe65b;</span>{$title|default=''}
         <div class="pull-right">{block name='button'}{/block}</div>
     </div>
-    {/notempty}{/block}
+    {/notempty}
+    {/block}
     <div class="layui-card-line"></div>
     <div class="layui-card-body">
         <div class="layui-card-table">

app/admin/view/user/pass.html

@@ -1,5 +1,6 @@
 <form class="layui-form layui-card" data-table-id="UserTable" action="{:sysuri()}" data-auto="true" method="post">
     <div class="layui-card-body padding-left-40">
+
         <div class="layui-form-item">
             <label class="relative block">
                 <span class="help-label"><b>登录用户账号</b>Username</span>
@@ -27,7 +28,7 @@
                 <span class="help-label"><b>新的登录密码</b>New Password</span>
                 <input type="password" name="password" maxlength="32" pattern="^(?![\d]+$)(?![a-zA-Z]+$)(?![^\da-zA-Z]+$).{6,32}$" required placeholder="请输入新的登录密码" class="layui-input">
             </label>
-            <p class="color-desc">密码必需包含大小写字母、数字、符号的任意两者组合。</p>
+            <p class="color-desc">密码必须包含大小写字母、数字、符号的任意两者组合。</p>
         </div>
 
         <div class="layui-form-item">
@@ -35,7 +36,7 @@
                 <span class="help-label"><b>重复登录密码</b>Repeat Password</span>
                 <input type="password" name="repassword" maxlength="32" pattern="^(?![\d]+$)(?![a-zA-Z]+$)(?![^\da-zA-Z]+$).{6,32}$" required placeholder="请重复输入登录密码" class="layui-input">
             </label>
-            <p class="color-desc">密码必需包含大小写字母、数字、符号的任意两者组合。</p>
+            <p class="color-desc">密码必须包含大小写字母、数字、符号的任意两者组合。</p>
         </div>
     </div>
 

app/data/controller/base/postage/Company.php

@@ -88,9 +88,8 @@ class Company extends Controller
         try {
             $result = ExpressService::instance()->company();
             if (empty($result['code'])) $this->error($result['info']);
-            foreach ($result['data'] as $vo) data_save(BasePostageCompany::class, [
-                'code_1' => $vo['code_1'], 'code_2' => $vo['code_2'],
-                'code_3' => $vo['code_3'], 'name' => $vo['title'], 'deleted' => 0,
+            foreach ($result['data'] as $vo) BasePostageCompany::mUpdate([
+                'code_1' => $vo['code_1'], 'code_2' => $vo['code_2'], 'code_3' => $vo['code_3'], 'name' => $vo['title'], 'deleted' => 0,
             ], 'code_1');
             $this->success('同步快递公司成功！');
         } catch (HttpResponseException $exception) {

public/static/admin.js

@@ -1023,7 +1023,14 @@ $(function () {
 
     /*! 注册 data-tips-image 事件行为 */
     onEvent('click', '[data-tips-image]', function () {
-        $.previewImage(this.dataset.tipsImage || this.dataset.lazySrc || this.src, this.dataset.width);
+        var items = [], $imgs;
+        ($imgs = $(this).parent().find('[data-tips-image]')).map(function () {
+            items.push({src: this.dataset.tipsImage || this.dataset.lazySrc || this.src});
+        }) && layui.layer.photos({
+            anim: 5, closeBtn: 1, photos: {start: $imgs.index(this), data: items}, tab: function (pic, $ele) {
+                $ele.find('.layui-layer-close').css({position: 'fixed', top: 0, right: 0});
+            }
+        });
     });
 
     /*! 注册 data-phone-view 事件行为 */