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
8f0e9e9b
Commit
8f0e9e9b
authored
Sep 21, 2023
by
liudong1993
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
481c2e48
01393804
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
1070 additions
and
330 deletions
+1070
-330
newTravelManager.css
src/assets/css/newTravelManager.css
+5
-1
tripIndexNew.css
src/assets/css/tripIndexNew.css
+6
-1
travelDays.vue
src/components/LeaveGroupDownload/travelDays.vue
+4
-4
AuditDan.vue
src/components/TravelManager/TravelGroupControl/AuditDan.vue
+4
-4
AuditDan1.vue
...components/TravelManager/TravelGroupControl/AuditDan1.vue
+1
-1
TravelControlListSale.vue
...onents/TravelManager/TravelList/TravelControlListSale.vue
+31
-0
CouponList.vue
src/components/activity/CouponList.vue
+203
-77
confirmationOrderDownLoadNew.vue
src/components/confirmationOrderDownLoadNew.vue
+2
-2
OrderListExaminePrice.vue
...ents/myOrdersAllType/components/OrderListExaminePrice.vue
+731
-193
allListChangePrice.vue
...ponents/myOrdersAllType/components/allListChangePrice.vue
+23
-1
TravelManagerThree.vue
...ewTravelmanager/TravelGroupControl/TravelManagerThree.vue
+9
-2
tripmap.vue
...omponents/newTravelmanager/TravelGroupControl/tripmap.vue
+15
-14
travelDays.vue
...newTravelmanager/travelLineTrip/components/travelDays.vue
+36
-30
No files found.
src/assets/css/newTravelManager.css
View file @
8f0e9e9b
...
...
@@ -1910,7 +1910,11 @@
.quoTation
._right
{
flex
:
1
;
align-items
:
center
;
display
:
flex
;
padding-left
:
20px
!important
;
border-left
:
1px
dashed
#DCDFE6
;}
.quoTation
.Quo_Content
{
width
:
300px
;
display
:
inline-block
;
white-space
:
nowrap
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
margin-left
:
20px
;}
.quoTation
._left
{
display
:
flex
;
flex
:
1
;
align-items
:
center
;
border-right
:
1px
dashed
#dddddd
;
padding-right
:
20px
;}
.quoTation
._left
:first-child
{
width
:
160px
;
flex
:
inherit
;
flex-shrink
:
0
;
}
.QT_CodeNum
{
min-width
:
70px
;
margin-left
:
10%
;}
.quoTation
._cent
{
flex
:
1
;
display
:
flex
;
align-items
:
center
;}
.quoTation
._rightAudit
{
flex
:
1
;
align-items
:
center
;
display
:
flex
;
padding-left
:
20px
!important
;
border-left
:
1px
dashed
#DCDFE6
;}
...
...
src/assets/css/tripIndexNew.css
View file @
8f0e9e9b
...
...
@@ -153,7 +153,8 @@ html, body{
height
:
0px
;
border-bottom
:
2px
dashed
red
;
left
:
0
;
top
:
1347px
;
/* 1347 */
top
:
1439px
;
right
:
0
;
}
.UpgradedVersion2Line
span
{
...
...
@@ -426,6 +427,10 @@ html, body{
-ms-border-radius
:
14px
;
-o-border-radius
:
14px
;
}
.travelDaysdetails-tsText
p
{
padding
:
0
;
margin
:
0
;
}
.travelDaysdetailsBJ
{
border-radius
:
100px
;
padding
:
20px
35px
;
...
...
src/components/LeaveGroupDownload/travelDays.vue
View file @
8f0e9e9b
...
...
@@ -24,10 +24,10 @@
<div
:id=
"'travelDaysMasterMap_'+index"
class=
"travelDaysMasterMap relative"
>
<div
class=
"travelDaysMasterMap-one"
:style=
"
{'color':'#fff'}">
<div
class=
"travelDaysMasterMap-oneImg bjF6"
:id=
"'travelDaysImg_one'+index"
>
<img
v-if=
"item.details&&item.details.length>0&&item.details[0].img&&item.details[0].img!=''"
class=
"absolute"
:src=
"item.details[0].img"
>
<img
v-else
class=
"absolute"
:src=
"domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'"
>
</div>
...
...
@@ -58,7 +58,7 @@
<
template
v-for=
"(t,tIndex) in item.tips"
>
<div
:key=
"tIndex"
class=
"travelDaysdetails-tsTextBox"
v-if=
"t.content&&getHtmlPlainText(t.content).length>0"
>
<div
class=
"travelDaysdetails-tsText row"
:style=
"
{'background':backgroundColor2}">
<span
class=
"travelDaysdetails-text0"
>
温馨提示:
</span>
<span
class=
"travelDaysdetails-text0"
style=
"float:left;"
>
温馨提示:
</span>
<span
v-html=
"t.content"
></span>
</div>
</div>
...
...
@@ -135,7 +135,7 @@
},
getFontSize
(
title
)
{
let
size
=
30
;
if
(
title
.
length
>
80
)
{
if
(
title
&&
title
.
length
>
0
&&
title
.
length
>
80
)
{
var
tempSize
=
Number
(
80
)
/
Number
(
title
.
length
);
tempSize
=
tempSize
*
30
;
size
=
tempSize
.
toFixed
(
1
);
...
...
src/components/TravelManager/TravelGroupControl/AuditDan.vue
View file @
8f0e9e9b
...
...
@@ -98,7 +98,7 @@
<div
class=
"commonContent"
v-loading=
"loading"
>
<ul
class=
"_content"
>
<li
v-for=
"item in dataList"
:key=
"item.ID"
style=
"padding:0 15px;"
>
<div
class=
"Audit_left"
style=
"width:1
4
0px"
>
<div
class=
"Audit_left"
style=
"width:1
6
0px"
>
<div
slot=
"reference"
v-if=
"item.TCNUMS"
class=
"line1"
>
团号:
{{
item
.
TCNUMS
}}
</div>
...
...
@@ -120,7 +120,7 @@
<p
class=
"quoListName"
style=
"padding-right:20px;width:100%;"
>
<span>
{{item.LineName}}
</span>
</p>
<p
class=
"Quo_Content"
style=
"padding-right:20px;width:100%;"
v-if=
"item.LtName"
>
<p
class=
"Quo_Content"
style=
"padding-right:20px;width:100%;"
v-if=
"item.LtName"
>
<span>
{{item.LtName}}
</span>
</p>
<p
class=
"Quo_Content"
style=
"padding-right:20px;width:100%;"
>
...
...
@@ -135,11 +135,11 @@
<span>
{{item.Title}}
</span>
</el-tooltip>
</p>
<p
class=
"Quo_Content"
style=
"padding-right:20px;width:100%;"
v-if=
"item.CustomerName"
>
<p
class=
"Quo_Content"
style=
"padding-right:20px;width:100%;"
v-if=
"item.CustomerName"
>
<span>
{{item.CustomerName}}
</span>
</p>
<p
class=
"Quo_Content"
style=
"padding-right:20px;width:100%;"
>
<span>
出团公司:{{item.OutBranchName}}
<span>
出团公司:{{item.OutBranchName}}
</span>
</p>
</div>
...
...
src/components/TravelManager/TravelGroupControl/AuditDan1.vue
View file @
8f0e9e9b
...
...
@@ -80,7 +80,7 @@
<div
class=
"commonContent"
v-loading=
"loading"
>
<ul
class=
"_content"
>
<li
v-for=
"item in dataList"
:key=
"item.ID"
style=
"padding:0 15px;"
>
<div
class=
"Audit_left"
style=
"width:1
4
0px"
>
<div
class=
"Audit_left"
style=
"width:1
6
0px"
>
<div>
<span>
编号:
{{
item
.
ID
}}
</span>
</div>
...
...
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @
8f0e9e9b
...
...
@@ -668,6 +668,37 @@
<div
class=
"TC_SeatList"
>
{{$t('Airticket.Air_firstClass')}}:{{item.FSeat}}
</div>
<div
class=
"TC_SeatList"
>
{{$t('Airticket.Air_businessClass')}}:{{item.CSeat}}
</div>
<div
class=
"TC_SeatList"
>
{{$t('Airticket.Air_EconomyClass')}}:{{item.YSeat}}
</div>
<div
class=
"TC_SeatList"
v-if=
"item.BindNum>0"
style=
"color:red;"
>
{{$t('Operation.Op_bindNum')}}:
{{item.BindNum}}
</div>
<div
class=
"TC_SeatList"
v-if=
"item.TicketNum>0 && item.TicketList"
>
<el-popover
width=
"550"
trigger=
"click"
>
<table
width=
"100%"
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<th
width=
"90"
style=
"text-align:center;"
>
{{$t('Operation.Op_bindNum')}}
</th>
<th
width=
"90"
style=
"text-align:center;"
>
{{$t('op.TicketNum')}}
</th>
<th
width=
"70"
style=
"text-align:center;"
>
{{$t('Operation.Op_price')}}
</th>
<th
width=
"70"
style=
"text-align:center;"
>
同业价
</th>
<th
width=
"70"
style=
"text-align:center;"
>
直客价
</th>
<th
width=
"130"
style=
"text-align:center;"
>
PNR
</th>
<th
width=
"130"
style=
"text-align:center;"
>
{{$t('op.CenterPNR')}}
</th>
<th
width=
"100"
style=
"text-align:center;"
>
{{$t('op.Tickets')}}
</th>
</tr>
<tr
v-for=
"(subItem,subIndex) in item.TicketList"
:key=
"subIndex"
>
<td
style=
"text-align:center;"
>
{{subItem.BindNum}}
</td>
<td
style=
"text-align:center;"
>
{{subItem.TicketNum}}
</td>
<td
style=
"text-align:center;"
>
{{subItem.TicketPrice}}
</td>
<td
style=
"text-align:center;"
>
{{subItem.B2BPrice}}
</td>
<td
style=
"text-align:center;"
>
{{subItem.B2CPrice}}
</td>
<td
style=
"text-align:center;"
>
{{subItem.PNR}}
</td>
<td
style=
"text-align:center;"
>
{{subItem.MidpiecePNR}}
</td>
<td
style=
"text-align:center;"
>
{{subItem.TicketCreateByName}}
</td>
</tr>
</table>
<span
slot=
"reference"
title=
"点击查看详情"
class=
"price"
style=
"cursor:pointer;color:red;text-decoration: underline;"
>
{{$t('op.FlightToNum')}}:
{{item.TicketNum}}
</span>
</el-popover>
</div>
<
template
v-if=
"item.AuditStatus==1"
>
<span
class=
"AuditRedType"
>
审核中
</span>
</
template
>
...
...
src/components/activity/CouponList.vue
View file @
8f0e9e9b
This diff is collapsed.
Click to expand it.
src/components/confirmationOrderDownLoadNew.vue
View file @
8f0e9e9b
...
...
@@ -905,12 +905,12 @@
if
(
jin
.
length
>
0
)
{
details
=
jin
}
else
if
(
dadian
.
length
>
0
)
{
if
(
dadian
[
0
].
img
==
''
&&
jiao
[
0
].
img
!=
''
)
{
if
(
dadian
[
0
].
img
&&
dadian
[
0
].
img
==
''
&&
jiao
[
0
].
img
&&
jiao
[
0
].
img
!=
''
)
{
dadian
[
0
].
img
=
jiao
[
0
].
img
;
}
details
=
dadian
;
}
else
if
(
jiao
.
length
>
0
)
{
if
(
j
==
this
.
tripList
.
length
-
1
)
{
let
obj
=
{
title
:
'温暖的家'
,
...
...
src/components/myOrdersAllType/components/OrderListExaminePrice.vue
View file @
8f0e9e9b
This diff is collapsed.
Click to expand it.
src/components/myOrdersAllType/components/allListChangePrice.vue
View file @
8f0e9e9b
...
...
@@ -102,6 +102,14 @@
</el-date-picker>
</span>
</li>
<li>
<span>
<em>
订单类型
</em>
<el-select
v-model=
"msg.OrderType"
class=
"w200 HworkInput"
>
<el-option
v-for=
"item in OrderTypeList"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
></el-option>
</el-select>
</span>
</li>
<li
>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('pub.searchBtn')"
@
click=
"msg.pageIndex=1,currentPage=1,GetList();showWarningSearch=false"
/>
...
...
@@ -264,6 +272,20 @@
}
});
},
GetOrderTypeEnumList
()
{
this
.
apipost
(
"CarSingle_post_GetOrderTypeEnumList"
,
{},
(
res
)
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
OrderTypeList
=
res
.
data
.
data
;
let
data
=
{
Name
:
"不限"
,
Id
:
"0"
,
};
this
.
OrderTypeList
.
unshift
(
data
);
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
}
});
},
getEmployee
()
{
//员工
this
.
apipost
(
'admin_get_EmployeeGetList'
,
this
.
employeeMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
...
...
@@ -404,7 +426,7 @@
if
(
this
.
Title
!=
'销售'
){
this
.
getEmployee
()
}
this
.
GetOrderTypeEnumList
()
this
.
Datelist
=
this
.
getyMDOne
()
this
.
userInfo
=
this
.
getLocalStorage
();
this
.
GetList
();
...
...
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @
8f0e9e9b
...
...
@@ -73,7 +73,10 @@
<p
v-else
@
click=
"ShowMap=!ShowMap"
style=
"cursor: pointer;"
>
地图暂未生成图
</p>
</div>
</div>
<Tripmap
v-if=
"ShowMap"
:dataAll=
"PostConfig"
:ConfigId=
"ConfigId"
@
Cancel=
"ShowMap=false"
@
Success=
"getMapImgSuccess"
></Tripmap>
<Tripmap
v-if=
"ShowMap"
:PostConfig=
"PostConfig"
:ConfigId=
"ConfigId"
@
Cancel=
"ShowMap=false"
@
Success=
"getMapImgSuccess()"
@
saveMsg=
"SaveData(1)"
></Tripmap>
</div>
<TravelNotice
:class=
"
{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
:subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
...
...
@@ -312,6 +315,9 @@
}
else
{
this
.
$refs
.
TravelFeature
.
setNewDate
(
data
);
}
},
getConfig
(){
},
/*获取组件配置信息【回调方法】*/
getConfig
(
configObj
)
{
...
...
@@ -415,6 +421,7 @@
basicData
.
RemoveChild
=
this
.
PostConfig
.
RemoveChild
;
basicData
.
OfferId
=
this
.
PostConfig
.
OfferId
;
basicData
.
TeamType
=
this
.
PostConfig
.
TeamType
;
basicData
.
TripMapList
=
this
.
PostConfig
.
TripMapList
;
basicData
.
StartCityId
=
0
;
basicData
.
ReturnArriveCityId
=
0
;
if
(
this
.
PostDaysTrip
)
{
...
...
@@ -448,7 +455,7 @@
basicData
.
WCityId
=
this
.
PostConfig
.
WCityId
;
basicData
.
TripCountryList
=
this
.
PostDaysTrip
.
TripCountryList
;
basicData
.
TripCitwlist
=
this
.
PostDaysTrip
.
TripCitwlist
;
basicData
.
TripMapList
=
this
.
PostDaysTrip
.
TripMapList
;
this
.
journeyList
.
IsUpdateTrip
=
this
.
PostDaysTrip
.
IsUpdateTrip
;
//行程特色数据
var
TripFeature
=
{};
...
...
src/components/newTravelmanager/TravelGroupControl/tripmap.vue
View file @
8f0e9e9b
<
template
>
<div
class=
"tripmap-form marginT20"
v-if=
"
dataAll
"
>
<div
class=
"tripmap-form marginT20"
v-if=
"
PostConfig
"
>
<div
class=
"tripmap-Search"
v-loading=
"setLoading"
>
<div
style=
"display: flex;align-items: start; justify-content: space-between;"
...
...
@@ -95,7 +95,7 @@ mapboxgl.accessToken =
"pk.eyJ1IjoiYWxleDkwMTIiLCJhIjoiY2xtOGw4NHdkMGFndTNjcnFkeWZncGc2dyJ9.lVrAdPHE0Dg5zoWFidfj4Q"
;
import
html2Canvas
from
"html2canvas"
;
export
default
{
props
:
[
"
dataAll
"
,
"ConfigId"
],
props
:
[
"
PostConfig
"
,
"ConfigId"
],
data
()
{
return
{
layerIds
:
[],
...
...
@@ -204,7 +204,7 @@ export default {
deep
:
true
,
immediate
:
false
},
dataAll
:
{
PostConfig
:
{
handler
(
val
,
oldVal
)
{
if
(
this
.
NationList
.
length
==
0
)
this
.
getAddress
(
1
);
if
(
val
.
TripMapList
.
length
==
0
)
this
.
SearchCity
(
2
);
...
...
@@ -218,8 +218,8 @@ export default {
CityListAll
:
this
.
CityListAll
,
CityListIds
:
[
4
,
6
],
NationList
:
this
.
NationList
,
ColorStr
:
this
.
dataAll
.
TripColor
?
this
.
dataAll
.
TripColor
ColorStr
:
this
.
PostConfig
.
TripColor
?
this
.
PostConfig
.
TripColor
:
"#409eff"
,
ConfigId
:
this
.
ConfigId
,
Id
:
0
,
...
...
@@ -445,7 +445,8 @@ export default {
},
// 保存标记坐标
SavePositionStr
()
{
this
.
dataAll
.
TripMapList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
TripMapList
));
this
.
PostConfig
.
TripMapList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
TripMapList
));
this
.
$emit
(
'saveMsg'
)
// this.TripMapList.forEach(x => {
// x.CityList.forEach(y => {
// this.citiesData.forEach(z => {
...
...
@@ -484,7 +485,7 @@ export default {
that
.
SavePositionStr
()
that
.
setLoading
=
false
;
let
allPath
=
that
.
domainManager
().
ViittoFileUrl
+
x
.
data
.
FilePath
;
that
.
dataAll
.
Mapurl
=
allPath
;
that
.
PostConfig
.
Mapurl
=
allPath
;
that
.
$emit
(
"Success"
,
allPath
);
}
else
{
that
.
setLoading
=
false
;
...
...
@@ -530,7 +531,7 @@ export default {
NationList
:
x
.
NationList
,
ColorStr
:
x
.
ColorStr
,
ConfigId
:
x
.
ConfigId
,
Id
:
x
.
Id
,
Id
:
0
,
MId
:
null
,
MName
:
null
,
MType
:
1
,
...
...
@@ -554,11 +555,11 @@ export default {
this
.
ClearSource
(
'curve-source-'
+
MId
,
2
)
this
.
ClearSource
(
'world-layer-'
+
MId
,
1
)
this
.
TripMapList
.
splice
(
index
,
1
);
this
.
dataAll
.
TripMapList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
TripMapList
));
this
.
PostConfig
.
TripMapList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
TripMapList
));
}
},
getColorStr
()
{
this
.
dataAll
.
TripMapList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
TripMapList
));
this
.
PostConfig
.
TripMapList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
TripMapList
));
},
// 城市ids
getCityListIds
(
x
,
index
)
{
...
...
@@ -567,7 +568,7 @@ export default {
CityList
:
[],
ColorStr
:
x
.
ColorStr
,
ConfigId
:
x
.
ConfigId
,
Id
:
x
.
Id
,
Id
:
0
,
MId
:
null
,
MName
:
null
,
MType
:
2
,
...
...
@@ -583,8 +584,8 @@ export default {
Top
:
0
}
};
x
.
CityList
All
.
forEach
(
item
=>
{
x
.
CityList
Ids
.
forEach
(
items
=>
{
x
.
CityList
Ids
.
forEach
(
items
=>
{
x
.
CityList
All
.
forEach
(
item
=>
{
if
(
item
.
ID
==
items
)
{
obj
.
MId
=
item
.
ID
;
obj
.
MName
=
item
.
Name
;
...
...
@@ -595,7 +596,7 @@ export default {
});
});
this
.
$forceUpdate
();
this
.
dataAll
.
TripMapList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
TripMapList
));
this
.
PostConfig
.
TripMapList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
TripMapList
));
},
// 查询城市
...
...
src/components/newTravelmanager/travelLineTrip/components/travelDays.vue
View file @
8f0e9e9b
<
template
>
<div
style=
"height: 100%;"
v-if=
"RenderingOk"
>
<div
style=
"height: 100%;
overflow: hidden;
"
v-if=
"RenderingOk"
>
<!-- -->
<div
class=
"UpgradedVersion-box2 UpgradedVersion-homebj relative"
style=
"zoom: 0.44;"
>
<div
class=
" z-index1"
style=
"left: 0;right: 0; top: 0;bottom: 0;"
>
...
...
@@ -25,7 +25,7 @@
<div
:id=
"'viewSpotBox_'+(item*4)+'_0'+index"
class=
"travelDaysMasterMap relative"
>
<div
class=
"travelDaysMasterMap-one"
:style=
"
{'color':'#fff'}">
<div
class=
"travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover"
>
<div
class=
"featureDay-vToolBar absolute z-index3"
>
<div
class=
"featureDay-vToolBar absolute z-index3"
style=
"zoom:2"
>
<FeatureControls
:index=
"index"
:FeatureData=
"item"
:ControlsType=
"'row'"
:isTemplate=
"false"
:isUploadImg=
"true"
:isSelectImg=
"true"
@
toUploadImg=
"UploadImg(0)"
@
toSelectImg=
"SelectImg(0)"
:x=
"1123"
:y=
"632"
></FeatureControls>
...
...
@@ -61,22 +61,24 @@
<vEditSpan
:canEdit=
'canEdit'
v-model=
"jindian.Description"
></vEditSpan>
</div>
</
template
>
<div
v-if=
"item.ScenicArray.length==0&&item.TrafficObj.trafficIntroduce.IntroduceTitle"
class=
"travelDaysContent-text"
>
<div
v-if=
"item.ScenicArray.length==0&&item.TrafficObj.trafficIntroduce.IntroduceTitle"
class=
"travelDaysContent-text"
>
<span
class=
"textBold"
>
<vEditDiv
class=
"dayCouponsName"
:canEdit=
'canEdit'
v-model=
"'【'+item.TrafficObj.trafficIntroduce.IntroduceTitle+'】'"
></vEditDiv>
</span>
<vEditSpan
:canEdit=
'canEdit'
v-model=
"item.TrafficObj.trafficIntroduce.IntroduceDetail"
></vEditSpan>
</div>
<div
v-if=
"item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceTitle"
class=
"travelDaysContent-text"
>
<div
v-if=
"item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceTitle"
class=
"travelDaysContent-text"
>
{{item.TitleObj.Title}}
</div>
</div>
<div
class=
"travelDaysdetails-tsTextBox"
v-if=
"item.WarmTipObj.Description&&getHtmlPlainText(item.WarmTipObj.Description).length>0"
>
<div
class=
"travelDaysdetails-tsText"
:style=
"{'background':backgroundColor2}"
>
<
div
class=
"travelDaysdetails-text0"
style=
"float:left;"
>
温馨提示:
</div
>
<
div
v-html=
"item.WarmTipObj.Description"
></div
>
<
span
class=
"travelDaysdetails-text0"
style=
"float:left;"
>
温馨提示:
</span
>
<
span
v-html=
"item.WarmTipObj.Description"
></span
>
</div>
</div>
<div
class=
"travelDaysdetails"
>
...
...
@@ -123,21 +125,24 @@
</div>
<!-- otherJourney-footer -->
<div
class=
"footer"
>
<div
class=
"otherJourney-introduceFooter absolute z-index1 row-aic"
:style=
"{'background':''}"
>
<div
class=
"introduceFooterBJ introduceFooterOne"
:style=
"{'background':dataAll.TripColor}"
>
</div>
<div
class=
"introduceFooterBJ introduceFootertTwo"
:style=
"{'background':dataAll.TripColor}"
>
</div>
<div
class=
"introduceFooter-text row-aic"
>
<img
src=
"http://imgfile.oytour.com/Static/NewTripFeature/footerLogo.png"
/>
<div
class=
"edit_div"
>
{{dataAll.LineShortName?dataAll.LineShortName:dataAll.LineName}}
</div>
<div
class=
"otherJourney-introduceFooter absolute z-index1 row-aic"
:style=
"{'background':''}"
>
<div
class=
"introduceFooterBJ introduceFooterOne"
:style=
"{'background':dataAll.TripColor}"
>
</div>
<div
class=
"introduceFooterBJ introduceFootertTwo"
:style=
"{'background':dataAll.TripColor}"
>
</div>
<div
class=
"introduceFooter-text row-aic"
>
<img
src=
"http://imgfile.oytour.com/Static/NewTripFeature/footerLogo.png"
/>
<div
class=
"edit_div"
>
{{dataAll.LineShortName?dataAll.LineShortName:dataAll.LineName}}
</div>
</div>
<div
class=
"introduceFooterBJ introduceFootertThree"
:style=
"{'background':dataAll.TripColor}"
>
</div>
<div
class=
"introduceFooterBJ introduceFootertFour"
:style=
"{'background':dataAll.TripColor}"
>
</div>
</div>
<div
class=
"introduceFooterBJ introduceFootertThree"
:style=
"{'background':dataAll.TripColor}"
>
</div>
<div
class=
"introduceFooterBJ introduceFootertFour"
:style=
"{'background':dataAll.TripColor}"
>
</div>
</div>
</div>
</div>
<div
class=
"UpgradedVersion2Line absolute z-index3 row-ajc"
>
<span>
底线
</span>
</div>
<div
class=
"UpgradedVersion2Line absolute z-index3 row-ajc"
style=
"top: 2878px;"
>
<span>
底线
</span>
</div>
</div>
<el-dialog
custom-class=
"resourceImgAdd"
:title=
"$t('sm.chooseImg')"
center
:visible
.
sync=
"isShowScenicImg"
>
<!--imgType:1-酒店,2-餐厅,3-景点,4-票务,5-车辆,6-领队,7-购物店,isCheckmore:是否多选图片-->
...
...
@@ -186,8 +191,7 @@
defaultScenicIndex
:
0
,
//当前默认选中的景点
};
},
mounted
()
{
},
mounted
()
{},
methods
:
{
getHtmlPlainText
(
html_str
)
{
//提取字符串中的文字
...
...
@@ -204,7 +208,7 @@
getFontSize
(
title
)
{
if
(
!
title
)
return
let
size
=
30
;
if
(
title
.
length
>
80
)
{
if
(
title
&&
title
.
length
>
0
&&
title
.
length
>
80
)
{
var
tempSize
=
Number
(
80
)
/
Number
(
title
.
length
);
tempSize
=
tempSize
*
30
;
size
=
tempSize
.
toFixed
(
1
);
...
...
@@ -279,9 +283,14 @@
let
allPath
=
that
.
domainManager
().
ViittoFileUrl
+
x
.
data
.
FilePath
;
let
i
=
e
.
target
.
id
.
split
(
"_"
)[
2
];
if
(
that
.
ScenicArrayList
.
length
>
0
)
{
that
.
ScenicArrayList
[
that
.
imgIndex
].
NewImaArray
[
0
].
Url
=
allPath
that
.
ScenicArrayList
[
that
.
imgIndex
].
NewImaArray
[
0
].
x
=
0
that
.
ScenicArrayList
[
that
.
imgIndex
].
NewImaArray
[
0
].
y
=
0
that
.
ScenicArrayList
[
0
].
NewImaArray
[
0
].
Url
=
allPath
that
.
ScenicArrayList
[
0
].
NewImaArray
[
0
].
x
=
0
that
.
ScenicArrayList
[
0
].
NewImaArray
[
0
].
y
=
0
that
.
ScenicArrayList
[
0
].
NewScenicImg
=
JSON
.
stringify
(
that
.
ScenicArrayList
[
0
].
NewImaArray
);
if
(
that
.
item
.
ScenicArray
&&
that
.
item
.
ScenicArray
.
length
>
0
)
{
that
.
item
.
ScenicArray
[
that
.
defaultScenicIndex
]
=
JSON
.
parse
(
JSON
.
stringify
(
that
.
ScenicArrayList
[
0
]));
}
}
else
{
that
.
item
.
TrafficObj
.
trafficIntroduce
.
IntroduceImage
=
allPath
that
.
item
.
TrafficObj
.
trafficIntroduce
.
x
=
0
...
...
@@ -289,7 +298,6 @@
that
.
item
.
TrafficObj
.
Introduce
=
JSON
.
stringify
(
this
.
item
.
TrafficObj
.
trafficIntroduce
);
}
that
.
$message
.
success
(
'上传成功'
);
that
.
item
.
ScenicArray
=
JSON
.
parse
(
JSON
.
stringify
(
that
.
ScenicArrayList
))
});
};
reader
.
readAsDataURL
(
e
.
target
.
files
[
0
]);
...
...
@@ -313,11 +321,11 @@
if
(
imgItem
.
FileType
)
{
obj
.
FileType
=
imgItem
.
FileType
;
}
that
.
ScenicArrayList
[
that
.
imgIndex
].
NewImaArray
=
[];
that
.
ScenicArrayList
[
that
.
imgIndex
].
NewImaArray
.
push
(
obj
);
that
.
ScenicArrayList
[
that
.
imgIndex
].
ScenicJson
.
x
=
0
that
.
ScenicArrayList
[
that
.
imgIndex
].
ScenicJson
.
y
=
0
that
.
ScenicArrayList
[
that
.
imgIndex
].
NewScenicImg
=
JSON
.
stringify
(
that
.
ScenicArrayList
[
0
].
NewImaArray
);
that
.
ScenicArrayList
[
0
].
NewImaArray
=
[];
that
.
ScenicArrayList
[
0
].
NewImaArray
.
push
(
obj
);
that
.
ScenicArrayList
[
0
].
ScenicJson
.
x
=
0
that
.
ScenicArrayList
[
0
].
ScenicJson
.
y
=
0
that
.
ScenicArrayList
[
0
].
NewScenicImg
=
JSON
.
stringify
(
that
.
ScenicArrayList
[
0
].
NewImaArray
);
});
}
else
{
this
.
item
.
TrafficObj
.
trafficIntroduce
.
IntroduceImage
=
selectImgArr
[
0
].
Path
...
...
@@ -325,19 +333,17 @@
this
.
item
.
TrafficObj
.
trafficIntroduce
.
y
=
0
this
.
item
.
TrafficObj
.
Introduce
=
JSON
.
stringify
(
this
.
item
.
TrafficObj
.
trafficIntroduce
);
}
this
.
isShowScenicImg
=
false
;
if
(
this
.
item
.
ScenicArray
&&
this
.
item
.
ScenicArray
.
length
>
0
)
{
this
.
item
.
ScenicArray
[
this
.
defaultScenicIndex
]
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
ScenicArrayList
[
0
]));
}
//this.item.ScenicArray = JSON.parse(JSON.stringify(this.ScenicArrayList))
}
},
computed
:
{},
watch
:
{
item
:
{
handler
(
val
,
oldVal
)
{
// console.log("changeScenic",this.item.ScenicArray);
this
.
RenderingOk
=
false
;
this
.
ScenicArrayList
=
[]
this
.
item
.
ScenicArray
.
forEach
((
x
,
index
)
=>
{
...
...
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