Merge branch '0402-v3.2.1' of https://gitee.com/zwyjjc/tl_estate into 0402-v3.2.1

application/api_broker/controller/Square.php

@@ -17,14 +17,20 @@ class Square extends Basic
 
     }
 
+    public function getDistrictLable()
+    {
+        $res = $this->s_square->getDistrictLable();
+        return $this->response("200", "成功",$res);
+    }
+
     public function addSquare() {
         $params = $this->params;
 
-        if (!isset($params['title']) or !isset($params['content']) or !isset($params['site_id']) or !isset($params['cover_img']) or !isset($params['district_id'])) {
+        if (!isset($params['title']) or !isset($params['content']) or !isset($params['site_id']) or !isset($params['cover_img']) or !isset($params['district_lable_id'])) {
             return $this->response("101", "参数不全");
         }
 
-        $result= $this->s_square->saveSquare($this->agentId,$params['title'],$params['content'],$params['cover_img'],$params['site_id'],$params['district_id']);
+        $result= $this->s_square->saveSquare($this->agentId,$params['title'],$params['content'],$params['cover_img'],$params['site_id'],$params['district_lable_id']);
         return $this->response("200", "request success", $result);
     }
 
@@ -83,10 +89,10 @@ class Square extends Basic
         }
 
         if (isset($params['level'])) {
-            if (!isset($params['comment_id']) or !isset($params['agent_id_a']) or !isset($params['agent_id_b']) or !isset($params['comment'])) {
+            if (!isset($params['comment_id'])  or !isset($params['agent_id_b']) or !isset($params['comment'])) {
                 return $this->response("101", "参数不全");
             }
-            $result = $this->s_square->addBCommentExt($params['comment_id'],$params['agent_id_a'],$params['agent_id_b'],$params['comment'],$params['level']);
+            $result = $this->s_square->addBCommentExt($params['comment_id'],$this->agentId,$params['agent_id_b'],$params['comment'],$params['level']);
         }else{
             if (!isset($params['square_id']) or !isset($params['square_id']) or !isset($params['comment'])) {
                 return $this->response("101", "参数不全");
@@ -102,6 +108,49 @@ class Square extends Basic
     }
 
 
+    public function getCommenInfo(){
+
+        $params = $this->params;
+        if (!isset($params['id'])) {
+            return $this->response("101", "参数不全");
+        }
+
+        $result= $this->s_square->getCommenInfo($params);
+
+        if($result){
+            return $this->response("200", "成功",$result);
+        }else{
+            return $this->response("200", "成功",$result);
+        }
+    }
+
+    public function getSquareCommentExtList()
+    {
+        $params = $this->params;
+
+        $result= $this->s_square->getSquareCommentExtList($params);
+
+        if($result){
+            return $this->response("200", "成功",$result);
+        }else{
+            return $this->response("200", "成功",$result);
+        }
+    }
+
+    public function editCommenSort() {
+        $params = $this->params;
+
+        if (!isset($params['id']) or !isset($params['sort'])) {
+            return $this->response("101", "参数不全");
+        }
+
+        $res= $this->s_square->editCommenSort($params);
+        if ($res) {
+            return $this->response("200", "成功");
+        } else {
+            return $this->response("101", "失败");
+        }
+    }
 
 
 

application/api_broker/service/RedisCacheService.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: 43897
+ * Date: 2019/4/3
+ * Time: 10:11
+ */
+
+namespace app\api_broker\service;
+
+
+use app\extra\RedisExt;
+use app\model\AAgents;
+use app\model\ADistrict;
+use app\model\AStore;
+use app\model\AuthGroup;
+use app\model\AuthRule;
+use app\model\Users;
+
+class RedisCacheService
+{
+    private $redis_ext;
+    private $user_key  = 'cache_user_';
+    private $agent_key = 'cache_agent_';
+    private $group_key = 'cache_group_';
+    private $rule_key  = 'cache_rule_';
+    private $time;
+
+    public function __construct()
+    {
+        $this->redis_ext = RedisExt::getRedis();
+        $this->time = 604800; //7天
+    }
+
+    /**
+     * @param $key
+     * @param $value
+     * @param int $time
+     * @return mixed
+     */
+    public function setRedisCache($key, $value, $time = 0)
+    {
+        $value = json_encode($value);
+        $key   = $this->key_string.$key;
+        if (!$time) {
+            $time = $this->time;
+        }
+        return $this->redis_ext->set($key, $value, $time);
+    }
+
+    /**
+     * @param $key
+     * @param $value
+     * @param int $time
+     * @return mixed
+     */
+    public function setRedisHashCache($key, $value, $time = 0)
+    {
+        $value = json_encode($value);
+        $key   = $this->key_string.$key;
+        if (!$time) {
+            $time = $this->time;
+        }
+        return $this->redis_ext->set($key, $value, $time);
+    }
+
+    /**
+     * 缓存用户信息
+     *
+     * @param $user_id
+     * @return array|false|\PDOStatement|string|\think\Model
+     */
+    public function userCache($user_id)
+    {
+        $m_user = new Users();
+        $field  = 'id,user_nick,user_name,user_phone,user_pic,other_pic,sex,protect_time,site_ids,agent_id,referrer_id,referrer_source';
+        $field .= ',is_open,industry_type,price_demand,area_demand,status,source,user_status,registration_time,vip,create_time,first_login_time';
+        $field .= ',source_intro';
+        $user_data = $m_user->findByOne($field, ['id'=>$user_id]);
+        if (!empty($user_data)) {
+            $this->setRedisCache($this->user_key.$user_id, $user_data);
+        }
+
+        return $user_data;
+    }
+
+    /**
+     * 缓存经纪人信息
+     *
+     * @param $agent_id
+     * @return array|false|\PDOStatement|string|\think\Model
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function agentCache($agent_id)
+    {
+        $m_agent = new AAgents();
+        $field = 'id,store_id,auth_group_id,district_id,level,name,phone,img,status,admin_off,site_id';
+        $data = $m_agent->getAgentInfo($field, $agent_id);
+
+        if ($data['district_id']) {
+            $m_district = new ADistrict();
+            $data['district_name'] = $m_district->getDistrictKeyById('district_name', ['id'=>$data['district_id']]);
+        } else {
+            $data['district_name'] = '';
+        }
+
+        if ($data['store_id']) {
+            $m_district = new AStore();
+            $data['store_name'] = $m_district->getStoreKeyById('store_name', ['id'=>$data['store_id']]);
+        } else {
+            $data['store_name'] = '';
+        }
+
+        if (!empty($data)) {
+            $this->setRedisCache($this->agent_key . $agent_id, $data);
+        }
+        return $data;
+    }
+
+    public function groupCache($group_id)
+    {
+        $m_auth_group = new AuthGroup();
+        $field = 'id,title,rules';
+        $data = $m_auth_group->getList2('id asc', $field, ['status'=>0, 'id'=>$group_id]);
+        if (!empty($data)) {
+            $this->setRedisCache($this->group_key . $group_id, $data[0]);
+        }
+        return $data;
+    }
+
+    public function authCache($rule_id)
+    {
+        $m_auth_rule = new AuthRule();
+        $field = 'id,name,title,pid,is_menu';
+        $data = $m_auth_rule->getRule($field, ['id'=>$rule_id,'status'=>0]);
+        if (!empty($data)) {
+            $this->setRedisCache($this->rule_key . $rule_id, $data[0]);
+        }
+        return $data;
+    }
+
+    /**
+     * @param $type  1:客户 2:经纪人 3:角色组 4:权限
+     * @param $id
+     * @return array|bool|false|mixed|\PDOStatement|string|\think\Model
+     */
+    public function getRedisCache($type, $id) {
+        if (empty($id)) {
+            return false;
+        }
+        try {
+            switch ($type) {
+                case 1:
+                    $result = $this->redis_ext->get($this->user_key . $id);
+                    if (empty($result)) {
+                        $result = $this->userCache($id);
+                    } else {
+                        $result = json_decode($result, true);
+                    }
+                    break;
+                case 2 :
+                    $result = $this->redis_ext->get($this->agent_key . $id);
+                    if (empty($result)) {
+                        $result = $this->agentCache($id);
+                    } else {
+                        $result = json_decode($result, true);
+                    }
+                    break;
+                case 3 :
+                    $result = $this->redis_ext->get($this->group_key . $id);
+                    if (empty($result)) {
+                        $result = $this->groupCache($id);
+                    } else {
+                        $result = json_decode($result, true);
+                    }
+                    break;
+                case 4 :
+                    $result = $this->redis_ext->get($this->rule_key. $id);
+                    if (empty($result)) {
+                        $result = $this->authCache($id);
+                    } else {
+                        $result = json_decode($result, true);
+                    }
+                    break;
+                default :
+                    $result = false;
+            }
+        } catch (\Exception $e) {
+            $result = false;
+        }
+        return $result;
+    }
+}
\ No newline at end of file

application/api_broker/service/SquareService.php

@@ -19,6 +19,22 @@ class SquareService
         $this->m_coment_ext = new BCommentExt();
     }
 
+    public function getDistrictLable(){
+
+        $res[]=['id'=>1,'name'=>'一部'];
+        $res[]=['id'=>2,'name'=>'二部'];
+        $res[]=['id'=>3,'name'=>'三部'];
+        $res[]=['id'=>4,'name'=>'四部'];
+        $res[]=['id'=>5,'name'=>'五部'];
+        $res[]=['id'=>6,'name'=>'六部'];
+        $res[]=['id'=>7,'name'=>'七部'];
+        $res[]=['id'=>8,'name'=>'八部'];
+        $res[]=['id'=>9,'name'=>'九部'];
+        $res[]=['id'=>10,'name'=>'十部'];
+
+        return $res;
+    }
+
     public function saveSquare($agent_id,$title,$content,$cover_img,$site_id,$district_id)
     {
         $insert["agent_id"] = $agent_id;//经纪人id
@@ -26,7 +42,7 @@ class SquareService
         $insert["content"] = $content;//text
         $insert["cover_img"] = $cover_img;//封面图
         $insert["site_id"] = $site_id;//站点id
-        $insert["district_id"] = $district_id;//部门id
+        $insert["district_lable_id"] = $district_id;//部门id
         $insert["status"] = 0;//状态： 0正常 1删除
 
         $res = $this->m_square->saveSquare($insert);//int(1)
@@ -51,8 +67,8 @@ class SquareService
             $get_params['Square.site_id'] = $params['site_id'];
         }
         //部门
-        if (!empty($params['district_id'])) {
-            $get_params['Square.district_id'] = $params['district_id'];
+        if (!empty($params['district_lable_id'])) {
+            $get_params['Square.district_lable_id'] = $params['district_lable_id'];
         }
         //文章标题
         if (!empty($params['title'])) {
@@ -64,7 +80,6 @@ class SquareService
         $field .= 'Square.cover_img,';//cover_img
         $field .= 'Agent.name,';//发布人
         $field .= 'Site.name as site_name,';//城市
-        $field .= 'District.district_name,';//部门
         $field .= 'Square.create_time';//发布时间
 
         $get_params['Square.status'] = 0;
@@ -85,6 +100,7 @@ class SquareService
 
         $field = 'Comment.id,';//
         $field .= 'Comment.comment,';//
+        $field .= 'Comment.agent_id,';//
         $field .= 'Comment.sort,';//
         $field .= 'Comment.create_time,';//
         $field .= 'Agent.name,';//
@@ -97,14 +113,15 @@ class SquareService
 
         foreach ($res as $key => $val) {
             $res[$key]['img'] = 'http://n.sinaimg.cn/ent/transform/20170921/FVGl-fymesmp0851702.jpg';
-            $field = 'CommentExt.id,';//
-            $field .= 'CommentExt.comment,';//
+            $get_params = [];
 
-            $field .= 'Agent.name,';//
-            $field .= 'Agent.img';//
+            $field = 'CommentExt.id,CommentExt.comment,AgentA.name as agent_id_a,AgentB.name as agent_id_b';//
             $get_params['CommentExt.comment_id'] = $val['id'];
-            $res = $this->m_coment_ext->getSquareCommentExtList(1, 2, $field, $get_params);
-            $res[$key]['comment_ext'] = 'http://n.sinaimg.cn/ent/transform/20170921/FVGl-fymesmp0851702.jpg';
+            // dump($val);
+            // dump($field);
+            // dump($get_params);
+
+            $res[$key]['comment_ext']= $this->m_coment_ext->getSquareCommentExtList(1, 2, $field, $get_params);
         }
 
         return [ 'data' => $res, 'total' => $res_total ];
@@ -118,17 +135,22 @@ class SquareService
         $field .= 'Square.cover_img,';//cover_img
         $field .= 'Agent.name,';//发布人
         $field .= 'Square.site_id,';//城市
-        $field .= 'Square.district_id,';//部门
+        $field .= 'Site.name as site_name,';//城市
+        $field .= 'Square.district_lable_id,';//部门
         $field .= 'Square.create_time';//发布时间
 
         $get_params['Square.id'] = $params['id'];
         // $get_params['Square.status'] = 0;
-
         $res = $this->m_square->getSquareInfo($field,$get_params);
+        $res['district_lable_name'] = '一部';
+
+        foreach ($this->getDistrictLable() as $key => $val) {
+            if($res['district_lable_id'] == $val['id']){
+                $res['district_lable_name'] = $val['name'];
+                continue;
+            }
+        }
 
-        // foreach ($res as $key => $val) {
-        //
-        // }
 
         return [ 'data' => $res];
     }
@@ -149,8 +171,8 @@ class SquareService
             $update_params['site_id'] = $params['site_id'];
         }
         //部门
-        if (!empty($params['district_id'])) {
-            $update_params['district_id'] = $params['district_id'];
+        if (!empty($params['district_lable_id'])) {
+            $update_params['district_lable_id'] = $params['district_lable_id'];
         }
         if (!empty($params['title'])) {
             $update_params['title'] = $params['title'];
@@ -207,4 +229,47 @@ class SquareService
         }
     }
 
+    public function getCommenInfo($params){
+        $field = 'Comment.id,Comment.comment,Comment.create_time,Agent.name,Agent.img';//
+        $get_params['Comment.id'] = $params['id'];
+        $res = $this->m_coment->getCommenInfo($field,$get_params);
+        $res['image_path'] = 'http://n.sinaimg.cn/ent/transform/20170921/FVGl-fymesmp0851702.jpg';
+        return [ 'data' => $res];
+    }
+
+    public function editCommenSort($params)
+    {
+        $where_params['id'] = $params['id'];
+        $update_params = [];
+        //城市
+        if (!empty($params['sort'])) {
+            $update_params['sort'] = $params['sort'];
+        }
+
+        if(!$update_params){
+            return false;
+        }
+
+        $res = $this->m_coment->updateStatus($where_params, $update_params);
+        return $res;
+    }
+
+    public function getSquareCommentExtList($params){
+        $pageNo = empty($params['page_no']) ? 1 : $params['page_no'];
+        $pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
+
+        $field = 'CommentExt.id,CommentExt.comment,CommentExt.create_time,AgentA.img,AgentA.name as agent_id_a,AgentB.name as agent_id_b';//
+
+        $get_params['CommentExt.comment_id'] = $params['id'];
+
+        $res = $this->m_coment_ext->getSquareCommentExtList($pageNo, $pageSize, $field, $get_params);
+        $res_total = $this->m_coment_ext->getSquareCommentExtListTotal($field, $get_params);
+
+        foreach ($res as $key => $val) {
+            $res[$key]['image_path'] = 'http://n.sinaimg.cn/ent/transform/20170921/FVGl-fymesmp0851702.jpg';
+        }
+
+        return [ 'data' => $res, 'total' => $res_total ];
+    }
+
 }
