init

application/api/controller/MobileController.php

@@ -7,6 +7,7 @@ use app\common\controller\UserApi;
 use app\common\library\MobileConstant;
 use app\common\model\Area;
 use app\common\model\Mobile;
+use app\common\model\MobileInfo;
 use app\common\model\MobileOrder;
 use app\common\service\SmsSend;
 use think\Db;
@@ -216,11 +217,26 @@ class MobileController extends UserApi
     }
 
     /**
-     *订单详情
+     * 订单详情
      * @ApiParams (name=id,description=订单id)
+     * @ApiReturnParams (name=no,description=手机号)
+     * @ApiReturnParams (name=order_no,description=订单号)
+     * @ApiReturnParams (name=amount_hd,description=活动价)
+     * @ApiReturnParams (name=amount_original,description=原价)
+     * @ApiReturnParams (name=amount_charge,description=预充)
+     * @ApiReturnParams (name=describe,description=套餐说明)
+     * @ApiReturnParams (name=admin.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=status,description="0=>'待付款',10=>'待发货',20=>'待收货',30=>'退款待处理',40=>'已退款',50=>'已关闭',")
      */
     public function order_detail(){
-        $order=MobileOrder::findOrFail(input('id'));
+        $order=MobileOrder::with(['admin'])->findOrFail(input('id'));
+        $order['admin']->hidden(['password']);
+        $order['describe']=MobileInfo::where('mobile_id',$order['mobile_id'])->value('describe','');
         $this->success('',$order);
     }
     /**

application/common/model/MobileOrder.php

@@ -31,7 +31,9 @@ class MobileOrder extends Model
         return $this->belongsTo(Mobile::class);
     }
     public function admin(){
-        return $this->belongsTo(Admin::class);
+        $columns=Admin::getTableInfo()['fields'];
+        unset($columns['password']);
+        return $this->belongsTo(Admin::class)->field($columns);
     }