xieruidong 2 years ago
parent
commit
082a4de687

+ 13 - 1
application/admin/controller/Orders.php

@@ -58,7 +58,7 @@ class Orders extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                ->with(['user'])
+                ->with(['user','logistics'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
@@ -134,4 +134,16 @@ class Orders extends Backend
             $this->success();
         }
     }
+    #查看物流
+    public function logistics($ids){
+        $order=$this->model->find($ids);
+        $timeLine=logistics()
+            ->setLogistics($order->logistics->com)
+            ->setPhone($order->address->mobile)
+            ->setUserName($order->address->name)
+            ->setNo($order->logistics->trans_no)
+            ->query();
+        $this->assign('timeLine',$timeLine);
+        return $this->fetch();
+    }
 }

+ 1 - 0
application/admin/view/orders/index.html

@@ -37,6 +37,7 @@
                            data-operate-send="{:$auth->check('orders/send')}"
                            data-operate-detail="{:$auth->check('orders/detail')}"
                            data-operate-tax="{:$auth->check('orders/tax')}"
+                           data-operate-logistics="{:$auth->check('orders/logistics')}"
                            width="100%">
                     </table>
                 </div>

+ 16 - 0
application/admin/view/orders/logistics.html

@@ -0,0 +1,16 @@
+<style>
+</style>
+<table class="table table-striped table-bordered table-hover table-nowrap" width="50%">
+    <tr>
+        <td><b>时间</b></td>
+        <td><b>详情</b></td>
+    </tr>
+   {foreach name='timeLine' item='a'}
+    <tr>
+        <td>{$a.time}</td>
+        <td style="width: 80%;white-space: inherit;">
+            {$a.content}
+        </td>
+    </tr>
+    {/foreach}
+</table>

+ 1 - 0
application/common/model/OrderAddress.php

@@ -5,6 +5,7 @@ namespace app\common\model;
 use think\Model;
 
 /**
+ * @property string mobile
  */
 class OrderAddress extends Model
 {

+ 4 - 1
application/common/model/OrderLogistics.php

@@ -5,7 +5,10 @@ namespace app\common\model;
 
 
 use think\Model;
-
+/**
+ * @property LogisticsCompany com
+ * @property string trans_no
+ */
 class OrderLogistics extends Model
 {
     public function com(){

+ 1 - 0
application/common/model/Orders.php

@@ -11,6 +11,7 @@ use Yansongda\Supports\Arr;
 /**
  * @property OrderInfo info
  * @property OrderAddress address
+ * @property OrderLogistics logistics
  * @property User user
  * @property bool is_wait_pay
  * @property bool is_wait_send

+ 17 - 0
public/assets/js/backend/orders.js

@@ -90,6 +90,23 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                         return !row.tax_link && row.tax && table.data('operate-tax');
                                     }
                                 },
+                                {
+                                    name: 'edit',
+                                    text: __('查看物流'),
+                                    title: __('查看物流'),
+                                    classname: 'btn btn-xs btn-warning btn-dialog',
+                                    icon: 'fa',
+                                    url: 'orders/logistics',
+                                    callback: function (data) {
+                                        //Layer.alert("接收到回传数据:" + JSON.stringify(data), {title: "回传数据"});
+                                        $('.btn-refresh').trigger('click')
+                                    },
+                                    extend: `data-area='["800px","80%"]'`,
+                                    visible: function (row) {
+                                        //返回true时按钮显示,返回false隐藏
+                                        return table.data('operate-logistics') && row.logistics && row.logistics.trans_no;
+                                    }
+                                },
                             ]}
                     ]
                 ]