Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
Athena
Project
Project
Details
Activity
Releases
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
华国豪
Athena
Commits
42d55633
Commit
42d55633
authored
Mar 20, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
团订单优惠券使用2
parent
f3ebff50
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
3 deletions
+20
-3
PsOrder.vue
src/components/PersonalCenter/PsOrder.vue
+18
-2
pay.vue
src/components/global/pay.vue
+1
-0
indexTwo.vue
src/components/trade/order/indexTwo.vue
+1
-1
No files found.
src/components/PersonalCenter/PsOrder.vue
View file @
42d55633
...
@@ -43,7 +43,8 @@
...
@@ -43,7 +43,8 @@
</td>
</td>
<td>
{{
item
.
createDate
}}
</td>
<td>
{{
item
.
createDate
}}
</td>
<td>
<td>
<span
class=
"hgh_pay_money_bth"
v-if=
"item.orderType==1"
@
click=
"goUrl('OrderInvoice')"
>
支付团款
</span>
<payurlItem
v-if=
"item.orderType==1"
@
b2b_get_GetWaitDealOrderPageList=
'b2b_get_GetWaitDealOrderPageList'
:item=
"item"
></payurlItem>
<!--
<span
class=
"hgh_pay_money_bth"
v-if=
"item.orderType==1"
@
click=
"goUrl('OrderInvoice')"
>
支付团款
</span>
-->
</td>
</td>
</tr>
</tr>
</tbody>
</tbody>
...
@@ -66,9 +67,10 @@
...
@@ -66,9 +67,10 @@
</el-row>
</el-row>
</
template
>
</
template
>
<
script
>
<
script
>
import
payURL
from
"../global/pay.vue"
;
export
default
{
export
default
{
components
:
{
components
:
{
payurlItem
:
payURL
,
},
},
data
(){
data
(){
return
{
return
{
...
@@ -92,8 +94,22 @@ export default {
...
@@ -92,8 +94,22 @@ export default {
},
},
mounted
()
{
mounted
()
{
this
.
getList
();
this
.
getList
();
this
.
b2b_get_GetWaitDealOrderPageList
();
},
},
methods
:
{
methods
:
{
b2b_get_GetWaitDealOrderPageList
(){
//获取待处理订单
let
msg
=
{
pageIndex
:
1
,
pageSize
:
100
,
}
this
.
apipost
(
'b2b_get_GetWaitDealOrderPageList'
,
msg
,
r
=>
{
if
(
r
.
data
.
resultCode
==
1
){
this
.
WaitDealOrderPageList
=
r
.
data
.
data
.
pageData
;
}
else
{
this
.
$message
.
error
(
r
.
data
.
message
);
}
},
null
)
},
goUrl
(
path
){
//页面跳转
goUrl
(
path
){
//页面跳转
this
.
$router
.
push
({
name
:
path
})
this
.
$router
.
push
({
name
:
path
})
},
},
...
...
src/components/global/pay.vue
View file @
42d55633
...
@@ -75,6 +75,7 @@
...
@@ -75,6 +75,7 @@
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
$message
.
success
(
res
.
data
.
message
)
this
.
$message
.
success
(
res
.
data
.
message
)
this
.
$emit
(
"b2b_get_GetWaitDealOrderPageList"
)
this
.
$emit
(
"b2b_get_GetWaitDealOrderPageList"
)
this
.
$router
.
go
(
0
)
}
else
{
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
)
this
.
$message
.
error
(
res
.
data
.
message
)
}
}
...
...
src/components/trade/order/indexTwo.vue
View file @
42d55633
...
@@ -563,7 +563,7 @@ export default {
...
@@ -563,7 +563,7 @@ export default {
}
}
}
}
}
}
if
(
this
.
UserCanUseCouponList
.
length
>
1
)
{
if
(
this
.
UserCanUseCouponList
.
length
>
0
)
{
let
CouponIds
=
''
let
CouponIds
=
''
let
CouponMoney
=
0
let
CouponMoney
=
0
let
CouponSale
=
1
let
CouponSale
=
1
...
...
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