Skip to content

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

Merge branch 'test'

parents 3496e92d 0c626b1a
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 6 deletions
public/app/dist/index.html
View file @ d7875c8b
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
if(!doc.addEventListener) return; if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false); win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false); doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.193e9a51ba0a6c766f7289cf647aca68.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.c1544c6e64ebde97066c.js></script><script type=text/javascript src=./static/js/app.d154fd833469c71ecc7c.js></script></body></html> })(document, window);</script><link href=./static/css/app.c376707aa1c581a2fac307c62ae814f1.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.c1544c6e64ebde97066c.js></script><script type=text/javascript src=./static/js/app.67d591c15b23c62a6a26.js></script></body></html>
\ No newline at end of file \ No newline at end of file
public/appnew/src/components/priceReport/priceReport.vue
View file @ d7875c8b
...@@ -733,7 +733,7 @@ ...@@ -733,7 +733,7 @@
str = "银满谷银行卡" ; str = "银满谷银行卡" ;
break ; break ;
} }
return str return str ;
} }
}, },
computed: { computed: {
......
public/resource/js/RemarkFollowIndex.js
View file @ d7875c8b
...@@ -352,10 +352,46 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css' ...@@ -352,10 +352,46 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
}); });
//客户列表操作 //客户列表操作
$(document).delegate(".caozuo", "click", function() { //点击操作跟进详情 $(document).delegate(".cao-zuo-record", "click", function() { //点击操作跟进详情
user.user_id = $(this).attr("data-id");
user.user_phone = $(this).attr("data-phone");
user.agent_id_infor = $(this).attr("data-agentId");
user.baohu = $(this).attr("data-baohu");
user.agentbaohu = $(this).attr("data-agent");
//隐藏拨打电话 相关
user.agent_id_call=$(this).attr("data-agent");
user.agent_id_call_current=$(this).attr("data-current");
user.agent_id_call_vip=$(this).attr("data-vip");
$('.call-user-five').html('');
$('.detail-modal-body-sec-2').show();
$('#take_look_name').html($(this).attr("data-name"));
$('#take_look_phone').html($(this).attr("data-phone"));
$('#take_look_id').html($(this).attr("data-id"));
$('#look_shop_date').val('');
$('#note_look').val('');
$('.look-shop').val('');
$('.look-shop').removeAttr('data-id');
$('.detail-modal-header-tab>a:nth-of-type(1)').removeClass('btn-default').addClass('btn-info').siblings().removeClass('btn-info').addClass('btn-default');
//点击客户详情 初始化客户动态 带看动态
$('.modal-title-genjing-con>span:nth-of-type(1)').addClass('text-info').siblings().removeClass('text-info');
user.detailTabIndex = 0;
$('.detail-modal-body-sec:nth-of-type(1)').show().siblings().hide();
//初始化客户动态 带看动态两个表格切换
$('.follow-up-modal-list-area:nth-of-type(1)').show().siblings().hide();
$('.followup-modal-comment-area>textarea').val('');//清空跟进框内容
user.getSiteTagsEdit();
user.getUserLogNew();//客户详情获取最近一条带看动态
$('.user-log-more').show();//显示加载更多
});
//客户列表操作
$(document).delegate(".genj_ure", "click", function() { //点击操作跟进详情
var _$this = $(this); var _$this = $(this);
$('#modal-record iframe').attr('src', '/index/userModalList?data=' + $.trim(_$this.next().html()) + '&idindex=' + _$this.attr('data-index') + '&id=' + _$this.attr('data-id')); $('#modal-record iframe').attr('src', '/index/userModalList?data=' + $.trim(_$this.next().html()) + '&idindex=' + _$this.attr('data-index') + '&id=' + _$this.attr('data-id'));
}); });
//查看弹出框里的tab点击事件,客户动态 带看动态 //查看弹出框里的tab点击事件,客户动态 带看动态
_doc.on('click', '.modal-title-genjing-con>span', function(e){ _doc.on('click', '.modal-title-genjing-con>span', function(e){
e.preventDefault(); e.preventDefault();
...@@ -1442,7 +1478,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css' ...@@ -1442,7 +1478,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
$("#take_look_phone").html(data.data.user_info.user_phone); //约带看手机号 $("#take_look_phone").html(data.data.user_info.user_phone); //约带看手机号
$("#take_look_id").html(data.data.user_info.user_id); //约带看id $("#take_look_id").html(data.data.user_info.user_id); //约带看id
//收藏客户 取消收藏 //收藏客户 取消收藏
if(data.data.user_info.is_collect == 2){ if(data.data.is_collect == 2){
$('#user_is_collect').html('收藏'); $('#user_is_collect').html('收藏');
}else{ }else{
$('#user_is_collect').html('取消收藏'); $('#user_is_collect').html('取消收藏');
...@@ -1503,7 +1539,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css' ...@@ -1503,7 +1539,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
} }
$(".user-details-introduce-id").html(data.data.user_info.referrer_user); //转介绍详情 $(".user-details-introduce-id").html(data.data.user_info.referrer_user); //转介绍详情
$("#introduce_edit_user").val(data.data.user_info.referrer_user); //转介绍编辑 $("#introduce_edit_user").val(data.data.user_info.referrer_user); //转介绍编辑
if(data.data.user_invite_info.referrer_source == 10){ if(data.data.referrer_source == 10){
$(".user-details-introduce").html('是'); //转介绍详情 $(".user-details-introduce").html('是'); //转介绍详情
}else{ }else{
$(".user-details-introduce").html('否'); //转介绍详情 $(".user-details-introduce").html('否'); //转介绍详情
......
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