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
dd61541c
Commit
dd61541c
authored
Jun 11, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
929ac690
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
113 additions
and
73 deletions
+113
-73
newHead.css
src/assets/mall/newHead.css
+21
-0
CustomizedTourism.vue
src/components/DependentTravel/CustomizedTourism.vue
+2
-0
IndependentList.vue
src/components/DependentTravel/IndependentList.vue
+1
-1
IndependentTravel.vue
src/components/DependentTravel/IndependentTravel.vue
+18
-13
index.vue
src/components/GroupTour/index.vue
+1
-1
Appointment.vue
src/components/LocalTour/Appointment.vue
+6
-1
LocalCuisineDetails.vue
src/components/LocalTour/LocalCuisineDetails.vue
+1
-2
Localtourhome.vue
src/components/LocalTour/Localtourhome.vue
+18
-6
TicketDetails.vue
src/components/LocalTour/TicketDetails.vue
+2
-2
newHead.vue
src/components/global/newHead.vue
+16
-6
detailTwo.vue
src/components/mall/detailTwo.vue
+8
-4
FoodTable.vue
...ewPersonalCenter/block/model/OrderInfoModel/FoodTable.vue
+4
-4
ScenTable.vue
...ewPersonalCenter/block/model/OrderInfoModel/ScenTable.vue
+1
-1
TCTable.vue
.../newPersonalCenter/block/model/OrderInfoModel/TCTable.vue
+9
-28
TcOrder.vue
src/components/newPersonalCenter/block/model/TcOrder.vue
+1
-0
index.vue
src/components/trade/order/index.vue
+2
-2
indexTwo.vue
src/components/trade/order/indexTwo.vue
+2
-2
No files found.
src/assets/mall/newHead.css
View file @
dd61541c
...
@@ -163,6 +163,27 @@ ul,li{list-style: none;}
...
@@ -163,6 +163,27 @@ ul,li{list-style: none;}
font-size
:
14px
;
font-size
:
14px
;
cursor
:
pointer
;
cursor
:
pointer
;
}
}
.new_header_nav_three
ul
._t_nav_box
li
.localtour
{
background
:
#ee4454
;
color
:
#fff
;
position
:
absolute
;
top
:
40px
;
width
:
210px
;
z-index
:
100
;
}
.new_header_nav_three
ul
._t_nav_box
li
.localtour
{
display
:
none
;
}
.new_header_nav_three
ul
._t_nav_box
li
.localtour
span
{
padding
:
0
10px
;
}
.new_header_nav_three
ul
._t_nav_box
li
.localtour
span
:hover
{
/* background-color: #DF3343 */
}
.new_header_nav_three
ul
._t_nav_box
.localLi
:hover
.localtour
{
display
:
block
;
}
.new_header_nav_three
ul
._t_nav_box
li
>
div
.el-dropdown
{
.new_header_nav_three
ul
._t_nav_box
li
>
div
.el-dropdown
{
width
:
95%
;
width
:
95%
;
text-align
:
center
;
text-align
:
center
;
...
...
src/components/DependentTravel/CustomizedTourism.vue
View file @
dd61541c
...
@@ -636,6 +636,8 @@ export default {
...
@@ -636,6 +636,8 @@ export default {
}
}
.CustomizedTourism
.Submitdemand
.dz_info_list
li
{
.CustomizedTourism
.Submitdemand
.dz_info_list
li
{
padding
:
6px
0
;
padding
:
6px
0
;
min-height
:
30px
;
box-sizing
:
border-box
;
}
}
.CustomizedTourism
.Submitdemand
.dz_info_list
{
.CustomizedTourism
.Submitdemand
.dz_info_list
{
font-size
:
12px
;
font-size
:
12px
;
...
...
src/components/DependentTravel/IndependentList.vue
View file @
dd61541c
...
@@ -254,7 +254,7 @@ export default {
...
@@ -254,7 +254,7 @@ export default {
// detailTwo
// detailTwo
path
=
'detailTwo'
path
=
'detailTwo'
path
=
`
${
path
}
/
${
encodeURIComponent
(
id
)}
/`
+
tcid
path
=
`
${
path
}
/
${
encodeURIComponent
(
id
)}
/`
+
tcid
this
.
$router
.
push
({
path
})
this
.
$router
.
push
({
path
,
query
:{
teamType
:
1
}
})
},
},
proving
(){
proving
(){
this
.
minPrice
=
this
.
minPrice
.
replace
(
/
[^\.\d]
/g
,
''
)
this
.
minPrice
=
this
.
minPrice
.
replace
(
/
[^\.\d]
/g
,
''
)
...
...
src/components/DependentTravel/IndependentTravel.vue
View file @
dd61541c
...
@@ -16,8 +16,7 @@
...
@@ -16,8 +16,7 @@
<img
class=
"left1"
src=
"../../assets/img/travel/left1.png"
alt
>
<img
class=
"left1"
src=
"../../assets/img/travel/left1.png"
alt
>
<img
class=
"right1"
src=
"../../assets/img/travel/right1.png"
alt
>
<img
class=
"right1"
src=
"../../assets/img/travel/right1.png"
alt
>
<el-row
class=
"max-w1500"
:gutter=
"0"
>
<el-row
class=
"max-w1500"
:gutter=
"0"
>
<el-col
:span=
"18"
:offset=
"3"
>
<div
style=
"width:1200px;margin:0 auto"
>
<div
class=
"_top_box clearfix"
>
<div
class=
"_top_box clearfix"
>
<div
class=
'wrap'
>
<div
class=
'wrap'
>
<div
class=
'left common'
></div>
<div
class=
'left common'
></div>
...
@@ -67,6 +66,9 @@
...
@@ -67,6 +66,9 @@
<p>
立即定制
</p>
<p>
立即定制
</p>
</div>
</div>
</div>
</div>
</div>
<el-col
:span=
"18"
:offset=
"3"
>
<!-- 当季精选特惠 -->
<!-- 当季精选特惠 -->
<div
style=
"margin-top:40px"
>
<div
style=
"margin-top:40px"
>
<p
style=
"text-align:center;font-family:PingFang-SC-Regular;"
>
Hot areas in the season
</p>
<p
style=
"text-align:center;font-family:PingFang-SC-Regular;"
>
Hot areas in the season
</p>
...
@@ -76,7 +78,7 @@
...
@@ -76,7 +78,7 @@
</div>
</div>
<div
class=
"Season_content"
>
<div
class=
"Season_content"
>
<div
v-for=
"(item,index) in TreatmentList"
:key=
"index+100"
v-if=
"index
<3
"
>
<div
v-for=
"(item,index) in TreatmentList"
:key=
"index+100"
v-if=
"index
<3
"
>
<div
@
click=
"goUrl('detail',item.id,item.tcid)"
class=
"Season_content_list"
:style=
"
{backgroundImage:'url('+item.imgCover[0].Url+')'}">
<div
class=
"Season_content_list"
:style=
"
{backgroundImage:'url('+item.imgCover[0].Url+')'}">
<div
style=
"position:relative;height: 35px;background-color: white;bottom: -5px;"
>
<div
style=
"position:relative;height: 35px;background-color: white;bottom: -5px;"
>
<!--
<img
ref=
"img0"
id=
"img0"
src=
"../../assets/img/visa/country1.png"
alt=
""
>
-->
<!--
<img
ref=
"img0"
id=
"img0"
src=
"../../assets/img/visa/country1.png"
alt=
""
>
-->
<div
:class=
"SeasonBtn==0 ? 'Season_moneyActive' :''"
class=
"Season_money"
>
<div
:class=
"SeasonBtn==0 ? 'Season_moneyActive' :''"
class=
"Season_money"
>
...
@@ -97,7 +99,7 @@
...
@@ -97,7 +99,7 @@
</div>
</div>
</div>
</div>
<div>
<div>
<el-button
size=
"mini"
class=
"btn"
@
click=
"goUrl('detail',item.id,item.tcid)"
>
立即购买
</el-button>
<el-button
size=
"mini"
class=
"btn"
@
click=
"goUrl('detail
Two
',item.id,item.tcid)"
>
立即购买
</el-button>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -105,7 +107,7 @@
...
@@ -105,7 +107,7 @@
<div
v-if=
"TreatmentList.length>3"
class=
"Season_content"
style=
"padding: 0px 120px;"
>
<div
v-if=
"TreatmentList.length>3"
class=
"Season_content"
style=
"padding: 0px 120px;"
>
<div
v-for=
"(item,index) in TreatmentList"
:key=
"index"
v-if=
"index>2 && index
<5
"
>
<div
v-for=
"(item,index) in TreatmentList"
:key=
"index"
v-if=
"index>2 && index
<5
"
>
<div
@
click=
"goUrl('detail',item.id,item.tcid)"
class=
"Season_content_list"
:style=
"
{backgroundImage:'url('+item.imgCover[0].Url+')'}">
<div
class=
"Season_content_list"
:style=
"
{backgroundImage:'url('+item.imgCover[0].Url+')'}">
<div
style=
"position:relative;height: 35px;background-color: white;bottom: -5px;"
>
<div
style=
"position:relative;height: 35px;background-color: white;bottom: -5px;"
>
<div
:class=
"SeasonBtn==0 ? 'Season_moneyActive' :''"
class=
"Season_money"
>
<div
:class=
"SeasonBtn==0 ? 'Season_moneyActive' :''"
class=
"Season_money"
>
<p
style=
"font-size:12px;padding-top:10px"
>
RMB
</p>
<p
style=
"font-size:12px;padding-top:10px"
>
RMB
</p>
...
@@ -125,7 +127,7 @@
...
@@ -125,7 +127,7 @@
</div>
</div>
</div>
</div>
<div>
<div>
<el-button
size=
"mini"
class=
"btn"
>
立即购买
</el-button>
<el-button
@
click=
"goUrl('detailTwo',item.id,item.tcid)"
size=
"mini"
class=
"btn"
>
立即购买
</el-button>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -178,7 +180,7 @@
...
@@ -178,7 +180,7 @@
</span>
</span>
<span
style=
"font-size:12px"
>
{{
item
.
startCityName
}}
出发
</span>
<span
style=
"font-size:12px"
>
{{
item
.
startCityName
}}
出发
</span>
</div>
</div>
<el-button
@
click=
"goUrl('detail',item.id,item.tcid)"
<el-button
@
click=
"goUrl('detail
Two
',item.id,item.tcid)"
size=
"mini"
size=
"mini"
style=
"background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top"
style=
"background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top"
>
立即抢购
</el-button>
>
立即抢购
</el-button>
...
@@ -210,7 +212,7 @@
...
@@ -210,7 +212,7 @@
</span>
</span>
<span
style=
"font-size:12px"
>
{{
item
.
startCityName
}}
出发
</span>
<span
style=
"font-size:12px"
>
{{
item
.
startCityName
}}
出发
</span>
</div>
</div>
<el-button
@
click=
"goUrl('detail',item.id,item.tcid)"
<el-button
@
click=
"goUrl('detail
Two
',item.id,item.tcid)"
size=
"mini"
size=
"mini"
style=
"background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top"
style=
"background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top"
>
立即抢购
</el-button>
>
立即抢购
</el-button>
...
@@ -254,7 +256,7 @@
...
@@ -254,7 +256,7 @@
</span>
</span>
<span
style=
"font-size:12px"
>
{{
item
.
startCityName
}}
出发
</span>
<span
style=
"font-size:12px"
>
{{
item
.
startCityName
}}
出发
</span>
</div>
</div>
<el-button
@
click=
"goUrl('detail',item.id,item.tcid)"
<el-button
@
click=
"goUrl('detail
Two
',item.id,item.tcid)"
size=
"mini"
size=
"mini"
style=
"background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top"
style=
"background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top"
>
立即抢购
</el-button>
>
立即抢购
</el-button>
...
@@ -389,10 +391,8 @@ export default {
...
@@ -389,10 +391,8 @@ export default {
methods
:
{
methods
:
{
//
//
goUrl
(
path
,
id
,
tcid
){
goUrl
(
path
,
id
,
tcid
){
// detailTwo
path
=
'detailTwo'
path
=
`
${
path
}
/
${
encodeURIComponent
(
id
)}
/`
+
tcid
path
=
`
${
path
}
/
${
encodeURIComponent
(
id
)}
/`
+
tcid
this
.
$router
.
push
({
path
})
this
.
$router
.
push
({
path
,
query
:{
teamType
:
1
}
})
},
},
HotCrash
(){
HotCrash
(){
this
.
apipost
(
'b2b_get_GetB2BFreeRecommendPageList'
,
this
.
apipost
(
'b2b_get_GetB2BFreeRecommendPageList'
,
...
@@ -417,6 +417,7 @@ export default {
...
@@ -417,6 +417,7 @@ export default {
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
TreatmentList
=
res
.
data
.
data
.
pageData
;
this
.
TreatmentList
=
res
.
data
.
data
.
pageData
;
console
.
log
(
"this.TreatmentList"
,
this
.
TreatmentList
)
this
.
TreatmentList
.
forEach
(
item
=>
{
this
.
TreatmentList
.
forEach
(
item
=>
{
item
.
imgCover
=
JSON
.
parse
(
item
.
imgCover
)
item
.
imgCover
=
JSON
.
parse
(
item
.
imgCover
)
})
})
...
@@ -893,7 +894,7 @@ p {
...
@@ -893,7 +894,7 @@ p {
overflow
:
hidden
;
overflow
:
hidden
;
}
}
.Indepentdent
.box
{
.Indepentdent
.box
{
/* width: 104%; */
width
:
100%
;
height
:
99px
;
height
:
99px
;
background
:
rgba
(
255
,
255
,
255
,
0
);
background
:
rgba
(
255
,
255
,
255
,
0
);
overflow
:
hidden
;
overflow
:
hidden
;
...
@@ -902,6 +903,10 @@ p {
...
@@ -902,6 +903,10 @@ p {
z-index
:
10
;
z-index
:
10
;
/* left: 68px; */
/* left: 68px; */
}
}
.Indepentdent
.box
img
{
width
:
100%
;
height
:
100%
;
}
.boxCont
{
.boxCont
{
/* width: 100%;
/* width: 100%;
height: 137px;
height: 137px;
...
...
src/components/GroupTour/index.vue
View file @
dd61541c
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<div
class=
"bg"
>
<div
class=
"bg"
>
<ul
class=
"typeLi"
>
<ul
class=
"typeLi"
>
<li
class=
"alltype"
>
所有分类
</li>
<li
class=
"alltype"
>
所有分类
</li>
<li
v-for=
"(item,index) in lineList"
:key=
"index+100"
>
<li
v-
if=
"index
<7
"
v-
for=
"(item,index) in lineList"
:key=
"index+100"
>
<span
class=
"right_border"
></span>
<span
class=
"right_border"
></span>
<p
class=
"typeTile"
>
{{
item
.
lineShortName
}}
</p>
<p
class=
"typeTile"
>
{{
item
.
lineShortName
}}
</p>
<p
class=
"typeAdress"
>
<p
class=
"typeAdress"
>
...
...
src/components/LocalTour/Appointment.vue
View file @
dd61541c
...
@@ -109,7 +109,9 @@
...
@@ -109,7 +109,9 @@
<div
class=
"orderOk"
>
<div
class=
"orderOk"
>
我已阅读并同意
我已阅读并同意
<span
style=
"color:#39B372"
>
预订须知、旅游合同、特别预订提示、安全提示
</span>
<span
style=
"color:#39B372"
>
预订须知、旅游合同、特别预订提示、安全提示
</span>
<span
@
click=
"SaveOrder('ruleForm')"
class=
"orderPay"
>
确认订单
</span>
<span
@
click=
"SaveOrder('ruleForm')"
class=
"orderPay"
>
<el-button
:loading=
"btnLoad"
style=
"background:rgba(233,82,82,1);border:none;width:100%;height:100%;color:#fff;line-height:10px"
>
确认订单
</el-button>
</span>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -167,6 +169,7 @@ export default {
...
@@ -167,6 +169,7 @@ export default {
SettlementPrice
:
0
,
SettlementPrice
:
0
,
price
:
0
,
price
:
0
,
CheckedId
:[],
CheckedId
:[],
btnLoad
:
false
,
}
}
},
},
created
(){
created
(){
...
@@ -298,7 +301,9 @@ export default {
...
@@ -298,7 +301,9 @@ export default {
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
if
(
valid
)
{
if
(
valid
)
{
this
.
btnLoad
=
true
;
this
.
apiJavaPost
(
"/api/b2b/scenic/setTicketOrder"
,
this
.
form
,
res
=>
{
this
.
apiJavaPost
(
"/api/b2b/scenic/setTicketOrder"
,
this
.
form
,
res
=>
{
this
.
btnLoad
=
false
;
if
(
res
.
data
.
resultCode
==
1
){
if
(
res
.
data
.
resultCode
==
1
){
this
.
Success
(
res
.
data
.
message
);
this
.
Success
(
res
.
data
.
message
);
this
.
$router
.
push
({
path
:
'/newPersonalCenter?key=8-8'
})
this
.
$router
.
push
({
path
:
'/newPersonalCenter?key=8-8'
})
...
...
src/components/LocalTour/LocalCuisineDetails.vue
View file @
dd61541c
...
@@ -235,7 +235,7 @@ export default {
...
@@ -235,7 +235,7 @@ export default {
this
.
Btnload
=
false
;
this
.
Btnload
=
false
;
if
(
res
.
data
.
resultCode
==
1
){
if
(
res
.
data
.
resultCode
==
1
){
this
.
Success
(
res
.
data
.
message
);
this
.
Success
(
res
.
data
.
message
);
this
.
$router
.
push
({
path
:
'/newPersonalCenter?key=8-9'
})
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
...
@@ -395,7 +395,6 @@ export default {
...
@@ -395,7 +395,6 @@ export default {
if
(
this
.
datadetails
.
foodTag
){
if
(
this
.
datadetails
.
foodTag
){
this
.
datadetails
.
foodTagList
=
this
.
datadetails
.
foodTag
.
split
(
","
);
this
.
datadetails
.
foodTagList
=
this
.
datadetails
.
foodTag
.
split
(
","
);
}
}
console
.
log
(
"this.datadetails"
,
this
.
datadetails
)
if
(
this
.
datadetails
.
diningMealList
.
length
>
0
){
if
(
this
.
datadetails
.
diningMealList
.
length
>
0
){
this
.
msg
.
mealId
=
this
.
datadetails
.
diningMealList
[
0
].
id
;
this
.
msg
.
mealId
=
this
.
datadetails
.
diningMealList
[
0
].
id
;
this
.
tcidDes
=
this
.
datadetails
.
diningMealList
[
0
].
idDes
;
this
.
tcidDes
=
this
.
datadetails
.
diningMealList
[
0
].
idDes
;
...
...
src/components/LocalTour/Localtourhome.vue
View file @
dd61541c
...
@@ -58,7 +58,7 @@
...
@@ -58,7 +58,7 @@
</div>
</div>
<!-- 境外一日游 -->
<!-- 境外一日游 -->
<div
class=
"outoneday"
>
<div
id=
"outoneday"
class=
"outoneday"
>
<div
class=
"outone_top commontitle"
>
<div
class=
"outone_top commontitle"
>
<div
class=
"outone_top_left"
>
<div
class=
"outone_top_left"
>
<p
style=
"color:#4CB960;font-size:24px"
>
境外一日游
</p>
<p
style=
"color:#4CB960;font-size:24px"
>
境外一日游
</p>
...
@@ -118,7 +118,7 @@
...
@@ -118,7 +118,7 @@
</div>
</div>
</div>
</div>
<!-- 游玩门票 -->
<!-- 游玩门票 -->
<div
class=
"PlayTicket"
>
<div
id=
"PlayTicket"
class=
"PlayTicket"
>
<div
class=
"outone_top commontitle"
>
<div
class=
"outone_top commontitle"
>
<div
class=
"outone_top_left"
>
<div
class=
"outone_top_left"
>
<p
style=
"color:#4CB960;font-size:24px"
>
游玩门票
</p>
<p
style=
"color:#4CB960;font-size:24px"
>
游玩门票
</p>
...
@@ -161,7 +161,7 @@
...
@@ -161,7 +161,7 @@
</div>
</div>
</div>
</div>
<!-- 车辆接驳 -->
<!-- 车辆接驳 -->
<div
class=
"VehicleCon"
>
<
!--
<
div
class=
"VehicleCon"
>
<div
class=
"outone_top commontitle"
>
<div
class=
"outone_top commontitle"
>
<div
class=
"outone_top_left"
>
<div
class=
"outone_top_left"
>
<p
style=
"color:#4CB960;font-size:24px"
>
车辆接驳
</p>
<p
style=
"color:#4CB960;font-size:24px"
>
车辆接驳
</p>
...
@@ -283,9 +283,9 @@
...
@@ -283,9 +283,9 @@
</li>
</li>
</ul>
</ul>
</div>
</div>
</div>
</div>
-->
<!-- 当地美食 -->
<!-- 当地美食 -->
<div
class=
"PlayTicket"
>
<div
id=
"LocalFood"
class=
"PlayTicket"
>
<div
class=
"outone_top commontitle"
>
<div
class=
"outone_top commontitle"
>
<div
class=
"outone_top_left"
>
<div
class=
"outone_top_left"
>
<p
style=
"color:#4CB960;font-size:24px"
>
当地美食
</p>
<p
style=
"color:#4CB960;font-size:24px"
>
当地美食
</p>
...
@@ -362,10 +362,13 @@ export default {
...
@@ -362,10 +362,13 @@ export default {
dayLoad
:
false
,
dayLoad
:
false
,
ticketLoad
:
false
,
ticketLoad
:
false
,
isLogin
:
0
,
isLogin
:
0
,
scrollobj
:
null
,
}
}
},
},
created
(){
created
(){
this
.
isLogin
=
this
.
$store
.
state
.
isLogin
;
this
.
isLogin
=
this
.
$store
.
state
.
isLogin
;
},
},
mounted
()
{
mounted
()
{
this
.
getSlideList
();
this
.
getSlideList
();
...
@@ -374,8 +377,17 @@ export default {
...
@@ -374,8 +377,17 @@ export default {
this
.
GetHotAbroad
();
this
.
GetHotAbroad
();
this
.
GetCuntryTicket
();
this
.
GetCuntryTicket
();
this
.
getFoodCountryItem
();
this
.
getFoodCountryItem
();
this
.
scrollobj
=
document
.
getElementsByClassName
(
"el-scrollbar__wrap"
)[
0
];
if
(
this
.
$route
.
query
.
str
){
let
str
=
this
.
$route
.
query
.
str
;
this
.
goAnchor
(
str
);
}
},
},
methods
:
{
methods
:
{
goAnchor
(
selector
)
{
var
anchor
=
document
.
getElementById
(
selector
);
this
.
scrollobj
.
scrollTop
=
anchor
.
offsetTop
;
},
SelectFood
(
countryId
){
SelectFood
(
countryId
){
this
.
foodmsg
.
countryId
=
countryId
;
this
.
foodmsg
.
countryId
=
countryId
;
this
.
FoodCountryList
();
this
.
FoodCountryList
();
...
...
src/components/LocalTour/TicketDetails.vue
View file @
dd61541c
...
@@ -31,9 +31,9 @@
...
@@ -31,9 +31,9 @@
<p
class=
"pfR"
style=
"color:#2A5532;font-size:20px;"
>
{{
dataDes
.
name
}}
</p>
<p
class=
"pfR"
style=
"color:#2A5532;font-size:20px;"
>
{{
dataDes
.
name
}}
</p>
<!--
<p
style=
"margin-top:20px"
class=
"ticketSpan"
>
票类包括:
<span>
大小同价
</span><span>
大小价
</span></p>
-->
<!--
<p
style=
"margin-top:20px"
class=
"ticketSpan"
>
票类包括:
<span>
大小同价
</span><span>
大小价
</span></p>
-->
<div
class=
"price"
>
<div
class=
"price"
>
¥
{{
dataDes
.
minPrice
}}
¥
{{
dataDes
.
minPrice
|
NoDesnum
}}
<span
v-if=
"dataDes.minPrice!=dataDes.maxPrice"
>
<span
v-if=
"dataDes.minPrice!=dataDes.maxPrice"
>
~¥
{{
dataDes
.
maxPrice
}}
~¥
{{
dataDes
.
maxPrice
|
NoDesnum
}}
</span>
</span>
</div>
</div>
<p>
<p>
...
...
src/components/global/newHead.vue
View file @
dd61541c
...
@@ -213,11 +213,16 @@
...
@@ -213,11 +213,16 @@
<!-- 当地游 -->
<!-- 当地游 -->
<li
:class=
"{_active: navActive === 3}"
>
<li
class=
"localLi"
:class=
"{_active: navActive === 3}"
>
<div
@
click=
"handleSelect('/Localtourhome', 3), navActive = 3"
>
<div
@
click=
"handleSelect('/Localtourhome', 3), navActive = 3"
>
<span>
当地游
</span>
<span>
当地游
</span>
<span
class=
"__splice"
>
|
</span>
<span
class=
"__splice"
>
|
</span>
</div>
</div>
<div
class=
"localtour"
>
<span
@
click=
"GoLocalTour('outoneday')"
>
一日游
</span>
<span
@
click=
"GoLocalTour('PlayTicket')"
>
游玩门票
</span>
<span
@
click=
"GoLocalTour('LocalFood')"
>
当地美食
</span>
</div>
</li>
</li>
<!-- <li :class="{_active: navActive === 3}">
<!-- <li :class="{_active: navActive === 3}">
<div @click="handleSelect('/OneDayTour', 3), navActive = 3">
<div @click="handleSelect('/OneDayTour', 3), navActive = 3">
...
@@ -226,12 +231,12 @@
...
@@ -226,12 +231,12 @@
</div>
</div>
</li> -->
</li> -->
<!-- 酒店 -->
<!-- 酒店 -->
<li
:class=
"{_active: navActive === 4}"
>
<
!-- <
li :class="{_active: navActive === 4}">
<div @click="handleSelect('/', 4), navActive = 4">
<div @click="handleSelect('/', 4), navActive = 4">
<span>酒店</span>
<span>酒店</span>
<span class="__splice">|</span>
<span class="__splice">|</span>
</div>
</div>
</li>
</li>
-->
<!-- 签证 -->
<!-- 签证 -->
<li
:class=
"{_active: navActive === 5}"
>
<li
:class=
"{_active: navActive === 5}"
>
<div
@
click=
"handleSelect('/VisaHomePage', 5), navActive = 5"
>
<div
@
click=
"handleSelect('/VisaHomePage', 5), navActive = 5"
>
...
@@ -247,12 +252,12 @@
...
@@ -247,12 +252,12 @@
</div>
</div>
</li>
</li>
<!-- 景点门票 -->
<!-- 景点门票 -->
<li
:class=
"{_active: navActive === 7}"
>
<
!-- <
li :class="{_active: navActive === 7}">
<div @click="handleSelect('/', 7), navActive = 7">
<div @click="handleSelect('/', 7), navActive = 7">
<span>景点门票</span>
<span>景点门票</span>
<span class="__splice">|</span>
<span class="__splice">|</span>
</div>
</div>
</li>
</li>
-->
<!-- 积分商城 -->
<!-- 积分商城 -->
<li
:class=
"{_active: navActive === 8}"
>
<li
:class=
"{_active: navActive === 8}"
>
<div
@
click=
"handleSelect('/IntegralMall', 8), navActive = 8"
>
<div
@
click=
"handleSelect('/IntegralMall', 8), navActive = 8"
>
...
@@ -286,7 +291,12 @@ export default {
...
@@ -286,7 +291,12 @@ export default {
city
:
0
,
city
:
0
,
}
}
},
methods
:{
},
methods
:{
GoLocalTour
(
str
){
let
routeData
=
this
.
$router
.
resolve
({
name
:
"Localtourhome"
,
query
:{
str
:
str
}});
// let routeData = this.$router.resolve({ path:path});
window
.
open
(
routeData
.
href
,
'_blank'
);
},
changeSite
(){
changeSite
(){
window
.
localStorage
.
site
=
this
.
city
window
.
localStorage
.
site
=
this
.
city
this
.
$emit
(
'siteCity'
,
this
.
city
==
0
?
-
1
:
this
.
city
)
this
.
$emit
(
'siteCity'
,
this
.
city
==
0
?
-
1
:
this
.
city
)
...
...
src/components/mall/detailTwo.vue
View file @
dd61541c
...
@@ -194,7 +194,7 @@
...
@@ -194,7 +194,7 @@
</el-col>
</el-col>
</el-col>
</el-col>
</el-row>
</el-row>
<trade
:priceList=
'dataList.priceList'
:trip=
'dataList'
:numPeople=
"null"
v-if=
"dataList.priceList && dataList.priceList.length>0"
></trade>
<trade
:teamType=
"teamType"
:priceList=
'dataList.priceList'
:trip=
'dataList'
:numPeople=
"null"
v-if=
"dataList.priceList && dataList.priceList.length>0"
></trade>
<div
ref=
"nav"
>
<div
ref=
"nav"
>
<el-row>
<el-row>
<el-col
:span=
"20"
:offset=
"2"
>
<el-col
:span=
"20"
:offset=
"2"
>
...
@@ -735,6 +735,7 @@ export default {
...
@@ -735,6 +735,7 @@ export default {
showFlight
:
false
,
showFlight
:
false
,
FlightList
:
[],
FlightList
:
[],
city
:
-
1
,
city
:
-
1
,
teamType
:
0
,
}
}
},
watch
:
{
// 监听参数变化
},
watch
:
{
// 监听参数变化
changeCity
:
{
changeCity
:
{
...
@@ -747,6 +748,9 @@ export default {
...
@@ -747,6 +748,9 @@ export default {
deep
:
true
deep
:
true
},
},
},
created
(){
},
created
(){
if
(
this
.
$route
.
query
.
teamType
){
this
.
teamType
=
this
.
$route
.
query
.
teamType
;
}
this
.
ID
=
decodeURIComponent
(
this
.
$route
.
params
.
id
)
this
.
ID
=
decodeURIComponent
(
this
.
$route
.
params
.
id
)
this
.
tcid
=
decodeURIComponent
(
this
.
$route
.
params
.
tcid
)
this
.
tcid
=
decodeURIComponent
(
this
.
$route
.
params
.
tcid
)
if
(
this
.
$route
.
params
.
pre
&&
this
.
$route
.
params
.
pre
==
'preview'
){
if
(
this
.
$route
.
params
.
pre
&&
this
.
$route
.
params
.
pre
==
'preview'
){
...
@@ -857,7 +861,7 @@ export default {
...
@@ -857,7 +861,7 @@ export default {
for
(
let
i
=
0
;
i
<
data
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
data
.
length
;
i
++
)
{
if
(
word
===
data
[
i
].
startDate
){
if
(
word
===
data
[
i
].
startDate
){
this
.
priceListIndex
=
i
;
this
.
priceListIndex
=
i
;
let
msg
=
{
configId
:
data
[
i
].
configIDDes
,
cityId
:
this
.
city
,
preview
:
this
.
pre
,
tcid
:
data
[
i
].
tcid
}
let
msg
=
{
configId
:
data
[
i
].
configIDDes
,
cityId
:
this
.
city
,
preview
:
this
.
pre
,
tcid
:
data
[
i
].
tcid
,
teamType
:
this
.
teamType
}
bus
.
$emit
(
'chosen-tripdate'
,
word
)
bus
.
$emit
(
'chosen-tripdate'
,
word
)
this
.
getData
(
msg
)
this
.
getData
(
msg
)
}
}
...
@@ -884,13 +888,13 @@ export default {
...
@@ -884,13 +888,13 @@ export default {
break
break
}
}
}
}
let
msg
=
{
configId
:
this
.
ID
,
cityId
:
city
,
preview
:
this
.
pre
,
tcid
:
this
.
tcid
}
let
msg
=
{
configId
:
this
.
ID
,
cityId
:
city
,
preview
:
this
.
pre
,
tcid
:
this
.
tcid
,
teamType
:
this
.
teamType
}
this
.
getData
(
msg
)
this
.
getData
(
msg
)
})
})
},
},
getData
:
function
(
msg
)
{
getData
:
function
(
msg
)
{
this
.
loadingDataList
=
true
this
.
loadingDataList
=
true
//
console.log('api',msg)
console
.
log
(
'api'
,
msg
)
this
.
apipost
(
'b2b_get_GetB2BTravelInfoV1'
,
msg
,
r
=>
{
this
.
apipost
(
'b2b_get_GetB2BTravelInfoV1'
,
msg
,
r
=>
{
if
(
r
.
data
.
resultCode
==
1
){
if
(
r
.
data
.
resultCode
==
1
){
let
data
=
(
r
.
data
.
data
);
let
data
=
(
r
.
data
.
data
);
...
...
src/components/newPersonalCenter/block/model/OrderInfoModel/FoodTable.vue
View file @
dd61541c
...
@@ -61,7 +61,7 @@
...
@@ -61,7 +61,7 @@
color
:
#666666
;
color
:
#666666
;
font-size
:
12px
;
font-size
:
12px
;
display
:
inline-block
;
display
:
inline-block
;
width
:
2
3
0px
;
width
:
2
5
0px
;
}
}
.color333
{
.color333
{
color
:
#333333
;
color
:
#333333
;
...
@@ -158,7 +158,7 @@
...
@@ -158,7 +158,7 @@
<table
class=
"orderTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<table
class=
"orderTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<thead>
<thead>
<tr>
<tr>
<th
width=
"3
2
8px"
>
<th
width=
"3
4
8px"
>
<div
class=
"__cp _drop"
>
<div
class=
"__cp _drop"
>
<el-dropdown
trigger=
"click"
@
command=
"handleCommandTwo"
>
<el-dropdown
trigger=
"click"
@
command=
"handleCommandTwo"
>
<span
class=
"el-dropdown-link"
>
<span
class=
"el-dropdown-link"
>
...
@@ -176,10 +176,10 @@
...
@@ -176,10 +176,10 @@
<th
width=
"180px"
>
<th
width=
"180px"
>
订单详情
订单详情
</th>
</th>
<th
width=
"1
7
0px"
>
<th
width=
"1
3
0px"
>
金额
金额
</th>
</th>
<th
width=
"1
4
0px"
>
<th
width=
"1
3
0px"
>
订单状态
订单状态
</th>
</th>
<th
width=
"159px"
>
<th
width=
"159px"
>
...
...
src/components/newPersonalCenter/block/model/OrderInfoModel/ScenTable.vue
View file @
dd61541c
...
@@ -218,7 +218,7 @@
...
@@ -218,7 +218,7 @@
<p>
{{
item
.
useDate
}}
</p>
<p>
{{
item
.
useDate
}}
</p>
<!--
<p>
婴儿:0
</p>
-->
<!--
<p>
婴儿:0
</p>
-->
</td>
</td>
<td>
<td
style=
"font-size:12px"
>
<p>
{{
item
.
contactCNName
}}
</p>
<p>
{{
item
.
contactCNName
}}
</p>
<p
style=
"margin-top:6px"
>
{{
item
.
contactMobile
}}
</p>
<p
style=
"margin-top:6px"
>
{{
item
.
contactMobile
}}
</p>
</td>
</td>
...
...
src/components/newPersonalCenter/block/model/OrderInfoModel/TCTable.vue
View file @
dd61541c
...
@@ -188,7 +188,7 @@
...
@@ -188,7 +188,7 @@
<
template
v-for=
"(item, index) in tableData"
>
<
template
v-for=
"(item, index) in tableData"
>
<tr
class=
"top"
:key=
"index"
: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"
>
<td
colspan=
"5"
>
<span
class=
"time"
>
{{
item
.
start
Date
}}
</span>
<span
class=
"time"
>
{{
item
.
create
Date
}}
</span>
<span
class=
"num"
>
订单号:
<span>
{{
item
.
orderId
}}
</span></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>
<span
class=
"contacts"
><i
class=
"iconfont icon-dianhua"
></i>
<span>
{{
item
.
serviceName
}}
{{
item
.
servicePhone
}}
</span></span>
</td>
</td>
...
@@ -244,25 +244,27 @@
...
@@ -244,25 +244,27 @@
</td>
</td>
<td
class=
"money"
>
<td
class=
"money"
>
<p>
总额 ¥
{{
item
.
preferPrice
|
priceFormat
}}
</p>
<p>
总额 ¥
{{
item
.
preferPrice
|
priceFormat
}}
</p>
<p
class=
"__cp pay_no"
v-if=
"!item.payShow"
@
click=
"item.payShow = true"
>
已付总额 ¥
{{
item
.
income
|
priceFormat
}}
<i
class=
"iconfont icon-xia"
></i></p>
<p
class=
"__cp pay_no"
v-if=
"!item.payShow"
@
click=
"item.payShow = true"
>
已付总额 ¥
{{
item
.
customerPayMoney
|
priceFormat
}}
<i
class=
"iconfont icon-xia"
></i></p>
<p
class=
"__cp pay_no"
v-if=
"item.payShow"
@
click=
"item.payShow = false"
>
已付总额 ¥
{{
item
.
income
|
priceFormat
}}
<i
class=
"iconfont icon-xia shang"
></i></p>
<p
class=
"__cp pay_no"
v-if=
"item.payShow"
@
click=
"item.payShow = false"
>
已付总额 ¥
{{
item
.
customerPayMoney
|
priceFormat
}}
<i
class=
"iconfont icon-xia shang"
></i></p>
<p
style=
"color:#999999"
>
优惠金额 ¥
{{
item
.
discountMoney
|
priceFormat
}}
</p>
<!-- :class="
{height_aotu: item.payShow}" -->
<!-- :class="
{height_aotu: item.payShow}" -->
<div
class=
"pay_list"
v-if=
"item.payShow"
>
<
!--
<
div
class=
"pay_list"
v-if=
"item.payShow"
>
<p>
04-18 ¥8680.00 支付宝
</p>
<p>
04-18 ¥8680.00 支付宝
</p>
<p>
04-18 ¥8680.00 支付宝
</p>
<p>
04-18 ¥8680.00 支付宝
</p>
<p>
04-18 ¥8680.00 支付宝
</p>
<p>
04-18 ¥8680.00 支付宝
</p>
</div>
</div>
-->
</td>
</td>
<td
class=
"color333 font-size14"
>
<td
class=
"color333 font-size14"
>
<span
v-if=
"item.orderState === 1"
>
待付定金
</span>
<span
v-if=
"item.orderState === 1"
>
待付定金
</span>
<span
v-else-if=
"item.orderState === 2"
>
待付尾款
</span>
<span
v-else-if=
"item.orderState === 2"
>
待付尾款
</span>
<span
v-else-if=
"item.orderState === 3"
>
待发团
</span>
<span
v-else-if=
"item.orderState === 3"
>
待发团
</span>
<span
v-else-if=
"item.orderState === 4"
>
交易完成
</span>
<span
v-else-if=
"item.orderState === 4"
>
交易完成
</span>
<span
v-else-if=
"item.orderState ===
0
"
>
取消
</span>
<span
v-else-if=
"item.orderState ===
5
"
>
取消
</span>
</td>
</td>
<td>
<td>
<payurlItem
<payurlItem
v-if=
"item.orderState
!== 0 && item.orderState !== 4
"
v-if=
"item.orderState
== 1 || item.orderState == 2
"
@
b2b_get_GetWaitDealOrderPageList=
"b2b_get_GetWaitDealOrderPageList"
@
b2b_get_GetWaitDealOrderPageList=
"b2b_get_GetWaitDealOrderPageList"
:item=
"item"
:item=
"item"
></payurlItem>
></payurlItem>
...
@@ -287,27 +289,6 @@ export default {
...
@@ -287,27 +289,6 @@ export default {
activeNames
:
[
'1'
],
activeNames
:
[
'1'
],
dropTitTwo
:
"10天内"
,
dropTitTwo
:
"10天内"
,
dataList
:[],
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
:
[
dayList
:
[
{
{
Day
:
"10天"
,
Day
:
"10天"
,
...
...
src/components/newPersonalCenter/block/model/TcOrder.vue
View file @
dd61541c
...
@@ -125,6 +125,7 @@ export default {
...
@@ -125,6 +125,7 @@ export default {
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
tableData
=
res
.
data
.
data
.
pageData
;
this
.
tableData
=
res
.
data
.
data
.
pageData
;
console
.
log
(
"this.tableData"
,
this
.
tableData
)
this
.
totalCount
=
res
.
data
.
data
.
pageCount
;
this
.
totalCount
=
res
.
data
.
data
.
pageCount
;
this
.
Count
=
res
.
data
.
data
.
count
;
this
.
Count
=
res
.
data
.
data
.
count
;
this
.
orderLoading
=
false
;
this
.
orderLoading
=
false
;
...
...
src/components/trade/order/index.vue
View file @
dd61541c
...
@@ -193,7 +193,7 @@
...
@@ -193,7 +193,7 @@
import
moment
from
'moment'
import
moment
from
'moment'
import
bus
from
'../../../plugins/event-bus'
import
bus
from
'../../../plugins/event-bus'
export
default
{
export
default
{
props
:[
'priceList'
,
'trip'
,
'numPeople'
],
props
:[
'priceList'
,
'trip'
,
'numPeople'
,
"teamType"
],
data
()
{
data
()
{
let
that
=
this
let
that
=
this
return
{
return
{
...
@@ -407,7 +407,7 @@ export default {
...
@@ -407,7 +407,7 @@ export default {
}
}
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
'/OrderInvoiceTwo'
,
path
:
'/OrderInvoiceTwo'
,
query
:
{
id
:
encodeURIComponent
(
ID
),
tcid
:
tcid
,
numPeople
:
JSON
.
stringify
(
numPeople
),
teamType
:
0
}
query
:
{
id
:
encodeURIComponent
(
ID
),
tcid
:
tcid
,
numPeople
:
JSON
.
stringify
(
numPeople
),
teamType
:
this
.
teamType
}
})
})
return
return
}
}
...
...
src/components/trade/order/indexTwo.vue
View file @
dd61541c
...
@@ -824,8 +824,8 @@ export default {
...
@@ -824,8 +824,8 @@ export default {
}
}
this
.
apipost
(
"sellorder_post_SetOrderInfoForB2B"
,
msg
,
this
.
apipost
(
"sellorder_post_SetOrderInfoForB2B"
,
msg
,
res
=>
{
res
=>
{
if
(
res
.
data
.
message
==
'操作成功!'
){
if
(
res
.
data
.
resultCode
==
1
){
this
.
$router
.
push
({
path
:
'/
PsOrder
'
})
this
.
$router
.
push
({
path
:
'/
newPersonalCenter?key=8-1
'
})
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
)
this
.
Error
(
res
.
data
.
message
)
}
}
...
...
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