发票

application/admin/controller/Orders.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\OrderInfo;
 use app\common\controller\Backend;
 use app\common\model\OrderLogistics;
 
@@ -72,7 +73,7 @@ class Orders extends Backend
         }
         return $this->view->fetch();
     }
-
+    #发货
     public function send($ids){
         $order=$this->model->find($ids);
         if($this->request->isGet()){
@@ -92,4 +93,28 @@ class Orders extends Backend
             $this->success();
         }
     }
+    #详情
+    public function detail($ids){
+        //当前是否为关联查询
+        $this->relationSearch = true;
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+
+            $list = OrderInfo::where($where)
+                ->where('orderInfo.order_id',$ids)
+                ->order($sort, $order)
+                ->paginate($limit);
+
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
 }

application/admin/view/orders/detail.html

@@ -0,0 +1,38 @@
+<div class="panel panel-default panel-intro">
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+<!--                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('orders/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('orders/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('orders/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('orders/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
+
+                        <div class="dropdown btn-group {:$auth->check('orders/multi')?'':'hide'}">
+                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
+                            <ul class="dropdown-menu text-left" role="menu">
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
+                            </ul>
+                        </div>-->
+
+                        
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="0"
+                           data-operate-del="0"
+                           data-operate-send="{:$auth->check('orders/send')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+<script>
+    let status={:json_encode($status)};
+    let payTypes={:json_encode($pay_types)};
+</script>

application/admin/view/orders/index.html

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

application/common/model/Coupon.php

@@ -47,7 +47,9 @@ class Coupon extends Model
         foreach ($users as $userId){
             $user=User::find($userId);
             if($user){
-                UserCoupon::toUser($user,$this);
+                for ($i=0;$i<$num;$i++) {
+                    UserCoupon::toUser($user, $this);
+                }
             }
         }
 

public/assets/js/backend/orders.js

@@ -57,6 +57,23 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                         return row.status===5 && table.data('operate-send');
                                     }
                                 },
+                                {
+                                    name: 'edit',
+                                    text: __('订单详情'),
+                                    title: __('订单详情'),
+                                    classname: 'btn btn-xs btn-info btn-detail btn-dialog',
+                                    icon: 'fa fa-outdent',
+                                    url: 'orders/detail',
+                                    extend:'data-area=\'["1200px","600px"]\'',
+                                    callback: function (data) {
+                                        //Layer.alert("接收到回传数据：" + JSON.stringify(data), {title: "回传数据"});
+                                        $('.btn-refresh').trigger('click')
+                                    },
+                                    visible: function (row) {
+                                        //返回true时按钮显示,返回false隐藏
+                                        return table.data('operate-detail');
+                                    }
+                                },
                             ]}
                     ]
                 ]
@@ -75,7 +92,52 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             bindevent: function () {
                 Form.api.bindevent($("form[role=form]"));
             }
-        }
+        },
+        detail: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'orders/detail' + location.search,
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                commonSearch:false,
+                search:false,
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'status', title: __('Status'),formatter: Table.api.formatter.label,searchList:status},
+                        {field: 'user.nickname', title: __('下单用户')},
+                        {field: 'order_no', title: __('Order_no')},
+                        {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: __('Num'),operate: 'between'},
+                          {field: 'num_install', title: __('Num_install'),operate: 'between'},*/
+                        {field: 'create_time', title: __('Create_time'),addClass:'datetimerange',formatter: Table.api.formatter.datetime,operate: 'range'},
+                        //{field: 'update_time', title: __('Update_time'),addClass:'datetimerange',formatter: Table.api.formatter.datetime,operate: 'range'},
+                        {field: 'pay_type', title: __('Pay_type'),formatter: Table.api.formatter.label,searchList:payTypes},
+                        {field: 'pay_time', title: __('支付时间'),addClass:'datetimerange',formatter: Table.api.formatter.datetime,operate: 'range'}
+                    ]
+                ],
+                onLoadSuccess(){
+                    setTimeout(()=>{
+                        $('.btn-detail').data('area',["500px","900px"])
+                    },200)
+                }
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
     };
     return Controller;
 });