Merge branch '0213-v3.0.7' into test

application/api/controller/AppointmentTime.php

@@ -228,26 +228,31 @@ class AppointmentTime extends Basic
     public function getYetListV2($pageNo, $pageSize, $params)
     {
         $field               = "a.id,a.report_agent_phone as phone,a.report_agent_id as agents_id,a.predict_see_time as expect_time,b.house_id,
-        d.external_title as house_title,d.residue_num as room_num_left, d.is_show,d.status,d.external_image_id";
+        d.external_title as house_title,d.residue_num as room_num_left, d.is_show,d.status,d.external_image_id,d.is_show_image";
         $where_["a.user_id"] = $params["user_id"];
         // $result              = $this->appointmentTimeModel->getHaveToSeeList($pageNo, $pageSize, "id desc", $field, $where_);
         $result = $this->reportModel->getHaveToSeeList($pageNo, $pageSize, "id desc", $field, $where_);
 
         //获取图片信息
         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;
 
-                $field = 'id,0 as house_id,img_type,label,img_name,img_status';
+            if ($val['is_show_image']) {
+                $result[$key]["api_path"] = CK_IMG_URL . 'images/';
+                $param["house_id"]        = $val["house_id"];
+                $param["img_type"]        = 1; //默认主图
+                $result[$key]["images"]   = $this->dbImg->getHouseImages($param, 1);
+            } else {
+                $result[$key]["api_path"] = SHOP_IMAGE_DEPOT_URL;
+                if ($val["external_image_id"]) {
+                    $param_2["id"]         = array( "in", $val["external_image_id"] );
+                    $param_2["img_status"] = 0;
+
+                    $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_2,1);
+                    $result[$key]["images"] = count($res) > 0 ? $res : [];
+                }
             }
             //todo 是否评价
             $evaluateResult              = $this->evaluateMode->getIsEvaluate(10, $val["id"], $params["user_id"]);
@@ -265,7 +270,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"];
@@ -273,19 +278,23 @@ 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;
-
-                $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 : [];
+            if ($val['is_show_image']) {
+                $result[$key]["api_path"] = CK_IMG_URL . 'images/';
+                $param["house_id"]        = $val["house_id"];
+                $param["img_type"]        = 2; //默认主图
+                $result[$key]["images"]   = $this->dbImg->getHouseImages($param, 1);
+            } else {
+                $result[$key]["api_path"] = SHOP_IMAGE_DEPOT_URL;
+                if ($val["external_image_id"]) {
+                    $param_2["id"]         = array( "in", $val["external_image_id"] );
+                    $param_2["img_status"] = 0;
+
+                    $field = 'id,0 as house_id,img_type,label,img_name,img_status';
+               
+                    $res                    = $this->imageDepotModel->getImageDepotById($field, $param_2,1);
+                    $result[$key]["images"] = count($res) > 0 ? $res : [];
+                }
             }
             //todo 是否评价
             $evaluateResult              = $this->evaluateMode->getIsEvaluate(10, $val["id"], $params["user_id"]);

application/api/controller/Banner.php

@@ -46,7 +46,7 @@ class Banner extends Basic
             $where_["type"] = array("in",[2,3]);
         }
 
-        $field = "id,title,CONCAT('".CK_IMG_URL."' , pic_path) as pic_path, url, type,sort,is_show,create_time,update_time";
+        $field = "id,title,CONCAT('".CK_IMG_URL.'images/'."' , pic_path) as pic_path, url, type,sort,is_show,create_time,update_time";
         $where_['is_show'] = array( "eq", 0 );
 
 

application/api/controller/Member.php

@@ -416,11 +416,10 @@ class Member extends Basic
             $data["buyer_nick"] = $result[0]["buyer_nick"];
             $data["user_nick"]  = $result[0]["user_nick"];
             $data["user_phone"] = $result[0]["user_phone"];
-            $data["user_pic"]   = !empty($result[0]["user_pic"]) ? HEADERIMGURL . $result[0]["user_pic"] : $result[0]["other_pic"];
+            $data["user_pic"]   = empty($result[0]["user_pic"]) ? HEADERIMGURL .$result[0]["other_pic"] : HEADERIMGURL . $result[0]["user_pic"];
             $data["AuthToken"]  = $AuthToken;