\ No newline at end of file

application/index/controller/Square.php

@@ -19,16 +19,22 @@ class Square extends Basic
         $this->s_square = new SquareService();
     }
 
+    public function getDistrictLable()
+    {
+        $res = $this->s_square->getDistrictLable();
+        return $this->response("200", "成功",$res);
+    }
+
     public function addSquare() {
         header('Access-Control-Allow-Origin:*');
 
         $params = $this->params;
 
-        if (!isset($params['title']) or !isset($params['content']) or !isset($params['site_id']) or !isset($params['cover_img']) or !isset($params['district_id'])) {
+        if (!isset($params['title']) or !isset($params['content']) or !isset($params['site_id']) or !isset($params['cover_img']) or !isset($params['district_lable_id'])) {
             return $this->response("101", "参数不全");
         }
 
-        $res= $this->s_square->saveSquare($this->userId,$params['title'],$params['content'],$params['cover_img'],$params['site_id'],$params['district_id']);
+        $res= $this->s_square->saveSquare($this->userId,$params['title'],$params['content'],$params['cover_img'],$params['site_id'],$params['district_lable_id']);
         if ($res) {
             return $this->response("200", "成功");
         } else {

application/index/service/HouseService.php

@@ -733,7 +733,6 @@ die('11111');
                             $update_data[$k]['phone'] = $v['phone'];
                             $edit_phone[] = substr_replace($phone, '****', 3, 4) . '修改为;' . substr_replace($v['phone'], '****', 3, 4);
                             $new_phone[] = $phone;
-                            $new_phone[] = $old_landlord[$v['id']];
                         }
                     } else {
                         $insert_data[$key]['phone'] = $v['phone'];

application/index/service/UserService.php

@@ -10,6 +10,7 @@ namespace app\index\service;
 
 
 use app\api_broker\service\PushMessageService;
+use app\api_broker\service\RedisCacheService;
 use app\api_broker\service\VipService;
 use app\extra\RedisExt;
 use app\index\validate\MemberValidate;
@@ -357,7 +358,20 @@ class UserService
         if(!$user_id){
             return 1;
         }
-        $res = $this->user->selectUser($user_id, "id,protect_time,create_time");
+
+        $redis_cache = new RedisCacheService();
+        $user_data = $redis_cache->getRedisCache(1, $user_id);
+        if (empty($user_data)) {
+            $res = $this->user->selectUser($user_id, "id,protect_time,create_time");
+        } else {
+            if ($user_data['status'] == 0 || $user_data['status'] == -1) {
+                $res['protect_time'] = $user_data['protect_time'];
+            }
+        }
+
+        if (empty($res['protect_time'])) {
+            return 1;//过保护期
+        }
 
         /*先判断客户创建时间是否超过24小时 目的是兼容老数据 2018-10-20号之后的版本可去除此处代码*/
 //        if((time() - strtotime($res['create_time'])) < (60*60*24)){

application/index/view/finance/daily_details.html

@@ -237,7 +237,7 @@
     .active {
     	color:dodgerblue;
     }
-    #file_input_pic {
+    #file_input_pic{
 		opacity: 0;
 		position: absolute;
 		top: 0;
@@ -245,7 +245,15 @@
 		height: 35px;
 		width: 80px;
 	}
-	
+	#file_input_pic_xi {
+		opacity: 0;
+		position: absolute;
+		top: 0;
+		left: 0;
+		height: 35px;
+		width: 80px;
+		
+	}
 	.hide {
 		display: none !important;
 	}
