合并分支 'heshupeng' 到 'master'

订单列表商品添加图片



查看合并请求 !134

@@ -118,10 +118,20 @@ class Litestoreorder extends Model
             $where['pay_status'] = '20';
             $where['order_status'] = '30';
         }
-        return $this->with(['goods'])
+        $list = $this->with(['goods'])
             ->where($where)
             ->order(['createtime' => 'desc'])->limit(50)
             ->select();
+        foreach($list as &$v){
+            $goodsList = [];
+            foreach ($v['goods'] as $index => $item) {
+                $item['image'] = cdnurl(explode(",",$item['images'])[0], true);
+                $item['sku_image'] = $item['spec']['spec_image']=='' ? '' : cdnurl($item['spec']['spec_image'], true);
+                $goodsList[] = $item;
+            }
+            $v['goods'] = $goodsList;
+        }
+        return $list;
     }
 
     public function getOrderDetail($order_id, $user_id){

@@ -720,6 +720,9 @@ class HouseAdmin extends Api
             ])->order(['createtime'=>'desc'])
             ->page($page,$pageNum)
             ->select();
+        if(!empty($list)){
+            $list = array_multisort(array_column($list,'createtime'),SORT_ASC,$list);
+        }
         // 管理员头像
         $user = HouseAdminModel::where(['user_id'=>$this->auth->id,'house_id'=>$msg['object_id']])->field('id,nickname,avatar')->find();
         $user['avatar'] = cdnurl($user['avatar'],true);