Skip to content

T
tl_estate
Commit ae87a3f6 authored by hujun's avatar hujun
Browse files
Options

Merge remote-tracking branch 'origin/test' into test

parents 134c8d75 408de364
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 24 deletions
application/api/controller/AppointmentTime.php
View file @ ae87a3f6
......@@ -153,6 +153,7 @@ class AppointmentTime extends Basic
$where_["status"] = array( "in", array( "0,1" ) );
$where_["user_id"] = array( "eq", $params["user_id"] );
$where_["applies_id"] = 0;
$result = $this->appointmentTimeModel->getAppointWatchShopList($pageNo, $pageSize, "id desc", $field, $where_);
//获取图片信息
......
application/index/view/member/users_list.html
View file @ ae87a3f6
......@@ -45,6 +45,9 @@
height: 34px;
line-height: 34px;
}
ld-Marheight{
margin-top: 15px;!
}
</style>
<!--导航star-->
......@@ -96,16 +99,16 @@
<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">
<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="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">
<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>
<input class="form-control btn2 margin-top-ld" data-rule-phoneus="false" data-rule-required="false" name="user" placeholder="客户姓名" type="text" value="">
<!-- <div class="row"></div> -->
<!-- <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="邀请人手机号(普通用户)" type="text" value="">
......@@ -136,13 +139,10 @@
<option value="1">已租</option>
<option value="-1">无效</option>
</select>
<!-- <span class="btn btn-default btn3 margin-top-ld search_1">搜索</span>
<span class="btn btn-default btn3 margin-top-ld search_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" id="search">搜索</span>
<span class="btn btn-info btn3 margin-top-ld" id="reset">重置</span>
<!-- <a href="#modal_add_user" data-toggle="modal" class="btn btn-default"><i class="icon-plus"></i>
添加客户</a> -->
<a href="#modal_modify_user" data-toggle="modal" class="btn btn-info btn3 margin-top-ld"><i class="icon-plus"></i>
批量修改客方</a>
......@@ -403,9 +403,9 @@
</div>
<div class="modal-body">
<br>
<input class="form-control btn5" data-rule-phoneus="false" data-rule-required="false" name="user1" placeholder="请输入经纪人姓名" type="text" value="">
<input class="form-control btn5" data-rule-phoneus="false" data-rule-required="false" name="old_agents" placeholder="请输入经纪人姓名" type="text" value="">
<span class="btn3" id="batch">批量修改为</span>
<input class="form-control btn5" data-rule-phoneus="false" data-rule-required="false" name="phone1" placeholder="请输入经纪人姓名" type="text" value="">
<input class="form-control btn5" data-rule-phoneus="false" data-rule-required="false" name="new_agents" placeholder="请输入经纪人姓名" type="text" value="">
<br><br><br>
</div>
<div class="modal-footer">
......
public/resource/js/banner.js
View file @ ae87a3f6
......@@ -35,15 +35,15 @@ define (['doT', 'text!temp/banner_template_tpl.html', 'ckfinder', 'ckfinderStart
params.cover_image = $ ("#cover_image").val ();
params.sort = $ ("#sort").val ();
var banner_type = $("input[name=banner_type]:checked").val();
var page_type = $("#type").val();
if(page_type == 0 && banner_type == 0 ){
var banner_type = $ ("input[name=banner_type]:checked").val ();
var page_type = $ ("#type").val ();
if (page_type == 0 && banner_type == 0) {
params.type = 0;
}else if(page_type == 0 && banner_type == 1 ){
} else if (page_type == 0 && banner_type == 1) {
params.type = 2;
}else if(page_type == 1 && banner_type == 0 ){
} else if (page_type == 1 && banner_type == 0) {
params.type = 1;
}else if(page_type == 1 && banner_type == 1 ){
} else if (page_type == 1 && banner_type == 1) {
params.type = 3;
}
......@@ -84,9 +84,27 @@ define (['doT', 'text!temp/banner_template_tpl.html', 'ckfinder', 'ckfinderStart
$ ("#editor_modal_title").html ("编辑广告");
var item = $ (this).parents ("tr").find ("td");
$ ("#id").val ($ (this).attr ("data-id"));
var type = item.eq (2).html ();
if (type.trim() == "用户app") {
$ ("input[name='banner_type']").get (0).checked = true;
} else {
$ ("input[name='banner_type']").get (1).checked = true;
}
$ ("#title").val (item.eq (0).html ());
$ ("#url").val (item.eq (3).html ());
$ ("#cover_image").val (item.eq (1).find ("input").val ());
console.log($.trim(item.eq (2).html ()));
if($.trim(item.eq (2).html ())=="用户app"){
// $ ("#client").attr ("checked",true);/prop能够反复改变 attr不能反复改变属性
$ ("#client").prop ("checked",true);
// $ ("#agent_side").attr ("checked",false);
}
if($.trim(item.eq (2).html ())=="经纪人app"){
// $ ("#agent_side").attr ("checked",true)
$ ("#agent_side").prop("checked", true);
console.log(66)
}
$ ("#sort").val (item.eq (4).html ());
});
......@@ -103,9 +121,9 @@ define (['doT', 'text!temp/banner_template_tpl.html', 'ckfinder', 'ckfinderStart
params.pageSize = banner.pageSize;
var url = '';
var requestPath = window.location.pathname;
if(requestPath.indexOf("advertising") > 0 ){
if (requestPath.indexOf ("advertising") > 0) {
url = '/admin.php/index/getPopList';
}else{
} else {
url = '/admin.php/index/bannerList';
}
$.ajax ({
......
public/resource/js/user.js
View file @ ae87a3f6
......@@ -58,10 +58,16 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
user.user_id = $ (this).attr ("data-id");
user.add_user();
});
// 跟进的提交按钮 点击
$ (document).delegate ("#edit_add", "click", function () {
user.edit_add();
});
// 批量修改客方
$ (document).delegate ("#modify_add", "click", function () {
user.modify_add();
});
$ (document).delegate (".caozuo", "click", function () {//点击操作跟进详情
user.user_id = $ (this).attr ("data-id");
user.Caozuo();
......@@ -204,6 +210,40 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
}
});
},
//
modify_add : function () {//modify_add批量修改客方
var old_agents_text = $("input[name = 'old_agents']").val();
var new_agents_text = $("input[name = 'new_agents']").val();
if (old_agents_text == '') {
alert('请输入经纪人内容为空');
return false;
}
if (new_agents_text == '') {
alert('请输入经纪人内容为空');
return false;
}
$.ajax ({
url: '/index/batchEditCustomer',
type: 'POST',
async: true,
data: {
// "user_id" : user.user_id,
// "content" : genj_text,
// "user_status": user_status
},
dataType: 'json',
success: function (data) {
if (data.code != 200) {
console.log(data);
alert(data.msg);
}
}
});
},
// ====================新增客户页面==================
Caozuo:function(){//获取跟进详情的数据
$.ajax({
......@@ -237,13 +277,15 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
user.pageNo = pageNo;
var params = {};
// 输入 name
params.name = $("input[name='user']").val();
// params.name = $("input[name='user']").val();
params.phone = $("input[name='phone']").val();
params.invite_phone = $("input[name='invite_phone']").val();
params.start_date = $("#start_date").val();
params.end_date = $("#end_date").val();
params.follow_start = $("#follow_start").val();
params.follow_end = $("#follow_end").val();
params.registration_start=$("#registration_start").val()
params.registration_end=$("#registration_end").val()
params.login_status = $("select[name=login_status]").val();
params.activate = $("select[name=activate]").val();
params.rent_user=$("select[name=lguest_status]").val();
......
public/resource/template/banner_template_tpl.html
View file @ ae87a3f6
......@@ -8,6 +8,7 @@
<img src='/resource/lib/Attachments/[%= it[item]["pic_path"] %]' class="diagram-image J_preview"
data-bimg='/resource/lib/Attachments/[%= it[item]["pic_path"] %]'>
</td>
<td>
[% if( it[item]["type"]==0 || it[item]["type"]==1) { %]
用户app
......@@ -88,11 +89,11 @@
<label class="col-sm-3 control-label">显示：</label>
<div class="col-sm-9">
<label>
<input type="radio" name="banner_type" value="0" checked>
<input type="radio" name="banner_type" value="0" id="client">
用户端
</label>
<label>
<input type="radio" name="banner_type" value="1">
<input type="radio" name="banner_type" value="1" id="agent_side">
经纪人端
</label>
</div>
......
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