@@ -845,14 +853,20 @@
 						<div class="form-group full-width-100 full-pic-area">
 							<!--input上传图片-->
 							<div id="container_body">
+								<button type="button btn2" class="btn btn-default">上传图片</button>
+								<input type="file" id="file_input_pic_xi"/>
 								<div id="container_body_img_area"></div>
 							</div>
 						</div>
 					</li>
+					
 				</ul>
 
 			</div>
 			<div class="modal-footer">
+				<button type="button btn2" class="btn btn-primary" id="saveBtnLiu" data-dismiss="modal">
+                    保存
+                </button>
 			</div>
 		</div>
 		<!-- /.modal-content -->

application/index/view/opensquare/opensquareLogList.html

@@ -263,7 +263,7 @@
 						<div class="pull-right">
 							<ul class="bread_btn">
 								<li>
-        	                          <a  class="btn btn-default" href="#add_modal" data-toggle="modal" data-id="[%= it[item]['id'] %]"><i class="icon-plus"></i>发布开盘</a> 
+        	                          <a  class="btn btn-default new-pan" href="#add_modal" data-toggle="modal" data-id="[%= it[item]['id'] %]"><i class="icon-plus"></i>发布开盘</a> 
 									
 								</li>
 							</ul>
@@ -283,13 +283,12 @@
 												<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date" type="date">
 												<!--下拉列表-->
 												<select class="form-control btn2 margin-top-ld input" name="" id="city_id" title=" ">
