Merge branch 'test'

application/api_broker/controller/Broker.php

@@ -399,7 +399,7 @@ class Broker extends Basic
 
         $file = request()->file('image');
         if($file){
-            $path = ROOT_PATH . 'public' . DS . 'static'. DS . 'agent_head_portrait';
+            $path = ROOT_PATH . 'public' . DS . 'static'. DS . 'user_header';
             $info = $file->validate(['size'=>512000,'ext'=>'jpg,png'])      //限制500KB
             ->move($path);
             if($info){

application/config.php

@@ -16,7 +16,7 @@ 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 . 'agent_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('_POOLKEY','FC100000022056027');//隐私号码

application/model/GHouses.php

@@ -355,6 +355,11 @@ class GHouses extends BaseModel
             $params['slotting_fee']   = $params['slotting_fee'] * 100; //存分
         }
 
+        //剩余商铺为0下架
+        if (empty($params['residue_num'])) {
+            $params['status'] = 2;
+        }
+
         //新增或编辑
         if ($params['id'] == '') {
 

application/task/controller/PrivacyNumber.php

@@ -29,7 +29,7 @@ class PrivacyNumber
         unset($post_data[0]['id']); //阿里大于返回是的id改为report_id
         
         if ($post_data[0]['phone_no']) {
-            $agents_id = Db::table('agents')->where("phone='{$post_data[0]['phone_no']}' AND password IS NOT NULL")->value('id');
+            $agents_id = Db::table('a_agents')->where("phone='{$post_data[0]['phone_no']}' AND password IS NOT NULL")->value('id');
             if (empty($agents_id)) {
                 $agents_id = Db::table('a_agents_phone')->where('phone',$post_data[0]['phone_no'])->value('agents_id');
             }