|
@@ -27,7 +27,8 @@ class Usercenter extends Api
|
|
|
'order.use_status' => $user_status,
|
|
|
];
|
|
|
$list = Db::name('package_order')->alias('order')
|
|
|
- ->field('order.id,order.starttime,order.endtime,order.days,order.is_gift,order.remain,order.price,order.use_apply_status,p.name,p.name_en,p.image,p.activeremark,p.activeremark_en,p.validity,p.validity_en')
|
|
|
+ ->field('order.id,order.starttime,order.endtime,order.days,order.is_gift,order.remain,order.price,order.use_apply_status,order.createtime,order.pay_type,order.remark,
|
|
|
+ p.name,p.name_en,p.image,p.activeremark,p.activeremark_en,p.validity,p.validity_en')
|
|
|
->join('lesson_package p','order.package_id = p.id','LEFT')
|
|
|
->where($map)->order('order.remain desc,order.endtime asc')
|
|
|
->autopage()->select();
|
|
@@ -41,6 +42,7 @@ class Usercenter extends Api
|
|
|
$val['remain'] = floatval($val['remain']);
|
|
|
//日期
|
|
|
$val['time_text'] = $this->date_lang($val['starttime']).'-'.$this->date_lang($val['endtime']);
|
|
|
+ $val['createtime_text'] = $this->date_lang($val['createtime']);
|
|
|
//是否有延期按钮
|
|
|
$val['expired'] = 0;
|
|
|
if($val['endtime'] < time()){
|