|
@@ -211,7 +211,7 @@ class Usercenter extends Api
|
|
|
];
|
|
|
$list = Db::name('lesson_order')->alias('order')
|
|
|
->field([
|
|
|
- 'order.id','order.order_amount','order.paytype','order.package_order_id','order.package_remark','order.trylesson_order_id','order.userremark','order.usernumber','order.jointype','order.cancel_reason',
|
|
|
+ 'order.id','order.order_amount','order.paytype','order.package_order_id','order.package_remark','order.trylesson_order_id','order.userremark','order.usernumber','order.jointype','order.cancel_reason','order.order_status',
|
|
|
'lesson.name','lesson.name_en',
|
|
|
'slot.starttime','slot.hours','slot.address','slot.coach_ids',
|
|
|
'coach.nickname as coach_text'
|
|
@@ -281,9 +281,15 @@ class Usercenter extends Api
|
|
|
$order['package_showtime_text'] = '';
|
|
|
}
|
|
|
|
|
|
+ //状态:0=待支付,10=已支付,20=已点名,30=已取消,40=已退课
|
|
|
+ $status_arr = [20=>'已完成',30=>'已取消',40=>'已取消'];
|
|
|
+ $status_arr_en = [20=>'Finished',30=>'Canceled',40=>'Canceled'];
|
|
|
+ $order['status_text'] = $status_arr[$order['order_status']];
|
|
|
+ $order['status_text_en'] = $status_arr_en[$order['order_status']];
|
|
|
+
|
|
|
}
|
|
|
|
|
|
- $list = $this->list_lang($list,['package_name']);
|
|
|
+ $list = $this->list_lang($list,['package_name','status_text']);
|
|
|
|
|
|
$this->success(1,$list);
|
|
|
}
|