init

application/api/controller/MobileController.php

@@ -225,16 +225,18 @@ class MobileController extends UserApi
      * @ApiReturnParams (name=amount_original,description=原价)
      * @ApiReturnParams (name=amount_charge,description=预充)
      * @ApiReturnParams (name=describe,description=套餐说明)
-     * @ApiReturnParams (name=admin.wx_qr,description=客服二维码)
+     * @ApiReturnParams (name=proxy.wx_qr,description=客服二维码)
      * @ApiReturnParams (name=name,description=收货人)
      * @ApiReturnParams (name=address,description=收货地址)
      * @ApiReturnParams (name=remark,description=备注)
      * @ApiReturnParams (name=create_time,description=下单时间)
      * @ApiReturnParams (name=amount,description=订单金额)
+     * @ApiReturnParams (name=trans_name,description=快递名称)
+     * @ApiReturnParams (name=trans_no,description=快递单号)
      * @ApiReturnParams (name=status,description="0=>'待付款',10=>'待发货',20=>'待收货',30=>'退款待处理',40=>'已退款',50=>'已关闭',")
      */
     public function order_detail(){
-        $order=MobileOrder::with(['admin'])->findOrFail(input('id'));
+        $order=MobileOrder::with(['proxy'])->findOrFail(input('id'));
         $order['admin']->hidden(['password']);
         $order['describe']=MobileInfo::where('mobile_id',$order['mobile_id'])->value('describe','');
         $this->success('',$order);
@@ -244,9 +246,15 @@ class MobileController extends UserApi
      * 订单列表
      * @ApiParams (name=page,description=page)
      * @ApiParams (name=limit,description=limit)
+     * @ApiParams (name=phone,description=手机号)
      */
     public function order_list(){
+        $data=$this->_validate([
+            'phone|参数'=>['require'],
+        ]);
+        $order=MobileOrder::with('proxy')->where('phone',$data['phone'])->order('id','desc')->paginate(input('limit',15));
 
+        $this->success('',$order);
     }
     /**
      * 筛选配置

application/common/model/Area.php

@@ -130,4 +130,10 @@ class Area extends Model
         }
         return [$provinceId,$cityId,$id];
     }
+    public static function getNameString($id){
+        if(!$id){
+            return '';
+        }
+        return implode('',self::whereIn('id',$id)->column('name'));
+    }
 }

application/common/model/MobileOrder.php

@@ -30,12 +30,16 @@ class MobileOrder extends Model
     public function mobile(){
         return $this->belongsTo(Mobile::class);
     }
-    public function admin(){
+    public function proxy(){
         $columns=Admin::getTableInfo()['fields'];
         unset($columns['password']);
         return $this->belongsTo(Admin::class)->field($columns);
     }
 
+    public function getAddressAttr($a,$b){
+        return Area::getNameString($b['city']).$a;
+    }
+
 
     protected static function init()
     {