From 6d499d4adda1b7179dc19e2e6adb547ba071c287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Thu, 25 Mar 2021 11:57:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/ShopOrder.php |  4 ++--
 app/data/view/user/index.html     | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/data/controller/ShopOrder.php b/app/data/controller/ShopOrder.php
index 4dc96bcb9..b8cb3fb61 100644
--- a/app/data/controller/ShopOrder.php
+++ b/app/data/controller/ShopOrder.php
@@ -190,11 +190,11 @@ class ShopOrder extends Controller
             $order = $this->app->db->name($this->table)->where(['order_no' => $data['order_no']])->find();
             if (empty($order) || $order['status'] !== 3) $this->error('不允许操作审核！');
             // 无需发货时的处理
-            if ($data['status'] === 4 && empty($order['truck_type'])) $data['status'] = 5;
+            if ($data['status'] === 4 && empty($order['truck_type'])) $data['status'] = 6;
             // 更新订单支付状态
             $map = ['status' => 3, 'order_no' => $data['order_no']];
             if ($this->app->db->name($this->table)->strict(false)->where($map)->update($data) !== false) {
-                if (in_array($data['status'], [4, 5])) {
+                if (in_array($data['status'], [4, 5, 6])) {
                     $this->app->event->trigger('ShopOrderPayment', $data['order_no']);
                     $this->success('订单审核通过成功！');
                 } else {
diff --git a/app/data/view/user/index.html b/app/data/view/user/index.html
index 93b716132..37671c133 100644
--- a/app/data/view/user/index.html
+++ b/app/data/view/user/index.html
@@ -31,7 +31,7 @@
                 <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
             </td>
             <td class="nowrap">
-                <div class="headimg" data-tips-image data-lazy-src="{$vo.headimg|default='__ROOT__/static/theme/img/headimg.png'}"></div>
+                <div class="headimg headimg-md" data-tips-image data-lazy-src="{$vo.headimg|default='__ROOT__/static/theme/img/headimg.png'}"></div>
                 <div class="inline-block">
                     <div>
                         {notempty name='vo.username'}
@@ -39,21 +39,21 @@
                         {else}
                         用户昵称：<span class="color-blue">{$vo.nickname|default='-'}</span>
                         {/notempty}
-                        <span class="margin-left-5">[ <b class="color-red">VIP{$vo.vip_code}</b> ] <b class="color-red">{$vo.vip_name}</b></span>
                     </div>
                     <div>用户手机：<span class="color-blue">{$vo.phone|default='-'}</span></div>
+                    <div>用户等级：[ <b class="color-red">VIP{$vo.vip_code}</b> ] <b class="color-red">{$vo.vip_name}</b></div>
                 </div>
             </td>
             <td class="nowrap">
                 {notempty name='vo.from'}
-                <div class="headimg" data-tips-image data-lazy-src="{$vo.from.headimg|default='__ROOT__/static/theme/img/headimg.png'}"></div>
                 <div class="inline-block text-middle">
                     <!--{notempty name='vo.pids'}-->
-                    <span class="layui-badge layui-badge-middle layui-bg-green">永久</span>
+                    <span class="layui-badge layui-badge-middle layui-bg-green">永 久</span>
                     <!--{else}-->
-                    <span class="layui-badge layui-badge-middle layui-bg-red">临时</span>
+                    <span class="layui-badge layui-badge-middle layui-bg-red">临 时</span>
                     <!--{/notempty}-->
                 </div>
+                <div class="headimg headimg-md" data-tips-image data-lazy-src="{$vo.from.headimg|default='__ROOT__/static/theme/img/headimg.png'}"></div>
                 <div class="inline-block text-middle">
                     <div>
                         {notempty name='vo.from.username'}
@@ -61,9 +61,9 @@
                         {else}
                         用户昵称：<span class="color-blue">{$vo.from.nickname|default='-'}</span>
                         {/notempty}
-                        <span class="margin-left-5">[ <b class="color-red">VIP{$vo.from.vip_code}</b> ] <b class="color-red">{$vo.from.vip_name}</b></span>
                     </div>
                     <div>用户手机：<span>{$vo.from.phone|default='-'}</span></div>
+                    <div>用户等级：[ <b class="color-red">VIP{$vo.from.vip_code}</b> ] <b class="color-red">{$vo.from.vip_name}</b></div>
                 </div>
                 {else}
                 <div class="color-desc">没有推荐人</div>