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
3fcf5904
Commit
3fcf5904
authored
May 08, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加自由行订单
parent
15f87ec7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
232 additions
and
26 deletions
+232
-26
home.css
src/assets/css/home.css
+61
-1
CustomizedTourism.vue
src/components/DependentTravel/CustomizedTourism.vue
+6
-2
DesignScheme.vue
src/components/DependentTravel/DesignScheme.vue
+4
-2
Home.vue
src/components/Home.vue
+153
-18
OrderCenter.vue
src/components/newPersonalCenter/block/OrderCenter.vue
+5
-1
TdOrder.vue
src/components/newPersonalCenter/block/model/TdOrder.vue
+1
-1
newPersonalCenter.vue
src/components/newPersonalCenter/newPersonalCenter.vue
+2
-1
No files found.
src/assets/css/home.css
View file @
3fcf5904
...
...
@@ -53,12 +53,69 @@
padding
:
5px
0
;
text-align
:
center
;
font-size
:
14px
;
font-weight
:
bold
;
float
:
right
;
font-family
:
"PingFangR"
}
.Home
.Home_top
.tag_right
.el-form-item__label
{
color
:
#666666
;
}
/* 选择条件部分 */
.Home
.Home_top
.tag_right
.chooseticketul
li
{
display
:
inline-block
;
width
:
182px
;
height
:
32px
;
line-height
:
32px
;
border
:
1px
solid
rgba
(
216
,
218
,
220
,
1
);
margin-bottom
:
10px
;
}
.Home
.Home_top
.tag_right
.chooseticketul
li
span
:nth-child
(
1
)
{
padding-left
:
10px
;
color
:
#666666
;
}
.Home
.Home_top
.tag_right
.chooseticketul
li
span
.el-input
{
width
:
98px
!important
;
position
:
relative
;
}
.Home
.Home_top
.tag_right
.chooseticketul
li
.el-input__prefix
{
right
:
5px
;
width
:
20px
;
}
.Home
.Home_top
.tag_right
.chooseticketul
.el-input__inner
{
border
:
none
;
line-height
:
30px
;
background
:
transparent
;
padding
:
0
;
}
.Home
.Home_top
.tag_right
.visaul_li
{
width
:
100%
;
height
:
32px
;
border
:
1px
solid
rgba
(
216
,
218
,
220
,
1
);
line-height
:
32px
;
box-sizing
:
border-box
;
}
.Home
.Home_top
.tag_right
.visaul_li
li
{
float
:
left
;
position
:
relative
;
}
.Home
.Home_top
.tag_right
.visaul_li
li
:nth-child
(
1
)
{
padding-left
:
10px
;
color
:
#666666
;
}
.Home
.Home_top
.tag_right
.visaul_li
li
.el-input__inner
{
border
:
none
;
line-height
:
30px
;
background
:
transparent
;
padding
:
0
;
}
.Home
.Home_top
.tag_right
.visaul_li
li
.el-date-editor.el-input
,
.el-date-editor.el-input__inner
{
width
:
100px
!important
;
position
:
relative
;
}
.Home
.Home_top
.tag_right
.visaul_li
li
.el-input__prefix
{
right
:
0px
;
}
.Home
.el-input__inner
{
border-radius
:
0px
;
}
...
...
@@ -66,6 +123,9 @@
font-size
:
20px
;
color
:
#ababab
;
}
.Home
ul
,
p
{
padding
:
0
;
...
...
src/components/DependentTravel/CustomizedTourism.vue
View file @
3fcf5904
...
...
@@ -159,7 +159,10 @@
<div
class=
"daylist"
v-for=
"(item,index) in datades.dayList"
:key=
"index+100"
>
<div
style=
"padding-left:36px;margin-bottom:30px;"
>
<span
class=
"dayindex"
>
D
{{
item
.
dayNum
}}
</span>
<span
v-if=
"item.title.childItem.title"
class=
"daytitle"
>
{{
item
.
title
.
childItem
.
title
}}
</span>
<span
v-if=
"item.title.childItem"
>
<span
:class=
"item.title.childItem.title?'daytitle':''"
>
{{
item
.
title
.
childItem
.
title
}}
</span>
</span>
</div>
<div
class=
"common_left"
>
<!-- 交通 -->
...
...
@@ -182,7 +185,7 @@
<span>
{{
tra
.
arrivalCityName
}}
</span>
</span>
<div
style=
"font-size:14px;margin-top:20px"
>
<span
style=
"color:#5F95E8;margin-left:5px"
>
{{
traff
.
childItem
.
descriptionText
}}
</span>
<span>
{{
traff
.
childItem
.
descriptionText
}}
</span>
</div>
...
...
@@ -413,6 +416,7 @@ export default {
}
})
});
console
.
log
(
"this.datades"
,
this
.
datades
)
}
else
{}
},
err
=>
{})
},
...
...
src/components/DependentTravel/DesignScheme.vue
View file @
3fcf5904
...
...
@@ -49,7 +49,9 @@
<div
class=
"daylist"
v-for=
"(item,index) in datades.dayList"
:key=
"index+100"
>
<div
style=
"padding-left:36px;margin-bottom:30px;"
>
<span
class=
"dayindex"
>
D
{{
item
.
dayNum
}}
</span>
<span
class=
"daytitle"
>
{{
item
.
title
.
childItem
.
title
}}
</span>
<span
v-if=
"item.title.childItem"
>
<span
:class=
"item.title.childItem.title?'daytitle':''"
>
{{
item
.
title
.
childItem
.
title
}}
</span>
</span>
</div>
<div
class=
"common_left"
>
<!-- 交通 -->
...
...
@@ -72,7 +74,7 @@
<span>
{{
tra
.
arrivalCityName
}}
</span>
</span>
<div
style=
"font-size:14px;margin-top:20px"
>
<span
style=
"color:#5F95E8;margin-left:5px"
>
{{
traff
.
childItem
.
descriptionText
}}
</span>
<span>
{{
traff
.
childItem
.
descriptionText
}}
</span>
</div>
...
...
src/components/Home.vue
View file @
3fcf5904
This diff is collapsed.
Click to expand it.
src/components/newPersonalCenter/block/OrderCenter.vue
View file @
3fcf5904
...
...
@@ -7,8 +7,10 @@
<div>
<!-- 团订单 -->
<TcOrder
v-if=
"data === '8-1'"
/>
<!-- 自由行订单 -->
<TzOrder
v-if=
"data === '8-2'"
/>
<!-- 定制游订单 -->
<TdOrder
v-if=
"data === '8-
2
'"
/>
<TdOrder
v-if=
"data === '8-
7
'"
/>
<!-- 机票订单 -->
<TkOrder
v-if=
"data === '8-5'"
/>
</div>
...
...
@@ -16,6 +18,7 @@
<
script
>
import
TcOrder
from
'./model/TcOrder'
import
TdOrder
from
'./model/TdOrder'
import
TzOrder
from
'./model/TzOrder'
import
TkOrder
from
'./model/TkOrder'
export
default
{
props
:{
...
...
@@ -25,6 +28,7 @@ export default {
TcOrder
:
TcOrder
,
TdOrder
:
TdOrder
,
TkOrder
:
TkOrder
,
TzOrder
:
TzOrder
,
},
data
()
{
return
{
...
...
src/components/newPersonalCenter/block/model/TdOrder.vue
View file @
3fcf5904
...
...
@@ -48,7 +48,7 @@ export default {
getOrderMsg
:
{
pageIndex
:
1
,
pageSize
:
10
,
orderType
:
2
,
orderType
:
7
,
queryDays
:
0
,
orderState
:
-
1
,
CustomerId
:
""
...
...
src/components/newPersonalCenter/newPersonalCenter.vue
View file @
3fcf5904
...
...
@@ -63,7 +63,8 @@
<span>
订单中心
</span>
</
template
>
<el-menu-item
index=
"8-1"
@
click=
"clickMenu('8-1')"
>
跟团游订单
</el-menu-item>
<el-menu-item
index=
"8-2"
@
click=
"clickMenu('8-2')"
>
定制游订单
</el-menu-item>
<el-menu-item
index=
"8-2"
@
click=
"clickMenu('8-2')"
>
自由行订单
</el-menu-item>
<el-menu-item
index=
"8-7"
@
click=
"clickMenu('8-7')"
>
定制游订单
</el-menu-item>
<el-menu-item
index=
"8-3"
@
click=
"clickMenu('8-3')"
>
当地游订单
</el-menu-item>
<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>
...
...
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