Skip to content

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

后台优化

parent e46cc480
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 236 deletions
application/index/view/collection/getCollection.html
View file @ 7407b86c
......@@ -3,9 +3,12 @@
<style>
.modal-body-height {
overflow-y: auto;
height: 200px;
height: 432px;
}
#container_body_img_area>div{
float: left;
width: 210px;
}
.user-ul2 {
width: 100%;
height: auto;
......@@ -169,9 +172,11 @@
.result>img,.result2>img{
width: 150px;
height: 150px;
margin-top: 6px;
}
#container_body{
position: relative;
overflow: hidden;
}
#file_input {
opacity: 0;
......@@ -208,6 +213,9 @@
#real_money2{
margin-top: 20px;
}
.modal-body-width{
width: 800px;
}
</style>
<div id="page-content-wrapper">
<div class="container">
......@@ -358,7 +366,7 @@
</div>
<!--收款图片 2.2版本-->
<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-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
......@@ -388,8 +396,6 @@
</div>
<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>
......
application/index/view/houses/houseList.html
View file @ 7407b86c
......@@ -140,6 +140,10 @@
width: 82px;
height: 34px;
}
.iframe-shop-detail-scroll{
height: 600px;
overflow-y: scroll;
}
</style>
<div id="page-content-wrapper">
<div class="container">
......@@ -333,35 +337,7 @@
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</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-dialog modal-dialog-dujia">
......@@ -480,7 +456,7 @@
<h4 class="modal-title detail-modal-header-tab" >
<a href="javascript:;" class="btn btn-default">商铺跟进</a>
<a href="javascript:;" class="btn btn-info">查看商铺</a>
<a href="javascript:;" class="btn btn-info">操作记录</a>
</h4>
</div>
<div class="modal-body modal-body-one">
......@@ -512,6 +488,21 @@
<div class="detail-modal-body-sec">
<iframe class="iframe-shop-detail"></iframe>
</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>
......
application/index/view/member/users_list.html
View file @ 7407b86c
......@@ -88,42 +88,35 @@
.left {
float: left;
/*font-size: 12px;*/
}
.bottom {
margin-top: 30px;
}
/*客户列表商 约带看*/
.detail-modal-bargaininfo-main-left {
float: left;
width: 340px;
line-height: 36px;
}
#bargaininfo_is_open,
#bargaininfo_type {
width: 100px !important;
display: inline-block;
}
#bargaininfo_expect_payback_time {
height: 32px;
}
.detail-modal-bargaininfo-main-right {
line-height: 36px;
width: 700px;
}
#bargaininfo_yetai {
width: 150px;
display: inline-block;
height: 26px;
padding: 3px 6px
}
#bargaininfo_chengjiao_price,
#bargaininfo_total_commission {
width: 120px;
......@@ -131,40 +124,33 @@
height: 26px;
padding: 3px 6px
}
.detail-modal-bargaininfo-form {
line-height: 48px;
width: 620px;
margin: 0 auto;
}
.detail-modal-bargaininfo-commission-inputpar {
width: 100%;
overflow: hidden;
clear: both;
}
.detail-modal-bargaininfo-commission-sec,
.addtax-modal-tax-commission-sec {
overflow: hidden;
}
.detail-modal-bargaininfo-commission-sec>label,
.addtax-modal-tax-commission-sec>label {
float: left;
}
.detail-modal-bargaininfo-commission-sec>label:nth-of-type(2),
.addtax-modal-tax-commission-sec>label:nth-of-type(2) {
margin-left: 50px;
}
.detail-modal-bargaininfo-commission-sec>div,
.addtax-modal-tax-commission-sec>div {
float: left;
width: 380px;
}
.detail-modal-bargaininfo-commission-sec>mark,
.addtax-modal-tax-commission-sec>mark {
float: left;
......@@ -219,12 +205,8 @@
height: 30px;
border-radius: 15px;
}
/*初始化 隐藏时间控件*/
/*.datetimepicker{
opacity: 0;
}*/
/*拨打电话样式*/
/*拨打电话样式*/
.modal-body-width {
width: 460px;
}
......@@ -271,7 +253,6 @@
#user_up,
#user_down {
/*font-size:14px;*/
color: #337ab7;
cursor: pointer;
}
......@@ -340,9 +321,6 @@
</style>
<!--导航star-->
<!-- Sidebar -->
<!-- /#sidebar-wrapper -->
<!-- Page Content -->
<div id="page-content-wrapper">
<div class="container">
......@@ -417,19 +395,6 @@
<span class="fore-span ld-Marheight">-</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="registration_end" name="registration_end" type="date">
<!--<span class="fore-span ld-Marheight">最后跟进时间:</span>-->
<!--<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="follow_start" name="follow_start" type="date">-->
<!--<span class="fore-span ld-Marheight">-</span>-->
<!--<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="follow_end" name="follow_end" type="date">-->
<!--<div class="row"></div>-->
<!-- <span class="fore-span ld-Marheight">第一次登录时间:</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="login_start" name="login_start" type="date">
<span class="fore-span ld-Marheight">-</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="login_end" name="login_end" type="date"> -->
<!-- <div class="row"></div> -->
<!--版本 2.2-->
<span class="fore-span ld-Marheight">VIP客户:</span>
<select class="form-control btn4 ld-Marheight" id="user_vip_select">
<option value="">请选择</option>
......@@ -478,24 +443,16 @@
</select>
<input class="form-control btn2 margin-top-ld input" data-rule-phoneus="false" data-rule-required="false" name="invite_agent_phone" placeholder="邀请人(经纪人)手机号" type="text" value="">
<!--<div class="clear"></div>-->
<!--<span class='left bottom'>(注:客方所属部门,客方所属门店与邀请人所属部门,邀请人所属门店不作为并列筛选项)</span>-->
<span class="fore-span ld-Marheight">首次登录时间:</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="first_login_start" type="date">
<span class="fore-span ld-Marheight">-</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="first_login_end" type="date">
<div class="clear"></div>
<!--<select class="form-control btn2 ld-Marheight" id="user_city_choose">
<option value="" selected="selected">城市筛选</option>
<option value="310100">上海市</option>
<option value="330100">杭州市</option>
</select>-->
</div>
<div class="col-xs-12" style="padding:0px">
<span class="btn btn-info btn3 margin-top-ld" id="search">搜索</span>
<span class="btn btn-info btn3 margin-top-ld" id="reset">重置</span>
<!--<a class="btn btn-info btn3 margin-top-ld user-favorites"> 收藏夹 </a>-->
<a href="#modal_modify_user" data-toggle="modal" class="btn btn-info btn3 margin-top-ld"><i class="icon-plus"></i> 批量修改客方
</a>
<!-- 本人商铺 -->
......@@ -503,7 +460,6 @@
<!-- 高级搜索-->
<span class="btn btn-info btn3 ld-Marheight" id="main_select" title="高级搜索">高级搜索</span>
<!-- <span class="btn btn-info btn3 margin-top-ld" id="modify">批量修改客方</span> -->
</div>
</form>
......@@ -528,10 +484,7 @@
</tbody>
</table>
</div>
<!-- /#page-content-wrapper
<!-- <div class="text-left">
每页显示<span id="page">15</span>条 | 共<span id="total_page"></span>条
</div> -->
<div class="text-right" id="pagediv">
</div>
......@@ -783,8 +736,7 @@
<span class="fore-span">创建时间:</span>
<span class="fore-span cus_date"></span>
</td>
<!--<td>
</td>-->
<td>
<span class="fore-span">下载登录时间:</span>
<span class="fore-span firstlogin_time"></span>
......@@ -802,7 +754,6 @@
<span class="fore-span">客方:</span>
<div class="col-sm-9">
<input type="text" class="form-control btn6-1 cus_fang_edit input-border-0" name="pwd" autocomplete="off" disabled="disabled">
<!--<ul class="user-ul2"></ul>-->
</div>
</div>
</td>
......@@ -816,9 +767,7 @@
</td>
</tr>
<!--<tr class="ld-Marheight">
<td class="text-left"><label>客方修改记录：</label></td>
</tr>-->
</thead>
</table>
......@@ -957,51 +906,7 @@
</div>
<!-- /.modal -->
</div>
<!-- /#跟进 -->
<!--<div class="modal fade" id="modal-add" 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">
&times;
</button>
<h4 class="modal-title">
跟进
</h4>
</div>
<div class="modal-body">
<label class="col-sm-3 control-label">跟进：</label>
<div class="col-sm-9">
<textarea class="form-control" rows="3" id="genj_text"></textarea>
<span class="use-span text-danger">(必填)</span>
</div>
<label class="col-sm-3 control-label">状态标签：</label>
<div class="col-sm-9">
<label class="control-label">求租</label><input type="radio" name="user_status" value="0">
<label class="control-label">已租</label><input type="radio" name="user_status" value="1">
<label class="control-label">无效</label><input type="radio" name="user_status" value="-1">
<span class="text-danger">(必填)</span>
</div>
<div class="clear">
</div>
<div class="followup-modal-list-area">
<table class="table table-striped table-bordered table-hover table-condensed">
<tbody class="text-center" id="caozuo_table2">
</tbody>
</table>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
<button type="button" class="btn btn-primary" id="edit_add">
提交
</button>
</div>
</div>
</div>
</div>-->
<!-- #批量修改客方-->
<div class="modal fade" id="modal_modify_user" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-one">
......@@ -1016,7 +921,6 @@
</div>
<div class="modal-body modal-body-one">
<br>
<!-- ============添加========== -->
<div class="jian_class">
<input name="ues_id" placeholder="请输入经纪人姓名" type="tel" value="" class="phone_jia old_agents form-control">
<ul class="phone_list"></ul>
......@@ -1041,81 +945,13 @@
</div>
<!-- /.modal -->
</div>
<!--约带看-->
<!--<div class="modal fade" id="modal-takeLook" 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" id=" ">
<thead>
<tr>
<td>
<form id="form1">
<span class="fore-span ld-Marheight">姓名:</span>
<span class="fore-span ld-Marheight" id="take_look_name"></span>
<div class="clear "></div>
<span class="fore-span ld-Marheight">电话:</span>
<span class="fore-span ld-Marheight" id="take_look_phone"></span>
<div class="clear "></div>
<span class="fore-span ld-Marheight">客户编号:</span>
<span class="fore-span ld-Marheight" id="take_look_id"></span>
<div class="clear"></div>
<div class="detail-modal-bargaininfo-commission-inputpar">
<div class="detail-modal-bargaininfo-commission-addarea">
<div class="form-group detail-modal-bargaininfo-commission-sec">
<span class="fore-span ld-Marheight">约带看商铺：</span>
<div class=" ">
<input type="text" class="form-control ld-Marheight look-shop" name=" " autocomplete="off" placeholder="请输入商铺名称、商铺编号、商铺地址关键词 ">
<ul class="look-shop-ul"></ul>
</div>
</div>
</div>
<div id="bargaininfo_commission_add_btn">
<img src="/resource/image/jia2@2x.png" />
</div>
</div>
<div class="clear"></div>
<span class="fore-span ld-Marheight">预计到场时间:</span>
<input type="text" value=" " class="form_datetime form-control btn6 ld-Marheight" id="look_shop_date" readonly="readonly">
<div class="clear"></div>
<div class="textarea-con ld-Marheight">
<span class="fore-span">备注:</span>
<textarea name=" " rows="5" cols="50" id="note_look"></textarea>
</div>
</form>
</td>
</tr>
</thead>
<tbody class="text-center" id="caozuo_table">
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary save-look">
保存
</button>
</div>
</div>
</div>
</div>-->
<!--拨打手机号-->
<div class="modal fade" id="modal-call" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content modal-body-width">
<div class="modal-header">
<!--<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times;
</button>-->
<h4 class="modal-title">
请使用
<span id="phone_title">
......@@ -1124,7 +960,6 @@
</h4>
</div>
<div class="modal-body">
<!--<input type="hidden " value=" " id="delete_id " />-->
<div id="phone_title2">
</div>
</div>
......@@ -1291,8 +1126,7 @@
<span class="fore-span ld-Marheight">创建时间:</span>
<span class="fore-span ld-Marheight cus_date"></span>
</td>
<!--<td>
</td>-->
<td>
<span class="fore-span ld-Marheight">下载登录时间:</span>
<span class="fore-span ld-Marheight firstlogin_time"></span>
......@@ -1364,13 +1198,7 @@
</div>
</div>
<!--<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
<button type="button" class="btn btn-primary submit_edit" data-dismiss="modal">
提交
</button>
</div>-->
</div>
<!-- /.modal-content -->
</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
business.Dujia();
});
$(document).delegate(".caozuo", "click", function() { //点击操作记录
business.house_id = $(this).attr("data-id");
checkLogin();
business.Caozuo();
});
......@@ -263,6 +262,10 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
checkLogin();
$('.followup-modal-comment-area>textarea').val('');//清空跟进框内容
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
business.detailTabIndex = 0;
$('.detail-modal-body-sec:nth-of-type(1)').show().siblings().hide();
$('.followup-modal-comment-area>textarea').val('');//清空跟进框内容
business.house_id = $(this).attr("data-id");
checkLogin();
business.getFollowupList();
// $('.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
$.each(data.data, function(i, item) {
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);
}else{
$("#caozuo_table").html('<tr><td colspan="3">暂无数据</td></tr>');
}
}
} else {
alert('获取失败！');
......@@ -1113,7 +1122,7 @@ if(data.code == 200) {
});
$('#modal_followup_table_list').html(_htmlTemp);
}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')){
......
public/resource/js/public.js
View file @ 7407b86c
......@@ -32,9 +32,6 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function
var _tempObj = $('[data-href="'+_hash+'"]');
_tempObj.addClass('active-a').siblings().removeClass('active-a');
_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
var _this = $(this);
_this.prevAll('.btn-default-hide-display').hide();
_this.hide();
// $('.btn-default-show-caozuo').show();
_this.prevAll('.btn-default-show-caozuo').show();
......@@ -260,6 +256,5 @@ function hideStr(str){
//处理url信息,改为当前域名的协议
function urlDeal(urlStr, httpStr) {
//处理
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
}(jQuery));
$(".form_datetime").datetimepicker({
//format: 'yyyy-mm-dd hh:ii:ss',
format: 'yyyy-mm-dd hh:ii:00',
autoclose: true,
language: 'zh-CN',
minView: 0,
minuteStep: 30
//hourStep: 1
});
$('.datetimepicker').hide();//初始化隐藏时间控件
......@@ -219,7 +217,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
$('#user_area_choose').html(''); //先清空
if(_id && _id != '0') {
user.getCityAreaList(_id, function(_data) {
// var _str = '';
var _str = '<option value="">区域</option>';
$.each(_data, function(i, item) {
_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
_this.next().html(''); //先清空
if(_id && _id != '0') {
user.getDistrictStoreList(_id, function(_data) {
// var _str = '';
var _str = '<option value="0">全部</option>';
$.each(_data, function(i, item) {
_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
// }else{
// layerTipsX('该客户今日已达拨打上限，请明日再来');
// }
//
});
//没打通手机号
$(document).on("click", "#unbind_call", function() {
......
public/resource/template/house_template_tpl.html
View file @ 7407b86c
......@@ -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 caozuo btn-default-hide-display" href="#modal-record" data-toggle="modal" data-id='[%= it[item]["id"] %]'>操作记录</a>
[% 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>
[% } %]
......
public/resource/template/user_template_tpl.html
View file @ 7407b86c
......@@ -23,9 +23,6 @@
<td>
[% if(it[item]["follow_time"] != null) { %] [%= it[item]["follow_time"] %] [% } %]
</td>
<!--<td>
[% if(it[item]["user_status"] != null) { %] [%= it[item]["user_status"] %] [% } %]
</td>-->
<td>
[% if(it[item]["user_status"] == 0) { %] 求租 [% }else if(it[item]["user_status"] == 1) { %] 已租 [% }else{ %] 无效 [% } %]
</td>
......@@ -47,7 +44,6 @@
[% }else{ %]
老数据客户
[% } %]
<!--[% if (it[item]['source'] != null){ %] [%= it[item]["source"] %] [% } %]-->
</td>
<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)) { %]
......@@ -58,13 +54,12 @@
[% }else if(it[item]["is_collect"] == 1 ) { %]
取消收藏
[% } %]
</a>
</a>&nbsp;
[% 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>
</tr>
[% } %] [% }else{ %]
......@@ -73,4 +68,3 @@
</tr>
[% } %]
</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