Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
70b4fe5c
Commit
70b4fe5c
authored
Sep 15, 2023
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
72a73d40
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
56 deletions
+8
-56
tripUtils.js
src/assets/utils/tripUtils.js
+3
-3
travelDays.vue
...newTravelmanager/travelLineTrip/components/travelDays.vue
+1
-43
travelDaysTripThree.vue
...s/newTravelmanager/travelLineTrip/travelDaysTripThree.vue
+4
-10
No files found.
src/assets/utils/tripUtils.js
View file @
70b4fe5c
let
locationName
=
window
.
location
.
hostname
;
let
ViittoFileUrl
=
locationName
.
indexOf
(
'oytour'
)
!==
-
1
||
locationName
.
indexOf
(
'viitto'
)
!==
-
1
?
"http://staticfile.oytour.com"
:
'http://192.168.
2
.214:8130'
let
ViittoFileUrl
=
locationName
.
indexOf
(
'oytour'
)
!==
-
1
||
locationName
.
indexOf
(
'viitto'
)
!==
-
1
?
"http://staticfile.oytour.com"
:
'http://192.168.
10
.214:8130'
var
tripUtils
=
{
TypeKey
:
{
traffic
:
"1"
,
...
...
@@ -356,9 +356,9 @@ var tripUtils = {
IsUseBus
:
0
,
//是否用车(0-不用车,1-用车)
//行程介绍
trafficIntroduce
:
{
IntroduceTitle
:
""
,
//行程介绍标题
IntroduceTitle
:
"
提示信息
"
,
//行程介绍标题
IntroduceImage
:
ViittoFileUrl
+
"/Upload/DefalutImage/DMC/defaultairline.png"
,
//行程介绍图片
IntroduceDetail
:
""
,
//行程介绍详细信息
IntroduceDetail
:
"
集合于国际机场,由专人为您办理登机手续后,搭程专机
"
,
//行程介绍详细信息
TrafficType
:
2
,
//交通类型,默认为专车
TrafficContent
:
""
,
//交通详情
TrafficImage
:
""
,
//交通图片
...
...
src/components/newTravelmanager/travelLineTrip/components/travelDays.vue
View file @
70b4fe5c
...
...
@@ -60,49 +60,7 @@
<
template
v-if=
"ScenicArrayList.length>0"
>
{{
ScenicArrayList
[
0
].
CouponsName
}}
</
template
>
</div>
</div>
<div
class=
"travelDaysMasterMap-two absolute z-index2"
v-if=
"ScenicArrayList.length>1||ScenicArrayList.length>2"
style=
"display: none;"
>
<div
class=
"travelDaysMasterMap-twoImg relative bjF6 UpgradedVersion-Hover"
:style=
"{'color':'#fff'}"
:id=
"'viewSpotBox_'+(item*4)+'_1'+index"
v-if=
"ScenicArrayList.length>1"
>
<div
class=
"featureDay-vToolBar absolute z-index3"
style=
"display: none;"
>
<FeatureControls
:index=
"index"
:FeatureData=
"item"
:ControlsType=
"'row'"
:isTemplate=
"false"
:isUploadImg=
"true"
:isSelectImg=
"true"
@
toUploadImg=
"UploadImg(1)"
@
toSelectImg=
"SelectImg(1)"
:x=
"335"
:y=
"198"
></FeatureControls>
</div>
<VueDraggableResizable
v-if=
"ScenicArrayList.length>1&&ScenicArrayList[1].NewImaArray[0].Url"
:w=
"335"
:h=
"198"
:ref=
"'viewSpotVds_' + item * 4 + '_1'+index"
tabindex=
"0"
:resizable=
"false"
:active=
"false"
:parent=
"false"
axis=
"y"
@
activated=
"onActivated(1)"
:x=
"ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
:y=
"ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
:z=
"2"
@
dragstop=
"onViewSpotDragstop"
>
<img
:src=
"ScenicArrayList[1].NewImaArray[0].Url"
:id=
"'viewSpotImg_'+(item*4)+'_1'+index"
>
</VueDraggableResizable>
<img
v-if=
"!ScenicArrayList[1].NewImaArray[0].Url"
class=
"absolute"
src=
"../../../../assets/img/defaultairline.png"
>
<div
class=
"travelDaysMasterMap-text textTwo absolute z-index2"
>
【{{ScenicArrayList[1].CouponsName}}】
</div>
</div>
<div
class=
"travelDaysMasterMap-twoImg relative bjF6 UpgradedVersion-Hover"
style=
"margin-top: 47px;"
:style=
"{'color':'#fff'}"
:id=
"'viewSpotBox_'+(item*4)+'_2'+index"
v-if=
"ScenicArrayList.length>2"
>
<div
class=
"featureDay-vToolBar absolute z-index3"
style=
"display: none;"
>
<FeatureControls
:index=
"index"
:FeatureData=
"item"
:ControlsType=
"'row'"
:isTemplate=
"false"
:isUploadImg=
"true"
:isSelectImg=
"true"
@
toUploadImg=
"UploadImg(2)"
@
toSelectImg=
"SelectImg(2)"
:x=
"697"
:y=
"930"
></FeatureControls>
</div>
<VueDraggableResizable
v-if=
"ScenicArrayList.length>2&&ScenicArrayList[2].NewImaArray[0].Url"
:w=
"335"
:h=
"198"
:ref=
"'viewSpotVds_' + item * 4 + '_2'+index"
tabindex=
"0"
:resizable=
"false"
:active=
"false"
:parent=
"false"
axis=
"y"
@
activated=
"onActivated(2)"
:x=
"ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
:y=
"ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
:z=
"2"
@
dragstop=
"onViewSpotDragstop"
>
<img
:src=
"ScenicArrayList[2].NewImaArray[0].Url"
:id=
"'viewSpotImg_'+(item*4)+'_2'+index"
>
</VueDraggableResizable>
<img
v-if=
"!ScenicArrayList[2].NewImaArray[0].Url"
class=
"absolute"
src=
"../../../../assets/img/defaultairline.png"
>
<div
class=
"travelDaysMasterMap-text textTwo absolute z-index2"
>
【{{ScenicArrayList[2].CouponsName}}】
</div>
</div>
</div>
</div>
<div
class=
"travelDaysContent"
>
<div
class=
"travelDaysContent-text"
v-for=
"(jindian,j) in item.ScenicArray"
v-if=
"item.ScenicArray.length>0"
...
...
src/components/newTravelmanager/travelLineTrip/travelDaysTripThree.vue
View file @
70b4fe5c
...
...
@@ -267,11 +267,6 @@
<
script
>
import
hotelTrip
from
"../travelLineTrip/HotelTripThree"
;
import
noScenic
from
"../TravelTripPreview/noScenic"
;
import
onedayList
from
"../TravelTripPreview/onedayList"
;
import
twodayList
from
"../TravelTripPreview/twodayList"
;
import
threedayList
from
"../TravelTripPreview/threedayList"
;
import
fourdayList
from
"../TravelTripPreview/fourdayList"
;
import
fivedayList
from
"../TravelTripPreview/fivedayList"
;
import
trifficTrip
from
"../travelLineTrip/trifficTripThree"
;
import
MyEdit
from
"../../EditTemplate.vue"
;
import
ScenicTraffic
from
"../travelLineTrip/ScenicTraffic"
;
...
...
@@ -805,12 +800,11 @@
},
mounted
()
{},
components
:
{
onedayList
,
hotelTrip
,
twodayList
,
threedayList
,
fourdayList
,
fivedayList
,
trifficTrip
,
noScenic
,
"my-edit"
:
MyEdit
,
...
...
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