Skip to content

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

Merge remote-tracking branch 'origin/0702-v.2.2.0' into 0702-v.2.2.0

parents 536d6d55 dbdba08d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 268 additions and 180 deletions
application/index/controller/Collection.php
View file @ 6cf08438
...@@ -77,7 +77,7 @@ class Collection extends Basic ...@@ -77,7 +77,7 @@ class Collection extends Basic
} }
if (empty($this->params['excel'])) { if (empty($this->params['excel'])) {
$field = 'a.id,a.order_id,a.create_time,c.user_name,c.user_phone,a.money,a.real_money,a.pay_type,a.house_number,a.type,d.internal_title,d.internal_address,a.source'; $field = 'a.id,a.father_id,a.order_id,a.create_time,c.user_name,c.user_phone,a.money,a.real_money,a.pay_type,a.house_number,a.type,d.internal_title,d.internal_address,a.source';
$data['data']['list'] = $order->getAddPayLogOrderListLmit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where); $data['data']['list'] = $order->getAddPayLogOrderListLmit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
$data['data']['total'] = $order->getAddPayLogOrderListLmitTotal($where); $data['data']['total'] = $order->getAddPayLogOrderListLmitTotal($where);
$data['data']['money_total'] = $order->getMoneyTotal(); //总额 $data['data']['money_total'] = $order->getMoneyTotal(); //总额
......
application/index/view/collection/getCollection.html
View file @ 6cf08438
...@@ -97,83 +97,106 @@ ...@@ -97,83 +97,106 @@
margin-top: -350px; margin-top: -350px;
} }
/*上传图片列表 样式*/ /*上传图片列表 样式*/
.form-group { .form-group {
margin: 10px; margin: 10px;
} }
.input-100-width { .input-100-width {
width: 100px!important; width: 100px!important;
} }
.input-360-width { .input-360-width {
width: 360px!important; width: 360px!important;
} }
.textarea-500-width { .textarea-500-width {
width: 500px!important; width: 500px!important;
} }
.list-group-item>.full-width-100+.full-width-100 { .list-group-item>.full-width-100+.full-width-100 {
padding-top: 10px; padding-top: 10px;
} }
.list-group-item>.full-width-100>label { .list-group-item>.full-width-100>label {
width: 60px; width: 60px;
} }
.list-group-item>.full-pic-area>label { .list-group-item>.full-pic-area>label {
width: 120px; width: 120px;
} }
.delet-pic-btn{
color:red; .delet-pic-btn {
} color: red;
/*css样式*/ }
.img-cont{ /*css样式*/
width:1000px;
height:570px; .img-cont {
border:2px solid #317ef3; width: 1000px;
margin:50px auto; height: 570px;
} border: 2px solid #317ef3;
margin: 50px auto;
.img-cont>div{ }
width:300px;
height:260px; .img-cont>div {
border:1px solid #777; width: 300px;
float:left; height: 260px;
margin:20px 0 0 20px; border: 1px solid #777;
} float: left;
margin: 20px 0 0 20px;
.img-cont>div>div{ }
width:300px;
height:220px; .img-cont>div>div {
border:1px solid red; width: 300px;
} height: 220px;
border: 1px solid red;
.img-cont>div>a{ }
width:60px;
height:30px; .img-cont>div>a {
border-radius:4px; width: 60px;
line-height: 30px; height: 30px;
text-align: center; border-radius: 4px;
color:#fff; line-height: 30px;
display: block; text-align: center;
background: #317ef3; color: #fff;
margin:5px 0 0 0px; display: block;
cursor: pointer; background: #317ef3;
} margin: 5px 0 0 0px;
cursor: pointer;
.hide{ }
display: none !important;
} .hide {
.result{ display: none !important;
width: 600px; }
}
.result>img{ .result,.result2 {
width: 200px; width: 600px;
height: 200px; }
}
/*css样式*/ .result>img,.result2>img{
width: 200px;
height: 200px;
}
#container_body{
position: relative;
}
#file_input {
opacity: 0;
position: absolute;
top: 0;
left: 145px;
height: 35px;
width: 80px;
}
.out-style {
position: absolute;
top: 0;
left: 60px;
}
/*css样式*/
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
...@@ -303,24 +326,25 @@ ...@@ -303,24 +326,25 @@
<div class="modal-body"> <div class="modal-body">
<ul class="list-group"> <ul class="list-group">
<li class="list-group-item"> <li class="list-group-item">
<div class="form-group full-width-100 full-pic-area"> <div class="form-group full-width-100 full-pic-area">
<!--input上传图片--> <!--input上传图片-->
<div id="container_body"> <div id="container_body">
<label>请选择一个图像文件：</label> <label>请选择一个图像文件：</label>
<input type="file" id="file_input"/> <button type="button btn2" class="btn btn-default">上传图片</button>
<input type="file" id="file_input"/>
</div> </div>
</div> </div>
<ul class="img-pre-ul" id="xiangqing_pic_ul"> <ul class="img-pre-ul" id="xiangqing_pic_ul">
</ul> </ul>
</li> </li>
</ul> </ul>
</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="saveBtn" data-dismiss="modal"> <button type="button btn2" class="btn btn-primary" id="saveBtn" data-dismiss="modal">
保存 保存
</button> </button>
</div> </div>
...@@ -330,5 +354,5 @@ ...@@ -330,5 +354,5 @@
<!-- /.modal --> <!-- /.modal -->
</div> </div>
<div id="img_mask_area" title="点击任意位置可关闭"> <div id="img_mask_area" title="点击任意位置可关闭">
<img /> <img />
</div> </div>
\ No newline at end of file \ No newline at end of file
public/app/js/customerinfo_details_new.js
View file @ 6cf08438
...@@ -279,8 +279,11 @@ function loadMain(){ ...@@ -279,8 +279,11 @@ function loadMain(){
var _this = $(this); var _this = $(this);
if((_this.attr('data-markid') == '1') || (_this.attr('data-markid') == '4')){ if((_this.attr('data-markid') == '1') || (_this.attr('data-markid') == '4')){
//如果选择了未打通，或取消拨打，则直接关闭 //如果选择了未打通，或取消拨打，则直接关闭
_genjinModal.hide();//跟进模态框关闭 if(_this.parent().parent().index() === 0){
return false; //只有在.genjin-mark-area-putong,电话跟进特有,下的标签才会隐藏
_genjinModal.hide();//跟进模态框关闭
return false;
}
}; };
if(!_this.hasClass('genjin-mark-active')){ if(!_this.hasClass('genjin-mark-active')){
_this.addClass('genjin-mark-active').siblings().removeClass('genjin-mark-active'); _this.addClass('genjin-mark-active').siblings().removeClass('genjin-mark-active');
...@@ -292,8 +295,6 @@ function loadMain(){ ...@@ -292,8 +295,6 @@ function loadMain(){
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
var _genjinMarkOBj = $('.genjin-mark-area-zhuangtai .genjin-mark-active'), var _genjinMarkOBj = $('.genjin-mark-area-zhuangtai .genjin-mark-active'),
_genjinMarkOBj2 = $('.genjin-mark-area-putong .genjin-mark-active'), _genjinMarkOBj2 = $('.genjin-mark-area-putong .genjin-mark-active'),
_beizhuObjVal = $.trim(_beizhuObj.val()), _beizhuObjVal = $.trim(_beizhuObj.val()),
...@@ -340,9 +341,6 @@ function loadMain(){ ...@@ -340,9 +341,6 @@ function loadMain(){
if(_isFreeFlag) { if(_isFreeFlag) {
freePhone(); freePhone();
}; };
layer.close(_index);
return false;
//如果是电话跟进，选择了没打通或者取消拨打，则关掉不进行提交
}else{ }else{
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
......
public/appnew/src/components/reportDetails/reportDetails.vue
View file @ 6cf08438
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
<li class="main-sec-li"> <li class="main-sec-li">
<div>应收佣金<span class="left">{{commission}}元</span></div> <div>应收佣金<span class="left">{{commission}}元</span></div>
</li> </li>
<li class="main-sec-li"> <li class="main-sec-li" v-if="!(estimated_receipt_date==''||estimated_receipt_date==null)">
<div>预计收款时间<span class="left">{{commission}}</span></div> <div>预计收款时间<span class="left">{{estimated_receipt_date}}</span></div>
</li> </li>
</ul> </ul>
<ul v-for="(item, index) in list"> <ul v-for="(item, index) in list">
...@@ -182,6 +182,7 @@ ...@@ -182,6 +182,7 @@
house_number: '', house_number: '',
price: '', price: '',
commission: '', commission: '',
estimated_receipt_date:'',
is_open: '', is_open: '',
trade_type: '', trade_type: '',
token: '', token: '',
...@@ -230,7 +231,14 @@ ...@@ -230,7 +231,14 @@
} }
if(e =='5') { if(e =='5') {
return '合作方' return '合作方'
}else{ }if(e =='6') {
return 'APP盘下载方'
}
if(e =='7') {
return 'APP客下载方'
}
else{
layer.tipsX('分佣方类型判断错误'); layer.tipsX('分佣方类型判断错误');
} }
}, },
...@@ -260,6 +268,7 @@ ...@@ -260,6 +268,7 @@
_this.house_number = response.data.data.bargainInfo.house_number; _this.house_number = response.data.data.bargainInfo.house_number;
_this.commission = response.data.data.bargainInfo.commission; _this.commission = response.data.data.bargainInfo.commission;
_this.price = response.data.data.bargainInfo.price; _this.price = response.data.data.bargainInfo.price;
_this.estimated_receipt_date=response.data.data.bargainInfo.estimated_receipt_date;
_this.list = response.data.data.bargainInfo.realIncome; _this.list = response.data.data.bargainInfo.realIncome;
_this.Datas = response.data.data.cent_commission; _this.Datas = response.data.data.cent_commission;
_this.taxDatas = response.data.data.taxes; _this.taxDatas = response.data.data.taxes;
......
public/resource/js/agent.js
View file @ 6cf08438
This diff is collapsed.
public/resource/js/getCollection.js
View file @ 6cf08438
...@@ -17,6 +17,7 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css ...@@ -17,6 +17,7 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
$(document.body).append(template); $(document.body).append(template);
follow.getList(0); follow.getList(0);
follow.event(); follow.event();
follow.getaddPicList2();
}, },
event: function() { event: function() {
...@@ -56,6 +57,15 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css ...@@ -56,6 +57,15 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
e.stopPropagation(); e.stopPropagation();
$(this).parent().remove(); $(this).parent().remove();
}); });
_doc.on('click', '.span-del2', function(e) {
e.preventDefault();
e.stopPropagation();
$(this).parent().remove();
$(this).prev().attr('class');
console.log($(this).prev().attr('class'));
follow.spandelList($(this).prev().attr('class'));
});
_doc.on('click', 'a[href="#modal-time"]', function(e) { _doc.on('click', 'a[href="#modal-time"]', function(e) {
follow.house_id = $(this).attr("data-id"); follow.house_id = $(this).attr("data-id");
e.preventDefault(); e.preventDefault();
...@@ -73,7 +83,9 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css ...@@ -73,7 +83,9 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
// follow.getaddPicList(); // follow.getaddPicList();
// }); // });
_doc.on('click', '.add-pic', function() { _doc.on('click', '.add-pic', function() {
follow.house_id = $(this).attr("data-id");
follow.getaddPicList(); follow.getaddPicList();
}); });
$("#reset").click(function() { //重置 $("#reset").click(function() { //重置
...@@ -108,37 +120,42 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css ...@@ -108,37 +120,42 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
_doc.on('click', '#saveBtn', function(e) { _doc.on('click', '#saveBtn', function(e) {
console.log(555); console.log(555);
var _this = $(this); var _this = $(this);
e.preventDefault();
e.stopPropagation();
var imgname=[];
for(var i=0;i<$('.result').length;i++){
imgname[i]=$('.result>img').get(i).getAttribute("class");
}
console.log(imgname.join(','));
var _data = { var _data = {
type: 1, img_id: follow.house_id,
image1: follow.image_file img_name: imgname.join(',')
}; };
e.preventDefault(); $.ajax({
e.stopPropagation(); type: 'GET',
// $.ajax({ url: '/index/addReceiptImg',
// type: 'GET', data: _data,
// url: '/index/uploadImg', dataType: 'json',
// data: _data, beforeSend: function() {},
//// timeout: 30000, success: function(_data) {
// dataType: 'json', if(typeof _data === 'object') {
// beforeSend: function() {}, follow.getList(0);
// success: function(_data) { } else {
// if(typeof _data === 'object') { alert('数据错误');
// };
// } else { },
// alert('数据错误'); error: function() {
// }; alert('enter error');
// }, },
// error: function() { complete: function(xhr, textStatus){
// alert('enter error'); if(textStatus === 'timeout') {
// }, //处理超时的逻辑
// complete: function(xhr, textStatus){ alert('请求超时,请重试');
// if(textStatus === 'timeout') { };
// //处理超时的逻辑 }
// alert('请求超时,请重试'); });
// };
// }
// });
}); });
//图片上传 2.2版本 //图片上传 2.2版本
...@@ -192,9 +209,49 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css ...@@ -192,9 +209,49 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
} }
}); });
}, },
//点击收款图片 调用的接口 spandelList: function(n) { //提交
getaddPicList: function() { $.ajax({
'type': 'POST',
'url': '/index/deleteReceiptImg',
data: {
id:n
},
dataType: "json",
success: function(data) {
if(data.code == 200) {
} else {}
}
});
},
getaddPicList: function() {//获取收款图片
// container_body
$('.result2,.result').remove();
$.ajax({
'type': 'GET',
'url': '/index/receiptImgList',
data: {
"id": follow.house_id,
},
dataType: "json",
success: function(data) {
if(data.code == 200) {
//渲染已经有的列表
for(i=0;i<data.data.length;i++){
var result = '<div class="result2"><img class="' + data.data[i].id + '" src="' + data.data[i].img_name + '" alt=""/> <span class="span-del2">删除</span></div>';
div = document.createElement('div');
div.innerHTML = result;
document.getElementById('container_body').appendChild(div);
}
　
} else {}
}
});
},
//点击收款图片 调用的接口 上传图片
getaddPicList2: function() {
var input = document.getElementById("file_input"); var input = document.getElementById("file_input");
var result, div; var result, div;
if(typeof FileReader === 'undefined') { if(typeof FileReader === 'undefined') {
...@@ -203,56 +260,54 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css ...@@ -203,56 +260,54 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
} else { } else {
input.addEventListener('change', readFile, false); input.addEventListener('change', readFile, false);
}; };
function readFile() { function readFile() {
console.log(this.files); console.log(this.files);
// var _this=$(this);
for(var i = 0; i < this.files.length; i++) { for(var i = 0; i < this.files.length; i++) {
if(!input['value'].match(/.jpg|.gif|.png|.bmp/i)) {　　 //判断上传文件格式 if(!input['value'].match(/.jpg|.gif|.png|.bmp/i)) {　　 //判断上传文件格式
return alert("上传的图片格式不正确，请重新选择")　　　　 return alert("上传的图片格式不正确，请重新选择")　　　　
} }
var reader = new FileReader(); var reader = new FileReader();
reader.readAsDataURL(this.files[i]); reader.readAsDataURL(this.files[i]);
var formData = new FormData();
formData.append('type', 'chat');
formData.append('image', this.files[0]);
console.log(this.files[0]);
console.log(formData);
reader.onload = function(e) { reader.onload = function(e) {
result = '<div class="result"><img src="' + this.result + '" alt=""/> <span class="span-del">删除</span></div>'; var result2 = this.result;
div = document.createElement('div'); $.ajax({
div.innerHTML = result; type: 'post',
document.getElementById('container_body').appendChild(div);　　　 url: '/index/uploadImg',
} data: formData,
}; dataType: 'json',
contentType: false,
var formData = new FormData(); cache: false,
formData.append('type',1); processData: false,
formData.append('image',this.files[0]); beforeSend: function() {},
console.log(this.files[0]); success: function(_data) {
console.log(formData); if(_data.code == 200) {
result = '<div class="result"><img class="' + _data.data.img_path + '" src="' + result2 + '" alt=""/> <span class="span-del">删除</span></div>';
$.ajax({ div = document.createElement('div');
type: 'post', div.innerHTML = result;
url: '/index/uploadImg', document.getElementById('container_body').appendChild(div);　
data: formData,
dataType: 'json',
contentType: false,
cache: false,
processData:false,
beforeSend: function() {},
success: function(_data) {
if(typeof _data === 'object') {
} else { } else {
alert('数据错误'); alert(_data.msg);
}; };
}, },
error: function() { error: function() {
alert('enter error'); alert('enter error');
}, },
complete: function(xhr, textStatus) { complete: function(xhr, textStatus) {
if(textStatus === 'timeout') { if(textStatus === 'timeout') {
//处理超时的逻辑 //处理超时的逻辑
alert('请求超时,请重试'); alert('请求超时,请重试');
}; };
}
});
　
} }
}); };
}; };
}, },
......
public/resource/js/schoolBusiness.js
View file @ 6cf08438
...@@ -518,7 +518,7 @@ define (['doT', 'text!temp/schoolBusiness_template_tpl.html','ckfinder','ckfinde ...@@ -518,7 +518,7 @@ define (['doT', 'text!temp/schoolBusiness_template_tpl.html','ckfinder','ckfinde
} }
}); });
}, },
add_news : function () {//新增文章 add_news : function () {//新增文章 编辑文章
var _imgUploadLiebiao = $('#liebiao_pic_ul');//列表页封面图ul var _imgUploadLiebiao = $('#liebiao_pic_ul');//列表页封面图ul
var _liebiaoPicObj = _imgUploadLiebiao.find('li>img'); var _liebiaoPicObj = _imgUploadLiebiao.find('li>img');
var _urlCut = location.origin + '/resource/lib/Attachments/images/';//要截取的部分url var _urlCut = location.origin + '/resource/lib/Attachments/images/';//要截取的部分url
...@@ -537,7 +537,11 @@ define (['doT', 'text!temp/schoolBusiness_template_tpl.html','ckfinder','ckfinde ...@@ -537,7 +537,11 @@ define (['doT', 'text!temp/schoolBusiness_template_tpl.html','ckfinder','ckfinde
//// _data['file_img[' + i + ']'] = item.src; //// _data['file_img[' + i + ']'] = item.src;
// //
// }); // });
if(getUrlParam('id')){
_data.id = getUrlParam('id');
};
_data.title = $("#announcement_title").val(); _data.title = $("#announcement_title").val();
_data.s_label_id = $("#district_id2").val();//商学院标签id _data.s_label_id = $("#district_id2").val();//商学院标签id
_data.file_img = _liebiaoPicObj[0].src.replace(_urlCut, '');//封面图 剪切后的字符串 _data.file_img = _liebiaoPicObj[0].src.replace(_urlCut, '');//封面图 剪切后的字符串
......
public/resource/template/get_collection_template_tpl.html
View file @ 6cf08438
...@@ -12,13 +12,10 @@ ...@@ -12,13 +12,10 @@
<td>[%= it[item]['internal_address'] %]</td> <td>[%= it[item]['internal_address'] %]</td>
<td>[%= it[item]['house_number'] %]</td> <td>[%= it[item]['house_number'] %]</td>
<td> <td>
<!--增加收款图片 2.2版本--> <!--增加收款图片 2.2版本-->
<a class="btn1 btn-info add-pic" href="#modal-addPic" data-toggle="modal" <a class="btn1 btn-info add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]'>收款图片</a>
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 timeline" href="#modal-time" data-toggle="modal" <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>
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> </td>
</tr> </tr>
[% } %] [% } %]
......
public/resource/template/schoolBusiness_template_tpl.html
View file @ 6cf08438
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<td>[%= it[item]["comment_number"] %]</td> <td>[%= it[item]["comment_number"] %]</td>
<td> <td>
_data.title = $("#announcement_title").val();
<a class="btn1 btn-success" href="new_text.html?id=[%= it[item]["id"] %]" data-createTime='[%= it[item]["create_time"] %]' data-title='[%= it[item]["title"] %]' data-id='[%= it[item]["id"] %]' data-content='[%= it[item]["content"] %]' target="_blank"> <a class="btn1 btn-success" href="new_text.html?id=[%= it[item]["id"] %]" data-createTime='[%= it[item]["create_time"] %]' data-title='[%= it[item]["title"] %]' data-id='[%= it[item]["id"] %]' data-content='[%= it[item]["content"] %]' target="_blank">
编辑 编辑
</a> </a>
......
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