Merge branch 'test' into 0927-v2.9.4

application/api/controller/Broker.php

@@ -31,6 +31,7 @@ class Broker extends Basic
      */
     public function index()
     {
+        header('Access-Control-Allow-Origin:*');
         $params         = $this->params;
         $data['status'] = 101;
         $data['data']   = [];

application/api/controller/Shop.php

@@ -11,6 +11,7 @@ namespace app\api\controller;
  */
 use app\api\extend\Basic;
 use app\api_broker\service\LookShopService;
+use app\api_broker\service\VerifyService;
 use app\model\AttentionModel;
 use app\model\GHouses;
 use app\model\GHousesImgs;
@@ -305,6 +306,11 @@ class Shop extends Basic
         $bargainModel            = new OBargainModel();
         $str                     = $bargainModel->selectBargainListByHouseId($params["id"]);
         $result["enter_num"]     .= $str;
+
+        $verify             = new VerifyService();
+        $agentId            = $verify->getPanpartyAgentsByHouseId($params["id"]);
+        $result["panParty"] = $agentId;
+
         $result['new_sign_rule'] = "付{$result['payment_month']}押{$result['deposit_month']}，签订{$result['age_limit']}年";
         return $this->response("200", 'request success', $result);
     }

application/api/controller/Version.php

@@ -56,7 +56,7 @@ class Version extends Basic
             $this->response("101","请求的设备类型不能为空");
         }
         $versionResult = $this->appVersion->getVersion($type);
-        $versionResult["is_show_wx"] = 1;
+        $versionResult["is_show_wx"] = 0;
         return $this->response("200", "request success", $versionResult);
     }
 }
\ No newline at end of file

application/api/extend/Basic.php

@@ -52,7 +52,7 @@ class Basic extends Controller
         "api/register",
         "api/shopList",
         "api/filtrateCondition",
-        "api/shopDetail",
+        "api/getShopDetail",
         "api/bannerList",
         "api/averagePriceAndTurnover",
         "api/getBroker",

application/api_broker/controller/Bargain.php

@@ -45,7 +45,9 @@ class Bargain extends Basic
         $status            = $params["status"];
         $is_my_correlation = $params["is_my_correlation"];
         $keyword           = empty($params["keyword"]) ? "" : $params["keyword"];
-
+        if ($is_my_correlation == 0) {//返回空
+            return $this->response("200", "success");
+        }
         $result = $this->service_->getBargainList($pageNo, $pageSize, $submit_agent_id, $status, $is_my_correlation, $keyword);
         return $this->response("200", "success", $result);
     }

application/app_broker/view/index/shop_detail_pc.html

@@ -143,7 +143,7 @@
 									<div class="fl">盘方：</div>
 									<div class="fl">
 										<ul class="oh phone-list">
-											<li class="fl oh" v-for="(item, index) in d.panParty" :key="index" :data-id="item.id">{{item.district_name+'-'+item.name+'-'+item.phone}}</li>
+											<li class="fl oh" v-for="(item, index) in d.panParty" :key="index" :data-id="item.id">{{item.district_name+'-'+item.store_name+'-'+item.name+'-'+item.phone}}</li>
 										</ul>
 									</div>
 								</td>

application/chat/controller/AppChat.php

@@ -318,7 +318,8 @@ class AppChat extends Basic
         if ($params["from"] == "C") {
             $field = "id,external_title as title,shop_area_start,shop_area_end,rent_type,rent_price,shop_type";
         } else {
-            $field = "id,internal_title as title,shop_area_start,shop_area_end,rent_type,rent_price,shop_type";
+            //todo 1004 暂时修复
+            $field = "id,external_title as title,shop_area_start,shop_area_end,rent_type,rent_price,shop_type";
         }
 
         $result = $gHousesModel->getHouseInfoById($field, $conditions);

application/model/GHousesToAgents.php

@@ -315,7 +315,7 @@ class GHousesToAgents extends BaseModel
     public function getHousesUpdateAgents($houses_id)
     {
         $select_data = $this
-            ->field('b.id,name,a.type,b.phone,c.store_name,d.district_name')
+            ->field('b.id,b.name,b.img,a.type,b.phone,c.store_name,d.district_name')
             ->alias('a')
             ->join('a_agents b', 'a.agents_id = b.id', 'LEFT')
             ->join("a_store c", "b.store_id = c.id", "left")

public/app/js/customerinfo_details_new.js

@@ -641,11 +641,15 @@ function loadMain(){
 		            	_btnSaveTemp.hide();
 		    			_btnSave.css('display','block');
 		                layerTipsX(data['msg']);
+		                _btnSaveTemp.hide();
+		    			_btnSave.css('display','block');
 		            };
 		        }else{
 		        	_btnSaveTemp.hide();
 		    		_btnSave.css('display','block');
 		            layerTipsX('数据错误');
+		            _btnSaveTemp.hide();
+		    		_btnSave.css('display','block');
 		        };
 		    },
 		    error: function() {
@@ -653,6 +657,9 @@ function loadMain(){
 		    	_btnSave.css('display','block');
 		    	//不能卸载complete里，因为还有解绑事件，要在解绑完成时再做处理
 		        layerTipsX('error');
+		        _btnSaveTemp.hide();
+		    	_btnSave.css('display','block');
+		    	//不能卸载complete里，因为还有解绑事件，要在解绑完成时再做处理
 		    },
 		    complete: function(xhr, textStatus){
 		        if(textStatus === 'timeout'){

public/resource/js/RemarkFollowIndex.js

@@ -1063,7 +1063,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 				type: 'GET',
 				async: true,
 				data: {
-//					'AuthToken' : user_info_obj.AuthToken,
+					'AuthToken' : user_info_obj.AuthToken,
 					"site_area":5,
 					"title":$(n).val()
 				},

public/resource/js/reportList.js

@@ -765,16 +765,17 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 			        if(typeof _data === 'object') {
 			            if(_data['code'] == '200') {
 			                $("#maid_new_table_list").html(doT.template($('#reportList_maid_list_tpl').html())(_data));
-			                var _isShowAddBtnFlag = true;
-			                $.each($('.detail-modal-maid-span-time'), function(i, v) {
-			                	if(v.innerHTML){
-			                		_isShowAddBtnFlag = false;
-			                	};
-			                });
-			                //如果确认时间都有，都不为空，则把新增按钮显示出来
-			                if(_isShowAddBtnFlag){
+//			                var _isShowAddBtnFlag = true;
+//			                $.each($('.detail-modal-maid-span-time'), function(i, v) {
+//			                	if(v.innerHTML){
+//			                		_isShowAddBtnFlag = false;
+//			                	};
+//			                });
+//			                //如果确认时间都有，都不为空，则把新增按钮显示出来
+//			                if(_isShowAddBtnFlag){
+//			                	$('#maid_new_btn').show();
+//			                };
 							$('#maid_new_btn').show();
-			                };
 			                bargain.maidCount(2);//计算合计的内容
 			            } else {
 			                layerTipsX(_data['msg']);

public/resource/js/user.js

@@ -1274,7 +1274,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 				type: 'GET',
 				async: true,
 				data: {
-//					'AuthToken' : user_info_obj.AuthToken,
+					'AuthToken' : user_info_obj.AuthToken,
 					"site_area":5,
 					"title":$(n).val()
 				},