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
5fc75d22
Commit
5fc75d22
authored
Jan 03, 2024
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
行程路线样式调整 主题色选择
parent
297e911a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
77 additions
and
24 deletions
+77
-24
tripIndexNewHV.css
src/assets/css/tripIndexNewHV.css
+1
-1
TravelConfig.vue
...ents/newTravelmanager/TravelGroupControl/TravelConfig.vue
+53
-3
travelDays.vue
...newTravelmanager/travelLineTrip/components/travelDays.vue
+17
-16
travelDaysHV.vue
...wTravelmanager/travelLineTrip/components/travelDaysHV.vue
+6
-4
No files found.
src/assets/css/tripIndexNewHV.css
View file @
5fc75d22
...
...
@@ -98,7 +98,7 @@
width
:
36px
;
height
:
36px
;
border-radius
:
50%
;
background
:
#D6CEC1
;
/* background: #D6CEC1; */
text-align
:
center
;
line-height
:
36px
;
margin-right
:
30px
;
...
...
src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue
View file @
5fc75d22
...
...
@@ -84,6 +84,20 @@
.TC_comDMCchoose
.el-dialog__body
{
padding
:
5px
25px
30px
;
}
.colorMark
{
width
:
25px
;
height
:
25px
;
position
:
relative
;
display
:
inline-block
;
border-radius
:
50%
;
margin
:
5px
;
background
:
#fff
;
border
:
5px
solid
#eee
;
cursor
:
pointer
;
}
._VideoStr_boxColor
.el-form-item__content
{
line-height
:
0
!important
;
}
</
style
>
...
...
@@ -224,10 +238,25 @@
</div>
</div>
</div>
<div
class=
"_VideoStr_box"
v-if=
"true"
>
<div
class=
"_VideoStr_box
_VideoStr_boxColor
"
v-if=
"true"
>
<el-form-item
label=
"行程主题色"
>
<el-color-picker
style=
'vertical-align: middle;'
v-model=
"PostConfig.TripColor"
></el-color-picker>
<span
style=
"color: red;margin-left: 15px;"
>
注意,如果你使用行程模板,系统将会强制修改主色
</span>
<div
class=
"row items-center nowrap"
>
<template
v-for=
"(x,i) in colorArr"
>
<el-tooltip
:key=
"i"
class=
"box-item"
effect=
"dark"
:content=
"x.ColorName"
placement=
"bottom"
>
<div
@
click=
"PostConfig.TripColor=x.ColorValue"
>
<span
class=
"colorMark"
:style=
"
{'background':x.ColorValue,'border-color':x.ColorValue==PostConfig.TripColor?'black':'#eee'}">
</span>
</div>
</el-tooltip>
</
template
>
</div>
<!-- <el-color-picker style='vertical-align: middle;' v-model="PostConfig.TripColor"></el-color-picker> -->
<span
style=
"color: red;margin-left: 5px;margin-top: 15px;display: block;"
>
注意,如果你使用行程模板,系统将会强制修改主色
</span>
</el-form-item>
</div>
</el-form>
...
...
@@ -282,6 +311,27 @@
SelfWCountryList
:
[],
//国家列表
SelfWLocationList
:
[],
//地区列表
SelfWCityList
:
[],
//城市列表
colorArr
:[
{
ColorName
:
'红色'
,
ColorValue
:
'#E53935'
},
{
ColorName
:
'玫红'
,
ColorValue
:
'#D61159'
},
{
ColorName
:
'紫色'
,
ColorValue
:
'#8E24AA'
},
{
ColorName
:
'深紫色'
,
ColorValue
:
'#4C24AB'
},
{
ColorName
:
'深蓝色'
,
ColorValue
:
'#3949AB'
},
{
ColorName
:
'蓝色'
,
ColorValue
:
'#1B84F1'
},
{
ColorName
:
'浅蓝色'
,
ColorValue
:
'#039BE6'
},
{
ColorName
:
'青色'
,
ColorValue
:
'#00ACC2'
},
{
ColorName
:
'深绿色'
,
ColorValue
:
'#01887A'
},
{
ColorName
:
'绿色'
,
ColorValue
:
'#4AAC45'
},
{
ColorName
:
'浅绿'
,
ColorValue
:
'#7DB343'
},
{
ColorName
:
'青绿色'
,
ColorValue
:
'#C0CA35'
},
{
ColorName
:
'黄色'
,
ColorValue
:
'#FDD734'
},
{
ColorName
:
'深黄色'
,
ColorValue
:
'#F5BE1B'
},
{
ColorName
:
'橙色'
,
ColorValue
:
'#FB8C00'
},
{
ColorName
:
'橘红色'
,
ColorValue
:
'#F5511E'
},
{
ColorName
:
'墨绿色'
,
ColorValue
:
'#767676'
},
{
ColorName
:
'墨青色'
,
ColorValue
:
'#546F7A'
},
{
ColorName
:
'深咖色'
,
ColorValue
:
'#6E4C43'
},
]
};
},
components
:
{
...
...
src/components/newTravelmanager/travelLineTrip/components/travelDays.vue
View file @
5fc75d22
...
...
@@ -75,7 +75,7 @@
<div
class=
"travelDaysContent"
>
<
template
v-if=
"item.ScenicArray.length>0"
>
<div
class=
"travelDaysContent-text"
v-for=
"(jindian,j) in item.ScenicArray"
:key=
"j"
>
<div
class=
"textBold"
>
<div
class=
"textBold"
:style=
"
{'color':dataAll.TripColor}"
>
<!-- 【 -->
<vEditSpan
:canEdit=
'canEdit'
v-model=
"jindian.CouponsName"
></vEditSpan>
<!-- 】 -->
...
...
@@ -87,7 +87,7 @@
</
template
>
<div
v-if=
"item.ScenicArray.length==0&&item.TrafficObj.trafficIntroduce.IntroduceTitle"
class=
"travelDaysContent-text"
>
<span
class=
"textBold"
>
<span
class=
"textBold"
:style=
"{'color':dataAll.TripColor}"
>
<!-- <vEditDiv class="dayCouponsName" :canEdit='canEdit'
v-model="'【'+item.TrafficObj.trafficIntroduce.IntroduceTitle+'】'"></vEditDiv> -->
<vEditDiv
class=
"dayCouponsName"
:canEdit=
'canEdit'
...
...
@@ -148,7 +148,8 @@
</div>
</div>
<div
class=
"MT21"
v-if=
"item.ScenicArray.length>0"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
:style=
"{'color':dataAll.TripColor}"
>
<vEditSpan
:canEdit=
'canEdit'
v-model=
"item.ScenicArray[0].CouponsName"
></vEditSpan>
</div>
<div
class=
"fz23 MT5 lineHeight42 color444 fontFamilyUI"
>
...
...
@@ -194,7 +195,7 @@
</div>
<div
class=
"ML30 flexG"
>
<
template
v-if=
"item.ScenicArray.length>1"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
:style=
"
{'color':dataAll.TripColor}"
>
<vEditSpan
:canEdit=
'canEdit'
v-model=
"item.ScenicArray[1].CouponsName"
></vEditSpan>
</div>
<div
class=
"fz23 MT5 lineHeight42 color444 fontFamilyUI"
>
...
...
@@ -246,7 +247,7 @@
</div>
<div
class=
"ML30 flexG"
>
<
template
v-if=
"item.ScenicArray.length>0"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
:style=
"
{'color':dataAll.TripColor}"
>
<vEditSpan
:canEdit=
'canEdit'
v-model=
"item.ScenicArray[0].CouponsName"
></vEditSpan>
</div>
<div
class=
"fz23 lineHeight42 color444 fontFamilyUI"
>
...
...
@@ -258,7 +259,7 @@
<div
class=
"row MB35"
>
<div
class=
"flexG"
>
<
template
v-if=
"item.ScenicArray.length>1"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
:style=
"
{'color':dataAll.TripColor}"
>
<vEditSpan
:canEdit=
'canEdit'
v-model=
"item.ScenicArray[1].CouponsName"
></vEditSpan>
</div>
<div
class=
"fz23 lineHeight42 color444 fontFamilyUI"
>
...
...
@@ -340,7 +341,7 @@
</div>
<div
class=
"ML30 flexG"
>
<
template
v-if=
"item.ScenicArray.length>2"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
:style=
"
{'color':dataAll.TripColor}"
>
<vEditSpan
:canEdit=
'canEdit'
v-model=
"item.ScenicArray[2].CouponsName"
></vEditSpan>
</div>
<div
class=
"fz23 lineHeight42 color444 fontFamilyUI"
>
...
...
@@ -392,7 +393,7 @@
</div>
<div
class=
"ML41 flexG"
>
<
template
v-if=
"item.ScenicArray.length>0"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
:style=
"
{'color':dataAll.TripColor}"
>
<vEditSpan
:canEdit=
'canEdit'
v-model=
"item.ScenicArray[0].CouponsName"
></vEditSpan>
</div>
<div
class=
"fz23 MT5 lineHeight42 color444 fontFamilyUI"
>
...
...
@@ -441,7 +442,7 @@
</div>
<div
class=
"MT20 width331"
>
<
template
v-if=
"item.ScenicArray.length>1"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A card-title lineHeight54"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A card-title lineHeight54"
:style=
"
{'color':dataAll.TripColor}"
>
<vEditSpan
:canEdit=
'canEdit'
v-model=
"item.ScenicArray[1].CouponsName"
></vEditSpan>
</div>
<div
class=
"fz23 MT5 lineHeight42 color444 fontFamilyUI"
>
...
...
@@ -489,7 +490,7 @@
</div>
<div
class=
"MT20"
>
<
template
v-if=
"item.ScenicArray.length>2"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A card-title lineHeight54"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A card-title lineHeight54"
:style=
"
{'color':dataAll.TripColor}"
>
<vEditSpan
:canEdit=
'canEdit'
v-model=
"item.ScenicArray[2].CouponsName"
></vEditSpan>
</div>
<div
class=
"fz23 MT5 lineHeight42 color444 fontFamilyUI"
>
...
...
@@ -538,7 +539,7 @@
<div
class=
"MT20"
>
<
template
v-if=
"item.ScenicArray.length>3"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A card-title lineHeight54"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A card-title lineHeight54"
:style=
"
{'color':dataAll.TripColor}"
>
<vEditSpan
:canEdit=
'canEdit'
v-model=
"item.ScenicArray[3].CouponsName"
></vEditSpan>
</div>
<div
class=
"fz23 MT5 lineHeight42 color444 fontFamilyUI"
>
...
...
@@ -589,7 +590,7 @@
</div>
</div>
<div
class=
"MT18"
v-if=
"item.ScenicArray.length>0"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
:style=
"{'color':dataAll.TripColor}"
>
<vEditSpan
:canEdit=
'canEdit'
v-model=
"item.ScenicArray[0].CouponsName"
></vEditSpan>
</div>
<div
class=
"fz23 lineHeight42 color444 fontFamilyUI"
>
...
...
@@ -632,7 +633,7 @@
</div>
</div>
<div
class=
"MT18"
v-if=
"item.ScenicArray.length>1"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
:style=
"{'color':dataAll.TripColor}"
>
<vEditSpan
:canEdit=
'canEdit'
v-model=
"item.ScenicArray[1].CouponsName"
></vEditSpan>
</div>
<div
class=
"fz23 lineHeight42 color444 fontFamilyUI"
>
...
...
@@ -681,7 +682,7 @@
</div>
<div
class=
"MT19"
>
<
template
v-if=
"item.ScenicArray.length>2"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
:style=
"
{'color':dataAll.TripColor}"
>
<vEditSpan
:canEdit=
'canEdit'
v-model=
"item.ScenicArray[2].CouponsName"
></vEditSpan>
</div>
<div
class=
"fz23 lineHeight42 color444 fontFamilyUI"
>
...
...
@@ -729,7 +730,7 @@
</div>
<div
class=
"MT19"
>
<
template
v-if=
"item.ScenicArray.length>3"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
:style=
"
{'color':dataAll.TripColor}"
>
<vEditSpan
:canEdit=
'canEdit'
v-model=
"item.ScenicArray[3].CouponsName"
></vEditSpan>
</div>
<div
class=
"fz23 lineHeight42 color444 fontFamilyUI"
>
...
...
@@ -777,7 +778,7 @@
</div>
<div
class=
"MT19"
>
<
template
v-if=
"item.ScenicArray.length>4"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
>
<div
class=
"fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
:style=
"
{'color':dataAll.TripColor}"
>
<vEditSpan
:canEdit=
'canEdit'
v-model=
"item.ScenicArray[4].CouponsName"
></vEditSpan>
</div>
<div
class=
"fz23 lineHeight42 color444 fontFamilyUI"
>
...
...
src/components/newTravelmanager/travelLineTrip/components/travelDaysHV.vue
View file @
5fc75d22
...
...
@@ -380,9 +380,10 @@
<div
class=
"travelDaysHVTdetails-textBox row-sb"
>
<div
class=
"travelDaysdetails-text row nowrap"
>
<div>
<div
class=
"travelDaysHVdetails-icon"
>
<div
class=
"travelDaysHVdetails-icon"
:style=
"{'background':backgroundColor}"
>
<span
class=
"iconfont icon-b-meals"
:style=
"{'color':
backgroundColor2
}"
></span>
:style=
"{'color':
'#64491E'
}"
></span>
</div>
</div>
<span
class=
"travelDaysHVdetails-text0"
>
早餐:
</span>
...
...
@@ -413,9 +414,10 @@
<div
class=
"travelDaysHVTdetails-textBox row"
>
<div
class=
"travelDaysdetails-text right0 row nowrap"
>
<div>
<div
class=
"travelDaysHVdetails-icon"
>
<div
class=
"travelDaysHVdetails-icon"
:style=
"{'background':backgroundColor}"
>
<span
class=
"iconfont icon-zhusu"
:style=
"{'color':
backgroundColor2
}"
></span>
:style=
"{'color':
'#64491E'
}"
></span>
</div>
</div>
<span
class=
"travelDaysHVdetails-text0"
>
住宿:
</span>
...
...
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