Skip to content

T
tl_estate
Commit 7c715df7 authored by clone's avatar clone
Browse files
Options

Merge branch 'chat_0705' of https://gitee.com/zwyjjc/tl_estate into chat_0705

parents 706eadd7 415e7fbe
Hide whitespace changes
Inline Side-by-side
Showing with 674 additions and 227 deletions
application/index/controller/Member.php
View file @ 7c715df7
...@@ -249,7 +249,16 @@ class Member extends Basic{ ...@@ -249,7 +249,16 @@ class Member extends Basic{
$where['a.first_login_time'] = ['between time', [$params['first_login_start'] . ' 00:00:00', $where['a.first_login_time'] = $params['first_login_end'] . ' 23:59:59']]; $where['a.first_login_time'] = ['between time', [$params['first_login_start'] . ' 00:00:00', $where['a.first_login_time'] = $params['first_login_end'] . ' 23:59:59']];
} }
$fields = 'a.id,a.user_nick,a.user_name,a.user_phone,a.user_pic,a.create_time,a.user_pswd,a.referrer_id,a.registration_time,a.user_name,a.last_login_ip,a.status,a.first_login_time,a.last_login_time,a.agent_id,a.vip'; if (!empty($params['vip'])) {
if ($params['vip'] == 1) {
$where['a.vip'] = 1;
} else {
$where['a.vip'] = 0;
}
}
$fields = 'a.id,a.user_nick,a.user_name,a.user_phone,a.user_pic,a.create_time,a.user_pswd,a.referrer_id,
a.user_name,a.status,a.first_login_time,a.last_login_time,a.agent_id,a.vip,a.price_demand,a.industry_type,a.area_demand';
try { try {
$data['list'] = $this->user->getUserAgent($pageNo, $pageSize, 'a.id DESC', $fields, $where, $type); $data['list'] = $this->user->getUserAgent($pageNo, $pageSize, 'a.id DESC', $fields, $where, $type);
......
application/index/view/member/users_list.html
View file @ 7c715df7
...@@ -6,7 +6,9 @@ ...@@ -6,7 +6,9 @@
overflow-y: auto; overflow-y: auto;
padding-bottom: 60px; padding-bottom: 60px;
} }
.modal-body-details{
width: 850px;
}
.user-ul { .user-ul {
width: 100%; width: 100%;
height: auto; height: auto;
...@@ -21,7 +23,8 @@ ...@@ -21,7 +23,8 @@
line-height: 30px; line-height: 30px;
} }
.user-ul2,.look-shop-ul { .user-ul2,
.look-shop-ul {
width: 100%; width: 100%;
height: auto; height: auto;
padding-bottom: 6px; padding-bottom: 6px;
...@@ -30,7 +33,8 @@ ...@@ -30,7 +33,8 @@
left: -40px; left: -40px;
} }
.user-ul2 li,.look-shop-ul li { .user-ul2 li,
.look-shop-ul li {
list-style: none; list-style: none;
line-height: 30px; line-height: 30px;
} }
...@@ -88,14 +92,17 @@ ...@@ -88,14 +92,17 @@
.clear { .clear {
clear: both; clear: both;
} }
.left{
.left {
float: left; float: left;
font-size: 12px; font-size: 12px;
} }
.bottom{
margin-top: 30px; .bottom {
margin-top: 30px;
} }
/*客户列表商 约带看*/ /*客户列表商 约带看*/
.detail-modal-bargaininfo-main-left { .detail-modal-bargaininfo-main-left {
float: left; float: left;
width: 340px; width: 340px;
...@@ -162,7 +169,7 @@ ...@@ -162,7 +169,7 @@
.detail-modal-bargaininfo-commission-sec>div, .detail-modal-bargaininfo-commission-sec>div,
.addtax-modal-tax-commission-sec>div { .addtax-modal-tax-commission-sec>div {
float: left; float: left;
width: 380px; width: 380px;
} }
.detail-modal-bargaininfo-commission-sec>mark, .detail-modal-bargaininfo-commission-sec>mark,
...@@ -189,10 +196,12 @@ ...@@ -189,10 +196,12 @@
display: block; display: block;
margin: 0 auto; margin: 0 auto;
} }
.opacity-0{
.opacity-0 {
opacity: 0; opacity: 0;
} }
#user_call{
#user_call {
height: 20px; height: 20px;
width: 30px; width: 30px;
border-radius: 3px; border-radius: 3px;
...@@ -200,18 +209,19 @@ ...@@ -200,18 +209,19 @@
margin-top: 22px; margin-top: 22px;
font-size: 10px; font-size: 10px;
text-align: center; text-align: center;
cursor:pointer cursor: pointer
} }
#phone_title2{
#phone_title2 {
font-weight: 600; font-weight: 600;
font-size: 36px; font-size: 36px;
} }
/*客户动态*/ /*客户动态*/
.followup-modal-list-area { .followup-modal-list-area {
height: 450px; height: 450px;
overflow-y: scroll; overflow-y: scroll;
} }
</style> </style>
<!--导航star--> <!--导航star-->
...@@ -269,13 +279,18 @@ ...@@ -269,13 +279,18 @@
<!-- <div class="row"></div> --> <!-- <div class="row"></div> -->
<!--版本 2.2--> <!--版本 2.2-->
<input class="form-control btn2 margin-top-ld" data-rule-phoneus="false" data-rule-required="false" name="userID" placeholder="客户ID" type="text" value=""> <input class="form-control btn2 margin-top-ld" data-rule-phoneus="false" data-rule-required="false" name="userID" placeholder="客户ID" type="text" value="">
<input class="form-control btn2 margin-top-ld" data-rule-phoneus="false" data-rule-required="false" name="user" placeholder="客户姓名" type="text" value=""> <span class="fore-span ld-Marheight">VIP客户:</span>
<select class="form-control btn4 ld-Marheight" id="user_vip_select">
<option value="" class="successModel">请选择</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
<input class="form-control btn2 margin-top-ld" data-rule-phoneus="false" data-rule-required="false" name="user" placeholder="客户姓名" type="text" value="">
<input class="form-control btn2 margin-top-ld" data-rule-phoneus="false" data-rule-required="false" name="phone" placeholder="客户手机号" type="text" value=""> <input class="form-control btn2 margin-top-ld" data-rule-phoneus="false" data-rule-required="false" name="phone" placeholder="客户手机号" type="text" value="">
<input class="form-control btn2 margin-top-ld input" data-rule-phoneus="false" data-rule-required="false" name="invite_phone" placeholder="邀请人(C端用户)手机号" type="text" value=""> <input class="form-control btn2 margin-top-ld input" data-rule-phoneus="false" data-rule-required="false" name="invite_phone" placeholder="邀请人(C端用户)手机号" type="text" value="">
<!--业态选择--> <!--业态选择-->
<select class="form-control btn2 margin-top-ld" name="industry_type"> <select class="form-control btn2 margin-top-ld" name="industry_type">
...@@ -329,7 +344,7 @@ ...@@ -329,7 +344,7 @@
<option value="0">客方所属部门</option> <option value="0">客方所属部门</option>
</select> </select>
<select class="form-control btn2 margin-top-ld input" name="" id="guest_stores" title=" <select class="form-control btn2 margin-top-ld input" name="" id="guest_stores" title="
客方所属部门、客方所属门店 与邀请人所属部门、邀请人所属门店 不作为并列筛选项" value=""> 客方所属部门、客方所属门店 与邀请人所属部门、邀请人所属门店 不作为并列筛选项" value="">
...@@ -341,7 +356,7 @@ ...@@ -341,7 +356,7 @@
<option value="0">邀请人所属部门</option> <option value="0">邀请人所属部门</option>
</select> </select>
<select class="form-control btn2 margin-top-ld input" name="" id="guest_stores2" title=" <select class="form-control btn2 margin-top-ld input" name="" id="guest_stores2" title="
客方所属部门、客方所属门店 与邀请人所属部门、邀请人所属门店 不作为并列筛选项"> 客方所属部门、客方所属门店 与邀请人所属部门、邀请人所属门店 不作为并列筛选项">
...@@ -349,13 +364,13 @@ ...@@ -349,13 +364,13 @@
<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=""> <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>--> <!--<div class="clear"></div>-->
<!--<span class='left bottom'>(注:客方所属部门,客方所属门店与邀请人所属部门,邀请人所属门店不作为并列筛选项)</span>--> <!--<span class='left bottom'>(注:客方所属部门,客方所属门店与邀请人所属部门,邀请人所属门店不作为并列筛选项)</span>-->
<span class="fore-span ld-Marheight">首次登录时间:</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"> <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> <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"> <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="first_login_end" type="date">
<div class="row"></div> <div class="row"></div>
<div class="clear"></div> <div class="clear"></div>
<!-- <span class="btn btn-info btn3 margin-top-ld" class="reset_1">搜索</span> <!-- <span class="btn btn-info btn3 margin-top-ld" class="reset_1">搜索</span>
<span class="btn btn-info btn3 margin-top-ld" class="reset_1">重置</span> --> <span class="btn btn-info btn3 margin-top-ld" class="reset_1">重置</span> -->
...@@ -505,16 +520,16 @@ ...@@ -505,16 +520,16 @@
<option value="1">是</option> <option value="1">是</option>
<option value="0">否</option> <option value="0">否</option>
</select> </select>
<span class="fore-span">（有权限的人才能看到VIP客户）</span> <span class="fore-span">（有权限的人才能看到VIP客户）</span>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal" id="close">关闭 <button type="button" class="btn btn-default" data-dismiss="modal" id="close">关闭
</button> </button>
<button type="button" class="btn btn-primary" id="add_user"> <button type="button" class="btn btn-primary" id="add_user">
提交 提交
</button> </button>
</div> </div>
...@@ -525,9 +540,9 @@ ...@@ -525,9 +540,9 @@
</div> </div>
<!--操作详情记录--> <!--操作详情记录-->
<div class="modal fade" id="modal-record" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade " id="modal-record" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content modal-body-details">
<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">
× ×
...@@ -540,78 +555,105 @@ ...@@ -540,78 +555,105 @@
<table class="table table-striped table-bordered table-hover table-condensed" id="caozuo_hide"> <table class="table table-striped table-bordered table-hover table-condensed" id="caozuo_hide">
<thead> <thead>
<tr> <tr>
<td colspan="9"> <td width="40%">
<form id="form1"> <span class="fore-span ld-Marheight">产生类型:</span>
<span class="fore-span ld-Marheight">产生类型:</span> <span class="fore-span ld-Marheight" id="source_type"></span>
<span class="fore-span ld-Marheight" id="source_type"></span> </td>
<!--是否vip--> <td>
<!--<label for="inputEmail3" class="col-sm-3 control-label">VIP客户：</label>-->
<span class="fore-span ld-Marheight">VIP客户:</span> <span class="fore-span ld-Marheight">VIP客户:</span>
<select class="form-control btn4 ld-Marheight" id="user_vip2"> <select class="form-control btn6 ld-Marheight" id="user_vip2">
<option value='' class="successModel">请选择</option> <option value='' class="successModel">请选择</option>
<option value="1">是</option> <option value="1">是</option>
<option value="0">否</option> <option value="0">否</option>
</select> </select>
<div class="clear"></div> </td>
<span class="fore-span ld-Marheight">客户编号:</span> <td>
<span class="fore-span ld-Marheight" id="cus_id"></span> <span class="fore-span ld-Marheight">客户编号:</span>
<span class="fore-span ld-Marheight">姓名:</span> <span class="fore-span ld-Marheight" id="cus_id"></span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="cus_name" name="name" type="text"> </td>
</tr>
<select class="form-control btn4 ld-Marheight" id="sex"> <tr>
<option value="0" class="successModel">性别</option> <td>
<option value="1">男</option> <span class="fore-span ld-Marheight">姓名:</span>
<option value="2">女</option> <input class="form-control btn6 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="cus_name" name="name" type="text">
</select> </td>
<!--详情增加业态-->
<span class="fore-span ld-Marheight">业态:</span> <td>
<select class="form-control btn5 margin-top-ld" name="industry_type_two"> <span class="fore-span ld-Marheight">性别:</span>
<!--<option value="-1">业态选择</option>--> <select class="form-control btn6 ld-Marheight" id="sex">
<option>轻餐饮</option> <option value="0" class="successModel">性别</option>
<option>重餐饮</option> <option value="1">男</option>
<option>百货零售</option> <option value="2">女</option>
<option>服装</option> </select>
<option>亲子教育</option> </td>
<option>休闲娱乐</option> <td>
<span class="fore-span ld-Marheight">电话:</span>
</select> <span class="fore-span ld-Marheight" id="cus_phone"></span>
<span class="fore-span ld-Marheight">价格:</span> <a class="fore-span btn-primary ld-Marheight" id="user_call" href="#modal-call" data-toggle="modal">拨打</a>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="" name="price_demand" type="number"><span class="fore-span ld-Marheight">元/月</span> </td>
<span class="fore-span ld-Marheight">面积:</span> </tr>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="" name="area_demand" type="number"><span class="fore-span ld-Marheight">m²</span> <tr>
<td>
<span class="fore-span ld-Marheight">电话:</span> <span class="fore-span ld-Marheight">业态:</span>
<span class="fore-span ld-Marheight" id="cus_phone"></span> <select class="form-control btn6 ld-Marheight" name="industry_type_two">
<a class="fore-span btn-primary ld-Marheight" id="user_call" href="#modal-call" data-toggle="modal">拨打</a> <option>轻餐饮</option>
<div class="clear"></div> <option>重餐饮</option>
<option>百货零售</option>
<span class="fore-span ld-Marheight">创建时间:</span> <option>服装</option>
<span class="fore-span ld-Marheight" id="cus_date"></span> <option>亲子教育</option>
<span class="fore-span ld-Marheight">邀请人:</span> <option>休闲娱乐</option>
<span class="fore-span ld-Marheight" id="referrer_user"></span>
<span class="fore-span ld-Marheight">昵称:</span> </select>
<span class="fore-span ld-Marheight" id="cus_nick"></span> </td>
<div class="clear"></div> <td>
<span class="fore-span ld-Marheight">注册时间:</span> <span class="fore-span ld-Marheight">价格:</span>
<span class="fore-span ld-Marheight" id="registration_time"></span> <input class="form-control btn6 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="" name="price_demand" type="number"><span class="fore-span ld-Marheight">元/月</span>
<div class="clear"></div> </td>
<span class="fore-span ld-Marheight">第一次登陆时间:</span> <td>
<span class="fore-span ld-Marheight" id="firstlogin_time"></span>
<span class="fore-span ld-Marheight">面积:</span>
<div class="row"></div> <input class="form-control btn6 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="" name="area_demand" type="number"><span class="fore-span ld-Marheight">m²</span>
<div class="form-group"> </td>
<span class="fore-span ">客方:</span> </tr>
<div class="col-sm-9"> <tr>
<input type="text" class="form-control btn6 " name="pwd" autocomplete="off" id="cus_fang"> <td>
<ul class="user-ul2"></ul> <div class="form-group">
</div> <span class="fore-span ld-Marheight">客方:</span>
<div class="col-sm-9">
<input type="text" class="form-control btn6-1 ld-Marheight" name="pwd" autocomplete="off" id="cus_fang">
<ul class="user-ul2"></ul>
</div> </div>
</form> </div>
</td>
<td>
<span class="fore-span ld-Marheight">邀请人:</span>
<span class="fore-span ld-Marheight" id="referrer_user"></span>
</td>
<td>
<span class="fore-span ld-Marheight">昵称:</span>
<span class="fore-span ld-Marheight" id="cus_nick"></span>
</td>
</tr>
<tr>
<td>
<span class="fore-span ld-Marheight">创建时间:</span>
<span class="fore-span ld-Marheight" id="cus_date"></span>
</td>
<td>
<span class="fore-span ld-Marheight">注册时间:</span>
<span class="fore-span ld-Marheight" id="registration_time"></span>
</td>
<td>
<span class="fore-span ld-Marheight">下载登录时间:</span>
<span class="fore-span ld-Marheight" id="firstlogin_time"></span>
</td> </td>
</tr> </tr>
<tr class="ld-Marheight"> <tr class="ld-Marheight">
<th class="text-center">客方修改记录：</th> <td class="text-left" >客方修改记录：</td>
</tr> </tr>
</thead> </thead>
<tbody class="text-center" id="caozuo_table"></tbody> <tbody class="text-center" id="caozuo_table"></tbody>
...@@ -689,18 +731,18 @@ ...@@ -689,18 +731,18 @@
<div class="clear"> <div class="clear">
</div> </div>
<div class="followup-modal-list-area"> <div class="followup-modal-list-area">
<table class="table table-striped table-bordered table-hover table-condensed""> <table class="table table-striped table-bordered table-hover table-condensed" ">
<tbody class="text-center" id="caozuo_table2"> <tbody class="text-center " id="caozuo_table2 ">
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer ">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭 <button type="button " class="btn btn-default " data-dismiss="modal ">关闭
</button> </button>
<button type="button" class="btn btn-primary" id="edit_add" data-dismiss="modal"> <button type="button " class="btn btn-primary " id="edit_add " data-dismiss="modal ">
提交 提交
</button> </button>
</div> </div>
...@@ -710,37 +752,37 @@ ...@@ -710,37 +752,37 @@
<!-- /.modal --> <!-- /.modal -->
</div> </div>
<!-- #批量修改客方--> <!-- #批量修改客方-->
<div class="modal fade" id="modal_modify_user" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <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"> <div class="modal-dialog modal-dialog-one ">
<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 ">
&times; &times;
</button> </button>
<h4 class="modal-title"> <h4 class="modal-title ">
批量修改盘方 批量修改盘方
</h4> </h4>
</div> </div>
<div class="modal-body modal-body-one"> <div class="modal-body modal-body-one ">
<br> <br>
<!-- ============添加========== --> <!-- ============添加========== -->
<div class="jian_class"> <div class="jian_class ">
<input name="ues_id" placeholder="请输入经纪人姓名" type="tel" value="" class="phone_jia old_agents form-control"> <input name="ues_id " placeholder="请输入经纪人姓名 " type="tel " value=" " class="phone_jia old_agents form-control ">
<ul class="phone_list"></ul> <ul class="phone_list "></ul>
</div> </div>
<span class="btn3" id="batch">批量修改为&nbsp;&nbsp;</span> <span class="btn3 " id="batch ">批量修改为&nbsp;&nbsp;</span>
<div class="jian_class"> <div class="jian_class ">
<input name="ues_id" placeholder="请输入经纪人姓名" type="tel" value="" class="phone_jia new_agents form-control"> <input name="ues_id " placeholder="请输入经纪人姓名 " type="tel " value=" " class="phone_jia new_agents form-control ">
<ul class="phone_list"></ul> <ul class="phone_list "></ul>
</div> </div>
<br><br><br> <br><br><br>
</div> </div>
<div class="modal-footer"> <div class="modal-footer ">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭 <button type="button " class="btn btn-default " data-dismiss="modal ">关闭
</button> </button>
<button type="button" class="btn btn-primary" id="modify_add" data-dismiss="modal"> <button type="button " class="btn btn-primary " id="modify_add " data-dismiss="modal ">
提交 提交
</button> </button>
</div> </div>
...@@ -750,81 +792,81 @@ ...@@ -750,81 +792,81 @@
<!-- /.modal --> <!-- /.modal -->
</div> </div>
<!--约带看--> <!--约带看-->
<div class="modal fade" id="modal-takeLook" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade " id="modal-takeLook " tabindex="-1 " role="dialog " aria-labelledby="myModalLabel " aria-hidden="true ">
<div class="modal-dialog"> <div class="modal-dialog ">
<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 ">
× ×
</button> </button>
<h4 class="modal-title"> <h4 class="modal-title ">
约带看 约带看
</h4> </h4>
</div> </div>
<div class="modal-body"> <div class="modal-body ">
<table class="table table-striped table-bordered table-hover table-condensed" id=" "> <table class="table table-striped table-bordered table-hover table-condensed " id=" ">
<thead> <thead>
<tr> <tr>
<td> <td>
<form id="form1"> <form id="form1 ">
<span class="fore-span ld-Marheight">姓名:</span> <span class="fore-span ld-Marheight ">姓名:</span>
<span class="fore-span ld-Marheight" id="take_look_name"></span> <span class="fore-span ld-Marheight " id="take_look_name "></span>
<div class="clear"></div> <div class="clear "></div>
<span class="fore-span ld-Marheight">电话:</span> <span class="fore-span ld-Marheight ">电话:</span>
<span class="fore-span ld-Marheight" id="take_look_phone"></span> <span class="fore-span ld-Marheight " id="take_look_phone "></span>
<div class="clear"></div> <div class="clear "></div>
<span class="fore-span ld-Marheight">客户编号:</span> <span class="fore-span ld-Marheight ">客户编号:</span>
<span class="fore-span ld-Marheight" id="take_look_id"></span> <span class="fore-span ld-Marheight " id="take_look_id "></span>
<div class="clear"></div> <div class="clear "></div>
<div class="detail-modal-bargaininfo-commission-inputpar"> <div class="detail-modal-bargaininfo-commission-inputpar ">
<div class="detail-modal-bargaininfo-commission-addarea"> <div class="detail-modal-bargaininfo-commission-addarea ">
<div class="form-group detail-modal-bargaininfo-commission-sec"> <div class="form-group detail-modal-bargaininfo-commission-sec ">
<span class="fore-span ld-Marheight">约带看商铺：</span> <span class="fore-span ld-Marheight ">约带看商铺：</span>
<div class=" "> <div class=" ">
<!--选择式--> <!--选择式-->
<input type="text" class="form-control ld-Marheight look-shop" name=" " autocomplete="off" placeholder="请输入商铺名称、商铺编号、商铺地址关键词"> <input type="text " class="form-control ld-Marheight look-shop " name=" " autocomplete="off " placeholder="请输入商铺名称、商铺编号、商铺地址关键词 ">
<ul class="look-shop-ul"></ul> <ul class="look-shop-ul "></ul>
<!--下拉列表--> <!--下拉列表-->
</div> </div>
<!--<mark href="javascript:;" class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png" /></mark>--> <!--<mark href="javascript:; " class="detail-modal-bargaininfo-commission-cancel-pic "><img src="/resource/image/search_gb.png " /></mark>-->
</div> </div>
</div> </div>
<div id="bargaininfo_commission_add_btn"> <div id="bargaininfo_commission_add_btn ">
<img src="/resource/image/jia2@2x.png" /> <img src="/resource/image/jia2@2x.png " />
</div> </div>
</div> </div>
<!--<div class="form-group"> <!--<div class="form-group ">
<span class="fore-span ld-Marheight">约带看商铺:</span> <span class="fore-span ld-Marheight ">约带看商铺:</span>
<input type="text" class="form-control btn6 ld-Marheight" name=" " autocomplete="off" id="look_shop" placeholder="请输入商铺名称、商铺编号、商铺地址关键词"> <input type="text " class="form-control btn6 ld-Marheight " name=" " autocomplete="off " id="look_shop " placeholder="请输入商铺名称、商铺编号、商铺地址关键词 ">
<ul class="look-shop-ul"></ul> <ul class="look-shop-ul "></ul>
</div>--> </div>-->
<div class="clear"></div> <div class="clear "></div>
<span class="fore-span ld-Marheight">预计到场时间:</span> <span class="fore-span ld-Marheight ">预计到场时间:</span>
<!--<input class="form-control btn6 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="" name=" " type="datetime-local">--> <!--<input class="form-control btn6 ld-Marheight " value=" " data-rule-phoneus="false " data-rule-required="false " id=" " name=" " type="datetime-local ">-->
<!--datetime-local--> <!--datetime-local-->
<!--bootstrap 时间控件--> <!--bootstrap 时间控件-->
<input type="text" value="" class="form_datetime form-control btn6 ld-Marheight" id="look_shop_date" readonly="readonly"> <input type="text " value=" " class="form_datetime form-control btn6 ld-Marheight " id="look_shop_date " readonly="readonly ">
<div class="clear"></div> <div class="clear "></div>
<div class="textarea-con ld-Marheight"> <div class="textarea-con ld-Marheight ">
<span class="fore-span">备注:</span> <span class="fore-span ">备注:</span>
<textarea name="" rows="5" cols="50" id="note_look"></textarea> <textarea name=" " rows="5 " cols="50 " id="note_look "></textarea>
</div> </div>
</form> </form>
</td> </td>
</tr> </tr>
</thead> </thead>
<tbody class="text-center" id="caozuo_table"> <tbody class="text-center " id="caozuo_table ">
</table> </table>
</div> </div>
<div class="modal-footer"> <div class="modal-footer ">
<!--<button type="button" class="btn btn-default" data-dismiss="modal">关闭 <!--<button type="button " class="btn btn-default " data-dismiss="modal ">关闭
</button>--> </button>-->
<button type="button" class="btn btn-primary save-look"> <button type="button " class="btn btn-primary save-look ">
<!--data-dismiss="modal"--> <!--data-dismiss="modal "-->
保存 保存
</button> </button>
</div> </div>
...@@ -834,31 +876,31 @@ ...@@ -834,31 +876,31 @@
<!-- /.modal --> <!-- /.modal -->
</div> </div>
<!--拨打手机号--> <!--拨打手机号-->
<div class="modal fade" id="modal-call" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade " id="modal-call " tabindex="-1 " role="dialog " aria-labelledby="myModalLabel " aria-hidden="true ">
<div class="modal-dialog"> <div class="modal-dialog ">
<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 ">
&times; &times;
</button> </button>
<h4 class="modal-title"> <h4 class="modal-title ">
请使用 请使用
<span id="phone_title"> <span id="phone_title ">
</span> </span>
的手机拨打该虚拟号 的手机拨打该虚拟号
</h4> </h4>
</div> </div>
<div class="modal-body"> <div class="modal-body ">
<div class="modal-body"> <div class="modal-body ">
<input type="hidden" value="" id="delete_id" /> <input type="hidden " value=" " id="delete_id " />
<span id="phone_title2"> <span id="phone_title2 ">
</span> </span>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer ">
<button type="button" class="btn btn-default" data-dismiss="modal" id="unbind_call">没打通 <button type="button " class="btn btn-default " data-dismiss="modal " id="unbind_call ">没打通
</button> </button>
<button type="button" class="btn btn-primary" id="" data-dismiss="modal"> <button type="button " class="btn btn-primary " id=" " data-dismiss="modal ">
已拨打 已拨打
</button> </button>
</div> </div>
......
application/index/view/notice/add_notice_view.html
View file @ 7c715df7
{layout name="global/frame_tpl" /} {layout name="global/frame_tpl" /}
2222 <input type="hidden" class="page-load" id="addNoticeView" />
\ No newline at end of file <style>
.modal-body1 {
height: 600px;
overflow-y: auto;
padding-bottom: 60px;
}
.modal-body2 {
padding: 35px;
/*height: 380px;*/
}
.user-ul {
width: 100%;
height: auto;
padding-bottom: 15px;
float: left;
position: relative;
left: -40px;
}
.user-ul li {
list-style: none;
line-height: 30px;
}
.user-ul2 {
width: 100%;
height: auto;
padding-bottom: 15px;
float: left;
position: relative;
left: -40px;
}
.user-ul2 li {
list-style: none;
line-height: 30px;
}
.input {
width: 16%!important;
}
.text-left {
float: left;
display: inline-block;
height: 26px;
line-height: 26px;
font-size: 14px;
}
.text-right {
float: right;
display: inline-block;
}
#batch {
float: left;
height: 34px;
line-height: 34px;
}
.ld-Marheight {
margin-top: 15px;
}
.phone_list {
margin-top: 32px;
width: 182px;
margin-left: -182px;
}
.phone_jia {
width: 182px;
}
.phone_list li {
height: 22px;
line-height: 22px;
}
.phone_list li:nth-of-type(even) {
display: none;
}
.modal-dialog-one {
width: 668px;
}
.clear {
clear: both;
}
.left {
float: left;
font-size: 12px;
}
.bottom {
margin-top: 30px;
}
.btn6_1 {
width: 80% !important;
float: left;
}
.notice-title {
font-size: 20px;
}
.notice-time {
font-size: 13px;
margin-top: 20px;
}
.notice-text {
font-size: 16px;
margin-top: 30px;
text-indent: 2em;
}
.col-sm-9 .btn5 {
width: 30%!important;
}
.img-pre-ul {
padding-left: 0;
overflow: hidden;
/*width: 100%;*/
}
/*图片上传相关样式*/
.img-pre-ul>li {
list-style: no;
float: left;
width: 210px;
height: 170px;
overflow: hidden;
margin-right: 10px;
margin-top: 10px;
}
.img-pre-ul>li.pdf-pre-li {
height: 70px;
}
.img-pre-ul>li>img {
float: left;
width: 210px;
height: 140px;
object-fit: contain;
cursor: pointer;
}
.img-pre-ul>li>a {
float: left;
width: 210px;
text-align: center;
line-height: 30px;
}
.img-pre-ul>li>a.pdf-pre-a {
line-height: 20px;
word-break: break-all;
}
/*图片点击放大预览区域的样式*/
#img_mask_area {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
overflow: hidden;
z-index: 1999;
background-color: rgba(0, 0, 0, .3);
display: none;
}
#img_mask_area>img {
width: 900px;
height: 700px;
object-fit: contain;
position: absolute;
left: 50%;
top: 50%;
margin-left: -450px;
margin-top: -350px;
}
/*上传图片列表 样式*/
.form-group {
margin: 10px;
}
.input-100-width {
width: 100px!important;
}
.input-360-width {
width: 360px!important;
}
.textarea-500-width {
width: 500px!important;
}
.list-group-item>.full-width-100+.full-width-100 {
padding-top: 10px;
}
.list-group-item>.full-width-100>label {
width: 60px;
}
.list-group-item>.full-pic-area>label {
width: 120px;
}
.delet-pic-btn {
color: red;
}
#modal_content_add {
width: 900px;
}
</style>
<!--导航star-->
<!-- Page Content -->
<div id="page-content-wrapper">
<div class="container">
<div class="row">
<div class="col-lg-10 col-lg-offset-0">
<div class="panel panel-default">
<div class="panel-heading breadcrumb">
<li>
<a href="#">公告</a>
</li>
<li class="active">新增公告</li>
<div class="pull-right">
<ul class="bread_btn">
<li>
</li>
</ul>
</div>
</div>
<div class="panel-body">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover table-condensed">
<thead>
</thead>
<tbody id="" class="text-center">
<div class="" id="modal_add_user">
<div class="">
<div class="" id="">
<div class="">
</button>
</div>
<div class="">
<form class="form-horizontal" action="/agents/add_user" id="">
<div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label">标题：</label>
<div class="col-sm-9">
<input type="text" class="form-control btn6" name="user_name" id="announcement_title" placeholder="请输入标题">
<span class="use-span text-danger">（50字以内，显示在首页列表）</span>
</div>
</div>
<!--<div class="form-group">
<label class="col-sm-2 control-label">标签：</label>
<div class="col-sm-9">
<select class="form-control btn5 input" name="" id="district_id2" title=" ">
<option value="">请选择标签</option>
</select>
</div>
</div>-->
<div class="form-group">
<label class="col-sm-2 control-label">内容</label>
<div class="col-sm-9">
<div class="form-group" style="width: 100%;">
<!--<label for="" style="width: 100%;">内容</label>-->
<div class="input-group" style="width: 100%;" id="dajiangtang">
<?php
create_editor('goods_sup_id','');
?>
</div>
</div>
</div>
</div>
</form>
</div>
<div class="">
<button type="button" class="btn btn-primary" id="add_announcement">
保存
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- /#wrapper -->
<!-- /#删除模态框 -->
<div class="modal fade" id="modal-delete" 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">
<div class="modal-body">
<input type="hidden" value="" id="delete_id" /> 确认删除吗？
</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="confirm_delete">
删除
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<div id="img_mask_area" title="点击任意位置可关闭">
<img />
</div>
\ No newline at end of file
application/index/view/notice/index.html
View file @ 7c715df7
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
} }
.modal-body2{ .modal-body2{
padding: 35px; padding: 35px;
height: 380px; /*height: 380px;*/
} }
.user-ul { .user-ul {
...@@ -135,7 +135,9 @@ ...@@ -135,7 +135,9 @@
<div class="pull-right"> <div class="pull-right">
<ul class="bread_btn"> <ul class="bread_btn">
<li> <li>
<a href="#modal_add_user" data-toggle="modal" class="btn btn-default add_alert"><i class="icon-plus"></i> 新增公告 <!--<a href="#modal_add_user" data-toggle="modal" class="btn btn-default add_alert"><i class="icon-plus"></i> 新增公告
</a>-->
<a href="addNoticeView.html" class="btn btn-default add_alert" target="_self"><i class="icon-plus"></i> 新增公告
</a> </a>
</li> </li>
</ul> </ul>
......
application/model/Users.php
View file @ 7c715df7
...@@ -304,7 +304,8 @@ class Users extends Model ...@@ -304,7 +304,8 @@ class Users extends Model
public function getClient($id) public function getClient($id)
{ {
if ($id) { if ($id) {
$field = "a.id as user_id,a.user_nick,a.user_name,a.user_phone,a.sex,a.agent_id,a.industry_type,a.price_demand,a.area_demand,a.create_time,b.name,b.phone"; $field = "a.id as user_id,a.user_nick,a.user_pic,a.other_pic,a.user_name,a.user_phone,a.sex,a.agent_id,
a.industry_type,a.price_demand,a.area_demand,a.create_time,b.name,b.phone,a.first_login_time";
$data = $this->field($field) $data = $this->field($field)
->alias('a') ->alias('a')
...@@ -313,6 +314,14 @@ class Users extends Model ...@@ -313,6 +314,14 @@ class Users extends Model
$data['agents'] = $data['name'] . '-' . $data['phone']; $data['agents'] = $data['name'] . '-' . $data['phone'];
$data['user_phone'] = hide_customer_phone($data['user_phone']); $data['user_phone'] = hide_customer_phone($data['user_phone']);
if (empty($data['user_pic'])) {
$data['user_pic'] = $data['other_pic'];
} else {
$data['user_pic'] = HEADERIMGURL . $data['user_pic'];
}
unset($data['other_pic']);
unset($data['name']); unset($data['name']);
unset($data['phone']); unset($data['phone']);
} else { } else {
......
public/resource/js/addNoticeView.js 0 → 100644
View file @ 7c715df7
define (['doT', 'text!temp/notice_template_tpl.html','ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker",'pagination','bootstrapJs'], function (doT, template) {
var user = {
pageNo: 1, /*第几页*/
pageSize: 15, /*每页显示多少条*/
user_id : 0,
urls: '',
agent_id_two:'',
agent_id2 : 0,
init: function () {
//初始化dot
$ ("body").append (template);
user.event ();
},
event: function () {
var _doc = $(document);
// 新增公告
$ (document).delegate ("#add_announcement", "click", function () {//新增客户
user.user_id = $ (this).attr ("data-id");
user.add_announcement();
});
},
add_announcement : function () {
var params = {};
params.title = $("#announcement_title").val();
// params.content = $("#announcement_content").val();
var _dajiangtangObj = $('#dajiangtang'); //大讲堂
var _dajiangtangVal = getCKeditorValue("goods_sup_id");
params.content=_dajiangtangVal;
if (params.title == '') {
alert('标题不能为空');
$("#announcement_title").focus();
return ;
}
// if (params.title.length > 20) {
// alert('标题字数20以内');
// $("#announcement_title").focus();
// return ;
// }
if (params.content == '') {
alert('内容不能为空');
$("#announcement_content").focus();
return ;
}
// if (params.content.length > 250) {
// alert('公告内容字数250以内');
// $("#announcement_content").focus();
// return ;
// }
$.ajax ({
url: '/index/addNotice',
type: 'POST',
async: true,
data: params,
dataType: 'json',
success: function (data) {
if (data.code == 200) {
$ ("#modal_add_user").modal ('hide');//提交成功 关闭模态框
alert('提交成功');
window.location.href = '/index/noticeIndex';
} else {
alert(data.msg);
}
}
});
},
};
return user;
});
public/resource/js/notice.js
View file @ 7c715df7
...@@ -64,11 +64,7 @@ define (['doT', 'text!temp/notice_template_tpl.html','ckfinder','ckfinderStart', ...@@ -64,11 +64,7 @@ define (['doT', 'text!temp/notice_template_tpl.html','ckfinder','ckfinderStart',
}); });
// ===========================新增公告==================== // ===========================新增公告====================
$ (document).delegate ("#add_announcement", "click", function () {//新增客户
user.user_id = $ (this).attr ("data-id");
user.add_announcement();
});
$ (document).delegate (".announcement-details", "click", function () {//点击公告详情 $ (document).delegate (".announcement-details", "click", function () {//点击公告详情
$('.notice-title').html($ (this).attr ("data-title")); $('.notice-title').html($ (this).attr ("data-title"));
$('.notice-time').html($ (this).attr ("data-createTime")); $('.notice-time').html($ (this).attr ("data-createTime"));
...@@ -310,47 +306,6 @@ define (['doT', 'text!temp/notice_template_tpl.html','ckfinder','ckfinderStart', ...@@ -310,47 +306,6 @@ define (['doT', 'text!temp/notice_template_tpl.html','ckfinder','ckfinderStart',
} }
}); });
}, },
add_announcement : function () {
var params = {};
params.title = $("#announcement_title").val();
params.content = $("#announcement_content").val();
if (params.title == '') {
alert('标题不能为空');
$("#announcement_title").focus();
return ;
}
// if (params.title.length > 20) {
// alert('标题字数20以内');
// $("#announcement_title").focus();
// return ;
// }
if (params.content == '') {
alert('内容不能为空');
$("#announcement_content").focus();
return ;
}
// if (params.content.length > 250) {
// alert('公告内容字数250以内');
// $("#announcement_content").focus();
// return ;
// }
$.ajax ({
url: '/index/addNotice',
type: 'POST',
async: true,
data: params,
dataType: 'json',
success: function (data) {
if (data.code == 200) {
$ ("#modal_add_user").modal ('hide');//提交成功 关闭模态框
user.getList(1);
alert('提交成功')
} else {
alert(data.msg);
}
}
});
},
delete_user : function(params) { delete_user : function(params) {
$.ajax ({ $.ajax ({
url: '/index/delNotice', url: '/index/delNotice',
......
public/resource/js/user.js
View file @ 7c715df7
...@@ -677,6 +677,8 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart', ...@@ -677,6 +677,8 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
params.user_nick = $("input[name='user']").val(); params.user_nick = $("input[name='user']").val();
params.phone = $("input[name='phone']").val(); params.phone = $("input[name='phone']").val();
params.id = $("input[name='userID']").val(); params.id = $("input[name='userID']").val();
// user_vip_select
// params.id = $("#user_vip_select").val();//vip筛选
params.phone = $("input[name='phone']").val(); params.phone = $("input[name='phone']").val();
params.invite_phone = $("input[name='invite_phone']").val(); params.invite_phone = $("input[name='invite_phone']").val();
params.start_date = $("#start_date").val(); params.start_date = $("#start_date").val();
......
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