From e371e10c6666fac4b26c3ff4476f8e0827cae1a4 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 25 Sep 2020 22:05:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/login/index.html                    |  4 ++--
 app/data/view/shop_goods/select.html               |  4 ++--
 app/data/view/shop_order/index.html                | 10 ++--------
 app/data/view/shop_order_send/index.html           | 14 +-------------
 app/data/view/shop_order_service/index_search.html |  3 ---
 public/static/admin.js                             |  5 ++---
 vendor/composer/ClassLoader.php                    |  2 +-
 vendor/services.php                                |  2 +-
 8 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/app/admin/view/login/index.html b/app/admin/view/login/index.html
index 1a00024e7..0d9191380 100644
--- a/app/admin/view/login/index.html
+++ b/app/admin/view/login/index.html
@@ -14,13 +14,13 @@
         <h2 class="notselect">系统管理</h2>
         <ul>
             <li class="username">
-                <label>
+                <label class="label-required-null">
                     <i class="layui-icon layui-icon-username"></i>
                     <input class="layui-input" required pattern="^\S{4,}$" name="username" autofocus autocomplete="off" placeholder="登录账号" title="请输入登录账号">
                 </label>
             </li>
             <li class="password">
-                <label>
+                <label class="label-required-null">
                     <i class="layui-icon layui-icon-password"></i>
                     <input class="layui-input" required pattern="^\S{4,}$" name="password" maxlength="32" type="password" autocomplete="off" placeholder="登录密码" title="请输入登录密码">
                 </label>
diff --git a/app/data/view/shop_goods/select.html b/app/data/view/shop_goods/select.html
index 9da35316e..ae64c6a63 100644
--- a/app/data/view/shop_goods/select.html
+++ b/app/data/view/shop_goods/select.html
@@ -19,9 +19,9 @@
         <tr>
             <td class='nowrap'>
                 {notempty name='vo.cover'}
-                <img data-tips-image style="width:auto;height:40px" src="{$vo.cover|default=''}" class="margin-right-5" alt="img">
+                <div class="headimg" data-tips-image data-lazy-src="{$vo.cover}"></div>
                 {/notempty}
-                <div class="inline-block text-top">
+                <div class="inline-block">
                     商品编号：{$vo.code|default='--'}<br>
                     商品名称：{$vo.name|default='--'}<br>
                 </div>
diff --git a/app/data/view/shop_order/index.html b/app/data/view/shop_order/index.html
index 8399c6e83..905e12ffe 100644
--- a/app/data/view/shop_order/index.html
+++ b/app/data/view/shop_order/index.html
@@ -34,18 +34,14 @@
                 </td>
                 <td class="nowrap relative">
                     <div>
-                        <div class="headimg">
-                            <img alt="img" data-tips-image src="{$vo.fromer.headimg|default='__ROOT__/static/theme/img/headimg.png'}">
-                        </div>
+                        <div class="headimg" data-tips-image data-lazy-src="{$vo.fromer.headimg|default='__ROOT__/static/theme/img/headimg.png'}"></div>
                         <div class="inline-block sub-span-blue">
                             推荐会员：{$vo.fromer.nickname|default='--'}<br>
                             推荐手机：<span>{$vo.fromer.phone|default='--'}</span><br>
                         </div>
                     </div>
                     <div>
-                        <div class="headimg">
-                            <img alt="img" data-tips-image src="{$vo.member.headimg|default='__ROOT__/static/theme/img/headimg.png'}">
-                        </div>
+                        <div class="headimg" data-tips-image data-lazy-src="{$vo.member.headimg|default='__ROOT__/static/theme/img/headimg.png'}"></div>
                         <div class="inline-block sub-span-blue">
                             会员昵称：{$vo.member.nickname|default='--'}<br>
                             会员手机：<span>{$vo.member.phone|default='--'}</span><br>
@@ -95,9 +91,7 @@
             {/foreach}
             </tbody>
         </table>
-
         {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-
     </div>
 </div>
 {/block}
diff --git a/app/data/view/shop_order_send/index.html b/app/data/view/shop_order_send/index.html
index 7bab9e80c..f15225b0a 100644
--- a/app/data/view/shop_order_send/index.html
+++ b/app/data/view/shop_order_send/index.html
@@ -33,9 +33,7 @@
                     <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
                 </td>
                 <td class="nowrap relative">
-                    <div class="headimg" style="width:56px;height:56px">
-                        <img data-tips-image src="{$vo.member.headimg|default='__ROOT__/static/theme/img/headimg.png'}" alt="img">
-                    </div>
+                    <div class="headimg" style="width:56px;height:56px" data-tips-image data-lazy-src="{$vo.member.headimg|default='__ROOT__/static/theme/img/headimg.png'}"></div>
                     <div class="inline-block sub-span-blue">
                         会员昵称：{$vo.member.nickname|default='--'}<br>
                         会员手机：<span>{$vo.member.phone|default='--'}</span><br>
@@ -74,14 +72,4 @@
 
     </div>
 </div>
-<style>
-    .think-badge-middle .layui-badge {
-        width: 1em;
-        height: 68px;
-        padding-top: 5px;
-        line-height: 21px;
-        white-space: normal;
-        vertical-align: middle;
-    }
-</style>
 {/block}
diff --git a/app/data/view/shop_order_service/index_search.html b/app/data/view/shop_order_service/index_search.html
index 2b7b67bc1..2e48d532b 100644
--- a/app/data/view/shop_order_service/index_search.html
+++ b/app/data/view/shop_order_service/index_search.html
@@ -113,9 +113,6 @@
         </div>
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-            {if auth('export')}
-            <button type="button" data-export-list class="layui-btn layui-btn-primary"><i class="layui-icon layui-icon-export"></i> 导 出</button>
-            {/if}
         </div>
     </form>
 </fieldset>
\ No newline at end of file
diff --git a/public/static/admin.js b/public/static/admin.js
index 9b192e252..723c70d12 100644
--- a/public/static/admin.js
+++ b/public/static/admin.js
@@ -808,7 +808,6 @@ $(function () {
         }
     }, true);
 
-    /*! 初始化事件 */
-    $.menu.listen();
-    $.vali.listen();
+    /*! 系统菜单表单页面初始化 */
+    $.menu.listen(), $.vali.listen(), $.form.reInit($body);
 });
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index fce8549f0..03b9bb9c4 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -60,7 +60,7 @@ class ClassLoader
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
         }
 
         return array();
diff --git a/vendor/services.php b/vendor/services.php
index fa58cdbf6..15d605ab7 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-09-25 09:55:13
+// This file is automatically generated at:2020-09-25 21:38:55
 declare (strict_types = 1);
 return array (
   0 => 'think\\admin\\Library',