Merge branch '1030-v2.9.6' into test

application/api_broker/controller/Bargain.php

@@ -42,6 +42,7 @@ class Bargain extends Basic
                 "page_size"         => 10
             );*/
 
+
         $checkResult = $this->validate($params, "BargainValidate.bargainList");
         if (true !== $checkResult) {
             return $this->response("101", $checkResult);
@@ -52,12 +53,10 @@ class Bargain extends Basic
         $status            = $params["status"];
         $is_my_correlation = $params["is_my_correlation"];
         $keyword           = empty($params["keyword"]) ? "" : $params["keyword"];
-
         /*业务员不允许点击查看全部成交报告 start*/
         $agent_field = "a.level";
         $agent_res = $this->agentModel->getAgentsInfoByAgentId($agent_field, [ "agent_id" => $submit_agent_id ]);
         if(($agent_res[0]['level'] == 10) &&  ($is_my_correlation == 0)){
-            Log::write('暂无权限', '7151'); //记录日志
 
             return $this->response("200", "暂无权限！");
         }

application/api_broker/controller/User.php

@@ -462,7 +462,14 @@ class User extends Basic
             $order       = 'id desc';
         }
 
-        $where['a.site_ids'] = [ 'LIKE', '%' . $this->siteId . '%' ];
+        #站点的客户
+        if (isset($params['site_id']) ) {
+            #根据前端选择站点客户
+            $conditions['site_ids'] = [ 'LIKE', '%' . $params['site_id'] . '%' ];
+        }else{
+            #前端不传站点参数就默认显示经纪人所在站点的客户
+            $conditions['site_ids'] = [ 'LIKE', '%' . $this->siteId . '%' ];
+        }
 
         $field    = 'id,user_nick,agent_id,vip,create_time';
         $user     = new Users();

application/api_broker/service/BargainService.php

@@ -36,6 +36,7 @@ class BargainService
         } else {
             $condition["father_id"] = 0;
         }
