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
021b9f68
Commit
021b9f68
authored
Sep 15, 2023
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
2f7f6127
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
25 deletions
+15
-25
travelDays.vue
...newTravelmanager/travelLineTrip/components/travelDays.vue
+11
-16
travelDaysTripThree.vue
...s/newTravelmanager/travelLineTrip/travelDaysTripThree.vue
+4
-9
No files found.
src/components/newTravelmanager/travelLineTrip/components/travelDays.vue
View file @
021b9f68
...
...
@@ -40,19 +40,10 @@
<img
v-if=
"!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url"
class=
"absolute"
:src=
"ScenicArrayList[0].NewImaArray[0].Url"
:id=
"'viewSpotImg_'+(item*4)+'_0'+index"
>
<template
v-if=
"ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].FileType=='.mp4'"
>
<video
ref=
"myVideo"
width=
"100%"
height=
"100%"
:src=
"ScenicArrayList[0].NewImaArray[0].VideoPath"
controls=
"controls"
:id=
"'viewSpotImg_'+(item*4)+'_0'+index"
>
</video>
</
template
>
</
template
>
<img
v-if=
"ScenicArrayList.length==0&&item.ScenicArray.length==0"
class=
"absolute"
:src=
"item.TrafficObj.trafficIntroduce.IntroduceImage"
:id=
"'viewSpotImg_'+(item*4)+'_0'+index"
>
</VueDraggableResizable>
<img
v-if=
"ScenicArrayList.length==0&&item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
class=
"absolute"
src=
"../../../../assets/img/defaultairline.png"
>
</div>
</div>
</div>
...
...
@@ -171,7 +162,6 @@
return
{
RenderingOk
:
false
,
canEdit
:
true
,
backgroundColor
:
''
,
backgroundColor2
:
''
,
textColor
:
''
,
...
...
@@ -186,6 +176,7 @@
queryId
:
0
,
},
imgIndex
:
null
,
defaultScenicIndex
:
0
,
//当前默认选中的景点
};
},
...
...
@@ -275,7 +266,6 @@
let
blob
=
that
.
base64ToBlob
(
event
.
target
.
result
);
let
newArr
=
[];
newArr
.
push
(
blob
);
var
fileName
=
`
${
that
.
uuid
(
10
,
10
)}
.png`
;
var
path
=
`/newFeature`
;
that
.
uploadSelfBlob
(
path
,
newArr
,
''
,
x
=>
{
let
allPath
=
that
.
domainManager
().
ViittoFileUrl
+
x
.
data
.
FilePath
;
...
...
@@ -321,16 +311,20 @@
that
.
ScenicArrayList
[
that
.
imgIndex
].
ScenicJson
.
y
=
0
that
.
ScenicArrayList
[
that
.
imgIndex
].
NewScenicImg
=
JSON
.
stringify
(
that
.
ScenicArrayList
[
0
].
NewImaArray
);
});
}
else
{
this
.
item
.
TrafficObj
.
trafficIntroduce
.
IntroduceImage
=
selectImgArr
[
0
].
Path
this
.
item
.
TrafficObj
.
trafficIntroduce
.
x
=
0
this
.
item
.
TrafficObj
.
trafficIntroduce
.
y
=
0
this
.
item
.
TrafficObj
.
Introduce
=
JSON
.
stringify
(
this
.
item
.
TrafficObj
.
trafficIntroduce
);
}
this
.
isShowScenicImg
=
false
;
this
.
item
.
ScenicArray
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
ScenicArrayList
))
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
:
{},
...
...
@@ -339,8 +333,9 @@
handler
(
val
,
oldVal
)
{
this
.
RenderingOk
=
false
;
this
.
ScenicArrayList
=
[]
this
.
item
.
ScenicArray
.
forEach
(
x
=>
{
if
(
x
.
Rank
>
0
)
{
this
.
item
.
ScenicArray
.
forEach
((
x
,
index
)
=>
{
if
(
x
.
DefaultNum
>
0
)
{
this
.
defaultScenicIndex
=
index
;
this
.
ScenicArrayList
.
push
(
x
)
}
});
...
...
src/components/newTravelmanager/travelLineTrip/travelDaysTripThree.vue
View file @
021b9f68
...
...
@@ -217,8 +217,7 @@
filterable
@
change=
"getScenicArray"
>
<el-option
v-for=
"(item,index) in dayObj.ScenicArray"
:label=
"item.CouponsName"
:value=
"item.CouponsId"
:key=
"index"
>
<span
style=
"float: left"
>
{{ item.CouponsName }}
</span>
<span
style=
"float: right; color: #8492a6; font-size: 13px"
>
{{ item.Inventory }}
</span>
</el-option>
</el-select>
</div>
...
...
@@ -226,7 +225,6 @@
</div>
</div>
<!-- 行程景点信息 -->
<div
class=
"TC-warmTips TC-Comtitlediv"
v-if=
"!dayObj.isRead"
:class=
"{'showOther':TeamType==3}"
>
<div
class=
"TC-SpecialInstruction clearfix column"
>
<div
class=
"TC-leftTitle"
style=
"height: 20px;"
>
温馨提示
</div>
...
...
@@ -317,17 +315,14 @@
methods
:
{
// 默认需要展示的图
getScenicArray
(){
let
i
=
1
let
list
=
[]
this
.
dayObj
.
ScenicArray
.
forEach
(
x
=>
{
x
.
Rank
=
0
x
.
DefaultNum
=
0
if
(
x
.
CouponsId
===
this
.
ScenicArraySingle
){
x
.
Rank
=
1
x
.
DefaultNum
=
1
}
})
this
.
dayObj
.
ScenicArrayImg
=
this
.
ScenicArraySingle
;
this
.
dayObj
.
ScenicArray
=
this
.
dayObj
.
ScenicArray
.
sort
((
a
,
b
)
=>
{
return
b
.
Rank
-
a
.
Rank
});
this
.
dayObj
.
ScenicArray
=
this
.
dayObj
.
ScenicArray
.
sort
((
a
,
b
)
=>
{
return
b
.
DefaultNum
-
a
.
DefaultNum
});
},
//非直采切换
NoDirectScenicCheck
(
number
)
{
...
...
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