Skip to content

T
tl_estate
Commit 7407b86c authored by agping's avatar agping
Browse files
Options

后台优化

parent e46cc480
Expand all Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 57 deletions
application/index/view/collection/getCollection.html
View file @ 7407b86c
...@@ -3,9 +3,12 @@ ...@@ -3,9 +3,12 @@
<style> <style>
.modal-body-height { .modal-body-height {
overflow-y: auto; overflow-y: auto;
height: 200px; height: 432px;
}
#container_body_img_area>div{
float: left;
width: 210px;
} }
.user-ul2 { .user-ul2 {
width: 100%; width: 100%;
height: auto; height: auto;
...@@ -169,9 +172,11 @@ ...@@ -169,9 +172,11 @@
.result>img,.result2>img{ .result>img,.result2>img{
width: 150px; width: 150px;
height: 150px; height: 150px;
margin-top: 6px;
} }
#container_body{ #container_body{
position: relative; position: relative;
overflow: hidden;
} }
#file_input { #file_input {
opacity: 0; opacity: 0;
...@@ -208,6 +213,9 @@ ...@@ -208,6 +213,9 @@
#real_money2{ #real_money2{
margin-top: 20px; margin-top: 20px;
} }
.modal-body-width{
width: 800px;
}
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
...@@ -358,7 +366,7 @@ ...@@ -358,7 +366,7 @@
</div> </div>
<!--收款图片 2.2版本--> <!--收款图片 2.2版本-->
<div class="modal fade" id="modal-addPic" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal-addPic" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog modal-body-width">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
...@@ -388,8 +396,6 @@ ...@@ -388,8 +396,6 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<!--<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>-->
<button type="button btn2" class="btn btn-primary" id="saveBtn" data-dismiss="modal"> <button type="button btn2" class="btn btn-primary" id="saveBtn" data-dismiss="modal">
保存 保存
</button> </button>
......
application/index/view/houses/houseList.html
View file @ 7407b86c
...@@ -140,6 +140,10 @@ ...@@ -140,6 +140,10 @@
width: 82px; width: 82px;
height: 34px; height: 34px;
} }
.iframe-shop-detail-scroll{
height: 600px;
overflow-y: scroll;
}
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
...@@ -333,35 +337,7 @@ ...@@ -333,35 +337,7 @@
</div><!-- /.modal-content --> </div><!-- /.modal-content -->
</div><!-- /.modal --> </div><!-- /.modal -->
</div> </div>
<!--操作记录-->
<div class="modal fade" id="modal-record" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
操作记录
</h4>
</div>
<div class="modal-body">
<table class="table table-striped table-bordered table-hover table-condensed">
<thead>
<tr>
<th class="text-center">盘方修改记录</th>
<th class="text-center">操作人</th>
<th class="text-center">操作时间</th>
</tr>
</thead>
<tbody class="text-center" id="caozuo_table">
</table>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
<!--是否独家--> <!--是否独家-->
<div class="modal fade" id="modal-dujia" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal-dujia" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-dujia"> <div class="modal-dialog modal-dialog-dujia">
...@@ -480,7 +456,7 @@ ...@@ -480,7 +456,7 @@
<h4 class="modal-title detail-modal-header-tab" > <h4 class="modal-title detail-modal-header-tab" >
<a href="javascript:;" class="btn btn-default">商铺跟进</a> <a href="javascript:;" class="btn btn-default">商铺跟进</a>
<a href="javascript:;" class="btn btn-info">查看商铺</a> <a href="javascript:;" class="btn btn-info">查看商铺</a>
<a href="javascript:;" class="btn btn-info">操作记录</a>
</h4> </h4>
</div> </div>
<div class="modal-body modal-body-one"> <div class="modal-body modal-body-one">
...@@ -512,6 +488,21 @@ ...@@ -512,6 +488,21 @@
<div class="detail-modal-body-sec"> <div class="detail-modal-body-sec">
<iframe class="iframe-shop-detail"></iframe> <iframe class="iframe-shop-detail"></iframe>
</div> </div>
<!--操作记录-->
<div class="detail-modal-body-sec iframe-shop-detail-scroll">
<table class="table table-striped table-bordered table-hover table-condensed">
<thead>
<tr>
<th class="text-center">盘方修改记录</th>
<th class="text-center">操作人</th>
<th class="text-center">操作时间</th>
</tr>
</thead>
<tbody class="text-center" id="caozuo_table">
</table>
</div>
</div> </div>
</div> </div>
......
public/resource/js/houseList.js
View file @ 7407b86c
...@@ -177,7 +177,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin ...@@ -177,7 +177,6 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
business.Dujia(); business.Dujia();
}); });
$(document).delegate(".caozuo", "click", function() { //点击操作记录 $(document).delegate(".caozuo", "click", function() { //点击操作记录
business.house_id = $(this).attr("data-id");
checkLogin(); checkLogin();
business.Caozuo(); business.Caozuo();
}); });
...@@ -263,6 +262,10 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin ...@@ -263,6 +262,10 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
checkLogin(); checkLogin();
$('.followup-modal-comment-area>textarea').val('');//清空跟进框内容 $('.followup-modal-comment-area>textarea').val('');//清空跟进框内容
business.getFollowupList(); business.getFollowupList();
};
if(business.detailTabIndex == 2){
business.Caozuo();
} }
}); });
// 提交按钮设置案场权限人 // 提交按钮设置案场权限人
...@@ -459,6 +462,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin ...@@ -459,6 +462,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
business.detailTabIndex = 0; business.detailTabIndex = 0;
$('.detail-modal-body-sec:nth-of-type(1)').show().siblings().hide(); $('.detail-modal-body-sec:nth-of-type(1)').show().siblings().hide();
$('.followup-modal-comment-area>textarea').val('');//清空跟进框内容 $('.followup-modal-comment-area>textarea').val('');//清空跟进框内容
business.house_id = $(this).attr("data-id");
checkLogin(); checkLogin();
business.getFollowupList(); business.getFollowupList();
// $('.iframe-shop-detail').attr('src', '/app_broker/shop_detail_pc?shop_id='+_id); // $('.iframe-shop-detail').attr('src', '/app_broker/shop_detail_pc?shop_id='+_id);
...@@ -730,7 +734,12 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin ...@@ -730,7 +734,12 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
$.each(data.data, function(i, item) { $.each(data.data, function(i, item) {
caozuo_table += '<tr><td>' + item.remark + '</td> <td>' + item.name + '</td> <td>' + item.create_time + '</td></tr>' caozuo_table += '<tr><td>' + item.remark + '</td> <td>' + item.name + '</td> <td>' + item.create_time + '</td></tr>'
}); });
if(caozuo_table){
$("#caozuo_table").html(caozuo_table); $("#caozuo_table").html(caozuo_table);
}else{
$("#caozuo_table").html('<tr><td colspan="3">暂无数据</td></tr>');
}
} }
} else { } else {
alert('获取失败！'); alert('获取失败！');
...@@ -1113,7 +1122,7 @@ if(data.code == 200) { ...@@ -1113,7 +1122,7 @@ if(data.code == 200) {
}); });
$('#modal_followup_table_list').html(_htmlTemp); $('#modal_followup_table_list').html(_htmlTemp);
}else{ }else{
$('#modal_followup_table_list').html('<tr><td>暂无数据</td></tr>'); $('#modal_followup_table_list').html('<tr><td class="text-center">暂无数据</td></tr>');
} }
//判断用户是否有权限跟进 //判断用户是否有权限跟进
if(check_auth('broker/addShopFollowUp')){ if(check_auth('broker/addShopFollowUp')){
......
public/resource/js/public.js
View file @ 7407b86c
...@@ -32,9 +32,6 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function ...@@ -32,9 +32,6 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function
var _tempObj = $('[data-href="'+_hash+'"]'); var _tempObj = $('[data-href="'+_hash+'"]');
_tempObj.addClass('active-a').siblings().removeClass('active-a'); _tempObj.addClass('active-a').siblings().removeClass('active-a');
_tempObj.closest('.dropdown-menu').prev().attr('aria-expanded', true).parents().addClass('open').siblings().removeClass('open'); _tempObj.closest('.dropdown-menu').prev().attr('aria-expanded', true).parents().addClass('open').siblings().removeClass('open');
console.log(_tempObj.closest('.dropdown-menu').prev().attr('aria-expanded', true).parents().attr("class"));
}); });
...@@ -132,7 +129,6 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function ...@@ -132,7 +129,6 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function
var _this = $(this); var _this = $(this);
_this.prevAll('.btn-default-hide-display').hide(); _this.prevAll('.btn-default-hide-display').hide();
_this.hide(); _this.hide();
// $('.btn-default-show-caozuo').show();
_this.prevAll('.btn-default-show-caozuo').show(); _this.prevAll('.btn-default-show-caozuo').show();
...@@ -260,6 +256,5 @@ function hideStr(str){ ...@@ -260,6 +256,5 @@ function hideStr(str){
//处理url信息,改为当前域名的协议 //处理url信息,改为当前域名的协议
function urlDeal(urlStr, httpStr) { function urlDeal(urlStr, httpStr) {
//处理
return urlStr.replace(/(http|https):\/\//g, (httpStr ? (httpStr + ':') : location.protocol) + '//'); return urlStr.replace(/(http|https):\/\//g, (httpStr ? (httpStr + ':') : location.protocol) + '//');
} }
\ No newline at end of file
public/resource/js/user.js
View file @ 7407b86c
...@@ -129,13 +129,11 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind ...@@ -129,13 +129,11 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
}(jQuery)); }(jQuery));
$(".form_datetime").datetimepicker({ $(".form_datetime").datetimepicker({
//format: 'yyyy-mm-dd hh:ii:ss',
format: 'yyyy-mm-dd hh:ii:00', format: 'yyyy-mm-dd hh:ii:00',
autoclose: true, autoclose: true,
language: 'zh-CN', language: 'zh-CN',
minView: 0, minView: 0,
minuteStep: 30 minuteStep: 30
//hourStep: 1
}); });
$('.datetimepicker').hide();//初始化隐藏时间控件 $('.datetimepicker').hide();//初始化隐藏时间控件
...@@ -219,7 +217,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind ...@@ -219,7 +217,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
$('#user_area_choose').html(''); //先清空 $('#user_area_choose').html(''); //先清空
if(_id && _id != '0') { if(_id && _id != '0') {
user.getCityAreaList(_id, function(_data) { user.getCityAreaList(_id, function(_data) {
// var _str = '';
var _str = '<option value="">区域</option>'; var _str = '<option value="">区域</option>';
$.each(_data, function(i, item) { $.each(_data, function(i, item) {
_str += '<option value="' + item.fullName + '">' + item.fullName + '</option>'; _str += '<option value="' + item.fullName + '">' + item.fullName + '</option>';
...@@ -267,7 +264,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind ...@@ -267,7 +264,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
_this.next().html(''); //先清空 _this.next().html(''); //先清空
if(_id && _id != '0') { if(_id && _id != '0') {
user.getDistrictStoreList(_id, function(_data) { user.getDistrictStoreList(_id, function(_data) {
// var _str = '';
var _str = '<option value="0">全部</option>'; var _str = '<option value="0">全部</option>';
$.each(_data, function(i, item) { $.each(_data, function(i, item) {
_str += '<option value="' + item.id + '">' + item.store_name + '</option>'; _str += '<option value="' + item.id + '">' + item.store_name + '</option>';
...@@ -507,7 +503,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind ...@@ -507,7 +503,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
// }else{ // }else{
// layerTipsX('该客户今日已达拨打上限，请明日再来'); // layerTipsX('该客户今日已达拨打上限，请明日再来');
// } // }
//
}); });
//没打通手机号 //没打通手机号
$(document).on("click", "#unbind_call", function() { $(document).on("click", "#unbind_call", function() {
......
public/resource/template/house_template_tpl.html
View file @ 7407b86c
...@@ -99,7 +99,6 @@ ...@@ -99,7 +99,6 @@
<a class="btn1 btn-success dujia btn-default-hide-display" href="#modal-dujia" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-exclusive='[%= it[item]["auth_edit_exclusive"] %]'>是否独家</a> <a class="btn1 btn-success dujia btn-default-hide-display" href="#modal-dujia" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-exclusive='[%= it[item]["auth_edit_exclusive"] %]'>是否独家</a>
[% } %] [% } %]
<a class="btn1 btn-success caozuo btn-default-hide-display" href="#modal-record" data-toggle="modal" data-id='[%= it[item]["id"] %]'>操作记录</a>
[% if(check_auth('index/houseDel')) { %] [% if(check_auth('index/houseDel')) { %]
<a data-toggle="modal" data-id='[%= it[item]["id"] %]' href="#modal-delete" class="btn1 btn-danger add_applies del_modal btn-default-hide-display">删除</a> <a data-toggle="modal" data-id='[%= it[item]["id"] %]' href="#modal-delete" class="btn1 btn-danger add_applies del_modal btn-default-hide-display">删除</a>
[% } %] [% } %]
......
public/resource/template/user_template_tpl.html
View file @ 7407b86c
...@@ -23,9 +23,6 @@ ...@@ -23,9 +23,6 @@
<td> <td>
[% if(it[item]["follow_time"] != null) { %] [%= it[item]["follow_time"] %] [% } %] [% if(it[item]["follow_time"] != null) { %] [%= it[item]["follow_time"] %] [% } %]
</td> </td>
<!--<td>
[% if(it[item]["user_status"] != null) { %] [%= it[item]["user_status"] %] [% } %]
</td>-->
<td> <td>
[% if(it[item]["user_status"] == 0) { %] 求租 [% }else if(it[item]["user_status"] == 1) { %] 已租 [% }else{ %] 无效 [% } %] [% if(it[item]["user_status"] == 0) { %] 求租 [% }else if(it[item]["user_status"] == 1) { %] 已租 [% }else{ %] 无效 [% } %]
</td> </td>
...@@ -47,7 +44,6 @@ ...@@ -47,7 +44,6 @@
[% }else{ %] [% }else{ %]
老数据客户 老数据客户
[% } %] [% } %]
<!--[% if (it[item]['source'] != null){ %] [%= it[item]["source"] %] [% } %]-->
</td> </td>
<td width="16%"> <td width="16%">
[% if((check_auth('auth_vip') && it[item]['vip']*1) || (it[item]['agent_id']*1 == 0) || (it[item]['agent_id']*1 == it[item]['current_agent_id']*1) || (check_auth('index/useraction_search') && it[item]['vip']*1 == 0)) { %] [% if((check_auth('auth_vip') && it[item]['vip']*1) || (it[item]['agent_id']*1 == 0) || (it[item]['agent_id']*1 == it[item]['current_agent_id']*1) || (check_auth('index/useraction_search') && it[item]['vip']*1 == 0)) { %]
...@@ -58,13 +54,12 @@ ...@@ -58,13 +54,12 @@
[% }else if(it[item]["is_collect"] == 1 ) { %] [% }else if(it[item]["is_collect"] == 1 ) { %]
取消收藏 取消收藏
[% } %] [% } %]
</a> </a>&nbsp;
[% if(it[item]['agent_id'] == it[item]['current_agent_id'] || check_auth('index/pcEditClient')) { %] [% if(it[item]['agent_id'] == it[item]['current_agent_id'] || check_auth('index/pcEditClient')) { %]
<a class="btn1 btn-success caozuo cao-zuo-record" href="#modal-record-edit" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>客户编辑</a>&nbsp; <a class="btn1 btn-success caozuo cao-zuo-record" href="#modal-record-edit" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>客户编辑</a>
[% } %] [% } %]
[% } %] [% } %]
</td> </td>
</tr> </tr>
[% } %] [% }else{ %] [% } %] [% }else{ %]
...@@ -73,4 +68,3 @@ ...@@ -73,4 +68,3 @@
</tr> </tr>
[% } %] [% } %]
</script> </script>
<!--arr.indexOf("c")-->
\ No newline at end of file
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