+													<option value="">请选择城市</option>
 													<option value="10001">上海市</option>
 													<option value="10002">杭州市</option>
 													<option value="10003">深圳市</option>
-													<option value="10006">广州市</option>
 												</select>
 												<select class="form-control btn2 margin-top-ld input" name="" id="district_id" title=" ">
-													<option value="">部门标签</option>
 												</select>
 												<input class="form-control btn2 margin-top-ld" data-rule-phoneus="false" data-rule-required="false" id="release_title" placeholder="文章标题" type="text" value="">
 												<span class="btn btn-info btn3 margin-top-ld" id="search">搜索</span>
@@ -394,7 +393,7 @@
                     ×
                 </button>
 				<h4 class="modal-title">
-                    发布开盘
+                   <span class="is-add">发布开盘</span> 
                 </h4>
 			</div>
 			<div class="modal-body">
@@ -416,11 +415,10 @@
 													<label class="col-sm-2 control-label">城市标签：</label>
 													<div class="col-sm-9">
 														<select class="form-control btn5 input" name="" id="add_city_id" title=" ">
-															<option value="">请选择标签</option>
+															<option value="">请选择城市</option>
 															<option value="10001">上海市</option>
 															<option value="10002">杭州市</option>
 															<option value="10003">深圳市</option>
