已看未看图片

application/api/controller/AppointmentTime.php

@@ -269,7 +269,7 @@ class AppointmentTime extends Basic
     public function getWaitListV2($pageNo, $pageSize, $params)
     {
         $field = "a.id,a.report_agent_phone as phone,a.report_agent_id as agents_id,b.house_id,a.predict_see_time as expect_time,
-        d.external_title as house_title,d.residue_num as room_num_left,d.external_image_id";
+        d.external_title as house_title,d.residue_num as room_num_left";
 
 
         $where_["user_id"] = $params["user_id"];
@@ -278,18 +278,21 @@ class AppointmentTime extends Basic
         //获取图片信息
         foreach ($result as $key => $val) {
             $result[$key]["api_path"] = SHOP_IMAGE_DEPOT_URL;
-        /*    $param["house_id"]        = $val["house_id"];
-            $param["img_type"]        = 1; //默认主图
-            $result[$key]["images"]   = $this->dbImg->getHouseImages($param, 1);*/
             $result[$key]["images"] = [];
-            if ($val["external_image_id"]) {
-                $param["id"]         = array( "in", $val["external_image_id"] );
-                $param["img_status"] = 0;
+            if ($val['is_show_image']) {
+                $param["house_id"]        = $val["house_id"];
+                $param["img_type"]        = 2; //默认主图
+                $result[$key]["images"]   = $this->dbImg->getHouseImages($param, 1);
+            } else {
+                if ($val["external_image_id"]) {
+                    $param["id"]         = array( "in", $val["external_image_id"] );
+                    $param["img_status"] = 0;
 
-                $field = 'id,0 as house_id,img_type,label,img_name,img_status';
+                    $field = 'id,0 as house_id,img_type,label,img_name,img_status';
 
-                $res                    = $this->imageDepotModel->getImageDepotById($field, $param,1);
-                $result[$key]["images"] = count($res) > 0 ? $res : [];
+                    $res                    = $this->imageDepotModel->getImageDepotById($field, $param,1);
+                    $result[$key]["images"] = count($res) > 0 ? $res : [];
+                }
             }
             //todo 是否评价
             $evaluateResult              = $this->evaluateMode->getIsEvaluate(10, $val["id"], $params["user_id"]);

application/model/OReportModel.php

@@ -908,7 +908,8 @@ class OReportModel extends Model
                     d.residue_num AS room_num_left,
                     d.is_show,
                     d.status,
-                    d.external_image_id
+                    d.external_image_id,
+                    d.is_show_image
                 FROM
                     `o_report` `a`
                 LEFT JOIN `o_order` `b` ON `b`.`f_id` = `a`.`id`
@@ -931,7 +932,8 @@ class OReportModel extends Model
                     b.residue_num AS room_num_left,
                     b.is_show,
                     b.status,
-                    b.external_image_id
+                    b.external_image_id,
+                    b.is_show_image
                 FROM
                     u_appoint_watch_shop a
                 LEFT JOIN g_houses b ON a.house_id = b.id