Skip to content

T
tl_estate
Commit 2f6296b6 authored by zw's avatar zw
Browse files
Options

Merge branch 'test'

parents 506bb03e 4f9ada3f
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 6 deletions
application/index/controller/CellPhone.php
View file @ 2f6296b6
......@@ -98,7 +98,9 @@ class CellPhone extends Basic
$list = $report->getCallList($pageNo, $pageSize, 'id desc', $field, $where);
$m_user = new Users();
$m_phone_follow = new UPhoneFollowUp($this->siteId);
$m_phone_follow_temp = new UPhoneFollowUpTemporary($this->siteId);
if($this->params['end_date'] >= date('Y-m-d',time())){
$m_phone_follow_temp = new UPhoneFollowUpTemporary($this->siteId);
}
$m_agent = new AAgents();
foreach ($list as $k => $v) {
if (empty($v['agents_id'])) {
......@@ -148,8 +150,12 @@ class CellPhone extends Basic
$where_follow['user_id'] = $v['users_id'];
$where_follow['type'] = 0;
$where_follow['agent_id'] = $v['agents_id'];
$result[$k]['content'] = $m_phone_follow_temp->getUserFollowKey('content', $where_follow, 'id DESC');
if (empty($result[$k]['content'])) {
if($this->params['end_date'] >= date('Y-m-d',time())){
$result[$k]['content'] = $m_phone_follow_temp->getUserFollowKey('content', $where_follow, 'id DESC');
if (empty($result[$k]['content'])) {
$result[$k]['content'] = $m_phone_follow->getUserFollowKey('content', $where_follow, 'id DESC');
}
}else{
$result[$k]['content'] = $m_phone_follow->getUserFollowKey('content', $where_follow, 'id DESC');
}
} else {
......
public/app/dist/index.html
View file @ 2f6296b6
......@@ -23,4 +23,4 @@
if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.f0355420c0450ddd6d5a8ca9eaa9406c.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.47d1a9eae2ac920f6cc7.js></script></body></html>
\ No newline at end of file
})(document, window);</script><link href=./static/css/app.49e7068bb37112ab84a6f844f9088bbe.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.f54574412330d2feee20.js></script></body></html>
\ No newline at end of file
public/app/dist/static/js/app.47d1a9eae2ac920f6cc7.js deleted 100644 → 0
View file @ 506bb03e
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.f54574412330d2feee20.js 0 → 100644
View file @ 2f6296b6
This source diff could not be displayed because it is too large. You can view the blob instead.
public/appnew/src/components/phoneDetail/phoneDetail.vue
View file @ 2f6296b6
......@@ -215,7 +215,7 @@
this.a = document.body.scrollHeight || document.documentElement.scrollHeight;
this.b = document.body.scrollTop || document.documentElement.scrollTop;
//通过判断滚动条的top位置与可视网页之和与整个网页的高度是否相等来决定是否加载内容；
if (this.b + this.c == this.a) {
if (this.b + this.c > this.a - 20) {
// this.$router.push('./intelligenceb');
setTimeout(()=> {
console.log("滚动到底了");
......
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