edit

src/place/api/Order.php

@@ -16,12 +16,14 @@ class Order extends Main
 
     public function getUserList()
     {
-        return $this->act->getUserList(array('order_num', 'status', 'cash', 'num'));
+        $data['list'] = $this->act->getUserList(array('order_num', 'status', 'cash', 'num'));
+        return $data;
     }
 
     # 查看订单详情
-    public function detail()
+    public function getView()
     {
-
+        $info = $this->act->getInfo();
+        return Dever::load('order', 'goods')->getView($info);
     }
 }

src/place/lib/Act.php

@@ -86,17 +86,33 @@ class Act
             foreach ($data as $k => $v) {
                 $info = $this->getTypeInfo($v['type'], $v['type_id']);
                 if ($info) {
-                    $info['data_id'] = $v['id'];
-                    $info['cdate'] = $v['cdate'];
-                    $info['cdate_str'] = date('Y-m-d H:i:s', $info['cdate']);
+                    $info['status_name'] = $this->db->value('status', $v['status']);
+                    $info['type'] = $v['type'];
+                    $info['type_id'] = $v['id'];
+                    //$info['cdate'] = $v['cdate'];
+                    $info['cdate_str'] = date('Y-m-d H:i:s', $v['cdate']);
                     if ($field) {
                         foreach ($field as $v1) {
                             $info[$v1] = $v[$v1];
                         }
                     }
-                    if ($v['type'] == 3) {
-                        $info['detail'] = Dever::load('order', 'goods')->getDetail($v['id']);
+                    if (strstr($this->db->config['load'], 'order')) {
+                        if ($v['type'] == 3) {
+                            $info['detail'] = Dever::load('order', 'goods')->getDetail($v['id']);
+                            $info['info'] = '共' . intval($info['num']) . '件商品';
+                        } else {
+                            $detail['id'] = $info['id'];
+                            $detail['name'] = $info['name'];
+                            $detail['pic'] = $info['pic'];
+                            $detail['sku_name'] = '';
+                            $detail['sku_id'] = 0;
+                            $detail['cash'] = $info['cash'];
+                            $detail['num'] = $info['num'];
+                            $info['detail'][] = $detail;
+                            $info['info'] = '';
+                        }
                     }
+                    
                     $result[] = $info;
                 }
             }

src/place/table/order.php

@@ -55,9 +55,9 @@ return array
             'value'         => array
             (
                 1 => '待支付',
-                2 => '待处理',
-                3 => '处理中',
-                4 => '待确认',
+                2 => '待发货',
+                3 => '已发货',
+                4 => '待收货',
                 5 => '已完成',
                 6 => '已完成（有退款）',
                 7 => '已取消',

src/resource/goods/lib/Order.php

@@ -6,7 +6,14 @@ class Order
     # 获取某个订单的详情
     public function getDetail($id)
     {
-        $result = Dever::db('order_detail', 'place')->select(array('type' => 3, 'order_id' => $id));
+        $result = Dever::db('order_detail', 'place')->select(array('type' => 3, 'order_id' => $id), array('col' => 'id,name,pic,sku_name,sku_id,cash,num'));
         return $result;
     }
+
+    # 获取订单详情
+    public function getView($info)
+    {
+        $info['detail'] = $this->getDetail($info['id']);
+        return $info;
+    }
 }