Skip to content

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

Merge branches 'test' and 'wx0604' of gitee.com:zwyjjc/tl_estate into test

parents 07550b86 e1ced0e7
Show whitespace changes
Inline Side-by-side
Showing with 143 additions and 36 deletions
.project
View file @ eae4fdcc
......@@ -51,5 +51,14 @@
<arguments>1.0-name-matches-false-false-node_modules</arguments>
</matcher>
</filter>
<filter>
<id>1530191912321</id>
<name></name>
<type>26</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-node_modules</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
application/index/view/agent/agent.html
View file @ eae4fdcc
......@@ -2,7 +2,7 @@
<input type="hidden" class="page-load" id="agent" />
<!--关联经纪人列表liudanjs文件-->
<style>
.J_preview{
.J_preview {
width: 30px;
height: 30px;
border-radius: 15px;
......@@ -22,8 +22,8 @@
<ul class="bread_btn">
<li>
<a href="#modal-edit" data-toggle="modal" class="btn btn-default agent_add">
<i class="icon-plus"></i>
新增</a>
<i class="icon-plus"></i> 新增
</a>
</li>
</ul>
</div>
......@@ -36,12 +36,16 @@
<tr>
<td colspan="11">
<form id="form_search">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="industry_type" placeholder="角色"
type="text" value="" name="groupname">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish" placeholder="门店"
type="text" value="" name="store_name">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="id" placeholder="姓名/手机号"
name="search" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="industry_type" placeholder="角色" type="text" value="" name="groupname">
<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish" placeholder="门店"
type="text" value="" name="store_name">-->
<select class="form-control btn2 input ld-Marheight" name="" id="district_id">
<option value="">客方所属部门</option>
</select>
<select class="form-control btn2 input ld-Marheight" name="" id="guest_stores">
</select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="id" placeholder="姓名/手机号" name="search" type="text" value="">
<span class="btn btn-default btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-default btn3 ld-Marheight" id="reset">重置</span>
......@@ -58,11 +62,9 @@
<th>手机号</th>
<th>角色</th>
<!--2.2版本 -->
<!--<th>评价次数</th>
<th>分数</th>-->
<th>评价次数</th>
<th>分数</th>
<th>操作</th>
</tr>
</thead>
<tbody id="agentlist">
......@@ -96,8 +98,7 @@
<form class="form-horizontal">
<div class="form-group">
<label class="col-sm-3 control-label">用户名：</label>
<input class="form-control btn6" data-rule-buga="false" data-rule-required="true" name="name" placeholder="登录账户所用名称" type="text"
value="" id="title">
<input class="form-control btn6" data-rule-buga="false" data-rule-required="true" name="name" placeholder="登录账户所用名称" type="text" value="" id="title">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">电话（登录账号）：</label>
......@@ -171,7 +172,6 @@
<!-- /.modal -->
</div>
<!--变更角色-->
<div class="modal fade" id="modal-user" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
......@@ -206,7 +206,7 @@
<!-- /.modal -->
</div>
<!--绑定手机 2.2版本-->
<div class="modal fade" id="modal-unbundling" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal fade" id="modal-unbundling" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
......
application/index/view/collection/getCollection.html
View file @ eae4fdcc
......@@ -272,7 +272,7 @@
<div class="modal-footer">
<!--<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>-->
<button type="button" class="btn btn-primary submit_edit" id=" " data-dismiss="modal">
<button type="button" class="btn btn-primary" id="saveBtn" data-dismiss="modal">
保存
</button>
</div>
......
application/index/view/member/users_list.html
View file @ eae4fdcc
......@@ -207,7 +207,7 @@
</select>
<select class="form-control btn2 margin-top-ld input" name="" id="district_id" title="
客方所属部门、客方所属门店 与邀请人所属部门、邀请人所属门店 不作为并列筛选项">
<option value="">客方所属部门</option>
<option value="0">客方所属部门</option>
</select>
......@@ -219,7 +219,7 @@
<!--邀请人-->
<select class="form-control btn2 margin-top-ld input" name="" id="district_id2" title="
客方所属部门、客方所属门店 与邀请人所属部门、邀请人所属门店 不作为并列筛选项">
<option value="">邀请人所属部门</option>
<option value="0">邀请人所属部门</option>
</select>
......@@ -242,7 +242,7 @@
<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_modify_user" data-toggle="modal" class="btn btn-info btn3 margin-top-ld"><i class="icon-plus"></i> 批量修改客方
<a href="#modal_modify_user" data-toggle="modal" class="btn btn-info btn3 margin-top-ld"><i class="icon-plus"></i> 批量修改盘方
</a>
<!-- <span class="btn btn-info btn3 margin-top-ld" id="modify">批量修改客方</span> -->
......@@ -565,7 +565,7 @@
&times;
</button>
<h4 class="modal-title">
批量修改客方
批量修改盘方
</h4>
</div>
<div class="modal-body modal-body-one">
......
public/appnew/src/components/achieveMain/achieveFork.vue
View file @ eae4fdcc
......@@ -187,6 +187,7 @@
</script>
<style scoped>
/*注释部分*/
nav>.nav-main {
display: flex;
box-sizing: border-box;
......
public/resource/js/agent.js
View file @ eae4fdcc
......@@ -12,11 +12,10 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'css!style/home.css', 'pagin
event: function () {
var _doc = $(document);
agent.getDistrict(function(){
_doc.on('input', '[name=district_id]', function(){
_doc.on('input', '#district_id', function(){
var _this = $(this);
var _id = _this.val();
var _objTemp = _this.parent().next().find('select');
_objTemp.html('');//先清空
_this.next().html('');//先清空
if(_id && _id != '0'){
agent.getDistrictStoreList(_id, function(_data){
// var _str = '';
......@@ -24,12 +23,12 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'css!style/home.css', 'pagin
$.each(_data, function(i,item) {
_str += '<option value="'+item.id+'">'+item.store_name+'</option>';
});
_objTemp.html(_str);
_this.next().html(_str);//先清空
});
}else{
};
});
})
});
$('#search').click(function (pageNo) {
agent.getList(1);
});
......@@ -245,6 +244,9 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'css!style/home.css', 'pagin
params.search = $("input[name='search']").val();
params.groupname = $("input[name='groupname']").val();
params.store_name = $("input[name='store_name']").val();
//后端加入两个字段搜索
params.district_id=$("#district_id").val();
params.store_id=$("#guest_stores").val();
$.ajax({
url: '/index/AgentList',
type: 'GET',
......@@ -298,7 +300,7 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'css!style/home.css', 'pagin
$.each(data.data, function(i,item) {
str += '<option value="'+item.id+'">'+item.district_name+'</option>';
});
$('[name=district_id]').append(str);
$('#district_id').append(str);
fn && fn();
}
}
......
public/resource/js/getCollection.js
View file @ eae4fdcc
......@@ -21,7 +21,7 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
event: function() {
var _doc = $(document);
var _imgMaskObj = $('#img_mask_area'); //预览大图的mask
var _imgUploadLunbo = $('#xiangqing_pic_ul'); //详情页轮播图ul
_doc.on('click', 'a[href="#modal-time"]', function(e){
follow.house_id = $ (this).attr ("data-id");
e.preventDefault();
......@@ -32,6 +32,20 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
$("#search").click(function() {
follow.getList(1);
});
//点击收款图片 2.2版本
// $(".add-pic").click(function() {
// follow.getaddPicList();
// });
_doc.on('click', '.add-pic', function(){
follow.getaddPicList();
});
$("#reset").click(function() { //重置
document.getElementById("form_search").reset();
});
......@@ -109,7 +123,7 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
url: '/index/delHouseFile',
data: {
'id': _imgId,
'house_id': _id
'house_id': 3104,
},
timeout: 30000,
dataType: 'json',
......@@ -140,7 +154,6 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
}
};
});
//图片预览点击放大事件
_doc.on('click', '.img-pre-ul>li>img', function(e) {
_imgMaskObj.show().find('img').attr('src', this.src);
......@@ -148,9 +161,48 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
_imgMaskObj.click(function(e) {
this.style.display = 'none';
});
//图片上传 2.2版本
//保存上传的图片
_doc.on('click', '#saveBtn', function(e) {
var _this = $(this);
var _data={
id:3104,
};
e.preventDefault();
e.stopPropagation();
var _imgUploadLunbo = $('#xiangqing_pic_ul'); //详情页轮播图ul
var _xiangqingPicObj = _imgUploadLunbo.find('li>img');
var _urlCut = location.origin + '/resource/lib/Attachments/images/';//要截取的部分url
$.each(_xiangqingPicObj, function(i, item) {
_data['slide_show[' + i + ']'] = item.src.replace(_urlCut, '');
});
var _imgId = _this.parent().attr('data-imgid');
$.ajax({
type: 'POST',
url: '/index/houseEdit',
data: _data,
// timeout: 30000,
dataType: 'json',
beforeSend: function() {},
success: function(_data) {
if(typeof _data === 'object') {
} else {
alert('数据错误');
};
},
error: function() {
alert('enter error');
},
complete: function(xhr, textStatus){
if(textStatus === 'timeout') {
//处理超时的逻辑
alert('请求超时,请重试');
};
}
});
});
//图片上传 2.2版本
},
addphone2:function(obj){
......@@ -202,6 +254,34 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
}
});
},
//点击收款图片 调用的接口
getaddPicList: function() { //提交
var _imgUploadLunbo = $('#xiangqing_pic_ul'); //详情页轮播图ul
var _urlCut = location.origin + '/resource/lib/Attachments/images/';//要截取的部分url
_imgUploadLunbo.empty();
$.ajax({
'type': 'GET',
'url': '/index/houseEdit',
data: {
"id": 3104,
},
dataType: "json",
success: function(data) {
if(data.code == 200) {
var _data = data['data'];
for(var i in _data['slide_show']) {
_imgUploadLunbo.append('<li data-imgid="{id}"><img title="点击查看大图" src="{0}" /><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
'0': _urlCut + _data['slide_show'][i]['img_name'],
'id': _data['slide_show'][i]['id']
}));
};
// follow.getList(0);
} else {
}
}
});
},
// 导出列表
exportList: function(pageNo) {
console.log(2);
......
public/resource/js/user.js
View file @ eae4fdcc
......@@ -398,6 +398,21 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
user.pageNo = pageNo;
var params = {};
// 并列搜索
// if($("#district_id").val()!=0){
// $("#district_id2").val('0');
// $("#guest_stores2").val('');
// console.log($("#district_id2").val());
// console.log($("#guest_stores2").val());
// };
// if($("#district_id2").val()!=0){
// $("#district_id1").val('0');
// $("#guest_stores1").val('');
// console.log($("#district_id").val());
// console.log($("#guest_stores").val());
// };
// 输入 name
// params.name = $("input[name='user']").val();
params.phone = $("input[name='phone']").val();
......
public/resource/template/agent_template_tpl.html
View file @ eae4fdcc
......@@ -13,8 +13,8 @@
<td>[%= it[item]["phone"] %]</td>
<td>[%= it[item]["groupname"] %]</td>
<!--增加评价次数 分数2.2-->
<!--<td>[%= it[item]["groupname"] %]</td>
<td>[%= it[item]["groupname"] %]</td>-->
<td>[%= it[item]["groupname"] %]</td>
<td>[%= it[item]["groupname"] %]</td>
<!--<td><span class="fa fa-check text-success"></span></td>-->
<td>
<a class="btn1 btn-success edit" href="#modal-edit" data-toggle="modal" data-id='[%= it[item]["id"] %]'>编辑</a>
......@@ -31,7 +31,7 @@
<a href="#modal-user" class="btn1 btn-danger" id='role' href="#modal-edit" data-toggle="modal" data-id='[%= it[item]["id"] %]'>角色设置</a>
[% } %]
<!--增加绑定手机号按钮 2.2版本-->
<!--<a class="btn1 btn-success" href="#modal-unbundling" data-toggle="modal" data-id='[%= it[item]["id"] %]'>绑定手机</a>-->
<a class="btn1 btn-success" href="#modal-unbundling" data-toggle="modal" data-id='[%= it[item]["id"] %]'>绑定手机</a>
</td>
</tr>
......
public/resource/template/get_collection_template_tpl.html
View file @ eae4fdcc
......@@ -13,7 +13,7 @@
<td>[%= it[item]['house_number'] %]</td>
<td>
<!--增加收款图片 2.2版本-->
<!--<a class="btn1 btn-info add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>收款图片</a>-->
<a class="btn1 btn-info add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>收款图片</a>
<a class="btn1 btn-info timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
<a class="btn1 btn-info submit_edit2" href="#modal-linetime" data-toggle="modal" data-id='[%= it[item]["id"]%]' data-money='[%= it[item]["real_money"] %]'>编辑</a>
</td>
......
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