|
@@ -26,12 +26,12 @@ 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,p.name,p.name_en,p.image')
|
|
|
+ ->field('order.id,order.starttime,order.endtime,order.days,order.is_gift,order.remain,order.price,p.name,p.name_en,p.image,p.activeremark,p.activeremark_en')
|
|
|
->join('lesson_package p','order.package_id = p.id','LEFT')
|
|
|
->where($map)->order('order.remain desc,order.endtime asc')
|
|
|
->autopage()->select();
|
|
|
|
|
|
- $list = $this->list_lang($list,['name']);
|
|
|
+ $list = $this->list_lang($list,['name','activeremark']);
|
|
|
$list = list_domain_image($list,['image']);
|
|
|
|
|
|
if(!empty($list)){
|
|
@@ -58,6 +58,7 @@ class Usercenter extends Api
|
|
|
'order.order_status' => 1,
|
|
|
//'order.remain' => ['gt',0],
|
|
|
'order.is_gift' => 1,
|
|
|
+ 'order.use_status' => 1,
|
|
|
];
|
|
|
$list = Db::name('package_order')->alias('order')
|
|
|
->field('order.id,order.order_no,order.starttime,order.endtime,order.days,order.is_gift,order.sessions,order.remain,order.use_status,
|