Skip to content

T
tl_estate
Commit b0c82b9b authored by agping's avatar agping
Browse files
Options

打包

parent 364b4557
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 56 deletions
application/index/view/finance/account_statement.html
View file @ b0c82b9b
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="reportList" />
<style type="text/css">
.envelope-list{
position: relative;
left: -144px;
opacity: 0;
}
.envelope-details{
font-size: 18px;
font-weight: 600;
......@@ -436,9 +442,9 @@
<br />
<span class="text-danger" style="float: left;font-weight: 600;font-size: 18px;">注：页面查看不完整 请隐藏菜单！！！</span>
<div href="#modal_date_select" data-toggle="modal">打开收佣日期选择框（默认隐藏）</div>
<a id="maid_ok_btn" class="btn btn-primary" data-toggle="modal">确认分佣</a>
<a class="btn btn-primary maid_ok_btn">确认分佣</a>
<a id="maid_save_btn" class="btn btn-primary" data-toggle="modal">保存</a>
<a class="btn btn-success envelope-list" href="#modal-envelope" data-toggle="modal" data-id='[%= it[item]["id"] %]'>红包提现</a>
<a class="btn btn-success envelope-list" href="#modal-envelope" data-toggle="modal">红包提现</a>
</div>
<!--分佣提成-->
</div>
......@@ -1255,17 +1261,12 @@
<table class="table table-striped table-bordered table-hover table-condensed">
<thead>
<tr>
<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">客户ID</th>
<th class="text-center">客户昵称</th>
<th class="text-center">客户手机号</th>
<th class="text-center">活动ID</th>
<th class="text-center">状态</th>
<th class="text-center">发放时间</th>
<th class="text-center">发放人</th>
</tr>
</thead>
<tbody class="text-center" id="maintable_envelope_list">
......@@ -1281,7 +1282,7 @@
</div>
<div class="modal-footer">
<button type="button btn2" class="btn btn-primary" id="" data-dismiss="modal">
<button type="button btn2" class="btn btn-primary maid_ok_btn" id="" data-dismiss="modal">
确认分佣
</button>
</div>
......
public/app/dist/index.html
View file @ b0c82b9b
......@@ -23,4 +23,4 @@
if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.aca2f163b683c8359f38092f14ec8b7b.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.c32c255822cf705e4bbe.js></script></body></html>
\ No newline at end of file
})(document, window);</script><link href=./static/css/app.9ec4cf5cd125252fba3ab077078221d9.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.a6b83af6259449de711a.js></script></body></html>
\ No newline at end of file
public/app/dist/static/js/app.a6b83af6259449de711a.js 0 → 100644
View file @ b0c82b9b
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.c32c255822cf705e4bbe.js deleted 100644 → 0
View file @ 364b4557
This source diff could not be displayed because it is too large. You can view the blob instead.
public/appnew/src/components/reportDetails/reportDetails.vue
View file @ b0c82b9b
......@@ -489,7 +489,8 @@
let _this = this;
this.common.Compatible({
paraIos: {
'route': "onShopClick",
'route': "onCollectionClick",
'bargain_id': _this.bargain_id
},
fnAndroid: function() {
window.android.onCollectionClick(_this.bargain_id);
......
public/resource/js/reportList.js
View file @ b0c82b9b
......@@ -17,6 +17,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
shouyong_date_active_sapn: null,
house_fatherid:'',
detailTabIndexLiu:0,//查看 弹出框 tab切换 初始化
report_id_liu:0,
init: function() {
//初始化dot
$(document.body).append(template);
......@@ -109,7 +110,6 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
});
//红包提现
_doc.on("click", ".envelope-list", function() {
// bargain.bargain_id = 127;
bargain.getEnvelopeList();
});
......@@ -363,7 +363,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
});
//详情弹出框，分佣提成里，点击确认分佣触发的事件
_doc.on('click', '#maid_ok_btn', function(e){
_doc.on('click', '.maid_ok_btn', function(e){
e.preventDefault();
e.stopPropagation();
bargain.maidConfirmOk(1);
......@@ -909,6 +909,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
success: function(data) {
if(data.code == 200) {
if(data.data) {
bargain.report_id_liu = data.data.report_id;
bargain.detail_shop_id = data.data.house_id;
bargain.detail_user_id = data.data.user_id;
$('#bargaininfo_id_span').html(data.data.id);
......@@ -1896,17 +1897,13 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
});
},
// 红包提现
getEnvelopeList: function(pageNo){
getEnvelopeList: function(){
var params = {
'pageNo': pageNo,
'pageSize': 100,
'bargain_id' :127,
'source' :-1,
'report_id': bargain.report_id_liu
};
$.ajax({
type: 'GET',
url: '/index/getCollection',
url: '/index/getActivityCoupon',
data: params,
timeout: 30000,
dataType: 'json',
......@@ -1916,10 +1913,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
if(typeof data === 'object') {
if(data.code == 200) {
var doTtmpl = doT.template(document.getElementById('envelope_template_tpl').innerHTML);
$("#maintable_envelope_list").html(doTtmpl(data.data.list));
/*分页代码*/
add_page(data.data.total, pageNo, bargain.pageSize, bargain.getList);
$("#maintable_envelope_list").html(doTtmpl(data.data));
} else {
alert(data['msg']);
......
public/resource/template/reportList_template_tpl.html
View file @ b0c82b9b
......@@ -239,36 +239,6 @@
<td>[%= it[item]['name'] %]</td>
<td>[%= it[item]['current_agent_name'] %]</td>
<td>[%= it[item]['store_name'] %]</td>
<td>[%= it[item]['type'] %]</td>
<td>[%= it[item]['money'] %]</td>
<td>[%= it[item]['real_money'] %]</td>
[% if(it[item]['is_refund'] == 1){ %]
[% if(it[item]['source'] == 0) { %]
<td>正常收款,被退款</td>
<td>正常,被退款</td>
[% } else if ( it[item]['source'] == 1 ) { %]
<td>正常收款,被退款</td>
<td>正常,被退款</td>
[% } else if ( it[item]['source'] == 2) { %]
<td>被调整收款(调整ID:[%= it[item]['source_id'] %],被退款)</td>
<td>被调整+被退款</td>
[% } else{%]
<td>被退款</td>
[% } %]
[% }else{ %]
[% if(it[item]['source'] == 0) { %]
<td>正常收款</td>
<td>正常</td>
[% } else if ( it[item]['source'] == 1 ) { %]
<td>正常收款</td>
<td>正常</td>
[% } else if ( it[item]['source'] == 2) { %]
<td>被调整收款(调整ID:[%= it[item]['source_id'] %])</td>
<td>被调整</td>
[% } else{%]
<td>--</td>
[% } %]
[% } %]
</tr>
[% } %]
[% }else{ %]
......
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