|
@@ -104,7 +104,7 @@ class Product extends Base
|
|
$evaluate = (new Evaluate)->alias('e')
|
|
$evaluate = (new Evaluate)->alias('e')
|
|
->join('user u', 'e.user_id = u.id')
|
|
->join('user u', 'e.user_id = u.id')
|
|
->where(['e.product_id' => $productId, 'toptime' => ['>', Evaluate::TOP_OFF]])
|
|
->where(['e.product_id' => $productId, 'toptime' => ['>', Evaluate::TOP_OFF]])
|
|
- ->field('u.username,u.avatar,e.*')
|
|
|
|
|
|
+ ->field('u.username,u.nickname,u.avatar,e.*')
|
|
->order(['toptime' => 'desc', 'createtime' => 'desc'])->limit(2)->select();
|
|
->order(['toptime' => 'desc', 'createtime' => 'desc'])->limit(2)->select();
|
|
if ($evaluate) {
|
|
if ($evaluate) {
|
|
$evaluate_list = collection($evaluate)->append(['createtime_text'])->toArray();
|
|
$evaluate_list = collection($evaluate)->append(['createtime_text'])->toArray();
|
|
@@ -350,7 +350,7 @@ class Product extends Base
|
|
$evaluate = (new Evaluate)->alias('e')
|
|
$evaluate = (new Evaluate)->alias('e')
|
|
->join('user u', 'e.user_id = u.id')
|
|
->join('user u', 'e.user_id = u.id')
|
|
->where(['e.product_id' => $productId])
|
|
->where(['e.product_id' => $productId])
|
|
- ->field('u.username,u.avatar,e.*')
|
|
|
|
|
|
+ ->field('u.username,u.nickname,u.avatar,e.*')
|
|
->order(['toptime' => 'desc', 'createtime' => 'desc'])
|
|
->order(['toptime' => 'desc', 'createtime' => 'desc'])
|
|
->page($page, $pageSize)
|
|
->page($page, $pageSize)
|
|
->select();
|
|
->select();
|