-
         }else{
-            return $this->response("101", "数据查询失败");
+            return $this->response("101", "没有该用户");
         }
         return $this->response("200","请求成功",$data);
     }
@@ -461,7 +460,9 @@ class Member extends Basic
 
                     $data['status'] = 200;
                     $data['msg']    = '上传成功';
-                    $data['data']   = ['file_name' => HEADERIMGURL . $img_path];
+                    $data['data']   = ['file_name' => IMAGES_URL . $img_path];
+                } else {
+                    $data['msg'] = '用户信息错误';
                 } else {
                     $data['msg'] = '用户信息错误';
                 }

application/api_broker/controller/Feed.php

@@ -64,7 +64,7 @@ class Feed extends Basic
             foreach ($data as $k => $v) {
                 if ($v['type'] == 0) {
                     //todo 0923 经理提的问题
-                    $data[$k]['icon']    = CURRENT_URL . "resource/image/notice_xibaotl.png";
+                    $data[$k]['icon']    = IMAGES_URL . "resource/image/notice_xibaotl.png";
                     $data[$k]['content'] = "恭喜{$v['content']}成交{$v['house_title']}商铺一套";
                     unset($data[$k]);
                 }

application/api_broker/controller/Shop.php

@@ -148,6 +148,16 @@ class Shop extends Basic
             $conditions['is_vip'] = $params['is_vip'];
         }
 
+        //residue_type  2已租，1求租
+        if (is_numeric($params['residue_type'])) {
+            if($params['residue_type'] == 1){
+                $conditions['residue_num'] = array('gt',0);
+            }else{
+                $conditions['residue_num'] = 0;
+            }
+        }
+
+
         $order_ = "";
         $spTagArr = array();
         switch ($params['site_area']) {
@@ -267,6 +277,7 @@ class Shop extends Basic
             $conditions['status'] = !empty($params['status']) ? $params['status'] : array('in', "1,2"); //只显示上架或下架的
         }
         $result = $this->gHousesModel->getHousesList($pageNo, $pageSize, $order_, $field, $conditions, $spTagArr);
+
         $m_business_district = new GBusinessDistrict();
         //获取图片信息
         foreach ($result as $key => $val) {
@@ -1039,7 +1050,7 @@ class Shop extends Basic
             $res = $this->gHousesModel->getExclusive($this->params['houses_id']);
             // dump($res);
             foreach ($res['exclusive_img'] as $key => $val) {
-                $res['exclusive_img'][$key]['file_name']    = CURRENT_URL.'resource/lib/Attachments/images/'.$val['img_name'];
+                $res['exclusive_img'][$key]['file_name']    = IMAGES_URL.'resource/lib/Attachments/images/'.$val['img_name'];
                 $res['exclusive_img'][$key]['save_path']    = $val['img_name'];
             }
         } else {

application/api_broker/controller/Statement.php

@@ -115,7 +115,7 @@ class Statement extends Basic
             $data['agent_id'] = $this->params['agent_id'];
             $data['img_url']  = $img_name;
             $data['type'] = $this->params['type'];
-            $data['img_name'] = CURRENT_URL.$url;
+            $data['img_name'] = IMAGES_URL.$url;
             $result = $agent_report->editData($data);
         } else {
             $result = 0;
@@ -194,7 +194,7 @@ class Statement extends Basic
         $data['list']  = $agent_report->getList($pageNo, $pageSize, 'id desc', $fields, $where);
         $data['total'] = $agent_report->getTotal($where);
         foreach ($data['list'] as $k=>$v) {
-            $data['list'][$k]['img_url'] = CURRENT_URL.'static/week_work_img/'.$data['list'][$k]['img_url'];
+            $data['list'][$k]['img_url'] = IMAGES_URL.'static/week_work_img/'.$data['list'][$k]['img_url'];
         }
         return $this->response($code, $msg, $data);
     }

application/api_broker/controller/UploadImg.php

@@ -47,4 +47,27 @@ class UploadImg extends Basic
         }
 
     }
