pc

application/admin/controller/Orders.php

@@ -3,6 +3,7 @@
 namespace app\admin\controller;
 
 use app\admin\model\OrderInfo;
+use app\admin\model\Refund;
 use app\common\controller\Backend;
 use app\common\model\OrderLogistics;
 use think\Db;
@@ -115,6 +116,7 @@ class Orders extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = OrderInfo::where($where)
+                ->with(['refund'])
                 ->where('order_info.order_id',$ids)
                 ->select();
 
@@ -122,6 +124,8 @@ class Orders extends Backend
 
             return json($result);
         }
+        $this->assign('refund_status',Refund::getRefundStatus());
+        $this->assign('refund_type',Refund::getRefundTypes());
         $this->assign('order',$this->model->find($ids));
         return $this->view->fetch();
     }

application/admin/view/orders/detail.html

@@ -20,6 +20,43 @@
 </div>
 <table class="table table-striped table-bordered table-hover table-nowrap" width="50%">
     <tr>
+        <td colspan="2"><b>订单信息</b></td>
+    </tr>
+    <tr>
+        <td>订单号：{$order.order_no}</td>
+        <td>支付时间：{:$order.pay_time?date('Y-m-d H:i:s',$order['pay_time']):'-'}</td>
+    </tr>
+    <tr>
+        <td>取消时间：{:$order.cancel_time?date('Y-m-d H:i:s',$order['cancel_time']):'-'}</td>
+        <td>收货时间：{:$order.rec_time?date('Y-m-d H:i:s',$order['rec_time']):'-'}</td>
+    </tr>
+    <tr>
+        <td>发货时间：{:$order.send_time?date('Y-m-d H:i:s',$order['send_time']):'-'}</td>
+        <td>创建时间：{$order.create_time|date='Y-m-d H:i:s',###}</td>
+    </tr>
+    <tr>
+        <td>状态：<span class="label label-info">{:$status[$order['status']]}</span></td>
+        <td>总金额：<span class="label label-default">{:$order.amount_total}</span></td>
+    </tr>
+    <tr>
+        <td>支付金额：<span class="label label-default">{$order.amount_pay}</span></td>
+        <td>安装费：<span class="label label-default">{:$order.amount_install}</span></td>
+    </tr>
+    <tr>
+        <td>优惠券抵扣金额：<span class="label label-default">{$order.amount_coupon}</span></td>
+        <td>等级折扣金额：<span class="label label-default">{:$order.amount_coupon_level}</span></td>
+    </tr>
+    <tr>
+        <td>优惠总金额：<span class="label label-default">{$order.amount_discount}</span></td>
+        <td>毛利：<span class="label label-default">{$order.amount_profit}</span></td>
+    </tr>
+    <tr>
+        <td>毛利率：<span class="label label-default">{$order.amount_profit_per}%</span></td>
+        <td>提成金额<span class="label label-default">{$order.amount_cmn}</span></td>
+    </tr>
+</table>
+<table class="table table-striped table-bordered table-hover table-nowrap" width="50%">
+    <tr>
         <td colspan="2"><b>物流信息</b></td>
     </tr>
     <tr>
@@ -32,6 +69,14 @@
             {$order.logistics.trans_no|default=''}
         </td>
     </tr>
+    <tr>
+        <td>收货地址：</td>
+        <td>
+            <div>地址：{$order.address.address}</div>
+            <div>姓名：{$order.address.name}</div>
+            <div>电话：{$order.address.mobile}</div>
+        </td>
+    </tr>
 </table>
 <table class="table table-striped table-bordered table-hover table-nowrap" width="50%">
     <tr>
@@ -71,10 +116,18 @@
         </td>
     </tr>
     {/if}
+    <tr>
+        <td>合同链接：</td>
+        <td>
+            <a href="{$order.contract_link}" target="_blank">点击下载</a>
+        </td>
+    </tr>
 </table>
 <script>
     let status={:json_encode($status)};
     let payTypes={:json_encode($pay_types)};
+    let refundStatus={:json_encode($refund_status)};
+    let refund_type={:json_encode($refund_type)};
 </script>
 <style>
     .smallDesc{display: inline-block;width: 100px;text-align: right;}

public/assets/js/backend/orders.js

@@ -172,13 +172,24 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {field: 'id', title: __('Id')},
                         {field: 'logo', title: __('商品图片'),formatter: Table.api.formatter.image,events:Table.api.events.image,operate: false},
-                        {field: 'goods_name', title: __('商品名称'),operate: false,formatter: Table.api.formatter.content,width:200},
+                        {field: 'goods_name', title: __('商品名称'),operate: false,formatter(name,orderInfo,index){
+                            let a=[]
+                                a.push(`<div>${name}</div>`)
+                                if(orderInfo.refund){
+                                    a.push(`<div>
+                                    <span class="label label-default">${refund_type[orderInfo.refund.refund_type]}</span>
+                                    <span class="label label-danger">${refundStatus[orderInfo.refund.refund_status]}</span>
+                                    </div>`)
+                                }
+                                return a.join('')
+                            },width:200},
                         {field: 'sku_name', title: __('商品规格'),operate: false},
                         {field: 'amount_total', title: __('Amount_total'), operate:'BETWEEN'},
                         {field: 'amount_pay', title: __('Amount_pay'), operate:'BETWEEN'},
                           {field: 'amount_install', title: __('Amount_install'), operate:'BETWEEN'},
                           {field: 'num', title: __('购买数量'),operate: 'between'},
                           {field: 'num_install', title: __('安装数量'),operate: 'between'},
+                          //{field: 'refund.refund_status', title: __('售后'),operate: 'eq',formatter: Table.api.formatter.label,searchList:refundStatus},
                     ]
                 ],
                 onLoadSuccess(){