Commit 771ad7bc authored by agping's avatar agping

商学院优化

parent aaaafa30
......@@ -410,7 +410,13 @@
<!--<span class="money_total_two fore-span ld-Marheight ">实付总额:</span><span id="money_total" class="money_total_two_shifu fore-span ld-Marheight">1268</span>元-->
<!--<span class="btn btn-info btn3 ld-Marheight" id="export" style="float:left">导出报表</span>-->
<!--<span class="btn btn-info btn3 ld-Marheight" id="count" style="float:left">统计</span>-->
<span class="money_total_two ld-Marheight " style="float:left">实付总额:</span><span style="float:left" id="money_total" class="money_total_two_shifu fore-span ld-Marheight">0元</span>
<br />
<span style="float: left;margin-left: 6px;font-size: 16px;margin-top: 6px;font-weight: 600;margin-bottom: 10px;">
收款总计:<span class="receiving-total-money"></span>(正常入账:<span class="receiving-total-normal"></span>元,调整入账<span class="receiving-total-adjusment"></span>元 ),
实付总计:<span class="real-pay-total"></span>(正常入账:<span class="real-pay-normal"></span>元,调整入账<span class="real-pay-adjusment"></span>元 )
</span>
<!--收款总计:45123元(正常入账:4512元,调整入账4512元)
实付总计:45123元(正常入账:4512元,调整入账4512元)-->
</form>
</td>
</tr>
......
......@@ -228,12 +228,17 @@
},
toShopSearchList(){
let _this = this;
_this.$router.push({
path: '/searchArticleList',
query: {
'token': _this.token
}
});
// window.removeEventListener('scroll', this.handleScroll, true);
// _this.$router.push({
// path: '/searchArticleList',
// query: {
// 'token': _this.token
// }
// });
localStorage.setItem('token',_this.token);
console.log(_this.token);
location.href = '/app/dist/#/searchArticleList';
},
},
computed: {
......
......@@ -53,11 +53,11 @@
},
data() {
let _this = this;
let _token = _this.$route.query.token;
if(!_token) {
layer.tipsX('token获取出错');
return false;
};
// let _token = _this.$route.query.token;
// if(!_token) {
// layer.tipsX('token获取出错');
// return false;
// };
return {
headerData: {
'title': '同联商学院',
......@@ -65,7 +65,7 @@
'isBack': false
},
icon_search,
token: _token,
token: '',
pageSize: 10,
initTabNumMain: 0,
isLoading: false,//是否正在加载
......@@ -97,7 +97,7 @@
_this.isLoading = false;
}
});
_this.token = localStorage.getItem('token');
_this.common.h5PageC(_this.token, () => {
_this.loadMain();
});
......@@ -105,8 +105,6 @@
methods: {
loadMain() {
let _this = this;
_this.token = localStorage.getItem('token');
// _this.getList();
},
getList() {
let _this = this;
......
......@@ -1281,8 +1281,16 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
that.listData = data.data.list;
var doTtmpl = doT.template(document.getElementById('receivables_template_tpl').innerHTML);
$("#order_list").html(doTtmpl(data.data.list));
// $("#money_total").html(data.data.money_total)
$('#money_total').text((data.data.money_total-0 > 0) ? (data.data.money_total+"元"): "0元" )
// $('#money_total').text((data.data.money_total-0 > 0) ? (data.data.money_total+"元"): "0元" )
$('.receiving-total-money').html((data.data.money_total*1+data.data.money_change_total*1).toFixed(2));//
$('.receiving-total-normal').html(data.data.money_total*1);
$('.receiving-total-adjusment').html(data.data.money_change_total*1);
$('.real-pay-total').html((data.data.real_money_total*1+data.data.real_money_change_total*1).toFixed(2));
$('.real-pay-normal').html(data.data.real_money_total*1);
$('.real-pay-adjusment').html(data.data.real_money_change_total*1);
/*分页代码*/
add_page(data.data.total, no, that.pageSize, that.getList);
} 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