-															<option value="10006">广州市</option>
 														</select>
 													</div>
 												</div>
@@ -429,8 +427,6 @@
 													<label class="col-sm-2 control-label">部门标签：</label>
 													<div class="col-sm-9">
 														<select class="form-control btn5 input" name="" id="add_district_id" title=" ">
-															<option value="">请选择标签</option>
-															<option value="7">四部林时达区域</option>
 														</select>
 													</div>
 												</div>

application/model/ADistrict.php

@@ -197,8 +197,13 @@ class ADistrict extends BaseModel
 
     /**
      * 获取部门
+     *
      * @param $params
+     * @param $field
      * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
      */
     public function getDistrict($params,$field)
     {

application/model/BComment.php

@@ -49,4 +49,26 @@ class BComment extends Model
     }
 
 
+    public function getCommenInfo($field,$params)
+    {
+        $order  = "Comment.create_time desc";
+        $result = Db::table($this->table)
+            ->field($field)
+            ->alias('Comment')
+            ->join('a_agents Agent', 'Agent.id = Comment.agent_id', 'left')
+            ->where($params)
+            ->order($order)
+            ->find();
+        // dump($this->getLastSql());
+        return $result;
+    }
+
+    public function updateStatus($where_params,$update_params)
+    {
+        $result = $this->where($where_params)->update($update_params);
+        // dump($this->getLastSql());exit;
+        // big_log($this->getLastSql());
+        return $result;
+    }
+
 }

application/model/BCommentExt.php

@@ -25,7 +25,8 @@ class BCommentExt extends Model
         $result = Db::table($this->table)
             ->field($field)
             ->alias('CommentExt')
-            ->join('a_agents Agent', 'Agent.id = Comment.agent_id', 'right')
+            ->join('a_agents AgentA', 'AgentA.id = CommentExt.agent_id_a', 'left')
+            ->join('a_agents AgentB', 'AgentB.id = CommentExt.agent_id_b', 'left')
             ->where($params)
             ->limit($pageSize)
             ->page($pageNo)
@@ -41,7 +42,8 @@ class BCommentExt extends Model
         $result = Db::table($this->table)
             ->field($field)
             ->alias('CommentExt')
-            ->join('a_agents Agent', 'Agent.id = Comment.agent_id', 'right')
+            ->join('a_agents AgentA', 'AgentA.id = CommentExt.agent_id_a', 'left')
+            ->join('a_agents AgentB', 'AgentB.id = CommentExt.agent_id_b', 'left')
             ->where($params)
             ->count();
         //dump($this->getLastSql());

application/model/BSquare.php

@@ -50,10 +50,8 @@ class BSquare extends Model
         $result = Db::table($this->table)
             ->field($field)
             ->alias('Square')
-            ->join('a_agents Agent', 'Agent.id = Square.agent_id', 'right')
-            ->join('a_site Site', 'Site.id = Square.site_id', 'right')
-            ->join('a_district District', 'District.id = Square.district_id', 'right')
-            // ->join('b_comment Comment', 'Square.id = Comment.square_id', 'right')
+            ->join('a_agents Agent', 'Agent.id = Square.agent_id', 'left')
+            ->join('a_site Site', 'Site.id = Square.site_id', 'left')
             ->where($params)
             ->limit($pageSize)
             ->page($pageNo)
@@ -69,10 +67,8 @@ class BSquare extends Model
         $result = Db::table($this->table)
             ->field($field)
             ->alias('Square')
-            ->join('a_agents Agent', 'Agent.id = Square.agent_id', 'right')
-            ->join('a_site Site', 'Site.id = Square.site_id', 'right')
-            ->join('a_district District', 'District.id = Square.district_id', 'right')
-            // ->join('b_comment Comment', 'Square.id = Comment.square_id', 'right')
+            ->join('a_agents Agent', 'Agent.id = Square.agent_id', 'left')
+            ->join('a_site Site', 'Site.id = Square.site_id', 'left')
             ->where($params)
             ->count();
         //dump($this->getLastSql());
