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
97f64586
Commit
97f64586
authored
Dec 12, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复 行程放大
parent
b21fb778
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1336 additions
and
8 deletions
+1336
-8
TravelFeature.vue
...nts/newTravelmanager/TravelGroupControl/TravelFeature.vue
+0
-1
TravelManagerThree.vue
...ewTravelmanager/TravelGroupControl/TravelManagerThree.vue
+3
-0
TravelDaysTrip_Direct.vue
...newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
+1
-1
TravelDaysTrip_DirectThree.vue
...avelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue
+25
-6
travelDaysHV.vue
...wTravelmanager/travelLineTrip/components/travelDaysHV.vue
+1307
-0
No files found.
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @
97f64586
...
@@ -299,7 +299,6 @@
...
@@ -299,7 +299,6 @@
this
.
dialogPptistVisible
=
false
this
.
dialogPptistVisible
=
false
},
},
handleMessage
(
event
,
targetOrigin
)
{
handleMessage
(
event
,
targetOrigin
)
{
console
.
log
(
event
.
data
,
'-----------event.data'
)
if
(
event
.
data
&&
event
.
data
.
data
&&!
event
.
data
.
data
)
return
if
(
event
.
data
&&
event
.
data
.
data
&&!
event
.
data
.
data
)
return
if
(
this
.
isPostMessage
)
return
if
(
this
.
isPostMessage
)
return
// if(event.data&&event.data=='行程数据保存成功'){
// if(event.data&&event.data=='行程数据保存成功'){
...
...
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @
97f64586
...
@@ -269,6 +269,7 @@
...
@@ -269,6 +269,7 @@
DayList
:
[],
DayList
:
[],
isFileUpload
:
false
,
//是否是一键上传行程
isFileUpload
:
false
,
//是否是一键上传行程
IsUpdateTrip
:
0
,
//是否联动行程特色
IsUpdateTrip
:
0
,
//是否联动行程特色
FeaturePageType
:
1
,
//1横版 2竖版
},
},
PostPrice
:
""
,
//报价信息
PostPrice
:
""
,
//报价信息
//线路
//线路
...
@@ -456,6 +457,7 @@
...
@@ -456,6 +457,7 @@
basicData
.
WCountryId
=
this
.
PostConfig
.
WCountryId
;
basicData
.
WCountryId
=
this
.
PostConfig
.
WCountryId
;
basicData
.
WLocationId
=
this
.
PostConfig
.
WLocationId
;
basicData
.
WLocationId
=
this
.
PostConfig
.
WLocationId
;
basicData
.
WCityId
=
this
.
PostConfig
.
WCityId
;
basicData
.
WCityId
=
this
.
PostConfig
.
WCityId
;
this
.
journeyList
.
FeaturePageType
=
this
.
PostDaysTrip
.
FeaturePageType
;
this
.
journeyList
.
IsUpdateTrip
=
this
.
PostDaysTrip
.
IsUpdateTrip
;
this
.
journeyList
.
IsUpdateTrip
=
this
.
PostDaysTrip
.
IsUpdateTrip
;
//行程特色数据
//行程特色数据
var
TripFeature
=
{};
var
TripFeature
=
{};
...
@@ -942,6 +944,7 @@
...
@@ -942,6 +944,7 @@
//默认不联动行程特色
//默认不联动行程特色
this
.
journeyList
.
IsUpdateTrip
=
0
;
this
.
journeyList
.
IsUpdateTrip
=
0
;
this
.
journeyList
.
FeaturePageType
=
2
;
this
.
journeyList
.
DayNum
=
tempData
.
DayNum
;
this
.
journeyList
.
DayNum
=
tempData
.
DayNum
;
this
.
journeyList
.
NightNum
=
tempData
.
NightNum
;
this
.
journeyList
.
NightNum
=
tempData
.
NightNum
;
this
.
journeyList
.
ReturnArriveCityId
=
tempData
.
ReturnArriveCityId
;
this
.
journeyList
.
ReturnArriveCityId
=
tempData
.
ReturnArriveCityId
;
...
...
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
View file @
97f64586
...
@@ -327,7 +327,7 @@
...
@@ -327,7 +327,7 @@
}
}
},
},
created
()
{
created
()
{
},
},
computed
:
{
computed
:
{
//获取行程天数
//获取行程天数
...
...
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue
View file @
97f64586
...
@@ -152,7 +152,7 @@
...
@@ -152,7 +152,7 @@
<span
class=
"TDTextspan"
:class=
"{'showOther':TeamType==3}"
>
{{$t('sm.jhcfchengshi')}}
</span>
<span
class=
"TDTextspan"
:class=
"{'showOther':TeamType==3}"
>
{{$t('sm.jhcfchengshi')}}
</span>
<span
:class=
"{'showOther':TeamType==3}"
>
<span
:class=
"{'showOther':TeamType==3}"
>
<el-form-item
prop=
"StartCityId"
>
<el-form-item
prop=
"StartCityId"
>
<el-select
class=
"w1
2
0"
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"subConfig.StartCityId"
filterable
>
<el-select
class=
"w1
0
0"
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"subConfig.StartCityId"
filterable
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"SelectDefaultValue"
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"SelectDefaultValue"
></el-option>
<el-option
v-for=
"item in StartCity"
:label=
"item.startCityName"
:value=
"item.ID"
:key=
"item.ID"
>
<el-option
v-for=
"item in StartCity"
:label=
"item.startCityName"
:value=
"item.ID"
:key=
"item.ID"
>
</el-option>
</el-option>
...
@@ -162,7 +162,7 @@
...
@@ -162,7 +162,7 @@
<span
class=
"TDTextspan"
:class=
"{'showOther':TeamType==3}"
>
{{$t('op.ReturnCity')}}
</span>
<span
class=
"TDTextspan"
:class=
"{'showOther':TeamType==3}"
>
{{$t('op.ReturnCity')}}
</span>
<span
:class=
"{'showOther':TeamType==3}"
>
<span
:class=
"{'showOther':TeamType==3}"
>
<el-form-item
prop=
"ReturnArriveCityId"
>
<el-form-item
prop=
"ReturnArriveCityId"
>
<el-select
class=
"w1
2
0"
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"subConfig.ReturnArriveCityId"
<el-select
class=
"w1
0
0"
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"subConfig.ReturnArriveCityId"
filterable
>
filterable
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"SelectDefaultValue"
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"SelectDefaultValue"
></el-option>
<el-option
v-for=
"item in StartCity"
:label=
"item.startCityName"
:value=
"item.ID"
:key=
"item.ID"
>
<el-option
v-for=
"item in StartCity"
:label=
"item.startCityName"
:value=
"item.ID"
:key=
"item.ID"
>
...
@@ -173,12 +173,25 @@
...
@@ -173,12 +173,25 @@
<span
class=
"TDTextspan"
:class=
"{'showOther':TeamType==3}"
>
{{$t('op.IsUpdateXCTS')}}
</span>
<span
class=
"TDTextspan"
:class=
"{'showOther':TeamType==3}"
>
{{$t('op.IsUpdateXCTS')}}
</span>
<span
:class=
"{'showOther':TeamType==3}"
>
<span
:class=
"{'showOther':TeamType==3}"
>
<el-form-item
prop=
"ReturnArriveCityId"
>
<el-form-item
prop=
"ReturnArriveCityId"
>
<el-select
class=
"w1
2
0"
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"subConfig.IsUpdateTrip"
>
<el-select
class=
"w1
0
0"
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"subConfig.IsUpdateTrip"
>
<el-option
:label=
"$t('op.notUpdate')"
:value=
"0"
></el-option>
<el-option
:label=
"$t('op.notUpdate')"
:value=
"0"
></el-option>
<el-option
:label=
"$t('op.Update')"
:value=
"1"
></el-option>
<el-option
:label=
"$t('op.Update')"
:value=
"1"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</span>
</span>
<
template
v-if=
"false"
>
<span
class=
"TDTextspan"
:class=
"
{'showOther':TeamType==3}">版型
</span>
<span
:class=
"
{'showOther':TeamType==3}">
<el-form-item
prop=
"ReturnArriveCityId"
>
<el-select
placeholder=
"请选择版型"
v-model=
"subConfig.FeaturePageType"
style=
"width: 80px;"
>
<el-option
label=
"横版"
:value=
"1"
></el-option>
<el-option
label=
"竖版"
:value=
"2"
></el-option>
</el-select>
</el-form-item>
</span>
</
template
>
</div>
</div>
<div
class=
"newTravelDayContent TravelDayContentThree clearfix"
style=
"padding-left: 0;"
>
<div
class=
"newTravelDayContent TravelDayContentThree clearfix"
style=
"padding-left: 0;"
>
<div
class=
"vertical-line"
style=
"left: 23px;"
></div>
<div
class=
"vertical-line"
style=
"left: 23px;"
></div>
...
@@ -193,10 +206,14 @@
...
@@ -193,10 +206,14 @@
<span
class=
"el-icon-full-screen absolute BlowUpTravelDays"
<span
class=
"el-icon-full-screen absolute BlowUpTravelDays"
@
click=
"clickBlowUpTravelDays(item)"
></span>
@
click=
"clickBlowUpTravelDays(item)"
></span>
</el-tooltip>
</el-tooltip>
<travelDays
:index=
"index"
:dataAll=
"dataAll"
:item=
"item"
>
<travelDaysHV
v-if=
"subConfig.FeaturePageType==1"
:index=
"index"
:dataAll=
"dataAll"
:item=
"item"
>
</travelDaysHV>
<travelDays
v-if=
"subConfig.FeaturePageType==2"
:index=
"index"
:dataAll=
"dataAll"
:item=
"item"
>
</travelDays>
</travelDays>
<div
v-if=
"item.IsBlowUp"
class=
"BlowUpTravelDaysBox"
>
<div
v-if=
"item.IsBlowUp"
class=
"BlowUpTravelDaysBox"
>
<travelDays
:index=
"index"
:dataAll=
"dataAll"
:item=
"item"
>
<travelDaysHV
v-if=
"subConfig.FeaturePageType==1"
:index=
"index"
:dataAll=
"dataAll"
:item=
"item"
>
</travelDaysHV>
<travelDays
v-if=
"subConfig.FeaturePageType==2"
:index=
"index"
:dataAll=
"dataAll"
:item=
"item"
>
</travelDays>
</travelDays>
<span
v-if=
"item.IsBlowUp"
class=
"el-icon-error BlowUpTravelDaysClose"
<span
v-if=
"item.IsBlowUp"
class=
"el-icon-error BlowUpTravelDaysClose"
@
click=
"clickBlowUpTravelDays(item)"
></span>
@
click=
"clickBlowUpTravelDays(item)"
></span>
...
@@ -223,6 +240,7 @@
...
@@ -223,6 +240,7 @@
<
script
>
<
script
>
import
travelDaysTrip
from
"../travelLineTrip/travelDaysTripThree"
;
import
travelDaysTrip
from
"../travelLineTrip/travelDaysTripThree"
;
import
travelDays
from
'./components/travelDays'
import
travelDays
from
'./components/travelDays'
import
travelDaysHV
from
'./components/travelDaysHV'
export
default
{
export
default
{
props
:
[
props
:
[
...
@@ -248,7 +266,8 @@
...
@@ -248,7 +266,8 @@
},
},
components
:
{
components
:
{
travelDaysTrip
:
travelDaysTrip
,
travelDaysTrip
:
travelDaysTrip
,
travelDays
travelDays
,
travelDaysHV
},
},
methods
:
{
methods
:
{
clickBlowUpTravelDays
(
item
){
clickBlowUpTravelDays
(
item
){
...
...
src/components/newTravelmanager/travelLineTrip/components/travelDaysHV.vue
0 → 100644
View file @
97f64586
This diff is collapsed.
Click to expand it.
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