Skip to content

T
tl_estate
Commit 384a4a77 authored by zw's avatar zw
Browse files
Options

Merge branch 'test'

parents 2896d7e9 bfeb8e36
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 7 deletions
application/api/controller/Broker.php
View file @ 384a4a77
...@@ -55,7 +55,7 @@ class Broker extends Basic ...@@ -55,7 +55,7 @@ class Broker extends Basic
$m_report = new OReportModel(); $m_report = new OReportModel();
$report_fields = 'COUNT( a.report_agent_id ) AS num,a.report_agent_id '; $report_fields = 'COUNT( a.report_agent_id ) AS num,a.report_agent_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")), date('Y-m-d')]]; $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); $report_agent_id = $m_report->getMaxReportAgent($report_fields, $report_where);
if (!empty($report_agent_id['report_agent_id'])) { if (!empty($report_agent_id['report_agent_id'])) {
...@@ -67,12 +67,17 @@ class Broker extends Basic ...@@ -67,12 +67,17 @@ class Broker extends Basic
$where['a.status'] = 0; $where['a.status'] = 0;
$list = $agents->getUser($pageNo, $pageSize, 'evaluate desc', $fields, $where); $list = $agents->getUser($pageNo, $pageSize, 'evaluate desc', $fields, $where);
if (!empty($agent_client['id'])) { $agent_id = [];
foreach ($list as $v) {
$agent_id[] = $v['id'];//下面去重
}
if (!empty($agent_client['id']) && !in_array($agent_client['id'], $agent_id)) {
$agent_client['show_content'] = '帮助客户找更多，善于了解客户需求'; $agent_client['show_content'] = '帮助客户找更多，善于了解客户需求';
array_unshift($list, $agent_client); array_unshift($list, $agent_client);
} }
if (!empty($report_agent[0]['id'])) { if (!empty($report_agent[0]['id']) && !in_array($report_agent[0]['id'], $agent_id)) {
$report_agent[0]['show_content'] = '我对本铺非常了解，最近带看本铺多次'; $report_agent[0]['show_content'] = '我对本铺非常了解，最近带看本铺多次';
array_unshift($list, $report_agent[0]); array_unshift($list, $report_agent[0]);
} }
......
public/privacy.html
View file @ 384a4a77
...@@ -3,19 +3,49 @@ ...@@ -3,19 +3,49 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title></title> <title></title>
<script type=text/javascript>(function(doc, win) {
var docEl = doc.documentElement,
resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
recalc = function() {
var clientWidth = docEl.clientWidth;
if(!clientWidth) return;
if(clientWidth >= 640) {
docEl.style.fontSize = '100px';
} else {
docEl.style.fontSize = 100 * (clientWidth / 750) + 'px';
var div = document.createElement('div');
div.style.width = '1.4rem';
div.style.height = '0';
document.body.appendChild(div);
var ideal = 140 * clientWidth / 750;
var rmd = (div.clientWidth / ideal);
if(rmd > 1.2 || rmd < 0.8) {
docEl.style.fontSize = 100 * (clientWidth / 750) / rmd + 'px';
}
document.body.removeChild(div);
};
};
if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script>
<style type="text/css"> <style type="text/css">
body{ body{
padding: 10px 15px; padding: .1rem .15rem;
box-sizing: border-box; box-sizing: border-box;
margin-bottom: 100px; margin-bottom: 1rem;
} }
p{ p{
color: #666; color: #666;
line-height: 36px; font-size: .24rem;
}
h4{
font-size: .32rem;
} }
.text-two{ .text-two{
text-indent: 2em; text-indent: 2em;
} }
</style> </style>
</head> </head>
<body> <body>
......
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