@@ -85,9 +81,9 @@ class BSquare extends Model
         $result = Db::table($this->table)
             ->field($field)
             ->alias('Square')
-            ->join('a_agents Agent', 'Agent.id = Square.agent_id', 'right')
-            ->join('a_site Site', 'Site.id = Square.site_id', 'right')
-            ->join('a_district District', 'District.id = Square.district_id', 'right')
+            ->join('a_agents Agent', 'Agent.id = Square.agent_id', 'left')
+            ->join('a_site Site', 'Site.id = Square.site_id', 'left')
+            // ->join('a_district District', 'District.id = Square.district_id', 'left')
             ->where($params)
             ->order($order)
             ->find();

application/route.php

@@ -212,7 +212,7 @@ Route::group('index', [
     'callCollectList'       => ['index/CellPhone/callCollectList', ['method' => 'get']],//经纪人通话汇总
     'bindAXB'               => ['index/CellPhone/bindAXB', ['method' => 'post']],//隐私号码
     'agentsUnBind'          => ['index/CellPhone/agentsUnBind', ['method' => 'post']],//解除绑定关系
-    'updateBindAXB'         => ['api_broker/CellPhone/updateBindAXB', ['method' => 'post']], //更新绑定关系隐私号码
+    'updateBindAXB'         => ['index/CellPhone/updateBindAXB', ['method' => 'post']], //更新绑定关系隐私号码
     'phoneList'             => ['index/Phone/phoneList', ['method' => 'get']], //号码池
     'bindPhoneListIndex'    => ['index/Phone/bindPhoneListIndex', ['method' => 'get']], //号码绑定列表
 
@@ -444,11 +444,12 @@ Route::group('index', [
     'videoCheckList' => ['index/VideoCheck/videoCheckList', ['method' => 'get|post']],
 
     //开盘广场
-    'addSquare' => ['index/Square/addSquare', ['method' => 'GET|POST']],
-    'getSquareList' => ['index/Square/getSquareList', ['method' => 'GET|POST']],
-    'getSquareInfo' => ['index/Square/getSquareInfo', ['method' => 'GET|POST']],
-    'delSquare' => ['index/Square/delSquare', ['method' => 'GET|POST']],
-    'editSquare' => ['index/Square/editSquare', ['method' => 'GET|POST']],
+    'getDistrictLable' => [ 'index/Square/getDistrictLable', [ 'method' => 'GET|POST' ] ],
+    'addSquare'        => [ 'index/Square/addSquare', [ 'method' => 'GET|POST' ] ],
+    'getSquareList'    => [ 'index/Square/getSquareList', [ 'method' => 'GET|POST' ] ],
+    'getSquareInfo'    => [ 'index/Square/getSquareInfo', [ 'method' => 'GET|POST' ] ],
+    'delSquare'        => [ 'index/Square/delSquare', [ 'method' => 'GET|POST' ] ],
+    'editSquare'       => [ 'index/Square/editSquare', [ 'method' => 'GET|POST' ] ],
 
 ]);
 
@@ -856,11 +857,14 @@ Route::group('broker', [
     'getStoreRandKingListByAgentId' => ['api_broker/RankingList/getStoreRandKingListByAgentId', ['method' => 'GET|POST']],
 
     //开盘广场
-    'addSquare'     => [ 'api_broker/Square/addSquare', [ 'method' => 'GET|POST' ] ],
-    'getSquareList' => [ 'api_broker/Square/getSquareList', [ 'method' => 'GET|POST' ] ],
-    'getSquareInfo' => [ 'api_broker/Square/getSquareInfo', [ 'method' => 'GET|POST' ] ],
-    'addComent'     => [ 'api_broker/Square/addComent', [ 'method' => 'GET|POST' ] ],
-    'getSquareCommentList'     => [ 'api_broker/Square/getSquareCommentList', [ 'method' => 'GET|POST' ] ],
+    'addSquare'               => [ 'api_broker/Square/addSquare', [ 'method' => 'GET|POST' ] ],
+    'getSquareList'           => [ 'api_broker/Square/getSquareList', [ 'method' => 'GET|POST' ] ],
+    'getSquareInfo'           => [ 'api_broker/Square/getSquareInfo', [ 'method' => 'GET|POST' ] ],
+    'addComent'               => [ 'api_broker/Square/addComent', [ 'method' => 'GET|POST' ] ],
+    'getSquareCommentList'    => [ 'api_broker/Square/getSquareCommentList', [ 'method' => 'GET|POST' ] ],
+    'getCommenInfo'           => [ 'api_broker/Square/getCommenInfo', [ 'method' => 'GET|POST' ] ],
+    'getSquareCommentExtList' => [ 'api_broker/Square/getSquareCommentExtList', [ 'method' => 'GET|POST' ] ],
+    'editCommenSort' => [ 'api_broker/Square/editCommenSort', [ 'method' => 'GET|POST' ] ],
 
 ]);
 

public/resource/js/financial_manager_daily_list.js

@@ -194,13 +194,54 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 					}
 				});
 			});
