Skip to content

T
tl_estate
Commit 97569b8d authored by zw's avatar zw
Browse files
Options

Merge branch 'test'

parents 384a4a77 ee77cc65
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 7 deletions
application/api/controller/Broker.php
View file @ 97569b8d
...@@ -8,7 +8,7 @@ use app\model\AAgents; ...@@ -8,7 +8,7 @@ use app\model\AAgents;
use app\model\Evaluate; use app\model\Evaluate;
use app\model\EvaluateSign; use app\model\EvaluateSign;
use app\model\OBargainModel; use app\model\OBargainModel;
use app\model\OReportModel; use app\model\OMarchInModel;
/** /**
* Description of Agents * Description of Agents
...@@ -52,14 +52,14 @@ class Broker extends Basic ...@@ -52,14 +52,14 @@ class Broker extends Basic
} }
//查找30天带看最多的人 //查找30天带看最多的人
$m_report = new OReportModel(); $m_march = new OMarchInModel();
$report_fields = 'COUNT( a.report_agent_id ) AS num,a.report_agent_id '; $report_fields = 'COUNT( a.reception_id ) AS num,a.reception_id ';
$report_where['b.house_id'] = $params['house_id']; $report_where['b.house_id'] = $params['house_id'];
$report_where['a.create_time'] = ['between', [date('Y-m-d', strtotime("-30 day")) . ' 00:00:00', date('Y-m-d').' 23:59:59']]; $report_where['a.create_time'] = ['between', [date('Y-m-d', strtotime("-30 day")) . ' 00:00:00', date('Y-m-d').' 23:59:59']];
$report_agent_id = $m_report->getMaxReportAgent($report_fields, $report_where); $reception_id = $m_march->getMaxMarchInAgent($report_fields, $report_where);
if (!empty($report_agent_id['report_agent_id'])) { if (!empty($reception_id['reception_id'])) {
$report_agent = $agents->getUser(1, 1, '', $fields, [ 'a.id' => $report_agent_id['report_agent_id'], 'a.status'=>0,'c.is_del'=>0 ]); $report_agent = $agents->getUser(1, 1, '', $fields, [ 'a.id' => $reception_id['reception_id'], 'a.status'=>0,'c.is_del'=>0 ]);
} }
$where['c.houses_id'] = $params['house_id']; $where['c.houses_id'] = $params['house_id'];
......
application/index/service/UserService.php
View file @ 97569b8d
...@@ -330,7 +330,7 @@ class UserService ...@@ -330,7 +330,7 @@ class UserService
*/ */
public function isUserProtect($user_id){ public function isUserProtect($user_id){
if(!$user_id){ if(!$user_id){
return false; return 1;
} }
$res = $this->user->selectUser($user_id, "id,protect_time,create_time"); $res = $this->user->selectUser($user_id, "id,protect_time,create_time");
......
application/model/OMarchInModel.php
View file @ 97569b8d
...@@ -397,4 +397,20 @@ class OMarchInModel extends Model ...@@ -397,4 +397,20 @@ class OMarchInModel extends Model
return $return; return $return;
} }
/**
* @param $field
* @param $where
* @return array|false|\PDOStatement|string|Model
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getMaxMarchInAgent($field, $where) {
return $this->alias('a')
->field($field)
->join('o_order b', 'a.id = b.f_id', 'left')
->where($where)
->group('a.reception_id ')
->find();
}
} }
\ No newline at end of file
public/privacy.html
View file @ 97569b8d
...@@ -42,6 +42,9 @@ ...@@ -42,6 +42,9 @@
h4{ h4{
font-size: .32rem; font-size: .32rem;
} }
h2{
font-size: .42rem;
}
.text-two{ .text-two{
text-indent: 2em; text-indent: 2em;
} }
...@@ -49,6 +52,7 @@ ...@@ -49,6 +52,7 @@
</style> </style>
</head> </head>
<body> <body>
<h2 style="text-align: center;">同联商业隐私政策</h2>
<p class="text-two">本应用尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务，本应用会按照本隐私权政策的规定使用和披露您的个人信息。但本应用将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外，在未征得您事先许可的情况下，本应用不会将这些信息对外披露或向第三方提供。本应用会不时更新本隐私权政策。 您在同意本应用服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本应用服务使用协议不可分割的一部分。</p> <p class="text-two">本应用尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务，本应用会按照本隐私权政策的规定使用和披露您的个人信息。但本应用将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外，在未征得您事先许可的情况下，本应用不会将这些信息对外披露或向第三方提供。本应用会不时更新本隐私权政策。 您在同意本应用服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本应用服务使用协议不可分割的一部分。</p>
<h4>1. 适用范围</h4> <h4>1. 适用范围</h4>
<p>(a) 在您注册本应用帐号时，您根据本应用要求提供的个人注册信息；</p> <p>(a) 在您注册本应用帐号时，您根据本应用要求提供的个人注册信息；</p>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment