Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pptist
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
viitto
pptist
Commits
3bd92d41
Commit
3bd92d41
authored
Jul 11, 2024
by
zhengke
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1.4.1'
parents
aa04332d
eb53719b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
918 additions
and
402 deletions
+918
-402
common.css
src/assets/styles/common.css
+12
-3
cellList.vue
src/components/CloudDisk/cellList.vue
+1
-0
index.vue
src/components/CloudDisk/index.vue
+4
-1
list.vue
src/components/CloudDisk/list.vue
+4
-1
waterfallFlowList.vue
src/components/CloudDisk/waterfallFlowList.vue
+1
-0
router.ts
src/router/router.ts
+4
-4
OrderService.ts
src/services/OrderService.ts
+16
-0
Order.vue
src/views/TeamCenter/Order.vue
+3
-155
OrderDetail.vue
src/views/TeamCenter/OrderDetail.vue
+10
-152
Layout.vue
src/views/TemplateCenter/Layout.vue
+1
-1
Layout.vue
src/views/UserCenter/Layout.vue
+2
-2
Order.vue
src/views/UserCenter/Order.vue
+313
-20
OrderDetail.vue
src/views/UserCenter/OrderDetail.vue
+65
-63
InvoiceDetails.vue
src/views/UserCenter/components/InvoiceDetails.vue
+185
-0
openInvoice.vue
src/views/UserCenter/components/openInvoice.vue
+297
-0
No files found.
src/assets/styles/common.css
View file @
3bd92d41
...
...
@@ -161,6 +161,12 @@ page {
.text-info
{
color
:
#b1b7cf
;
}
.text-black
{
color
:
black
;
}
.text-red
{
color
:
red
;
}
.bg-white
{
background-color
:
#FFF
;
}
...
...
@@ -489,9 +495,6 @@ page {
.q-pt-md
{
padding-top
:
12px
;
}
.q-pb-md
{
padding-bottom
:
10px
;
}
.q-ma-lg
{
margin
:
20px
}
...
...
@@ -598,9 +601,15 @@ page {
.fz12
{
font-size
:
12px
;
}
.fz13
{
font-size
:
13px
;
}
.fz14
{
font-size
:
14px
;
}
.fz15
{
font-size
:
15px
;
}
.fz16
{
font-size
:
16px
;
}
...
...
src/components/CloudDisk/cellList.vue
View file @
3bd92d41
...
...
@@ -227,6 +227,7 @@
.CloudDisk-R-Img
{
width
:
12
.85vw
;
height
:
12
.85vw
;
background
:
#f1f2f4
;
margin-bottom
:
9px
;
border-radius
:
8px
;
overflow
:
hidden
;
...
...
src/components/CloudDisk/index.vue
View file @
3bd92d41
...
...
@@ -73,7 +73,9 @@
<el-image
class=
"row items-center"
:src=
"item.FilePath"
style=
"width: 100%; height: 100%;"
fit=
"cover"
>
<template
#
error
>
<el-image
:src=
"errImg"
></el-image>
<div
class=
"row items-center"
style=
"height: 100%;"
>
<el-image
:src=
"errImg"
></el-image>
</div>
</
template
>
</el-image>
<!-- <el-image
...
...
@@ -659,6 +661,7 @@ onBeforeUnmount(() => {
.CloudDisk-R-Img
{
width
:
80px
;
height
:
80px
;
background
:
#f1f2f4
;
margin-bottom
:
9px
;
border-radius
:
8px
;
overflow
:
hidden
;
...
...
src/components/CloudDisk/list.vue
View file @
3bd92d41
...
...
@@ -8,7 +8,7 @@
<el-table-column
type=
"selection"
width=
"55"
/>
<el-table-column
label=
"基本信息"
show-overflow-tooltip
min-width=
"400"
>
<template
#
default=
"scope"
>
<div
class=
"row items-center"
>
<div
class=
"row items-center
CloudDisk-R-Img
"
>
<el-image
class=
"cursor-pointer row items-center"
style=
"width: 50px; height: auto"
...
...
@@ -248,4 +248,7 @@
padding-left
:
24px
;
padding-bottom
:
20px
;
}
.CloudDisk-R-Img
.el-image
{
background
:
#f1f2f4
;
}
</
style
>
\ No newline at end of file
src/components/CloudDisk/waterfallFlowList.vue
View file @
3bd92d41
...
...
@@ -234,6 +234,7 @@
.CloudDisk-R-Img
{
width
:
12
.85vw
;
height
:
auto
;
background
:
#f1f2f4
;
margin-bottom
:
9px
;
border-radius
:
8px
;
box-shadow
:
0px
0px
13px
0px
#eee
;
...
...
src/router/router.ts
View file @
3bd92d41
...
...
@@ -257,7 +257,7 @@ const routes: RouteRecordRaw[] = [
}
},
{
path
:
'/a/order'
,
path
:
'/a/order
/:activeName?
'
,
component
:
()
=>
import
(
'@/views/TeamCenter/Order.vue'
),
meta
:{
title
:
'我的订单/发票'
...
...
@@ -278,7 +278,7 @@ const routes: RouteRecordRaw[] = [
}
},
{
path
:
'/a/order
/:id
'
,
path
:
'/a/order
Detail/:id/:isFirm/:activeName
'
,
component
:
()
=>
import
(
'@/views/TeamCenter/OrderDetail.vue'
),
meta
:{
title
:
'订单详情'
...
...
@@ -308,14 +308,14 @@ const routes: RouteRecordRaw[] = [
}
},
{
path
:
'/u/order'
,
path
:
'/u/order
/:activeName?
'
,
component
:
()
=>
import
(
'@/views/UserCenter/Order.vue'
),
meta
:{
title
:
'我的订单/发票'
}
},
{
path
:
'/u/order
/:id
'
,
path
:
'/u/order
Detail/:id/:activeName
'
,
component
:
()
=>
import
(
'@/views/UserCenter/OrderDetail.vue'
),
meta
:{
title
:
'订单详情'
...
...
src/services/OrderService.ts
View file @
3bd92d41
...
...
@@ -3,6 +3,22 @@ import Api,{ HttpResponse, Result } from './../utils/request';
class
OrderService
{
static
async
GetUserDutyParagraph
():
Promise
<
HttpResponse
>
{
return
Api
.
Post
(
"ppt_GetUserDutyParagraph"
,{})
}
static
async
GetPPTUserInvoicePage
(
pageIndex
:
number
,
pageSize
:
number
):
Promise
<
HttpResponse
>
{
let
msg
=
{
pageIndex
,
pageSize
}
return
Api
.
Post
(
"ppt_GetPPTUserInvoicePage"
,
msg
)
}
static
async
SetPPTUserInvoice
(
params
:
any
):
Promise
<
HttpResponse
>
{
return
Api
.
Post
(
"ppt_SetPPTUserInvoice"
,
params
)
}
static
async
CreatePPTPayOrder
(
orderid
:
Number
):
Promise
<
HttpResponse
>
{
let
msg
=
{
orderid
}
return
Api
.
Post
(
"ppt_CreatePPTPayOrder"
,
msg
)
...
...
src/views/TeamCenter/Order.vue
View file @
3bd92d41
<
template
>
<div
class=
""
>
<el-tabs
v-model=
"activeName"
@
tab-click=
"tabsHandlerClick"
class=
"no-border dark sticky-header"
>
<el-tab-pane
label=
"全部订单"
name=
"all"
></el-tab-pane>
<el-tab-pane
label=
"待支付"
name=
"pay"
></el-tab-pane>
<el-tab-pane
label=
"已完成"
name=
"finish"
></el-tab-pane>
<el-tab-pane
label=
"待开票"
name=
"invoice"
></el-tab-pane>
<el-tab-pane
label=
"历史发票"
name=
"invoiceHistory"
></el-tab-pane>
<div
class=
"order-bar rounded row"
>
<div
class=
"item"
style=
"width: 280px !important; min-width: 280px; text-align: left;"
>
商品信息
</div>
<div
class=
"item col"
>
时长
</div>
<div
class=
"item col"
>
单价
</div>
<div
class=
"item col"
>
数量
</div>
<div
class=
"item none-width"
>
<div
style=
"background-color: rgba(0,0,0,.08);width:1px"
>
</div>
</div>
<div
class=
"item col"
>
实付款
</div>
<div
class=
"item col"
>
订单状态
</div>
<div
class=
"item"
>
操作
</div>
</div>
</el-tabs>
<template
v-if=
"orders && orders.length>0 && !loading"
>
<div
class=
"order-body q-mt-lg"
v-for=
"x in orders"
:key=
"x.orderid"
>
<div
class=
"order-item rounded"
>
<div
class=
"title"
>
<span>
{{
x
.
create
}}
</span>
<span
class=
"q-ml-md"
>
{{
x
.
ordernum
}}
</span>
</div>
<div
class=
"bg-white rounded row items-center"
>
<div
class=
"item row items-center"
style=
"width: 280px !important; min-width: 280px; text-align: left;padding:24px;"
>
<img
:src=
"x.cover"
style=
"width:72px;"
class=
"rounded"
>
<div
class=
"q-ml-lg"
>
{{
x
.
pricetypename
}}
_
{{
x
.
vipname
}}
</div>
</div>
<div
class=
"item col"
>
{{
x
.
productname
}}
</div>
<div
class=
"item col"
>
¥
{{
x
.
price
.
toFixed
(
2
)
}}
</div>
<div
class=
"item col"
>
{{
x
.
use
}}
席位
</div>
<div
class=
"item none-width"
>
<div
style=
"background-color: rgba(0,0,0,.08);width:1px;height:72px;"
>
</div>
</div>
<div
class=
"item col"
>
<div
class=
"text-weight-bold q-mb-sm"
style=
"font-size: 16px"
>
¥
{{
x
.
price
.
toFixed
(
2
)
}}
</div>
<!--
<div
class=
"row items-center flex-end"
>
<span
class=
"text-grey-8 q-mr-md"
>
已优惠 ¥10.00
</span>
<IconHelp
:size=
"16"
class=
"cursor-pointer"
></IconHelp>
</div>
-->
</div>
<div
class=
"item col"
>
<div
class=
"q-mb-sm"
:class=
"
{'text-waring':x.status==1,'text-grey-8':x.status==3}">
{{
x
.
statusname
}}
</div>
<el-button
link
@
click=
"forwardOrderDetail(x.orderid)"
>
订单详情
</el-button>
</div>
<div
class=
"item column"
>
<el-button
type=
"primary"
v-if=
"x.status==2"
>
发票
</el-button>
<br
/>
<el-button
type=
"default"
v-if=
"x.status==2"
>
售后
</el-button>
<el-button
type=
"warning"
v-if=
"x.status==1"
>
支付
</el-button>
<br
/>
<el-button
type=
"default"
v-if=
"x.status==1"
>
取消
</el-button>
</div>
</div>
</div>
</div>
</
template
>
<div
v-if=
"loading"
style=
"height: 200px;margin-top: 100px;"
v-loading=
"loading"
></div>
<div
v-if=
"(!orders || orders.length==0) && !loading"
>
<el-empty
class=
"q-ma-xl"
description=
"暂无数据"
/>
</div>
</div>
<Order
:firm=
"type"
></Order>
</
template
>
<
script
lang=
"ts"
setup
>
import
{
ApiResult
}
from
"@/configs/axios"
;
import
OrderService
from
"@/services/OrderService"
;
import
{
ref
}
from
"vue"
;
import
{
useRouter
}
from
"vue-router"
;
const
activeName
=
ref
<
string
>
(
'all'
)
const
parameters
=
ref
({
pageIndex
:
1
,
pageSize
:
15
,
starttime
:
''
,
endtime
:
''
,
orderstatus
:
0
})
const
orders
=
ref
<
any
[]
>
()
const
count
=
ref
(
0
)
const
loading
=
ref
(
false
)
const
router
=
useRouter
()
const
tabsHandlerClick
=
(
e
:
any
)
=>
{
console
.
log
(
e
)
}
const
getOrders
=
async
()
=>
{
if
(
loading
.
value
)
return
loading
.
value
=
true
const
response
=
await
OrderService
.
GetOrders
(
parameters
.
value
)
if
(
response
.
data
.
resultCode
==
ApiResult
.
SUCCESS
){
orders
.
value
=
response
.
data
.
data
.
pageData
count
.
value
=
response
.
data
.
data
.
pageCount
}
loading
.
value
=
false
}
const
forwardOrderDetail
=
(
id
:
string
)
=>
{
router
.
push
(
'/u/order/'
+
encodeURIComponent
(
id
))
}
getOrders
()
import
Order
from
'../UserCenter/Order.vue'
const
type
=
ref
(
1
)
</
script
>
<
style
scoped
>
.sticky-header
{
position
:
sticky
;
top
:
0
;
left
:
0
;
background
:
#FFF
;
}
.order-bar
{
background
:
#f6f7f9
!important
;
}
.order-bar
.item
,
.order-body
.order-item
.item
{
padding
:
0
24px
;
height
:
42px
;
line-height
:
42px
;
font-size
:
14px
;
color
:
gray
;
text-align
:
right
;
min-width
:
108px
;
}
.order-bar
.item.none-width
,
.order-body
.order-item
.item.none-width
{
min-width
:
unset
;
}
.order-body
{
}
.order-body
.order-item
{
background
:
#f6f7f9
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,
.08
);
font-size
:
14px
;
}
.order-body
.order-item
.title
{
padding
:
0
24px
;
height
:
45px
;
line-height
:
45px
;
color
:
grey
;
white-space
:
nowrap
;
overflow
:
hidden
;
}
.order-body
.order-item
.item
{
height
:
auto
;
line-height
:
1
;
color
:
#000
;
white-space
:
nowrap
;
overflow
:
hidden
;
}
</
style
>
\ No newline at end of file
src/views/TeamCenter/OrderDetail.vue
View file @
3bd92d41
<
template
>
<div
class=
"row items-center"
>
<IconLeft
:size=
"18"
class=
"q-mr-md cursor-pointer"
@
click=
"forwardOrder"
></IconLeft>
<div
class=
"text-weight-bold cursor-pointer"
@
click=
"forwardOrder"
>
订单/发票
</div>
</div>
<template
v-if=
"order && !loading"
>
<div
class=
"q-mt-xl q-pa-xl rounded bg-info"
>
<el-steps
style=
"max-width: 100%;margin: 0 auto;"
:active=
"3"
align-center
>
<el-step
title=
"选择商品"
description=
""
/>
<el-step
title=
"确认下单"
description=
""
/>
<el-step
title=
"支付"
description=
""
/>
<el-step
title=
"交易完成"
description=
""
/>
</el-steps>
<div
class=
"q-mt-xl text-center text-weight-bold"
style=
"font-size: 18px;"
>
订单状态:待支付
</div>
<div
class=
"q-mt-md row items-center flex-center"
style=
"font-size: 13px;"
>
<span>
请在
</span>
<el-countdown
title=
""
format=
"DD [天] HH:mm:ss"
:value=
"countValue"
value-style=
"font-size:13px;color:#f89c53;"
class=
"q-mx-md inline"
/>
<span>
内完成转账,超时订单自动取消
</span>
</div>
<div
class=
"row items-center flex-center q-mt-xl"
>
<el-button
size=
"large"
>
取消订单
</el-button>
<el-button
type=
"primary"
size=
"large"
>
去支付
</el-button>
</div>
</div>
<div
class=
"order-bar rounded row q-mt-xl"
>
<div
class=
"item"
style=
"width: 280px !important; min-width: 280px; text-align: left;"
>
商品信息
</div>
<div
class=
"item col"
>
时长
</div>
<div
class=
"item col"
>
单价
</div>
<div
class=
"item col"
>
数量
</div>
<div
class=
"item none-width"
>
<div
style=
"background-color: rgba(0,0,0,.08);width:1px"
>
</div>
</div>
<div
class=
"item col"
>
小计
</div>
</div>
<div
class=
"order-body q-mt-lg"
>
<div
class=
"order-item rounded"
>
<div
class=
"title"
>
<span>
{{
order
.
create
}}
</span>
<span
class=
"q-ml-md"
>
{{
order
.
ordernum
}}
</span>
</div>
<div
class=
"bg-white rounded row items-center"
>
<div
class=
"item row items-center"
style=
"width: 280px !important; min-width: 280px; text-align: left;padding:24px;"
>
<img
:src=
"order.cover"
style=
"width:72px;"
class=
"rounded"
>
<div
class=
"q-ml-lg"
>
{{
order
.
pricetypename
}}
_
{{
order
.
vipname
}}
</div>
</div>
<div
class=
"item col"
>
{{
order
.
productname
}}
</div>
<div
class=
"item col"
>
¥
{{
order
.
price
.
toFixed
(
2
)
}}
</div>
<div
class=
"item col"
>
{{
order
.
use
}}
席位
</div>
<div
class=
"item none-width"
>
<div
style=
"background-color: rgba(0,0,0,.08);width:1px;height:72px;"
>
</div>
</div>
<div
class=
"item col"
>
<div
class=
"text-weight-bold q-mb-sm"
style=
"font-size: 16px"
>
¥
{{
order
.
price
.
toFixed
(
2
)
}}
</div>
</div>
</div>
</div>
</div>
<div
class=
"q-mt-lg text-right"
>
<span
style=
"font-size: 14px;"
>
订单总金额:¥
</span>
<span
style=
"font-size: 18px"
class=
"text-weight-bold text-dark"
>
{{
order
.
price
.
toFixed
(
2
)
}}
</span>
</div>
<div
class=
"q-mt-lg text-right"
v-if=
"order.status==2"
>
<span
style=
"font-size: 14px;"
>
实付总金额:¥
</span>
<span
style=
"font-size: 18px"
class=
"text-weight-bold text-dark text-negative"
>
{{
order
.
price
.
toFixed
(
2
)
}}
</span>
</div>
</
template
>
<div
v-if=
"loading"
style=
"height: 200px;margin-top: 100px;"
v-loading=
"loading"
></div>
<div
v-if=
"!order && !loading"
>
<el-empty
class=
"q-ma-xl"
description=
"暂无数据"
/>
</div>
</template>
<
script
lang=
"ts"
setup
>
import
{
ApiResult
}
from
"@/configs/axios"
import
OrderService
from
"@/services/OrderService"
import
{
ref
}
from
"vue"
import
{
useRouter
}
from
"vue-router"
const
order
=
ref
<
any
>
()
const
loading
=
ref
(
false
)
const
router
=
useRouter
()
const
countValue
=
ref
(
Date
.
now
()
+
1000
*
60
*
60
*
7
)
const
forwardOrder
=
(
id
:
string
)
=>
{
router
.
push
(
'/u/order'
)
}
const
getOrder
=
async
()
=>
{
const
orderid
=
router
.
currentRoute
.
value
.
params
.
id
?.
toString
()
if
(
!
orderid
)
return
loading
.
value
=
true
const
response
=
await
OrderService
.
GetOrder
(
orderid
)
if
(
response
.
data
.
resultCode
==
ApiResult
.
SUCCESS
)
{
order
.
value
=
response
.
data
.
data
countValue
.
value
=
new
Date
(
order
.
value
.
create
.
replaceAll
(
'-'
,
'/'
)).
getTime
()
+
1000
*
60
*
60
*
720
}
loading
.
value
=
false
}
getOrder
()
</
script
>
<
style
scoped
>
.order-bar
{
background
:
#f6f7f9
!important
;
}
.order-bar
.item
,
.order-body
.order-item
.item
{
padding
:
0
24px
;
height
:
42px
;
line-height
:
42px
;
font-size
:
14px
;
color
:
gray
;
text-align
:
right
;
min-width
:
108px
;
}
.order-bar
.item.none-width
,
.order-body
.order-item
.item.none-width
{
min-width
:
unset
;
}
.order-body
{}
.order-body
.order-item
{
background
:
#f6f7f9
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,
.08
);
font-size
:
14px
;
}
.order-body
.order-item
.title
{
padding
:
0
24px
;
height
:
45px
;
line-height
:
45px
;
color
:
grey
;
white-space
:
nowrap
;
overflow
:
hidden
;
}
.order-body
.order-item
.item
{
height
:
auto
;
line-height
:
1
;
color
:
#000
;
white-space
:
nowrap
;
overflow
:
hidden
;
}
</
style
>
\ No newline at end of file
<OrderDetail></OrderDetail>
</
template
>
<
script
lang=
"ts"
setup
>
import
OrderDetail
from
'../UserCenter/OrderDetail.vue'
</
script
>
<
style
scoped
>
</
style
>
\ No newline at end of file
src/views/TemplateCenter/Layout.vue
View file @
3bd92d41
...
...
@@ -16,7 +16,7 @@
<div
class=
"col row"
>
<div
class=
"user-center-menu column "
>
<el-menu
:default-active=
"activeIndex"
class=
"no-border md-menu col"
router
>
<el-menu-item
:index=
"
i
"
v-for=
"(x,i) in menus"
:key=
"i"
:route=
"x.url"
>
<el-menu-item
:index=
"
`$
{i}`
" v-for="(x,i) in menus" :key="i" :route="x.url">
<component
:is=
"x.icon"
style=
"font-size: 20px;"
></component>
<span
class=
"q-ml-lg"
>
{{
x
.
name
}}
</span>
</el-menu-item>
...
...
src/views/UserCenter/Layout.vue
View file @
3bd92d41
...
...
@@ -12,8 +12,8 @@
</div>
<div
class=
"col row"
>
<div
class=
"user-center-menu column "
>
<el-menu
:default-active=
"
activeIndex
"
class=
"no-border md-menu col"
router
>
<el-menu-item
:index=
"
i
"
v-for=
"(x,i) in menus"
:key=
"i"
:route=
"x.url"
>
<el-menu
:default-active=
"
String(activeIndex)
"
class=
"no-border md-menu col"
router
>
<el-menu-item
:index=
"
`$
{i}`
" v-for="(x,i) in menus" :key="i" :route="x.url">
<component
:is=
"x.icon"
style=
"font-size: 20px;"
></component>
<span
class=
"q-ml-lg"
>
{{
x
.
name
}}
</span>
</el-menu-item>
...
...
src/views/UserCenter/Order.vue
View file @
3bd92d41
This diff is collapsed.
Click to expand it.
src/views/UserCenter/OrderDetail.vue
View file @
3bd92d41
<
template
>
<div
class=
"row items-center"
>
<IconLeft
:size=
"18"
class=
"q-mr-md cursor-pointer"
@
click=
"forwardOrder"
></IconLeft>
<div
class=
"text-weight-bold cursor-pointer"
@
click=
"forwardOrder"
>
订单/发票
</div>
</div>
<div
v-loading=
"CancelLoading"
>
<template
v-if=
"order && !loading"
>
<div
class=
"q-mt-xl q-pa-xl rounded bg-info"
>
<el-steps
style=
"max-width: 100%;margin: 0 auto;"
:active=
"active"
align-center
>
<el-step
title=
"选择商品"
description=
""
/>
<el-step
title=
"确认下单"
description=
""
/>
<el-step
title=
"待支付"
description=
""
/>
<el-step
:title=
"order.status==3?'交易取消':'交易完成'"
description=
""
/>
</el-steps>
<div
class=
"q-mt-xl text-center text-weight-bold"
style=
"font-size: 18px;"
>
订单状态:
{{
order
.
statusname
}}
</div>
<div
v-if=
"order.status==1"
class=
"q-mt-md row items-center flex-center"
style=
"font-size: 13px;"
>
<span>
请在
</span>
<el-countdown
title=
""
format=
"DD [天] HH:mm:ss"
:value=
"countValue"
value-style=
"font-size:13px;color:#f89c53;"
class=
"q-mx-md inline"
/>
<span>
内完成转账,超时订单自动取消
</span>
</div>
<div
class=
"row items-center flex-center q-mt-xl"
v-if=
"order.status==1"
>
<el-button
size=
"large"
@
click=
"goControls(2)"
>
取消订单
</el-button>
<el-button
type=
"primary"
size=
"large"
@
click=
"goControls(1)"
>
去支付
</el-button>
</div>
</div>
<div
class=
"order-bar rounded row q-mt-xl"
>
<div
class=
"item"
style=
"width: 280px !important; min-width: 280px; text-align: left;"
>
商品信息
</div>
<div
class=
"item col"
>
时长
</div>
<div
class=
"item col"
>
单价
</div>
<div
class=
"item col"
>
数量
</div>
<div
class=
"item none-width"
>
<div
style=
"background-color: rgba(0,0,0,.08);width:1px"
>
</div>
<div
v-loading=
"CancelLoading"
>
<template
v-if=
"order && !loading"
>
<div
class=
"q-mt-xl q-pa-xl rounded bg-info"
>
<el-steps
style=
"max-width: 100%;margin: 0 auto;"
:active=
"active"
align-center
>
<el-step
title=
"选择商品"
description=
""
/>
<el-step
title=
"确认下单"
description=
""
/>
<el-step
title=
"待支付"
description=
""
/>
<el-step
:title=
"order.status==3?'交易取消':'交易完成'"
description=
""
/>
</el-steps>
<div
class=
"q-mt-xl text-center text-weight-bold"
style=
"font-size: 18px;"
>
订单状态:
{{
order
.
statusname
}}
</div>
<div
v-if=
"order.status==1"
class=
"q-mt-md row items-center flex-center"
style=
"font-size: 13px;"
>
<span>
请在
</span>
<el-countdown
title=
""
format=
"DD [天] HH:mm:ss"
:value=
"countValue"
value-style=
"font-size:13px;color:#f89c53;"
class=
"q-mx-md inline"
/>
<span>
内完成转账,超时订单自动取消
</span>
</div>
<div
class=
"row items-center flex-center q-mt-xl"
v-if=
"order.status==1"
>
<el-button
size=
"large"
@
click=
"goControls(2)"
>
取消订单
</el-button>
<el-button
type=
"primary"
size=
"large"
@
click=
"goControls(1)"
>
去支付
</el-button>
</div>
</div>
<div
class=
"
item col"
>
小计
</div
>
</div>
<div
class=
"order-body q-mt-lg"
>
<div
class=
"order-item rounded"
>
<div
class=
"
title"
>
<span>
{{
order
.
create
}}
</span
>
<
span
class=
"q-ml-md"
>
{{
order
.
ordernum
}}
</span
>
<div
class=
"
order-bar rounded row q-mt-xl"
>
<div
class=
"item"
style=
"width: 280px !important; min-width: 280px; text-align: left;"
>
商品信息
</div>
<div
class=
"item col"
>
时长
</div
>
<div
class=
"item col"
>
单价
</div
>
<div
class=
"
item col"
>
数量
</div
>
<div
class=
"item none-width"
>
<
div
style=
"background-color: rgba(0,0,0,.08);width:1px"
>
</div
>
</div>
<div
class=
"bg-white rounded row items-center"
>
<div
class=
"item row items-center"
style=
"width: 280px !important; min-width: 280px; text-align: left;padding:24px;"
>
<img
:src=
"order.cover"
style=
"width:72px;"
class=
"rounded"
>
<div
class=
"q-ml-lg"
>
{{
order
.
pricetypename
}}
_
{{
order
.
vipname
}}
</div>
</div>
<div
class=
"item col"
>
{{
order
.
productname
}}
</div>
<div
class=
"item col"
>
¥
{{
order
.
price
.
toFixed
(
2
)
}}
</div>
<div
class=
"item col"
>
{{
order
.
use
}}
席位
</div>
<div
class=
"item none-width"
>
<div
style=
"background-color: rgba(0,0,0,.08);width:1px;height:72px;"
>
</div>
<div
class=
"item col"
>
小计
</div>
</div>
<div
class=
"order-body q-mt-lg"
>
<div
class=
"order-item rounded"
>
<div
class=
"title"
>
<span>
{{
order
.
create
}}
</span>
<span
class=
"q-ml-md"
>
{{
order
.
ordernum
}}
</span>
</div>
<div
class=
"item col"
>
<div
class=
"text-weight-bold q-mb-sm"
style=
"font-size: 16px"
>
¥
{{
order
.
price
.
toFixed
(
2
)
}}
</div>
<div
class=
"bg-white rounded row items-center"
>
<div
class=
"item row items-center"
style=
"width: 280px !important; min-width: 280px; text-align: left;padding:24px;"
>
<img
:src=
"order.cover"
style=
"width:72px;"
class=
"rounded"
>
<div
class=
"q-ml-lg"
>
{{
order
.
pricetypename
}}
_
{{
order
.
vipname
}}
</div>
</div>
<div
class=
"item col"
>
{{
order
.
productname
}}
</div>
<div
class=
"item col"
>
¥
{{
order
.
price
.
toFixed
(
2
)
}}
</div>
<div
class=
"item col"
>
{{
order
.
use
}}
席位
</div>
<div
class=
"item none-width"
>
<div
style=
"background-color: rgba(0,0,0,.08);width:1px;height:72px;"
>
</div>
</div>
<div
class=
"item col"
>
<div
class=
"text-weight-bold q-mb-sm"
style=
"font-size: 16px"
>
¥
{{
order
.
price
.
toFixed
(
2
)
}}
</div>
</div>
</div>
</div>
</div>
<div
class=
"q-mt-lg text-right"
>
<span
style=
"font-size: 14px;"
>
订单总金额:¥
</span>
<span
style=
"font-size: 18px"
class=
"text-weight-bold text-dark"
>
{{
order
.
price
.
toFixed
(
2
)
}}
</span>
</div>
<div
class=
"q-mt-lg text-right"
v-if=
"order.status==2"
>
<span
style=
"font-size: 14px;"
>
实付总金额:¥
</span>
<span
style=
"font-size: 18px"
class=
"text-weight-bold text-dark text-negative"
>
{{
order
.
price
.
toFixed
(
2
)
}}
</span>
</div>
</
template
>
<div
v-if=
"loading"
style=
"height: 200px;margin-top: 100px;"
v-loading=
"loading"
></div>
<div
v-if=
"!order && !loading"
>
<el-empty
class=
"q-ma-xl"
description=
"暂无数据"
/>
</div>
<div
class=
"q-mt-lg text-right"
>
<span
style=
"font-size: 14px;"
>
订单总金额:¥
</span>
<span
style=
"font-size: 18px"
class=
"text-weight-bold text-dark"
>
{{
order
.
price
.
toFixed
(
2
)
}}
</span>
</div>
<div
class=
"q-mt-lg text-right"
v-if=
"order.status==2"
>
<span
style=
"font-size: 14px;"
>
实付总金额:¥
</span>
<span
style=
"font-size: 18px"
class=
"text-weight-bold text-dark text-negative"
>
{{
order
.
price
.
toFixed
(
2
)
}}
</span>
</div>
</
template
>
<div
v-if=
"loading"
style=
"height: 200px;margin-top: 100px;"
v-loading=
"loading"
></div>
<div
v-if=
"!order && !loading"
>
<el-empty
class=
"q-ma-xl"
description=
"暂无数据"
/>
</div>
</div>
<WePay
v-if=
"showPay"
:orderid=
"order.orderid"
@
close=
"showPay=false"
@
success=
"showPay=false,getOrder()"
></WePay>
</template>
...
...
@@ -124,7 +123,10 @@ const CanceltOrders = async ()=>{
}
const
forwardOrder
=
(
id
:
string
)
=>
{
router
.
push
(
'/u/order'
)
let
activeName
=
router
.
currentRoute
.
value
.
params
.
activeName
?
`/
${
router
.
currentRoute
.
value
.
params
.
activeName
}
`
:
''
let
isFirm
=
router
.
currentRoute
.
value
.
params
.
isFirm
let
url
=
isFirm
==
1
?
`/a/order
${
activeName
}
`
:
`/u/order
${
activeName
}
`
router
.
push
(
url
)
}
const
getOrder
=
async
()
=>
{
...
...
src/views/UserCenter/components/InvoiceDetails.vue
0 → 100644
View file @
3bd92d41
<
template
>
<el-dialog
v-model=
"dialogVisible"
width=
"450"
title=
"发票详情"
:close-on-press-escape=
"false"
:close-on-click-modal=
"false"
@
close=
"close"
>
<div
class=
"InvoiceVerify"
>
<div
class=
"InvoiceVerify-box fz14"
>
<div
class=
"row flex-between items-center q-py-sm"
>
<span>
开票金额
</span>
<span
class=
"text-bold"
>
¥
{{
InvoiceDetails
.
Money
.
toFixed
(
2
)
}}
</span>
</div>
<div
class=
"row flex-between items-center q-py-sm"
>
<span>
开具方式
</span>
<span
class=
"text-bold"
>
{{
InvoiceDetails
.
IssuedType
==
1
?
'电子普通发票'
:
'增值税专用发票'
}}
</span>
</div>
<div
class=
"row flex-between items-center q-py-sm"
>
<span>
发票类型
</span>
<span
class=
"text-bold"
>
{{
InvoiceDetails
.
InvoiceType
==
1
?
'企业'
:
'个人'
}}
</span>
</div>
<div
class=
"row flex-between items-center q-py-sm"
>
<span>
发票抬头
</span>
<span
class=
"text-bold"
>
{{
InvoiceDetails
.
InvoiceTitle
}}
</span>
</div>
<div
class=
"row flex-between items-center q-py-sm"
>
<span>
邮箱地址
</span>
<span
class=
"text-bold"
>
{{
InvoiceDetails
.
Email
}}
</span>
</div>
</div>
</div>
<div
v-if=
"false"
class=
"order-body q-pt-md"
>
<div
class=
"order-item rounded"
>
<div
class=
"title row flex-between items-center"
>
<span
class=
""
>
订单
</span>
<el-button
v-if=
"props.InvoiceDetails.OrderList.length>1"
link
@
clcik=
"MoreData"
>
<el-icon
v-if=
"!isMore"
><ArrowRight
/></el-icon>
<el-icon
v-else
><ArrowUp
/></el-icon>
</el-button>
</div>
<!-- :class="[!isMore||isMore?'animate__fadeInUp':'']" -->
<div
class=
"animate__animated"
>
<div
v-for=
"x in Orders"
:key=
"x.OrderId"
class=
"order-list"
@
click=
"forwardOrderDetail(x.OrderId)"
>
<div
class=
"bg-white row flex-between q-px-md q-pt-md text-5B5D62"
>
<span>
{{
x
.
PayTime
}}
</span>
<span
class=
"q-ml-md"
>
<el-button
link
@
click=
"forwardOrderDetail(x.OrderId)"
>
{{
x
.
OrderNum
}}
</el-button>
</span>
</div>
<div
class=
"bg-white rounded row items-center q-pb-md"
>
<div
class=
"item items-center"
style=
"padding: 5px 10px;"
>
<div>
{{
x
.
PriceTypeName
}}
_
{{
x
.
VipName
}}
</div>
</div>
<div
class=
"item"
>
{{
x
.
InvalidName
}}
</div>
<div
class=
"item col text-right"
>
¥
{{
x
.
TradePrice
.
toFixed
(
2
)
}}
</div>
</div>
</div>
</div>
</div>
</div>
<template
#
footer
>
<div
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"DownloadInvoice(InvoiceDetails.InvoiceFile[0])"
>
查看发票
</el-button>
</div>
</
template
>
</el-dialog>
</template>
<
script
lang=
"ts"
setup
>
import
{
ApiResult
,
VipType
}
from
'@/configs/axios'
import
{
EntMemberRight
,
FreeMemberRight
,
PersonMemberRight
}
from
'@/configs/customer'
import
OrderService
from
'@/services/OrderService'
import
{
ref
,
onMounted
,
reactive
,
watch
}
from
'vue'
import
{
ElMessage
,
FormInstance
,
FormRules
}
from
'element-plus'
;
import
{
useRouter
}
from
"vue-router"
;
import
{
openNewBlank
}
from
'@/utils/common'
;
const
router
=
useRouter
()
const
props
=
defineProps
({
InvoiceDetails
:
{}
as
Object
,
show
:
true
as
Boolean
,
firm
:
0
as
Number
})
const
isMore
=
ref
(
false
)
const
Orders
=
ref
([]
as
any
)
const
emit
=
defineEmits
<
{
(
event
:
'close'
):
void
,
(
event
:
'success'
):
void
}
>
()
const
dialogVisible
=
ref
(
false
)
const
forwardOrderDetail
=
(
id
:
string
)
=>
{
let
url
=
props
.
firm
?
`/a/order/
${
encodeURIComponent
(
id
)}
/
${
props
.
firm
}
`
:
`/u/order/
${
encodeURIComponent
(
id
)}
`
// router.push(url)
openNewBlank
(
url
)
}
const
DownloadInvoice
=
(
x
:
any
)
=>
{
// let name = x.Content.split('/')
// const xhr = new XMLHttpRequest()
// xhr.open('GET', x.Url, true)
// xhr.responseType = 'blob'
// xhr.onprogress = (e:any)=>{
// }
// xhr.onload = ()=>{
// var blob = xhr.response;
// let link = document.createElement('a');
// link.download = name[name.length-1];
// link.href = URL.createObjectURL(blob);
// link.click()
// }
// xhr.send()
window
.
open
(
x
.
Url
)
// window.open("https://view.officeapps.live.com/op/view.aspx?src=" + encodeURIComponent(x.Url),'_blank')
}
const
MoreData
=
()
=>
{
isMore
.
value
=
!
isMore
.
value
if
(
isMore
.
value
)
Orders
.
value
=
JSON
.
parse
(
JSON
.
stringify
(
props
.
InvoiceDetails
.
OrderList
))
else
{
Orders
.
value
=
[]
Orders
.
value
.
push
(
props
.
InvoiceDetails
.
OrderList
[
0
])
}
}
const
close
=
()
=>
{
emit
(
'close'
)
}
watch
(()
=>
props
.
show
,(
n
,
o
)
=>
{
if
(
n
)
{
Orders
.
value
=
[]
Orders
.
value
.
push
(
props
.
InvoiceDetails
.
OrderList
[
0
])
dialogVisible
.
value
=
true
}
else
dialogVisible
.
value
=
false
})
</
script
>
<
style
scoped
>
.InvoiceVerify-title
{
color
:
#9BA1AA
;
}
.InvoiceVerify-box
{
border-radius
:
8px
;
background
:
#F6F7F9
;
padding
:
10px
20px
;
}
.order-body
{
}
.order-body
.order-item
{
background
:
#f6f7f9
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,
.08
);
font-size
:
14px
;
}
.order-body
.order-item
.title
{
padding
:
0
14px
;
height
:
35px
;
line-height
:
35px
;
color
:
grey
;
white-space
:
nowrap
;
overflow
:
hidden
;
}
.order-body
.order-item
.item
{
height
:
auto
;
line-height
:
1
;
color
:
#000
;
white-space
:
nowrap
;
overflow
:
hidden
;
padding
:
0
10px
;
}
.order-list
{
border-bottom
:
1px
solid
rgba
(
0
,
0
,
0
,
.08
);
}
.order-list
:last-child
{
border
:
0
;
}
</
style
>
\ No newline at end of file
src/views/UserCenter/components/openInvoice.vue
0 → 100644
View file @
3bd92d41
This diff is collapsed.
Click to expand it.
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