+			//图片上传相关(资料)
+            $('#file_input_pic_xi').on('change', function(){
+				var _this = $(this);
+				var formData = new FormData();
+					formData.append('type', 'chat');
+					formData.append('image', _this[0].files[0]);
+				$.ajax({
+					type: 'post',
+					url: ServerHostImageLiu + '/index/uploadImg',
+					data: formData,
+					dataType: 'json',
+					contentType: false,
+					cache: false,
+					processData: false,
+					beforeSend: function() {},
+					success: function(_data) {
+						if(_data.code == 200) {
+							$('#container_body_img_area').append('<div class="result-du-l"><img data-imgname="{0}" src="{1}" alt=""/> <span class="span-del-du-l">删除</span></div>'.stringFormatObj({
+								'0': _data.data.img_path,
+								'1': _data.data.internet_img_name?urlDeal(_data.data.internet_img_name):_data.data.internet_img_name
+							}));
+						} else {
+							alert(_data.msg);
+						};
+					},
+					error: function() {
+						alert('enter error');
+					},
+					complete: function(xhr, textStatus) {
+						if(textStatus === 'timeout') {
+							//处理超时的逻辑
+							alert('请求超时,请重试');
+						};
+					}
+				});
+			});
             //图片删除事件
 			_doc.on('click', '.span-del-du', function(e) {
 				e.preventDefault();
 				e.stopPropagation();
 				$(this).parent().remove();
 			});
-			
+			//图片删除事件
+			_doc.on('click', '.span-del-du-l', function(e) {
+				e.preventDefault();
+				e.stopPropagation();
+				$(this).parent().remove();
+			});
 			//图片删除，已有的则调用接口删除
 			_doc.on('click', '.span-del2-du', function(e) {
 				var _this = $(this);
@@ -275,7 +316,51 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 				});
 			});
             //收款详情页面
