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
5c268c08
Commit
5c268c08
authored
May 16, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
75a8781e
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
64 additions
and
36 deletions
+64
-36
AdmissionTicket.vue
src/components/LocalTour/AdmissionTicket.vue
+8
-1
Appointment.vue
src/components/LocalTour/Appointment.vue
+2
-0
TicketDetails.vue
src/components/LocalTour/TicketDetails.vue
+4
-1
LocalTourCalendar.vue
src/components/mall/LocalTourCalendar.vue
+9
-2
OrderCenter.vue
src/components/newPersonalCenter/block/OrderCenter.vue
+4
-0
TCTable.vue
.../newPersonalCenter/block/model/OrderInfoModel/TCTable.vue
+33
-29
TdOrder.vue
src/components/newPersonalCenter/block/model/TdOrder.vue
+3
-3
newPersonalCenter.vue
src/components/newPersonalCenter/newPersonalCenter.vue
+1
-0
No files found.
src/components/LocalTour/AdmissionTicket.vue
View file @
5c268c08
...
...
@@ -20,6 +20,7 @@
</div>
<div
class=
"threeDiv"
>
<p><span
style=
"color:#FDAC11;font-size:22px"
>
¥
{{
item
.
b2bPrice
|
NoDesnum
}}
</span>
起
</p>
<p
style=
"margin-top:10px;cursor:pointer"
><span
@
click=
"GoUrl(item)"
>
查看详情
</span></p>
</div>
</li>
<ul
class=
"ticketDiv"
>
...
...
@@ -32,7 +33,7 @@
<!--
<span
style=
"color:#999999;font-size:12px;margin-left:7px;text-decoration: line-through"
>
原价:¥300
</span>
-->
</span>
<span
class=
"ThreeSpan"
>
<span
@
click=
"
GoUrl(item
)"
class=
"yd"
>
预定
</span>
<span
@
click=
"
YdUrl(item,ticket
)"
class=
"yd"
>
预定
</span>
</span>
</li>
...
...
@@ -72,6 +73,12 @@ export default {
},
methods
:
{
YdUrl
(
item
,
ticket
){
sessionStorage
.
dataDes
=
JSON
.
stringify
(
item
);
sessionStorage
.
Ticketinfo
=
JSON
.
stringify
(
ticket
);
this
.
$router
.
push
({
path
:
'/Appointment'
,
query
:{
idDes
:
encodeURIComponent
(
ticket
.
idDes
)}
})
},
GoUrl
(
item
){
this
.
$router
.
push
({
path
:
'/TicketDetails'
,
query
:{
idDes
:
encodeURIComponent
(
item
.
idDes
)}
})
...
...
src/components/LocalTour/Appointment.vue
View file @
5c268c08
...
...
@@ -294,6 +294,8 @@ export default {
this
.
apiJavaPost
(
"/api/b2b/scenic/setTicketOrder"
,
this
.
form
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
Success
(
res
.
data
.
message
);
this
.
$router
.
push
({
path
:
'/newPersonalCenter?key=8-8'
})
}
else
{
this
.
Error
(
res
.
data
.
message
)
...
...
src/components/LocalTour/TicketDetails.vue
View file @
5c268c08
...
...
@@ -28,7 +28,10 @@
<p
class=
"pfR"
style=
"color:#2A5532;font-size:20px;"
>
{{
dataDes
.
name
}}
</p>
<!--
<p
style=
"margin-top:20px"
class=
"ticketSpan"
>
票类包括:
<span>
大小同价
</span><span>
大小价
</span></p>
-->
<div
class=
"price"
>
¥
{{
dataDes
.
minPrice
|
NoDesnum
}}
~¥
{{
dataDes
.
maxPrice
|
NoDesnum
}}
¥
{{
dataDes
.
minPrice
|
NoDesnum
}}
<span
v-if=
"dataDes.minPrice!=dataDes.maxPrice"
>
~¥
{{
dataDes
.
maxPrice
|
NoDesnum
}}
</span>
</div>
<p>
<span
style=
"color:#666666"
>
景点地址:
</span>
...
...
src/components/mall/LocalTourCalendar.vue
View file @
5c268c08
...
...
@@ -61,10 +61,17 @@
box-sizing
:
border-box
;
}
.LocalTourCalendar
.monthDayList
{
overflow
:
auto
;
/* overflow: auto; */
border-top
:
1px
solid
#E1E1E1
;
}
.LocalTourCalendar
.monthDayList
:after
{
clear
:
both
;
content
:
'.'
;
display
:
block
;
height
:
0
;
overflow
:
hidden
;
}
.LocalTourCalendar
.dayList.yesPrice
:hover
{
background
:
#FF680B
;
color
:
#fff
!important
;
...
...
src/components/newPersonalCenter/block/OrderCenter.vue
View file @
5c268c08
...
...
@@ -13,6 +13,8 @@
<TdOrder
v-if=
"data === '8-7'"
/>
<!-- 机票订单 -->
<TkOrder
v-if=
"data === '8-5'"
/>
<!-- 景点门票订单 -->
<ScenOrder
v-if=
"data === '8-8'"
/>
</div>
</
template
>
<
script
>
...
...
@@ -20,6 +22,7 @@ import TcOrder from './model/TcOrder'
import
TdOrder
from
'./model/TdOrder'
import
TzOrder
from
'./model/TzOrder'
import
TkOrder
from
'./model/TkOrder'
import
ScenOrder
from
'./model/ScenOrder'
export
default
{
props
:{
data
:
''
...
...
@@ -29,6 +32,7 @@ export default {
TdOrder
:
TdOrder
,
TkOrder
:
TkOrder
,
TzOrder
:
TzOrder
,
ScenOrder
:
ScenOrder
,
},
data
()
{
return
{
...
...
src/components/newPersonalCenter/block/model/OrderInfoModel/TCTable.vue
View file @
5c268c08
...
...
@@ -183,11 +183,11 @@
</thead>
<tbody>
<
template
v-for=
"(item, index) in tableData"
>
<tr
class=
"top"
:class=
"
{hover_bg: activeRow === index}" @mouseenter="enter(index)" @mouseleave="enter()">
<tr
class=
"top"
:
key=
"index"
:
class=
"
{hover_bg: activeRow === index}" @mouseenter="enter(index)" @mouseleave="enter()">
<td
colspan=
"5"
>
<span
class=
"time"
>
2019-04-28 08:25:23
</span>
<span
class=
"num"
>
订单号:
<span>
451648
</span></span>
<span
class=
"contacts"
><i
class=
"iconfont icon-dianhua"
></i>
<span>
李晓敏 13880688956
</span></span>
<span
class=
"time"
>
{{
item
.
startDate
}}
</span>
<span
class=
"num"
>
订单号:
<span>
{{
item
.
orderId
}}
</span></span>
<span
class=
"contacts"
><i
class=
"iconfont icon-dianhua"
></i>
<span>
{{
item
.
serviceName
}}
{{
item
.
servicePhone
}}
</span></span>
</td>
</tr>
<tr
class=
"info"
@
mouseenter=
"enter(index)"
@
mouseleave=
"enter()"
:class=
"
{hover_bg: activeRow === index}">
...
...
@@ -195,9 +195,9 @@
<div
class=
"tc_info"
>
<div
class=
"_left"
></div>
<div
class=
"_right"
>
<p
class=
"color333 font-size14"
>
日本跟团游
</p>
<p
class=
"color333 font-size14"
>
{{
item
.
title
}}
</p>
<p>
系列名称系列名称系列名称...
</p>
<p>
团号:
XY336889999
</p>
<p>
团号:
{{
item
.
tcid
}}
</p>
</div>
</div>
</td>
...
...
@@ -284,33 +284,35 @@ export default {
components
:
{
payurlItem
:
payURL
,
},
// props:["tableData"],
props
:[
"tableData"
],
data
()
{
return
{
activeRow
:
''
,
activeNames
:
[
'1'
],
dropTitTwo
:
"10天内"
,
tableData
:
[
{
title
:
'111'
,
payShow
:
false
,
orderState
:
1
},{
title
:
'222'
,
payShow
:
false
,
orderState
:
0
},
{
title
:
'333'
,
payShow
:
false
,
orderState
:
2
},
{
title
:
'444'
,
payShow
:
false
,
orderState
:
3
}
],
dataList
:[],
// tableData: [
// {
// title: '111',
// payShow: false,
// orderState: 1
// },{
// title: '222',
// payShow: false,
// orderState: 0
// },
// {
// title: '333',
// payShow: false,
// orderState: 2
// },
// {
// title: '444',
// payShow: false,
// orderState: 3
// }
// ],
dayList
:
[
{
Day
:
"10天"
,
...
...
@@ -330,7 +332,9 @@ export default {
],
};
},
mounted
()
{},
mounted
()
{
console
.
log
(
"tableData"
,
this
.
tableData
)
},
methods
:
{
enter
:
function
(
t
)
{
if
(
t
+
1
)
{
...
...
src/components/newPersonalCenter/block/model/TdOrder.vue
View file @
5c268c08
...
...
@@ -6,7 +6,7 @@
<!-- 条件 -->
<ul
class=
"clearfix"
>
<template
v-for=
"item in TitList"
>
<li
<li
:key=
"item.ID"
class=
"__cp"
@
click=
"handleClick(item)"
:class=
"
{_active: activeName === item.ID}"
...
...
@@ -15,6 +15,7 @@
</ul>
<!-- 表格 -->
<TCTable
:tableData=
"tableData"
/>
<div
class=
"empty-data"
v-if=
"tableData.length<1"
>
<i
class=
"iconfont icon-kong"
></i>
很抱歉,你想要的信息我们真的找不到了
...
...
@@ -100,7 +101,6 @@ export default {
},
computed
:
{},
created
()
{
console
.
log
(
"定制游订单"
);
},
mounted
()
{
let
userInfo
=
localStorage
.
userInfo
...
...
@@ -136,9 +136,9 @@ export default {
"/api/b2b/user/getrecentorder"
,
this
.
getOrderMsg
,
res
=>
{
console
.
log
(
"定制游订单"
,
res
);
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
tableData
=
res
.
data
.
data
.
pageData
;
console
.
log
(
"this.tableData"
,
this
.
tableData
)
this
.
totalCount
=
res
.
data
.
data
.
pageCount
;
this
.
Count
=
res
.
data
.
data
.
count
;
this
.
orderLoading
=
false
;
...
...
src/components/newPersonalCenter/newPersonalCenter.vue
View file @
5c268c08
...
...
@@ -69,6 +69,7 @@
<el-menu-item
index=
"8-4"
@
click=
"clickMenu('8-4')"
>
签证订单
</el-menu-item>
<el-menu-item
index=
"8-5"
@
click=
"clickMenu('8-5')"
>
机票订单
</el-menu-item>
<el-menu-item
index=
"8-6"
@
click=
"clickMenu('8-6')"
>
酒店订单
</el-menu-item>
<el-menu-item
index=
"8-8"
@
click=
"clickMenu('8-8')"
>
门票订单
</el-menu-item>
</el-submenu>
<el-submenu
index=
"3"
>
<
template
slot=
"title"
>
...
...
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