+
         switch ($status) {
             case 1:
                 $condition["account_statement"] = 0;

application/index/controller/PerformanceInfo.php

@@ -18,11 +18,13 @@ use think\Session;
 class PerformanceInfo extends Basic
 {
     protected $oBargainModel;
+    protected $status;
 
     public function __construct($request = null)
     {
         parent::__construct($request);
         $this->oBargainModel = new OBargainModel();
+        $this->status = array('in','10,11,13');
 
     }
 
@@ -35,7 +37,7 @@ class PerformanceInfo extends Basic
             $pageNo   = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
             $pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
 
-            $where['Obargain.status'] = array('in','10,11,13,20');
+            $where['Obargain.status'] = $this->status;
             /*开始结束时间*/
             if (($this->params['create_time_start'] != NULL) && ($this->params['create_time_end'] != NULL)) {
                 $where['Obargain.create_time'] = ['between time', [$this->params['create_time_start']. ' 00:00:00', $this->params['create_time_end'] . ' 23:59:59']];
@@ -135,7 +137,7 @@ class PerformanceInfo extends Basic
     public function getPerformanceInfoExcel()
     {
 
-        $where['Obargain.status'] = array('in','10,11,13,20');
+        $where['Obargain.status'] = $this->status;
         /*开始结束时间*/
         if (($this->params['create_time_start'] != NULL) && ($this->params['create_time_end'] != NULL)) {
             $where['Obargain.create_time'] = ['between time', [$this->params['create_time_start']. ' 00:00:00', $this->params['create_time_end'] . ' 23:59:59']];

public/appnew/src/components/shop/shopList.vue

@@ -66,12 +66,12 @@
 			<div v-show="index == 3">
 				<div class="mark-shop-choose-ul mark-shop-choose-ul-padding">
 					<p class="rent-choose">租金（单选）</p>
-					<span v-for="(item6, index6) in mainDataChooseLi.money" class="li-choose-span li-choose-span-rent" :class="{active:index6 === initTabNumRent}" @click="tabRent(index6,item6.value.split('-'))">{{item6.value}}</span>
+					<span v-for="(item6, index6) in mainDataChooseLi.money" class="li-choose-span li-choose-span-rent" :class="{active:index6 === initTabNumRent}" @click="tabRent(index6)">{{item6.value}}</span>
 					<p class="lable-choose">特色标签（多选）</p>
 					<span v-for="(item3, index3) in mainDataChooseLi.more" class="li-choose-span li-choose-span-sign" :class="{active:arrShop.indexOf(item3) > -1}" @click="tabShopSign(item3)">{{item3}}</span>
 					<div class="more-button">
-						<span class="clear-btn" @click="delMore()">清空</span>
-						<span class="save-btn" @click="saveMore()">保存</span>
+						<span class="clear-btn">清空</span>
+						<span class="save-btn">保存</span>
 					</div>
 				</div>
 				
@@ -131,11 +131,9 @@
 			ajaxDisc:'',
 			ajaxBusiness:'',
 			ajaxYeTai:'',
+			ajaxArea:'',
 			ajax_shop_area_start:'',
 			ajax_shop_area_end:'',
-			ajax_rent_price_start:'',
-			ajax_rent_price_end:'',
-			ajaxShopSign:'',
 			arrShop: ['全部'],
 			mainDataChoose:[{
 				'title': '区域',
@@ -187,24 +185,15 @@
 					    if(_this.ajax_shop_area_end){
 					       _data.shop_area_end = _this.ajax_shop_area_end;
 					    };
-					    if(_this.ajax_rent_price_start){
-					       _data.rent_price_start = _this.ajax_rent_price_start;
-					    };
-					    if(_this.ajax_rent_price_end){
-					       _data.rent_price_end = _this.ajax_rent_price_end;
-					    };
 					    if(_this.ajaxDisc){
 					    	_data.disc =  _this.ajaxDisc;
 					    };
 					    if(_this.ajaxBusiness){
 					        _data.business_id = _this.ajaxBusiness;
 					    };
-					    if(_this.ajaxYeTai){
+					     if(_this.ajaxYeTai){
 					       _data.industry_type = _this.ajaxYeTai;
 					    };
-					    if(_this.ajaxShopSign){
-					       _data.shop_sign = _this.ajaxShopSign;
-					    };
 					    
 					_this.axios({
 						method: 'get',
@@ -288,7 +277,6 @@
 				let _this = this;
 				_this.initTabNumYeTai = index;
 				_this.ajaxYeTai = yetai
-				_this.mainDataChoose[_this.initTabNumMainChoose].title = yetai;
 				_this.mainDataChoose[_this.initTabNumMainChoose].isShow = false;
 				_this.resetConditions();
 				_this.getList();
@@ -297,7 +285,7 @@
 			tabArea(index,area){
 				let _this = this;
 				 _this.initTabNumArea = index;
-				_this.mainDataChoose[_this.initTabNumMainChoose].title = area.join('-');
+				 _this.ajaxArea = area;
 				 if(area[0] != '全部' ){
 				 	var parseIntStart = parseInt(area[0]);
 				 }
@@ -336,29 +324,9 @@
 				_this.getList();
 				
 			},
-			tabRent(index,rent){
+			tabRent(index){
 				let _this = this;
 				_this.initTabNumRent = index;
-				 if(rent[0] != '全部' ){
-				 	var parseIntStart = parseInt(rent[0]);
-				 }
-				if(rent[0] == '全部'){
-					_this.ajax_rent_price_start = '';
-					_this.ajax_rent_price_end = '';
-				}else if((rent.length == 1) && (rent[0] != '全部')){
-					if(parseIntStart > 1){
-						_this.ajax_rent_price_start = parseIntStart*10000;
-						_this.ajax_rent_price_end = '';
-					}else{
-						_this.ajax_rent_price_start = '0';
-						_this.ajax_rent_price_end = parseIntStart*10000;
-					};
-				}else{
-				   var parseIntEnd = parseInt(rent[1]);
-				       _this.ajax_rent_price_start = parseIntStart*10000;
-					   _this.ajax_rent_price_end = parseIntEnd*10000;
-					
-				}
 			},
 			tabShopSign(item){
 				let _this = this;
@@ -367,21 +335,7 @@
 					_this.arrShop.splice(_shopIndex, 1); 
 				}else{
 					_this.arrShop.push(item); 
-			    };
-			    _this.ajaxShopSign = _this.arrShop.join(',');
-			},
-			delMore(){
-				let _this = this;
-				_this.initTabNumRent = 0;
-				_this.ajax_rent_price_start = '';
-				_this.ajax_rent_price_end = '';
-				_this.arrShop = ['全部'];
-			},
-			saveMore(){
-				let _this = this;
-				_this.mainDataChoose[_this.initTabNumMainChoose].isShow = false;
-			    _this.resetConditions();
-				_this.getList();
+			    }
 			},
 			tabLable(index){
 				let _this = this;