合并分支 'heshupeng' 到 'master'

bug修改



查看合并请求 !45

@@ -167,13 +167,12 @@ class House extends Api
 
 
         $data = Db::name('house_board')
         $data = Db::name('house_board')
             ->field('id,house_id,title,content,look_num,createtime')
             ->field('id,house_id,title,content,look_num,createtime')
-            ->where('deletetime','')
             ->where('id',$id)
             ->where('id',$id)
             ->find();
             ->find();
         $data['createtime'] = date('Y-m-d',$data['createtime']);
         $data['createtime'] = date('Y-m-d',$data['createtime']);
 
 
 
 
-        $data['avatar'] = Db::name('house_board')
+        $data['avatar'] = Db::name('house_board_detail')
             ->alias('a')
             ->alias('a')
             ->join('user b','a.user_id = b.id')
             ->join('user b','a.user_id = b.id')
             ->where('a.house_board_id',$id)
             ->where('a.house_board_id',$id)

@@ -529,7 +529,9 @@ class HouseBoard extends Api
         $house_activity_id = $this->request->param('house_activity_id');
         $house_activity_id = $this->request->param('house_activity_id');
         $activity = \app\admin\model\HouseActivity::get($house_activity_id);
         $activity = \app\admin\model\HouseActivity::get($house_activity_id);
         empty($activity) && $this->error('活动信息不存在');
         empty($activity) && $this->error('活动信息不存在');
+        // 规格信息
         $spec_data = $activity['spec_type'] == '2' ? $activity->getManySpecData($activity['spec_rel'], $activity['spec']) : null;
         $spec_data = $activity['spec_type'] == '2' ? $activity->getManySpecData($activity['spec_rel'], $activity['spec']) : null;
+        // 规格价格信息
         if($spec_data){
         if($spec_data){
             $spec_list = [];
             $spec_list = [];
             foreach($spec_data['spec_list'] as $v){
             foreach($spec_data['spec_list'] as $v){