+
+    /**
+     * 富文本文件上传
+     */
+    public function uploadEditor() {
+        header('Access-Control-Allow-Origin:*');
+        set_time_limit(0);
+        $file         = $_FILES['image'];
+        if (empty($file)) {
+            $file = $_FILES['upload'];
+        }
+        $type         = request()->param('type');
+        $uploadResult = $this->uFService->upload($file, $type);
+
+        $cb = $_GET['CKEditorFuncNum']; //获得ck的回调id
+        try {
+            $url = $uploadResult["msg"]['internet_img_name']; //我自己的放置上传图片的逻辑，返回图片放置后的url
+            echo "<script type='text/javascript'>window.parent.CKEDITOR.tools.callFunction($cb,'".$url."','');</script>";
+        }catch (\Exception $e) {
+            $erro = $e->getMessage();
+            echo "<script>window.parent.CKEDITOR.tools.callFunction($cb, '','$erro');</script>"; //图片上传失败，通知ck失败消息
+        }
+    }
 }
\ No newline at end of file

application/app_broker/view/index/shop_detail_pc.html

@@ -11,7 +11,7 @@
 	</head>
 
 	<body style="display: none;">
-		<div id="app">
+		<div id="app" style="color: #061C43;font-size: 14px;">
 			<main>
 				<section v-show="dataCode==200">
 					<table>

application/config.php

@@ -15,15 +15,16 @@ define('PAGESIZE', 15); //分页每页条数
 define('ADMIN_URL_TL','https://admin.tonglianjituan.com/');  //B端网址
 //define('TEST_ADMIN_URL_TL','https://dev.tonglianjituan.com/');  //B端网址
 define('CURRENT_URL', 'https://'.$_SERVER['HTTP_HOST'].'/'); //取当前域名地址
-define('HEADERIMGURL', CURRENT_URL . 'static'. DS . 'head_portrait/'); //头像地址
-define('AGENTHEADERIMGURL', CURRENT_URL . 'static'. DS . 'user_header/'); //头像地址
-define('CHAT_IMG_URL', CURRENT_URL . 'static'. DS . 'chat_image/'); //聊天图片地址
-define('CK_IMG_URL', CURRENT_URL . 'resource/lib/Attachments/'); //ck 资源文件
+define('IMAGES_URL', 'http://images.tonglianjituan.com/'); //取当前域名地址
+define('HEADERIMGURL', IMAGES_URL . 'static'. DS . 'head_portrait/'); //头像地址
+define('AGENTHEADERIMGURL', IMAGES_URL . 'static'. DS . 'user_header/'); //头像地址
+define('CHAT_IMG_URL', IMAGES_URL . 'static'. DS . 'chat_image/'); //聊天图片地址
+define('CK_IMG_URL', IMAGES_URL . 'resource/lib/Attachments/'); //ck 资源文件
 define('_POOLKEY','FC100000022056027');//隐私号码
 define('_TLSYPoolKey','FC100000022056027');//隐私号码池
-define('WEEK_WORK_IMG', CURRENT_URL . 'static'. DS . 'week_work_img/'); //周报日报目录
+define('WEEK_WORK_IMG', IMAGES_URL . 'static'. DS . 'week_work_img/'); //周报日报目录
 define('PHONE_VOICE', ROOT_PATH.'public'.DS.'static'.DS.'voice'); //录音绝对路径
-define('SHOP_IMAGE_DEPOT_URL', CURRENT_URL . 'static'. DS . 'shop_image_depot/'); //C端商铺随机图片地址
+define('SHOP_IMAGE_DEPOT_URL', IMAGES_URL . 'static'. DS . 'shop_image_depot/'); //C端商铺随机图片地址
 
 return [
     // +----------------------------------------------------------------------

application/index/controller/Broker.php

@@ -1016,7 +1016,7 @@ class Broker extends Basic
         if (!isset($params["agents_black_list_id"])) {
             return $this->response("101", "请求参数错误");
         }
-        $internet_path = CURRENT_URL.'static/agent_black_list/';
+        $internet_path = IMAGES_URL.'static/agent_black_list/';
         $m_agents_black_list = new AAgentsBlackList();
         $m_agents_black_list_img = new AAgentsBlackListImg();