Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
771ad7bc
Commit
771ad7bc
authored
Mar 28, 2019
by
agping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商学院优化
parent
aaaafa30
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
18 deletions
+35
-18
getCollection.html
application/index/view/finance/getCollection.html
+7
-1
articleList.vue
public/appnew/src/components/businessCollege/articleList.vue
+11
-6
searchArticleList.vue
...pnew/src/components/businessCollege/searchArticleList.vue
+7
-9
getCollection.js
public/resource/js/getCollection.js
+10
-2
No files found.
application/index/view/finance/getCollection.html
View file @
771ad7bc
...
...
@@ -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>
...
...
public/appnew/src/components/businessCollege/articleList.vue
View file @
771ad7bc
...
...
@@ -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
:
{
...
...
public/appnew/src/components/businessCollege/searchArticleList.vue
View file @
771ad7bc
...
...
@@ -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
;
...
...
public/resource/js/getCollection.js
View file @
771ad7bc
...
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment