Merge branch 'master' of http://git.liuniu946.com/Kirin/zccy

app/admin/model/order/StoreOrder.php

@@ -97,6 +97,7 @@ class StoreOrder extends BaseModel
             $item['_info'] = $_info;
             $item['spread_nickname'] = User::where('uid', $item['spread_uid'])->value('nickname');
             $item['add_time'] = $item['add_time'] ? date('Y-m-d H:i:s', $item['add_time']) : '';
+            $item['arrive_time'] = $item['arrive_time'] ? date('Y-m-d H:i:s', $item['arrive_time']) : '';
             $item['back_integral'] = $item['back_integral'] ?: 0;
             if ($item['pink_id'] || $item['combination_id']) {
                 $pinkStatus = StorePink::where('order_id_key', $item['id'])->value('status');

app/admin/view/merchant/system_store/order.php

@@ -603,19 +603,21 @@
     layList.tableList('List', "{:Url('order_list',['real_name'=>$real_name])}", function () {
         return [
             {type: 'checkbox'},
-            {field: 'order_id', title: '订单号', sort: true, event: 'order_id', width: '11%', templet: '#order_id'},
+            {field: 'order_id', title: '订单号', sort: true, event: 'order_id', width: '8%', templet: '#order_id'},
             {field: 'nickname', title: '用户信息', templet: '#userinfo', width: '6%', align: 'center'},
             {field: 'store', title: '门店', width: '6%', align: 'center'},
             {field: 'point', title: '自提点', width: '6%', align: 'center'},
-            {field: 'spread_uid', title: '推荐人信息', templet: '#spread_uid', width: '8%', align: 'center'},
+            {field: 'spread_uid', title: '推荐人信息', templet: '#spread_uid', width: '6%', align: 'center'},
             {field: 'info', title: '商品信息', templet: "#info", height: 'full-20'},
             {field: 'pay_price', title: '支付金额', width: '6%', align: 'center'},
             {field: 'deposit', title: '支付押金', width: '6%', align: 'center'},
             {field: 'deposit_back', title: '已退押金', width: '6%', align: 'center'},
             {field: 'use_integral', title: '使用积分', width: '6%', align: 'center'},
+            {field: 'time_area', title: '送达时间', width: '6%', align: 'center'},
             {field: 'paid', title: '支付状态', templet: '#paid', width: '6%', align: 'center'},
             {field: 'status', title: '订单状态', templet: '#status', width: '6%', align: 'center'},
             {field: 'add_time', title: '下单时间', width: '6%', sort: true, align: 'center'},
+            {field: 'arrive_time', title: '收货时间', width: '6%', sort: true, align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act', width: '10%'},
         ];
     });