Skip to content

T
tl_estate
Commit e70acb83 authored by xishifeng's avatar xishifeng
Browse files
Options

编辑修改

parent 74f9b2eb
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 14 deletions
application/index/view/finance/account_statement.html
View file @ e70acb83
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
</tr> </tr>
<tr class="maintable-tr-bar"> <tr class="maintable-tr-bar">
<th class="text-center">提交时间</th> <th class="text-center">提交时间</th>
<th class="text-center">是否开业</th>
<th class="text-center">商铺地址</th> <th class="text-center">商铺地址</th>
<th class="text-center">商铺号</th> <th class="text-center">商铺号</th>
<th class="text-center">成交客户</th> <th class="text-center">成交客户</th>
...@@ -171,6 +172,7 @@ ...@@ -171,6 +172,7 @@
<th class="text-center">现金奖(元)</th> <th class="text-center">现金奖(元)</th>
<th class="text-center">实收佣金(元)</th> <th class="text-center">实收佣金(元)</th>
<th class="text-center">确认时间</th> <th class="text-center">确认时间</th>
<th class="text-center">操作</th>
</tr> </tr>
</thead> </thead>
<tbody class="text-center" id="maid_new_table_list"> <tbody class="text-center" id="maid_new_table_list">
......
public/resource/css/report_list.css
View file @ e70acb83
...@@ -142,13 +142,16 @@ addtax_ ...@@ -142,13 +142,16 @@ addtax_
#maid_new_btn{ #maid_new_btn{
float: right; float: right;
} }
#maid_table_main>thead th:nth-last-of-type(-n+6){ #maid_table_main>thead th:nth-last-of-type(-n+7){
width: 91px; width: 91px;
} }
#maid_table_main>thead th:nth-last-of-type(1){ #maid_table_main>thead th:nth-last-of-type(2){
width: 149px; width: 149px;
} }
#maid_table_main>thead th:nth-last-of-type(1){
width: 40px;
}
.detail-modal-maid-mix-td{ .detail-modal-maid-mix-td{
padding: 0!important; padding: 0!important;
...@@ -304,7 +307,7 @@ addtax_ ...@@ -304,7 +307,7 @@ addtax_
#modal_detail>div { #modal_detail>div {
/*width: 1030px;*/ /*width: 1030px;*/
width: 1250px; width: 1280px;
} }
/*成交信息tab*/ /*成交信息tab*/
......
public/resource/js/agent.js
View file @ e70acb83
...@@ -147,7 +147,7 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp ...@@ -147,7 +147,7 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp
return; return;
} }
agent.id = $(this).attr("data-id"); agent.id = $(this).attr("data-id");
var user_info_obj = JSON.parse(decodeURIComponent(sessionStorage.getItem('pcUserInfo'))); //读取缓存 var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
// console.log(user_info_obj); // console.log(user_info_obj);
var params = { var params = {
......
public/resource/js/commission.js
View file @ e70acb83
...@@ -927,7 +927,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_s ...@@ -927,7 +927,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_s
$.each($('.addtax-modal-tax-table-datatr'), function(i, v) { $.each($('.addtax-modal-tax-table-datatr'), function(i, v) {
_data['tax['+i+']'] = { _data['tax['+i+']'] = {
'fee': v.childNodes[3].innerHTML, 'fee': v.childNodes[3].innerHTML,
'agent_id': JSON.parse(decodeURIComponent(sessionStorage.getItem('pcUserInfo'))).id, 'agent_id': JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))).id,
'role': v.getAttribute('data-role'), 'role': v.getAttribute('data-role'),
'scale': v.childNodes[2].innerHTML.split('%')[0] 'scale': v.childNodes[2].innerHTML.split('%')[0]
}; };
......
public/resource/js/houseList.js
View file @ e70acb83
...@@ -64,7 +64,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin ...@@ -64,7 +64,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
}, },
event: function() { event: function() {
var _doc = $(document); var _doc = $(document);
var user_info_obj = JSON.parse(decodeURIComponent(sessionStorage.getItem('pcUserInfo'))); //读取缓存 var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
business.AuthToken = user_info_obj.AuthToken; business.AuthToken = user_info_obj.AuthToken;
business.agent_id = user_info_obj.id; business.agent_id = user_info_obj.id;
business.phone = user_info_obj.phone; business.phone = user_info_obj.phone;
......
public/resource/js/login.js
View file @ e70acb83
...@@ -53,7 +53,7 @@ $(function(){ ...@@ -53,7 +53,7 @@ $(function(){
success: function(data) { success: function(data) {
if(typeof data === 'object') { if(typeof data === 'object') {
if (data.code == 200) { if (data.code == 200) {
sessionStorage.setItem('pcUserInfo',encodeURIComponent(JSON.stringify(data.data)));//存储PC后台登录用户所有信息 localStorage.setItem('pcUserInfo',encodeURIComponent(JSON.stringify(data.data)));//存储PC后台登录用户所有信息
location.href = '/admin.php/index/banner'; location.href = '/admin.php/index/banner';
}else { }else {
alert(data['msg']); alert(data['msg']);
......
public/resource/js/public.js
View file @ e70acb83
...@@ -37,7 +37,8 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function ...@@ -37,7 +37,8 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function
function menu_bar(fn) { function menu_bar(fn) {
var user_info_obj = JSON.parse(decodeURIComponent(sessionStorage.getItem('pcUserInfo'))); //读取缓存 var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
$ ("#menu_bar").append (template); $ ("#menu_bar").append (template);
...@@ -70,7 +71,7 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function ...@@ -70,7 +71,7 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function
} }
$("#logout").click(function () { $("#logout").click(function () {
sessionStorage.removeItem('pcUserInfo'); localStorage.removeItem('pcUserInfo');
}); });
var _doc = $(document); var _doc = $(document);
...@@ -124,7 +125,7 @@ String.prototype.stringFormatObj = function(){ ...@@ -124,7 +125,7 @@ String.prototype.stringFormatObj = function(){
* @returns {boolean} * @returns {boolean}
*/ */
function check_auth(auth_rule) { function check_auth(auth_rule) {
var user_info_obj = JSON.parse(decodeURIComponent(sessionStorage.getItem('pcUserInfo'))); //读取缓存 var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
var result = false; var result = false;
if (user_info_obj.id != 1) { if (user_info_obj.id != 1) {
......
public/resource/js/reportList.js
View file @ e70acb83
...@@ -213,6 +213,17 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s ...@@ -213,6 +213,17 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
} }
}); });
//详情弹出框，分佣提成里，点击删除触发的事件
_doc.on('click', '.detail-modal-maid-a-del', function(e){
e.preventDefault();
e.stopPropagation();
var _this = $(this);
if(confirm('确认删除吗？')){
var _id = _this.closest('tr').attr('data-agentid');
bargain.deletMaid(_id);
};
});
//详情弹出框，分佣提成里，点击新增,分佣方选择，弹出选择列表触发的事件 //详情弹出框，分佣提成里，点击新增,分佣方选择，弹出选择列表触发的事件
_doc.on('click', '#addmaid_select_ul>li', function(e){ _doc.on('click', '#addmaid_select_ul>li', function(e){
e.preventDefault(); e.preventDefault();
...@@ -948,6 +959,40 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s ...@@ -948,6 +959,40 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
} }
}); });
}, },
//分佣提成，删除
deletMaid: function(id){
$.ajax({
type: 'POST',
url: '/index/delPartialCommission',
data: {
'partial_id': id
},
timeout: 30000,
dataType: 'json',
beforeSend: function() {},
success: function(_data) {
if(typeof _data === 'object') {
if(_data['code'] == '200') {
alert('删除成功');
bargain.maidShow();
} else {
layerTipsX(_data['msg']);
}
} else {
layerTipsX('数据错误');
};
},
error: function() {
layerTipsX('enter error');
},
complete: function(xhr, textStatus){
if(textStatus === 'timeout') {
//处理超时的逻辑
layerTipsX('请求超时,请重试');
};
}
});
},
//转到一级审核 //转到一级审核
transFirstExamine: function(){ transFirstExamine: function(){
$.ajax({ $.ajax({
...@@ -1056,7 +1101,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s ...@@ -1056,7 +1101,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
if(data.code == 200) { if(data.code == 200) {
var doTtmpl = doT.template(document.getElementById('reportList_list_tpl').innerHTML); var doTtmpl = doT.template(document.getElementById('reportList_list_tpl').innerHTML);
$("#maintable_list").html(doTtmpl(data.data)); $("#maintable_list").html(doTtmpl(data.data));
// var user_info_obj = JSON.parse(decodeURIComponent(sessionStorage.getItem('pcUserInfo'))); // var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));
/*分页代码*/ /*分页代码*/
add_page(data.data.total, pageNo, bargain.pageSize, bargain.getList); add_page(data.data.total, pageNo, bargain.pageSize, bargain.getList);
......
public/resource/js/reportList_newtri.js
View file @ e70acb83
...@@ -251,7 +251,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s ...@@ -251,7 +251,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
if(data.code == 200) { if(data.code == 200) {
var doTtmpl = doT.template(document.getElementById('reportList_list_tpl').innerHTML); var doTtmpl = doT.template(document.getElementById('reportList_list_tpl').innerHTML);
$("#maintable_list").html(doTtmpl(data.data)); $("#maintable_list").html(doTtmpl(data.data));
// var user_info_obj = JSON.parse(decodeURIComponent(sessionStorage.getItem('pcUserInfo'))); // var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));
/*分页代码*/ /*分页代码*/
add_page(data.data.total, pageNo, bargain.pageSize, bargain.getList); add_page(data.data.total, pageNo, bargain.pageSize, bargain.getList);
......
public/resource/js/shop_edit.js
View file @ e70acb83
...@@ -119,7 +119,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function ...@@ -119,7 +119,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
}); });
}; };
var _pcUserInfo = JSON.parse(decodeURIComponent(sessionStorage.getItem('pcUserInfo'))); var _pcUserInfo = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));
console.log(_pcUserInfo); console.log(_pcUserInfo);
$('#pf_tel_jia').prev().find('input').val(_pcUserInfo.id + '-' + _pcUserInfo.name + '-' + _pcUserInfo.phone).attr('data-id', _pcUserInfo.id); $('#pf_tel_jia').prev().find('input').val(_pcUserInfo.id + '-' + _pcUserInfo.name + '-' + _pcUserInfo.phone).attr('data-id', _pcUserInfo.id);
$('#acqx_tel_jia').prev().find('input').val(_pcUserInfo.id + '-' + _pcUserInfo.name + '-' + _pcUserInfo.phone).attr('data-id', _pcUserInfo.id); $('#acqx_tel_jia').prev().find('input').val(_pcUserInfo.id + '-' + _pcUserInfo.name + '-' + _pcUserInfo.phone).attr('data-id', _pcUserInfo.id);
......
public/resource/template/reportList_maid_template_tpl.html
View file @ e70acb83
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
</div> </div>
[% } %] [% } %]
</td> </td>
<td><a href="javascript:;" class="detail-modal-maid-a-del">删除</a></td>
</tr> </tr>
[% } %] [% } %]
[% }else{ %] [% }else{ %]
......
public/resource/template/reportList_template_tpl.html
View file @ e70acb83
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
[% for(var item in it["list"]){ %] [% for(var item in it["list"]){ %]
<tr data-id="[%= it['list'][item]['id'] %]" data-orderid="[%= it['list'][item]['order_id'] %]"> <tr data-id="[%= it['list'][item]['id'] %]" data-orderid="[%= it['list'][item]['order_id'] %]">
<td class="text-center" width="10%">[%= it["list"][item]['create_time'] %]</td> <td class="text-center" width="10%">[%= it["list"][item]['create_time'] %]</td>
<td class="text-left" width="36%">[%= it["list"][item]['internal_address'] %]</td> <td class="text-center" width="8%">[%= it["list"][item]['is_open']?'是':'否' %]</td>
<td class="text-left">[%= it["list"][item]['internal_address'] %]</td>
<td class="text-center">[%= it["list"][item]['house_number'] %]</td> <td class="text-center">[%= it["list"][item]['house_number'] %]</td>
<td class="text-center">[%= it["list"][item]['user_name'] %]</td> <td class="text-center">[%= it["list"][item]['user_name'] %]</td>
<td class="text-center">[%= hideTel(it["list"][item]['user_phone']) %]</td> <td class="text-center">[%= hideTel(it["list"][item]['user_phone']) %]</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