-			
+			//保存上传的图片(资料)
+		    _doc.on('click', '#saveBtnLiu', function(e) {
+				var _this = $(this);
+				e.preventDefault();
+				e.stopPropagation();
+				var imgname = [];
+				for(var i = 0; i < $('.result-du-l').length; i++) {
+					imgname[i] = $('.result-du-l>img').eq(i).attr('data-imgname');
+				};
+				var id_pic = bargain.house_fatherid ;
+				var _data = {
+					img_id: bargain.recordid,
+				};
+				//无新的图片上传 不调用接口
+				if(imgname.join(',')) {
+					_data['img_name'] = imgname.join(',');
+				} else {
+					return
+				};
+				$.ajax({
+					type: 'GET',
+					url: '/index/addReceiptImg',
+					data: _data,
+					dataType: 'json',
+					beforeSend: function() {},
+					success: function(_data) {
+						if(typeof _data === 'object') {
+							alert('保存成功');
+							$('#container_body_img_area').html("");
+							bargain.getList();
+						} else {
+							alert('数据错误');
+						};
+					},
+					error: function() {
+						alert('enter error');
+					},
+					complete: function(xhr, textStatus) {
+						if(textStatus === 'timeout') {
+							//处理超时的逻辑
+							alert('请求超时,请重试');
+						};
+					}
+				});
+			});
 			//店长提交日报
 			_doc.on('click', '.is-submit', function(e) {
 				e.preventDefault();

public/resource/js/opensquareList.js

@@ -17,6 +17,8 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
         agent_id2 : 0,
         modal_btn_id : '' ,
         announcementdel_id:'',//文章id
+        is_add:1,//是否新增 
+        switchUrl:'',
         init: function () {
             //初始化dot
             $ ("body").append (template);
@@ -30,7 +32,7 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
 			var	_imgUploadLunbo = $('#xiangqing_pic_ul'); //详情页轮播图ul
             //获取学院标签
             user.getDistrict(function(){
-            	_doc.on('input', '#district_id, #district_id2', function(){
+            	_doc.on('input', '#district_id', function(){
 					var _this = $(this);
 					var _id = _this.val();
 					_this.next().html('');//先清空
@@ -45,6 +47,22 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
             _doc.on('click', '.add-pic', function(){
 				follow.getaddPicList();
 			});
+			//新增开盘 编辑开盘
+			 _doc.on('click', '.new-pan', function(){
+			 	//置空内容
+                 $('#announcement_title_add').val('');
+                 $('#add_city_id').val('');
+                 $('#add_city_id').val('');
+                 $('#fujian_ul_add').html('');
+                 var ue = UE.getEditor('myEditor');
+					ue.ready(function() {//编辑器初始化完成再赋值
+						ue.setContent('');  //赋值给UEditor
+					});
+			 	user.is_add = 1;
+				$('.is-add').html('发布开盘')
+				user.getDistrict();
+				user.switchUrl = '/index/addSquare';
+			});
 			_doc.on('click', '.pdf-pre-a', function() {
 				var file_id = $(this).parent('li').attr('id') - 0 ;
 				var _url = ServerHostImageLiu+'/index/downloadFile';
@@ -73,16 +91,6 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
                 user.user_id = $ (this).attr ("data-id");
                 user.add_news();
             });
-            
-            $ (document).delegate (".announcement-details", "click", function () {//点击公告详情
-                 $('.notice-title').html($ (this).attr ("data-title"));
-                 $('.notice-time').html($ (this).attr ("data-createTime"));
-                 $('.notice-text').html($ (this).attr ("data-content"));
-                 user.news_id = $ (this).attr ("data-id");
-                 console.log(user.news_id);
-                 user.announcement_details();
-                 
-            });
             _doc.on('click', '.jian_class>ul>li', function(){
                 var _this = $(this);
                 _this.parent().prev().val(_this.html()).attr('data-id',_this.attr('data-id'));
@@ -171,8 +179,8 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
 			});
 			_doc.on('click','.edit_modal_btn' ,function(e){//点击编辑
                 user.announcementdel_id = $ (this).attr ("data-id");
+                user.is_add = 0;
 				user.text_details();
-				
 			});
 			
 			
@@ -180,6 +188,9 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
         
         //点击编辑 调用的接口
 		text_details: function() {
+			$('.is-add').html('编辑开盘')
+			user.switchUrl = '/index/editSquare';
+			user.getDistrict();
 			$.ajax({
 				'type': 'GET',
 				'url': '/index/getSquareInfo',
@@ -190,17 +201,19 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
 				success: function(data) {
 					if(data.code == 200) {
 						$('#announcement_title_add').val(data.data.data.title);
-						$("#add_city_id").val(data.data.data.title);
-						$("#add_district_id").val(data.data.data.title);
+						$("#add_city_id").val(data.data.data.site_id);
+						$("#add_district_id").val(data.data.data.district_lable_id);
 						var ue = UE.getEditor('myEditor');
 						ue.ready(function() {//编辑器初始化完成再赋值
 							ue.setContent(data.data.data.content);  //赋值给UEditor
 						});
 						
 						var _data = data['data']['data'];
-						if(_data['cover_plan']) {
-							$('#fujian_ul').html('<li><img title="点击查看大图" src="{0}" /></li>'.stringFormatObj({
-								'0': _data['cover_plan']
+						if(_data['cover_img']) {
+							$('#fujian_ul_add').html('<li><img title="点击查看大图" src="{0}" data-name="{1}" class="titleImg"/></li>'.stringFormatObj({
+								'0': ServerHostImageLiu + "/resource/lib/Attachments/images/" + _data['cover_img'],
+								'1': _data['cover_img']
+								
 							}));
 						};
 					} else {}
@@ -234,7 +247,7 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
             params.end_date = $("#end_date").val();
             params.title = $("#release_title").val();
             params.site_id = $("#city_id").val();
-//          params.district_id = $("#city_id").val();
+            params.district_id = $("#district_id").val();
             params.page_no = user.pageNo;
             params.page_size = user.pageSize;
 
@@ -245,7 +258,6 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
                 data: params,
                 dataType: 'json',
                 success: function (data) {
-                    console.log('公告');
                     var temp = document.getElementById ('opensquare_list_tpl').innerHTML;
                     var doTtmpl = doT.template (temp);
                     $ ("#users_list").html (doTtmpl (data.data.data));
@@ -255,21 +267,24 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
                 }
             });
         },
-        getDistrict : function (fn) {
+        getDistrict : function () {
+        	$("#district_id").html('');
+            $("#add_district_id").html('');
             $.ajax ({
-                url: '/index/getNewsLabel',
+                url: '/index/getDistrictLable',
                 type: 'GET',
                 async: true,
                 data: {},
                 dataType: 'json',
                 success: function (data) {
                     if (data.code == 200 && data.data != null) {
-                        var str = '';
+                        var str = '<option value="">部门标签</option>';
                         $.each(data.data, function(i,item) {
-                            str += '<option value="'+item.id+'">'+item.label_name+'</option>';
+                            str += '<option value="'+item.id+'">'+item.name+'</option>';
                         });
                         $("#district_id").append(str);
-                        fn && fn();
+                        $("#add_district_id").append(str);
+                        
                     }
                 }
             });
@@ -295,21 +310,17 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
 			if ($('.titleImg')) {
 				var pic = $('.titleImg').attr("data-name");
 			}
-			var _imgUploadLiebiao = $('#fujian_ul'); //列表页封面图ul
-			var _liebiaoPicObj = $('.titleImg');
-			var _urlCut = location.origin + '/resource/lib/Attachments/images/'; //要截取的部分url
-			if(_liebiaoPicObj.length < 1) {
-				alert('列表页封面图需要上传');
-				return false;
-			};
 			var _data = {};
+			if(user.is_add*1 == 0){//编辑 传id
+			  _data.id = user.announcementdel_id;
+			}
 			_data.title = $("#announcement_title_add").val();
 			_data.site_id = $("#add_city_id").val(); //商学院标签id
 			_data.district_id = $("#add_district_id").val(); //商学院标签id
 			_data.cover_img = pic; //封面图 剪切后的字符串
 			_data.content = UE.getEditor('myEditor').getContent();
 			$.ajax({
-				url: '/index/addSquare',//发布开盘
+				url: user.switchUrl,
 				type: 'POST',
 				async: true,
 				data: _data,

public/resource/template/opensquareList_template_tpl.html

@@ -12,8 +12,8 @@
                 [%= it[item]["site_name"] %]
             [% } %]
         </td>
-        <td>[%= it[item]["district_name"] %]</td>
-        <td>[%= it[item]["id"] %]</td>
+        <td>[%= '部门标签' %]</td>
+        <td>[%= '评论数' %]</td>
         
         <td>
         	<a  class="btn1 btn-success show_modal_btn" href="#show_modal" data-toggle="modal" data-id="[%= it[item]['id'] %]">查看</a>