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
17351c69
Commit
17351c69
authored
Apr 17, 2024
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
6b35e7c9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
199 additions
and
105 deletions
+199
-105
TravelFeature.vue
...nts/newTravelmanager/TravelGroupControl/TravelFeature.vue
+164
-82
TravelManagerThree.vue
...ewTravelmanager/TravelGroupControl/TravelManagerThree.vue
+35
-23
No files found.
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @
17351c69
This diff is collapsed.
Click to expand it.
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @
17351c69
...
...
@@ -55,11 +55,10 @@
:IsDirect=
"PostConfig.IsDirect"
v-bind:AllCityList=
"AllCityList"
v-bind:StartCity=
"StartCity"
:UseTypeArray=
"UseTypeArray"
:AirPickUp=
"AirPickUp"
:AirSend=
"AirSend"
@
change=
"handlerChangeData"
:TeamType=
"TeamType"
:IsOpenHotel=
"PostConfig.IsOpenHotel"
></TravelDaysTripDirect>
<TravelFeature
:TripColor=
"PostConfig.TripColor"
:dataAll=
"PostConfig"
:class=
"
{'showOther':(TeamType==3)}" ref="TravelFeature"
id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType"
:isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo"
@ConfigInfo="firstLoadConfigInfo"
@pptJourney="getPptJourney">
<TravelFeature
:TripColor=
"PostConfig.TripColor"
:dataAll=
"PostConfig"
:class=
"
{'showOther':(TeamType==3)}"
ref="TravelFeature" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData"
:TeamType="TeamType" :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit"
:CurrentUserInfo="CurrentUserInfo" @ConfigInfo="firstLoadConfigInfo" @pptJourney="getPptJourney">
</TravelFeature>
<!-- 地图 -->
<div
id=
"thirdMap"
>
...
...
@@ -226,8 +225,8 @@
TripCountryList
:
[],
//行程国家
TripCityList
:
[],
//行程城市
TripMapList
:
[],
NotQueryCityList
:
[],
//使用系统中的经纬度城市
FeaturePageType
:
0
,
//1横版 2竖版
NotQueryCityList
:
[],
//使用系统中的经纬度城市
FeaturePageType
:
0
,
//1横版 2竖版
},
//行程
FeatureData
:
{
...
...
@@ -250,6 +249,12 @@
IsSave
:
false
,
//是否保存
TripColor
:
""
,
//行程特色主色
LtName
:
""
,
//系列名称
DetailsImageList
:
''
,
//行程详情图片
TripImageList
:
''
,
//行程特色图片
IsUploadFeature
:
0
,
//是否上传自定义行程特色
IsUploadDetails
:
0
,
//是否上传自定义行程图片
TripImageListNew
:
[],
//行程特色图片数组
DetailsImageListNew
:
[],
//行程详情图片数组
},
//线路行程
journeyList
:
{
...
...
@@ -340,7 +345,7 @@
reader
.
readAsDataURL
(
e
.
target
.
files
[
0
]);
}
},
getPptJourney
(
status
){
getPptJourney
(
status
)
{
this
.
isPptJourney
=
status
},
/*获取行程特色内容对象*/
...
...
@@ -419,7 +424,7 @@
},
//提交验证
submitForm
(
SaveType
)
{
if
(
this
.
FeatureData
.
FeatureType
==
9
&&!
this
.
isPptJourney
)
{
if
(
this
.
FeatureData
.
FeatureType
==
9
&&
!
this
.
isPptJourney
)
{
this
.
Error
(
'请编辑PPT行程并保存'
);
return
}
...
...
@@ -440,7 +445,7 @@
}
},
/*保存数据*/
SaveData
(
SaveType
,
MapUrl
)
{
SaveData
(
SaveType
,
MapUrl
)
{
this
.
ShowMap
=
false
this
.
saveLoading
=
true
;
this
.
MsgBus
.
$emit
(
'saveTravel'
,
true
);
...
...
@@ -729,12 +734,12 @@
this
.
journeyList
.
isFileUpload
=
true
;
this
.
journeyList
.
DayNum
=
configData
.
Days
.
length
;
this
.
journeyList
.
NightNum
=
this
.
journeyList
.
DayNum
-
1
;
let
arrDayList
=
function
(
list
)
{
list
.
forEach
(
x
=>
{
let
arrDayList
=
function
(
list
)
{
list
.
forEach
(
x
=>
{
x
.
IsBlowUp
=
false
if
(
this
.
PostConfig
.
FeaturePageType
==
2
)
{
if
(
this
.
PostConfig
.
FeaturePageType
==
2
)
{
x
.
zoom
=
0.40
}
else
if
(
this
.
PostConfig
.
FeaturePageType
==
1
)
{
}
else
if
(
this
.
PostConfig
.
FeaturePageType
==
1
)
{
x
.
zoom
=
0.285
}
})
...
...
@@ -801,10 +806,16 @@
this
.
FeatureData
.
ID
=
tempData
.
Feature
.
ID
;
this
.
FeatureData
.
ConfigId
=
tempData
.
Feature
.
ConfigId
;
this
.
FeatureData
.
FeatureType
=
tempData
.
Feature
.
FeatureType
;
this
.
FeatureData
.
TripImageListNew
=
tempData
.
Feature
.
TripImageListNew
;
this
.
FeatureData
.
FeatureImg
=
tempData
.
Feature
.
FeatureImg
;
this
.
FeatureData
.
TemplateId
=
tempData
.
Feature
.
TemplateId
;
this
.
FeatureData
.
FeatureContent
=
tempData
.
Feature
.
FeatureContent
;
this
.
FeatureData
.
IsUploadDetails
=
tempData
.
Feature
.
IsUploadDetails
;
this
.
FeatureData
.
IsUploadFeature
=
tempData
.
Feature
.
IsUploadFeature
;
this
.
FeatureData
.
DetailsImageList
=
tempData
.
Feature
.
DetailsImageList
;
this
.
FeatureData
.
TripImageList
=
tempData
.
Feature
.
TripImageList
;
this
.
FeatureData
.
TripImageListNew
=
tempData
.
Feature
.
TripImageListNew
;
this
.
FeatureData
.
DetailsImageListNew
=
tempData
.
Feature
.
DetailsImageListNew
;
//图片列表
this
.
FeatureData
.
fileList
=
tempData
.
Feature
.
FeatureImgList
;
this
.
FeatureData
.
FeatureHtmlJson
=
...
...
@@ -928,7 +939,8 @@
this
.
PostConfig
.
TeamType
=
tempData
.
TeamType
;
this
.
PostConfig
.
FeaturePageType
=
tempData
.
FeaturePageType
;
this
.
PostConfig
.
FeatureType
=
tempData
.
Feature
&&
tempData
.
Feature
.
FeatureType
?
tempData
.
Feature
.
FeatureType
:
8
this
.
PostConfig
.
FeatureType
=
tempData
.
Feature
&&
tempData
.
Feature
.
FeatureType
?
tempData
.
Feature
.
FeatureType
:
8
//视频地址
this
.
PostConfig
.
VideoStr
=
tempData
.
VideoStr
;
this
.
PostConfig
.
OpenTeamDescribe
=
tempData
.
OpenTeamDescribe
;
...
...
@@ -941,7 +953,7 @@
this
.
PostConfig
.
TripCountryList
=
tempData
.
TripCountryList
;
this
.
PostConfig
.
TripCityList
=
tempData
.
TripCityList
;
this
.
PostConfig
.
TripMapList
=
tempData
.
TripMapList
;
this
.
PostConfig
.
NotQueryCityList
=
tempData
.
NotQueryCityList
;
this
.
PostConfig
.
NotQueryCityList
=
tempData
.
NotQueryCityList
;
this
.
PostConfig
.
MapUrl
=
tempData
.
MapUrl
;
let
arrList
=
function
(
list
)
{
list
.
forEach
(
x
=>
{
...
...
@@ -999,12 +1011,12 @@
this
.
journeyList
.
NightNum
=
tempData
.
NightNum
;
this
.
journeyList
.
ReturnArriveCityId
=
tempData
.
ReturnArriveCityId
;
this
.
journeyList
.
StartCityId
=
tempData
.
StartCityId
;
let
arrDayList
=
function
(
list
)
{
list
.
forEach
(
x
=>
{
let
arrDayList
=
function
(
list
)
{
list
.
forEach
(
x
=>
{
x
.
IsBlowUp
=
false
if
(
tempData
.
FeaturePageType
==
2
)
{
if
(
tempData
.
FeaturePageType
==
2
)
{
x
.
zoom
=
0.40
}
else
if
(
tempData
.
FeaturePageType
==
1
)
{
}
else
if
(
tempData
.
FeaturePageType
==
1
)
{
x
.
zoom
=
0.285
}
})
...
...
@@ -1099,12 +1111,12 @@
'$route'
(
to
,
from
)
{
//监听路由是否变化
location
.
reload
()
},
PostDaysTrip
:{
PostDaysTrip
:
{
handler
:
function
(
val
,
oldVal
)
{
},
deep
:
true
,
immediate
:
true
immediate
:
true
}
},
mounted
()
{
...
...
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