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
5edaea4f
Commit
5edaea4f
authored
Aug 30, 2023
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
4d0dd2fb
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
53 additions
and
52 deletions
+53
-52
header.vue
.../TravelGroupControl/UpgradedVersion/components/header.vue
+3
-22
headerTitle.vue
...elGroupControl/UpgradedVersion/components/headerTitle.vue
+1
-5
subheading.vue
...velGroupControl/UpgradedVersion/components/subheading.vue
+11
-14
index.vue
...ravelmanager/TravelGroupControl/UpgradedVersion/index.vue
+38
-10
config.js
src/router/config.js
+0
-1
No files found.
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/header.vue
View file @
5edaea4f
...
@@ -2,9 +2,8 @@
...
@@ -2,9 +2,8 @@
<div
class=
"UpgradedVersion-header absolute row-sb z-index1"
>
<div
class=
"UpgradedVersion-header absolute row-sb z-index1"
>
<div
class=
"UpgradedVersion-header-left relative row-aic"
:style=
"
{'background':TripColor}">
<div
class=
"UpgradedVersion-header-left relative row-aic"
:style=
"
{'background':TripColor}">
<img
class=
"header-leftBj absolute z-index2"
:src=
"backgroundImgBj2"
/>
<img
class=
"header-leftBj absolute z-index2"
:src=
"backgroundImgBj2"
/>
<img
class=
"header-leftImg"
src=
"http://
192.168.10.214:8130/Upload
/NewTripFeature/headerLogoTwo.png"
/>
<img
class=
"header-leftImg"
src=
"http://
imgfile.oytour.com/Static
/NewTripFeature/headerLogoTwo.png"
/>
</div>
</div>
<div
class=
"UpgradedVersion-header-right"
>
<div
class=
"UpgradedVersion-header-right"
>
<div
class=
"UpgradedVersion-header-title"
>
<div
class=
"UpgradedVersion-header-title"
>
<vEditDiv
:canEdit=
'canEdit'
v-model=
"FeatureItem.dataObj.LineShortName"
></vEditDiv>
<vEditDiv
:canEdit=
'canEdit'
v-model=
"FeatureItem.dataObj.LineShortName"
></vEditDiv>
...
@@ -25,30 +24,13 @@
...
@@ -25,30 +24,13 @@
data
()
{
data
()
{
return
{
return
{
canEdit
:
true
,
canEdit
:
true
,
backgroundImg
:
''
,
backgroundImgBj2
:
'http://imgfile.oytour.com/Static/NewTripFeature/logoBjTwo.png'
,
//白色背景
backgroundImgBj1
:
'http://192.168.10.214:8130/Upload/NewTripFeature/logoBjOne.png'
,
//花纹背景
backgroundImgBj2
:
'http://192.168.10.214:8130/Upload/NewTripFeature/logoBjTwo.png'
,
//白色背景
};
};
},
},
methods
:
{
methods
:
{},
},
computed
:
{},
computed
:
{},
watch
:
{
watch
:
{
TripColor
:
{
handler
(
val
,
oldVal
)
{
// this.backgroundImg = `url('http://192.168.10.214:8130/Upload/NewTripFeature/logoBj.png') no-repeat right ${val}`
},
deep
:
false
,
immediate
:
true
},
FeatureItem
:
{
handler
(
val
,
oldVal
)
{
},
deep
:
true
,
immediate
:
true
}
},
},
mounted
()
{
mounted
()
{
...
@@ -56,7 +38,6 @@
...
@@ -56,7 +38,6 @@
};
};
</
script
>
</
script
>
<
style
>
<
style
>
.UpgradedVersion-header
{
.UpgradedVersion-header
{
top
:
0
;
top
:
0
;
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/headerTitle.vue
View file @
5edaea4f
...
@@ -4,12 +4,10 @@
...
@@ -4,12 +4,10 @@
<vEditDiv
:canEdit=
'canEdit'
v-model=
"FeatureItem.dataObj.LtName"
></vEditDiv>
<vEditDiv
:canEdit=
'canEdit'
v-model=
"FeatureItem.dataObj.LtName"
></vEditDiv>
</div>
</div>
<div
class=
"UpgradedVersion-headerTitle-two absolute z-index2"
>
<div
class=
"UpgradedVersion-headerTitle-two absolute z-index2"
>
<vEditDiv
:canEdit=
'canEdit
1
'
v-model=
"FeatureItem.dataObj.Title"
></vEditDiv>
<vEditDiv
:canEdit=
'canEdit'
v-model=
"FeatureItem.dataObj.Title"
></vEditDiv>
</div>
</div>
<div
class=
"UpgradedVersion-headerTitle-three absolute z-index1"
:style=
"
{'background':backgroundColor}">
<div
class=
"UpgradedVersion-headerTitle-three absolute z-index1"
:style=
"
{'background':backgroundColor}">
</div>
</div>
<!--
<img
class=
"UpgradedVersion-headerTitle-three absolute z-index1"
src=
"http://192.168.10.214:8130/Upload/NewTripFeature/textBj.png"
/>
-->
</div>
</div>
</
template
>
</
template
>
...
@@ -25,9 +23,7 @@
...
@@ -25,9 +23,7 @@
],
],
data
()
{
data
()
{
return
{
return
{
canEdit
:
true
,
canEdit
:
true
,
canEdit1
:
true
,
backgroundColor
:
null
backgroundColor
:
null
};
};
},
},
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/subheading.vue
View file @
5edaea4f
...
@@ -6,13 +6,13 @@
...
@@ -6,13 +6,13 @@
:class=
"[FeatureData.pageType==4||FeatureData.pageType==5||FeatureData.pageType==6?'UpgradedVersion-otherSubheading':'']"
>
:class=
"[FeatureData.pageType==4||FeatureData.pageType==5||FeatureData.pageType==6?'UpgradedVersion-otherSubheading':'']"
>
<div
class=
"UpgradedVersion-subIdeBj relative z-index2"
>
<div
class=
"UpgradedVersion-subIdeBj relative z-index2"
>
<div
class=
"UpgradedVersion-subIdeBj1 absolute z-index2"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"UpgradedVersion-subIdeBj1 absolute z-index2"
:style=
"
{'background':TripColor}">
</div>
<!--
<div
class=
"UpgradedVersion-subIdeBj2 absolute z-index1"
>
</div>
-->
<div
class=
"UpgradedVersion-subIdeBj-h absolute z-index3"
>
<div
class=
"UpgradedVersion-subIdeBj-h absolute z-index3"
>
<vEditDiv
:canEdit=
'canEdit2'
:textLength=
"FeatureData.pageType==2?2:1"
v-model=
"FeatureData.pageTitle"
></vEditDiv>
<vEditDiv
:canEdit=
'canEdit'
:textLength=
"FeatureData.pageType==2?2:1"
v-model=
"FeatureData.pageTitle"
>
</vEditDiv>
</div>
</div>
</div>
</div>
<img
class=
"UpgradedVersion-titleIcon relative"
<img
class=
"UpgradedVersion-titleIcon relative"
src=
"http://
192.168.10.214:8130/Upload
/NewTripFeature/titleIcon.png"
/>
src=
"http://
imgfile.oytour.com/Static
/NewTripFeature/titleIcon.png"
/>
</div>
</div>
<!-- 宿、食、景 副标题 -->
<!-- 宿、食、景 副标题 -->
<div
class=
"UpgradedVersion-subIdeText-box"
<div
class=
"UpgradedVersion-subIdeText-box"
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
</div>
</div>
<div
class=
"UpgradedVersion-sTR marginL20"
>
<div
class=
"UpgradedVersion-sTR marginL20"
>
<div
class=
"UpgradedVersion-sTR-h"
>
<div
class=
"UpgradedVersion-sTR-h"
>
<vEditDiv
:canEdit=
'canEdit
1
'
v-model=
"FeatureData.dataObj.MainName"
></vEditDiv>
<vEditDiv
:canEdit=
'canEdit'
v-model=
"FeatureData.dataObj.MainName"
></vEditDiv>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -88,10 +88,10 @@
...
@@ -88,10 +88,10 @@
<!-- 介绍标题 -->
<!-- 介绍标题 -->
<div
class=
"UpgradedVersion-intTitle"
v-if=
"FeatureData.pageTitle=='介绍'"
>
<div
class=
"UpgradedVersion-intTitle"
v-if=
"FeatureData.pageTitle=='介绍'"
>
<div
class=
"UpgradedVersion-intTitle-one absolute"
>
<div
class=
"UpgradedVersion-intTitle-one absolute"
>
<vEditDiv
:canEdit=
'canEdit
3
'
v-model=
"FeatureData.dataObj.MainName"
></vEditDiv>
<vEditDiv
:canEdit=
'canEdit'
v-model=
"FeatureData.dataObj.MainName"
></vEditDiv>
</div>
</div>
<div
class=
"UpgradedVersion-intTitle-two absolute"
>
<div
class=
"UpgradedVersion-intTitle-two absolute"
>
<vEditDiv
:canEdit=
'canEdit
4
'
v-model=
"FeatureData.dataObj.SubName"
></vEditDiv>
<vEditDiv
:canEdit=
'canEdit'
v-model=
"FeatureData.dataObj.SubName"
></vEditDiv>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -114,27 +114,24 @@
...
@@ -114,27 +114,24 @@
data
()
{
data
()
{
return
{
return
{
canEdit
:
true
,
canEdit
:
true
,
canEdit1
:
true
,
canEdit2
:
true
,
canEdit3
:
true
,
canEdit4
:
true
,
};
};
},
},
methods
:
{
methods
:
{
toUploadImg
(
index
)
{
toUploadImg
(
index
)
{
this
.
$emit
(
'toUploadImg'
,
index
,
'模版图'
)
this
.
$emit
(
'toUploadImg'
,
index
,
'模版图'
)
},
},
toSelectImg
(
index
)
{
toSelectImg
(
index
)
{
this
.
$emit
(
'toSelectImg'
,
index
,
'模版图'
)
this
.
$emit
(
'toSelectImg'
,
index
,
'模版图'
)
},
},
toAddImg
()
{
toAddImg
()
{
this
.
$emit
(
'toAddImg'
)
this
.
$emit
(
'toAddImg'
)
},
},
toDeleteImg
(
index
)
{
toDeleteImg
(
index
)
{
this
.
$emit
(
'toDeleteImg'
,
index
,
'模版图'
)
this
.
$emit
(
'toDeleteImg'
,
index
,
'模版图'
)
},
},
setTemplate
(
TemplateType
)
{
setTemplate
(
TemplateType
)
{
this
.
$emit
(
'setTemplate'
,
TemplateType
)
this
.
$emit
(
'setTemplate'
,
TemplateType
)
}
}
},
},
computed
:
{},
computed
:
{},
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @
5edaea4f
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
<div
class=
"introduceFooterBJ introduceFooterOne"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"introduceFooterBJ introduceFooterOne"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"introduceFooterBJ introduceFootertTwo"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"introduceFooterBJ introduceFootertTwo"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"introduceFooter-text row-aic"
>
<div
class=
"introduceFooter-text row-aic"
>
<img
src=
"http://
192.168.10.214:8130/Upload
/NewTripFeature/footerLogo.png"
/>
<img
src=
"http://
imgfile.oytour.com/Static
/NewTripFeature/footerLogo.png"
/>
<vEditDiv
class=
"z-index2"
:canEdit=
'canEdit'
v-model=
"FeatureData.LineShortName"
></vEditDiv>
<vEditDiv
class=
"z-index2"
:canEdit=
'canEdit'
v-model=
"FeatureData.LineShortName"
></vEditDiv>
</div>
</div>
<div
class=
"introduceFooterBJ introduceFootertThree"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"introduceFooterBJ introduceFootertThree"
:style=
"
{'background':TripColor}">
</div>
...
@@ -122,13 +122,43 @@
...
@@ -122,13 +122,43 @@
},
},
//添加页面
//添加页面
AddPages
(
index
,
featureDataObj
)
{
AddPages
(
index
,
featureDataObj
)
{
console
.
log
(
"featureDataObj"
,
featureDataObj
);
var
pageData
=
this
.
getPageObj
();
var
pageData
=
this
.
getPageObj
();
pageData
.
isDeletePage
=
true
pageData
.
isDeletePage
=
true
;
pageData
.
pageType
=
featureDataObj
.
pageType
pageData
.
pageType
=
featureDataObj
.
pageType
;
if
(
featureDataObj
.
pageType
>
3
)
{
var
tripObj
=
this
.
getTripData
();
pageData
.
pageTemplate
=
1
var
newObj
=
this
.
getDetailsObj
();
newObj
.
LineName
=
this
.
FeatureData
.
LineName
;
newObj
.
LtName
=
this
.
FeatureData
.
LtName
;
newObj
.
Title
=
this
.
FeatureData
.
Title
;
newObj
.
LineShortName
=
this
.
FeatureData
.
LineShortName
;
//首页
if
(
pageData
.
pageType
==
1
)
{
if
(
tripObj
.
cityStr
&&
tripObj
.
cityStr
!=
''
)
{
newObj
.
MainName
=
tripObj
.
cityStr
;
//地区1
}
else
{
newObj
.
MainName
=
"大阪"
;
}
if
(
tripObj
.
cityStr2
&&
tripObj
.
cityStr2
!=
''
)
{
newObj
.
SubName
=
tripObj
.
cityStr2
;
//地区2
}
else
{
newObj
.
SubName
=
"东京"
;
}
newObj
.
ShadowName
=
"遇见最美好的自己"
;
newObj
.
SubShadowName
=
"在古老的日本樱花街道"
;
if
(
tripObj
.
scenicArray
&&
tripObj
.
scenicArray
.
length
>
0
)
{
newObj
.
DetailsName
=
tripObj
.
scenicArray
[
0
].
MainName
;
newObj
.
ImgList
=
tripObj
.
scenicArray
[
0
].
ImgList
;
newObj
.
MainDesc
=
tripObj
.
scenicArray
[
0
].
MainDesc
;
}
else
{
newObj
.
DetailsName
=
"景点介绍"
;
newObj
.
ImgList
=
[{
url
:
"http://imgfile.oytour.com//Static/NewTripFeature/homeBg1.jpg"
}];
newObj
.
MainDesc
=
"景点描述"
;
}
}
}
pageData
.
dataObj
=
newObj
;
this
.
pageList
.
splice
(
index
,
0
,
pageData
);
this
.
pageList
.
splice
(
index
,
0
,
pageData
);
},
},
//删除页面
//删除页面
...
@@ -158,8 +188,6 @@
...
@@ -158,8 +188,6 @@
if
(
oldJson
&&
oldJson
.
length
>
0
)
{
if
(
oldJson
&&
oldJson
.
length
>
0
)
{
this
.
pageList
=
oldJson
;
this
.
pageList
=
oldJson
;
}
else
{
}
else
{
var
tripObj
=
this
.
getTripData
();
console
.
log
(
"tripObj"
,
tripObj
);
this
.
pageList
.
forEach
(
pItem
=>
{
this
.
pageList
.
forEach
(
pItem
=>
{
var
newObj
=
this
.
getDetailsObj
();
var
newObj
=
this
.
getDetailsObj
();
newObj
.
LineName
=
this
.
FeatureData
.
LineName
;
newObj
.
LineName
=
this
.
FeatureData
.
LineName
;
...
@@ -187,7 +215,7 @@
...
@@ -187,7 +215,7 @@
}
else
{
}
else
{
newObj
.
DetailsName
=
"景点介绍"
;
newObj
.
DetailsName
=
"景点介绍"
;
newObj
.
ImgList
=
[{
newObj
.
ImgList
=
[{
url
:
"http://imgfile.oytour.com/
Upload/DMC/DsrkBYw5MnQnzk2WzksZ4knrrKFbeP3a
.jpg"
url
:
"http://imgfile.oytour.com/
/Static/NewTripFeature/homeBg1
.jpg"
}];
}];
newObj
.
MainDesc
=
"景点描述"
;
newObj
.
MainDesc
=
"景点描述"
;
}
}
...
@@ -305,7 +333,7 @@
...
@@ -305,7 +333,7 @@
pItem
.
dataObj
=
newObj
;
pItem
.
dataObj
=
newObj
;
});
});
}
}
console
.
log
(
"this.pageList"
,
this
.
pageList
);
},
},
//获取行程信息
//获取行程信息
getTripData
()
{
getTripData
()
{
...
...
src/router/config.js
View file @
5edaea4f
...
@@ -87,7 +87,6 @@ export default {
...
@@ -87,7 +87,6 @@ export default {
title
:
'出团通知书下载新'
title
:
'出团通知书下载新'
},
},
},
},
{
{
path
:
'/SalesconfirmationOrder'
,
//销售出团通知
path
:
'/SalesconfirmationOrder'
,
//销售出团通知
name
:
'SalesconfirmationOrder'
,
name
:
'SalesconfirmationOrder'
,
...
...
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