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
2cd90f5a
Commit
2cd90f5a
authored
Aug 29, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
a9e412df
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
275 additions
and
219 deletions
+275
-219
UpgradedVersion.css
src/assets/css/UpgradedVersion.css
+3
-0
DMCchooseImg.vue
src/components/commonPage/DMCchooseImg.vue
+9
-1
TravelFeature.vue
...nts/newTravelmanager/TravelGroupControl/TravelFeature.vue
+1
-1
UpgradedVersionDetails.vue
...elGroupControl/UpgradedVersion/UpgradedVersionDetails.vue
+1
-1
MasterMapList.vue
...GroupControl/UpgradedVersion/components/MasterMapList.vue
+198
-197
featureHome.vue
...anager/TravelGroupControl/UpgradedVersion/featureHome.vue
+1
-1
otherJourney.vue
...nager/TravelGroupControl/UpgradedVersion/otherJourney.vue
+62
-18
No files found.
src/assets/css/UpgradedVersion.css
View file @
2cd90f5a
.bjE6
{
.bjE6
{
background
:
#e6e6e6
;
background
:
#e6e6e6
;
}
}
.bjF6
{
background
:
#f6f6f6
;
}
.relative
{
.relative
{
position
:
relative
;
position
:
relative
;
}
}
...
...
src/components/commonPage/DMCchooseImg.vue
View file @
2cd90f5a
...
@@ -182,7 +182,7 @@
...
@@ -182,7 +182,7 @@
placeholder=
"请输入关键字"
/>
placeholder=
"请输入关键字"
/>
<span
class=
"search-imgicon"
><i
class=
"iconfont icon-img_cz searchImgIcon"
@
click=
"getList"
></i></span>
<span
class=
"search-imgicon"
><i
class=
"iconfont icon-img_cz searchImgIcon"
@
click=
"getList"
></i></span>
</span>
</span>
<div
class=
"addimgContent test-1"
>
<div
class=
"addimgContent test-1"
v-loading=
"loading"
>
<div
class=
"addimgDiv"
v-for=
"(item, index) in imglistArry"
:key=
"item.subCode"
<div
class=
"addimgDiv"
v-for=
"(item, index) in imglistArry"
:key=
"item.subCode"
v-if=
"item.isShowImgDiv && item.Path != null"
>
v-if=
"item.isShowImgDiv && item.Path != null"
>
<div
class=
"itemImgdiv"
@
click=
"selectImg(index)"
>
<div
class=
"itemImgdiv"
@
click=
"selectImg(index)"
>
...
@@ -246,6 +246,7 @@ export default {
...
@@ -246,6 +246,7 @@ export default {
props
:
[
"imgType"
,
"isCheckmore"
,
'queryItem'
,
'IsShowAdd'
,
'IsShowVideo'
,
'checkType'
],
props
:
[
"imgType"
,
"isCheckmore"
,
'queryItem'
,
'IsShowAdd'
,
'IsShowVideo'
,
'checkType'
],
data
()
{
data
()
{
return
{
return
{
loading
:
false
,
queryMsg
:
{
queryMsg
:
{
pageSize
:
50
,
pageSize
:
50
,
pageIndex
:
1
,
pageIndex
:
1
,
...
@@ -280,6 +281,7 @@ export default {
...
@@ -280,6 +281,7 @@ export default {
getList
()
{
getList
()
{
//初始化弹窗图片列表
//初始化弹窗图片列表
this
.
imglistArry
=
[];
this
.
imglistArry
=
[];
this
.
loading
=
true
this
.
apipost
(
this
.
apipost
(
"hotel_post_GetPicList"
,
"hotel_post_GetPicList"
,
this
.
queryMsg
,
this
.
queryMsg
,
...
@@ -290,6 +292,9 @@ export default {
...
@@ -290,6 +292,9 @@ export default {
x
.
isShowImgDiv
=
true
;
x
.
isShowImgDiv
=
true
;
})
})
this
.
queryMsg
.
total
=
res
.
data
.
data
.
count
;
this
.
queryMsg
.
total
=
res
.
data
.
data
.
count
;
this
.
loading
=
false
}
else
{
this
.
loading
=
false
}
}
},
},
null
null
...
@@ -452,6 +457,9 @@ export default {
...
@@ -452,6 +457,9 @@ export default {
},
},
//点击确定选择
//点击确定选择
chkedVideoList
()
{
chkedVideoList
()
{
if
(
this
.
isCheckmore
>
1
&&
this
.
selectVideoArr
.
length
>
this
.
isCheckmore
){
return
this
.
Error
(
`最多选
${
this
.
isCheckmore
}
张图`
);
}
this
.
$emit
(
"headCallBack"
,
this
.
selectVideoArr
);
this
.
$emit
(
"headCallBack"
,
this
.
selectVideoArr
);
this
.
$emit
(
"closeImg"
);
this
.
$emit
(
"closeImg"
);
}
}
...
...
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @
2cd90f5a
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
<div
class=
"TFslide"
v-for=
"item in TypeArray"
<div
class=
"TFslide"
v-for=
"item in TypeArray"
:class=
"
{'TFcked':item.isShow,'display_none':(item.TypeState===4
&&
FeatureData.FeatureType !== 4) || (item.TypeState===4
&&
!$route.query.configId)}"
:class=
"
{'TFcked':item.isShow,'display_none':(item.TypeState===4
&&
FeatureData.FeatureType !== 4) || (item.TypeState===4
&&
!$route.query.configId)}"
@click="clickFeature(item)" :key="item.subCode"
@click="clickFeature(item)" :key="item.subCode"
v-if="((item.TypeState>3
&&
CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState
<
=
3
)
&&
item
.
TypeState
!=
8
"
>
v-if="((item.TypeState>3
&&
CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState
<
=
3
)"
>
<img
v-bind:src=
"item.imgUrl"
>
<img
v-bind:src=
"item.imgUrl"
>
<div>
{{
item
.
ckTitle
}}
</div>
<div>
{{
item
.
ckTitle
}}
</div>
</div>
</div>
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/UpgradedVersionDetails.vue
View file @
2cd90f5a
<
template
>
<
template
>
<div
class=
"UpgradedVersionDetails-form absolute row-sb z-index1"
:style=
"
{'background':backgroundColor}">
<div
class=
"UpgradedVersionDetails-form absolute row-sb z-index1"
:style=
"
{'background':backgroundColor}">
<div
class=
"UpgradedVersionDetails-form-Box absolute UpgradedVersion-Hover"
>
<div
class=
"UpgradedVersionDetails-form-Box absolute UpgradedVersion-Hover"
>
<div
class=
"UpgradedVersionDetails-formBox1 absolute"
>
<div
class=
"UpgradedVersionDetails-formBox1 absolute"
>
<FeatureControls
:index=
"index"
:FeatureData=
"FeatureData"
:ControlsType=
"'row'"
<FeatureControls
:index=
"index"
:FeatureData=
"FeatureData"
:ControlsType=
"'row'"
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/MasterMapList.vue
View file @
2cd90f5a
This diff is collapsed.
Click to expand it.
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome.vue
View file @
2cd90f5a
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
:isUploadImg=
"true"
:isSelectImg=
"true"
:isAddImg=
"false"
:isDeleteImg=
"false"
@
toUploadImg=
"UploadImg"
:isUploadImg=
"true"
:isSelectImg=
"true"
:isAddImg=
"false"
:isDeleteImg=
"false"
@
toUploadImg=
"UploadImg"
@
toSelectImg=
"SelectImg"
@
toAddImg=
"AddImg"
@
toDeleteImg=
"DeleteImg"
></FeatureControls>
@
toSelectImg=
"SelectImg"
@
toAddImg=
"AddImg"
@
toDeleteImg=
"DeleteImg"
></FeatureControls>
</div>
</div>
<div
class=
"featureHome-left-one bj
E
6 absolute z-index2"
>
<div
class=
"featureHome-left-one bj
F
6 absolute z-index2"
>
<template
v-if=
"FeatureItem.dataObj.ImgList&&FeatureItem.dataObj.ImgList.length>0"
>
<template
v-if=
"FeatureItem.dataObj.ImgList&&FeatureItem.dataObj.ImgList.length>0"
>
<img
:src=
"FeatureItem.dataObj.ImgList[0].url"
/>
<img
:src=
"FeatureItem.dataObj.ImgList[0].url"
/>
</
template
>
</
template
>
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/otherJourney.vue
View file @
2cd90f5a
...
@@ -14,12 +14,24 @@
...
@@ -14,12 +14,24 @@
<div
class=
"MasterMapList-box-two absolute z-index3"
>
<div
class=
"MasterMapList-box-two absolute z-index3"
>
<FeatureControls
:index=
"index"
:FeatureData=
"FeatureItem"
:ControlsType=
"'column'"
<FeatureControls
:index=
"index"
:FeatureData=
"FeatureItem"
:ControlsType=
"'column'"
:isUploadImg=
"FeatureItem.pageType==2?true:false"
:isSelectImg=
"FeatureItem.pageType==2?true:false"
:isUploadImg=
"FeatureItem.pageType==2?true:false"
:isSelectImg=
"FeatureItem.pageType==2?true:false"
:isAddImg=
"FeatureItem.pageType==2?false:true"
:isDeleteImg=
"false"
@
toUploadImg=
"UploadImg"
:isAddImg=
"FeatureItem.pageType==2?false:
FeatureItem.pageType!=2&&FeatureItem.dataObj.ImgList
&&FeatureItem.dataObj.ImgList.length
<9
?
false:true
"
:isDeleteImg=
"false"
@
toUploadImg=
"UploadImg"
@
toSelectImg=
"SelectImg"
@
toAddImg=
"AddImg"
@
toDeleteImg=
"DeleteImg"
></FeatureControls>
@
toSelectImg=
"SelectImg"
@
toAddImg=
"AddImg"
@
toDeleteImg=
"DeleteImg"
></FeatureControls>
</div>
</div>
</div>
</div>
<!-- 上传文件 -->
<MasterMapList
:index=
"index"
:FeatureData=
"FeatureItem"
@
toUploadImg=
"UploadImg"
@
toSelectImg=
"SelectImg"
<input
type=
"file"
style=
"display:none"
:id=
"'MasterMapfile_'+(index * 2 + 1) + '_0'"
@
change=
"uploadpic"
>
<input
type=
"file"
style=
"display:none"
:id=
"'MasterMapfile_'+(index * 2 + 1) + '_1'"
@
change=
"uploadpic"
>
<input
type=
"file"
style=
"display:none"
:id=
"'MasterMapfile_'+(index * 2 + 1) + '_2'"
@
change=
"uploadpic"
>
<input
type=
"file"
style=
"display:none"
:id=
"'MasterMapfile_'+(index * 2 + 1) + '_3'"
@
change=
"uploadpic"
>
<input
type=
"file"
style=
"display:none"
:id=
"'MasterMapfile_'+(index * 2 + 1) + '_4'"
@
change=
"uploadpic"
>
<input
type=
"file"
style=
"display:none"
:id=
"'MasterMapfile_'+(index * 2 + 1) + '_5'"
@
change=
"uploadpic"
>
<input
type=
"file"
style=
"display:none"
:id=
"'MasterMapfile_'+(index * 2 + 1) + '_6'"
@
change=
"uploadpic"
>
<input
type=
"file"
style=
"display:none"
:id=
"'MasterMapfile_'+(index * 2 + 1) + '_7'"
@
change=
"uploadpic"
>
<input
type=
"file"
style=
"display:none"
:id=
"'MasterMapfile_'+(index * 2 + 1) + '_8'"
@
change=
"uploadpic"
>
<input
type=
"file"
style=
"display:none"
:id=
"'MasterMapfile_'+(index * 2 + 1) + '_9'"
@
change=
"uploadpic"
>
<MasterMapList
:index=
"index"
:FeatureData=
"FeatureItem.dataObj"
:pageType=
"FeatureItem.pageType"
@
toUploadImg=
"UploadImg"
@
toSelectImg=
"SelectImg"
@
toAddImg=
"AddImg"
@
toDeleteImg=
"DeleteImg"
></MasterMapList>
@
toAddImg=
"AddImg"
@
toDeleteImg=
"DeleteImg"
></MasterMapList>
<!-- 副标题 -->
<!-- 副标题 -->
...
@@ -69,19 +81,27 @@
...
@@ -69,19 +81,27 @@
queryItem
:
{
queryItem
:
{
queryName
:
''
,
queryName
:
''
,
queryId
:
0
,
queryId
:
0
,
}
},
MasterMapIndex
:
null
,
};
};
},
},
methods
:
{
methods
:
{
UploadImg
()
{
UploadImg
(
index
)
{
this
.
MasterMapIndex
=
index
?
index
:
0
console
.
log
(
`#MasterMapfile_
${(
this
.
index
*
2
+
1
)}
_
${
index
}
`
)
if
(
this
.
FeatureItem
.
pageType
==
2
){
if
(
this
.
FeatureItem
.
pageType
==
2
){
document
.
querySelector
(
`#introducefile_
${(
this
.
FeatureItem
*
2
+
1
)}
_0`
).
click
();
document
.
querySelector
(
`#introducefile_
${(
this
.
index
*
2
+
1
)}
_0`
).
click
();
}
else
{
document
.
querySelector
(
`#MasterMapfile_
${(
this
.
index
*
2
+
1
)}
_
${
index
}
`
).
click
();
}
}
console
.
log
(
this
.
uploadpic
(),
'====='
)
},
},
uploadpic
(
e
)
{
uploadpic
(
e
)
{
let
that
=
this
;
let
that
=
this
;
console
.
log
(
this
.
MasterMapIndex
,
'========='
)
if
(
e
.
target
.
files
.
length
>
0
&&
e
.
target
.
files
[
0
].
size
>
0
)
{
if
(
e
.
target
.
files
.
length
>
0
&&
e
.
target
.
files
[
0
].
size
>
0
)
{
// 压缩图片需要的一些元素和对象
var
reader
=
new
FileReader
();
var
reader
=
new
FileReader
();
reader
.
onload
=
function
(
event
)
{
reader
.
onload
=
function
(
event
)
{
let
blob
=
that
.
base64ToBlob
(
event
.
target
.
result
);
let
blob
=
that
.
base64ToBlob
(
event
.
target
.
result
);
...
@@ -94,26 +114,39 @@
...
@@ -94,26 +114,39 @@
let
i
=
e
.
target
.
id
.
split
(
"_"
)[
2
];
let
i
=
e
.
target
.
id
.
split
(
"_"
)[
2
];
if
(
that
.
FeatureItem
.
pageType
==
2
){
if
(
that
.
FeatureItem
.
pageType
==
2
){
that
.
FeatureItem
.
dataObj
.
ImgList
[
0
].
url
=
allPath
that
.
FeatureItem
.
dataObj
.
ImgList
[
0
].
url
=
allPath
}
else
{
that
.
FeatureItem
.
dataObj
.
ImgList
[
that
.
MasterMapIndex
].
url
=
allPath
}
}
that
.
FeatureItem
.
dataObj
.
ImgList
[
that
.
MasterMapIndex
].
url
=
allPath
});
});
};
};
reader
.
readAsDataURL
(
e
.
target
.
files
[
0
]);
reader
.
readAsDataURL
(
e
.
target
.
files
[
0
]);
// return allPath
}
}
},
},
SelectImg
()
{
SelectImg
(
index
)
{
console
.
log
(
index
,
'--------SelectImg'
)
this
.
MasterMapIndex
=
index
?
index
:
0
if
(
this
.
FeatureItem
.
pageType
==
4
)
this
.
choseType
=
1
else
if
(
this
.
FeatureItem
.
pageType
==
5
)
this
.
choseType
=
2
else
if
(
this
.
FeatureItem
.
pageType
==
6
)
this
.
choseType
=
3
else
this
.
choseType
=
0
this
.
isShowScenicImg
=
true
this
.
isShowScenicImg
=
true
},
},
AddImg
()
{
AddImg
()
{
let
obj
=
{
url
:
''
}
this
.
FeatureItem
.
dataObj
.
ImgList
.
push
(
obj
)
},
},
DeleteImg
()
{
DeleteImg
(
index
)
{
this
.
FeatureItem
.
dataObj
.
ImgList
.
splice
(
index
,
1
)
},
},
toAddPages
(
index
,
FeatureData
)
{
toAddPages
()
{
this
.
$emit
(
'toAddPages'
,
index
,
FeatureData
)
this
.
$emit
(
'toAddPages'
,
this
.
index
,
this
.
FeatureItem
)
},
},
toDeletePages
(
index
,
FeatureData
)
{
toDeletePages
()
{
this
.
$emit
(
'toDeletePages'
,
index
,
FeatureData
)
this
.
$emit
(
'toDeletePages'
,
this
.
index
,
this
.
FeatureItem
)
},
},
setTemplate
(
index
,
TemplateType
)
{
setTemplate
(
index
,
TemplateType
)
{
this
.
$emit
(
'setTemplate'
,
index
,
TemplateType
)
this
.
$emit
(
'setTemplate'
,
index
,
TemplateType
)
...
@@ -122,9 +155,13 @@
...
@@ -122,9 +155,13 @@
this
.
isShowScenicImg
=
false
this
.
isShowScenicImg
=
false
},
},
getDMCimg
(
selectImgArr
)
{
getDMCimg
(
selectImgArr
)
{
if
(
this
.
FeatureItem
.
pageType
==
2
){
let
Path
=
selectImgArr
[
0
].
Path
this
.
FeatureItem
.
dataObj
.
ImgList
[
0
].
url
=
selectImgArr
[
0
].
Path
// if(this.FeatureItem.pageType==2){
}
// this.FeatureItem.dataObj.ImgList[0].url = Path
// }else if(this.FeatureItem.pageType==4||this.FeatureItem.pageType==5||this.FeatureItem.pageType==6){
// this.FeatureItem.dataObj.ImgList[this.MasterMapIndex].url = Path
// }
this
.
FeatureItem
.
dataObj
.
ImgList
[
this
.
MasterMapIndex
].
url
=
Path
this
.
isShowScenicImg
=
false
this
.
isShowScenicImg
=
false
}
}
...
@@ -139,6 +176,13 @@
...
@@ -139,6 +176,13 @@
deep
:
true
,
deep
:
true
,
immediate
:
true
immediate
:
true
},
},
MasterMapIndex
:{
handler
(
val
,
oldVal
){
console
.
log
(
val
,
oldVal
)
},
deep
:
true
,
immediate
:
true
}
},
},
mounted
()
{
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