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 @@ -
+
{notempty name='vo.username'} @@ -39,21 +39,21 @@ {else} 用户昵称:{$vo.nickname|default='-'} {/notempty} - [ VIP{$vo.vip_code} ] {$vo.vip_name}
用户手机:{$vo.phone|default='-'}
+
用户等级:[ VIP{$vo.vip_code} ] {$vo.vip_name}
{notempty name='vo.from'} -
- 永久 + 永 久 - 临时 + 临 时
+
{notempty name='vo.from.username'} @@ -61,9 +61,9 @@ {else} 用户昵称:{$vo.from.nickname|default='-'} {/notempty} - [ VIP{$vo.from.vip_code} ] {$vo.from.vip_name}
用户手机:{$vo.from.phone|default='-'}
+
用户等级:[ VIP{$vo.from.vip_code} ] {$vo.from.vip_name}
{else}
没有推荐人