Merge branch 'wx0604' of https://gitee.com/zwyjjc/tl_estate into wx0604

application/api/controller/Broker.php

@@ -177,7 +177,7 @@ class Broker extends Basic
             $evaluate = new Evaluate();
 
             $fields_evaluate = 'house_id,user_id,user_nick,user_phone,user_pic,evaluate_grade,evaluate_content,';
-            $fields_evaluate .= 'evaluate_sign,a.create_time,record_id,a.source,a.house_id,c.external_address';
+            $fields_evaluate .= 'evaluate_sign,a.create_time,record_id,a.source,a.house_id,c.external_address,c.internal_address,c.disc';
 
             $bargain_fields = 'a.id,a.price,a.create_time as singntime,d.external_title as title,d.rent_type,d.shop_sign,shop_area_start as room_area,c.house_id';
 

application/api_broker/service/VerifyRepetitionService.php

@@ -30,13 +30,16 @@ class VerifyRepetitionService
         if (!$this->redis_) {
             return true;
         }
-        $key = "";
+        $key  = "";
+        $time = 60;
         switch ($type) {
             case 1: //进场
-                $key = self::MARCH_IN_KEY;
+                $key  = self::MARCH_IN_KEY;
+                $time = self::TIME_OUT;
                 break;
             case 2:
-                $key = self::CALL_NUMBER;
+                $key  = self::CALL_NUMBER;
+                $time = strtotime(date('Y-m-d') . ' 23:59:59') - time();
                 break;
             case 3:
                 break;
@@ -46,7 +49,7 @@ class VerifyRepetitionService
         if ($this->redis_->get($agent_id . $key . $order_id)) {
             return false;
         } else {
-            $this->redis_->set($agent_id . $key . $order_id, 1, self::TIME_OUT);
+            $this->redis_->set($agent_id . $key . $order_id, 1, $time);
             return true;
         }
 

application/index/controller/Finance.php

@@ -848,7 +848,7 @@ class Finance extends Basic
         $log_data = [];
         foreach ($tax as $k => $v) {
             $tax[$k]['agent_name'] = $m_agent->getAgentsById($v['agent_id'], 'name');
-            $log_data[] = '[经纪人:id:'.$v['agent_id'].',名字:'.$tax[$k]['agent_name'].',税费:'.$v['fee'].'][开票比例:'.$this->params['scale'].']';
+            $log_data[] = '[经纪人:id:'.$v['agent_id'].',名字:'.$tax[$k]['agent_name'].',税费:'.$v['fee'].'][开票比例:'.$v['scale'].']';
         }
 
         if ($this->params['id'] && $this->params['id'] > 0) { //编辑

application/index/controller/Notice.php

@@ -93,7 +93,7 @@ class Notice extends Basic
         $service_push = new PushMessageService();
         $url = 'app/dist/index.html#/announcementDetails?id='.$this->m_push->id;
         $this->m_push->editData(['link'=> CURRENT_URL . $url], $this->m_push->id);
-//        $service_push->pushAll($data['title'], $data['content'], $url);
+        $service_push->pushAll($data['title'], $data['content'], $url);
 
         return $this->response(200, '新增成功！');
     }

application/model/Evaluate.php

@@ -41,6 +41,7 @@ class Evaluate extends Model
         } else {
             $result = $this->field($field)->alias('a')
                 ->join('u_users b', 'a.user_id = b.id', 'left')
+                ->join('g_houses c', 'a.house_id = c.id', 'left')
                 ->where('is_show', 0)
                 ->order($order_)
                 ->limit($pageSize)
@@ -79,9 +80,9 @@ class Evaluate extends Model
 
             if (empty($v['external_address'])) {
                 $len = mb_strlen($v['internal_address']);
-                $v['internal_address'] = mb_substr($v['internal_address'], 0, (int)$len/2) . '***';
+                $v['internal_address'] = $v['disc'].mb_substr($v['internal_address'], 0, (int)$len/2) . '***';
             } else {
-                $v['internal_address'] = $v['external_address'];
+                $v['internal_address'] = $v['disc'].$v['external_address'];
             }
 
             $data[$k]['houserAddress'] = $v['internal_address'];

public/app/dist/index.html

@@ -23,4 +23,4 @@
 				if(!doc.addEventListener) return;
 				win.addEventListener(resizeEvt, recalc, false);
 				doc.addEventListener('DOMContentLoaded', recalc, false);
-			})(document, window);</script><script type=text/javascript src=./vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script><link href=./static/css/app.b6d88ed90e9709ed41a73d5839d2306e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.94d51f6620cb57f6116c.js></script><script type=text/javascript src=./static/js/app.ad2a821bba839875ce1d.js></script></body></html>
\ No newline at end of file
+			})(document, window);</script><script type=text/javascript src=./vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script><link href=./static/css/app.65a7482b65465b468cd50d083c6b13f2.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.94d51f6620cb57f6116c.js></script><script type=text/javascript src=./static/js/app.ae212a464103491b75e1.js></script></body></html>
\ No newline at end of file