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
09fe2929
Commit
09fe2929
authored
Feb 22, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
‘行程特色 请勿更新前端!!!!!!!’
parent
70075e84
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
19 deletions
+20
-19
feture2.css
src/assets/css/feture2.css
+2
-2
confirmationOrderDownLoad.vue
src/components/confirmationOrderDownLoad.vue
+3
-3
TravelFeature.vue
...nts/newTravelmanager/TravelGroupControl/TravelFeature.vue
+14
-13
travelFeature3.vue
...lmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
+1
-1
No files found.
src/assets/css/feture2.css
View file @
09fe2929
...
@@ -1987,8 +1987,8 @@ div{
...
@@ -1987,8 +1987,8 @@ div{
background-color
:
#f6dc61
!important
background-color
:
#f6dc61
!important
}
}
.template_bg_2
{
.template_bg_2
{
background-color
:
pink
!important
background-color
:
#ffc2ca
!important
}
}
.template_bg_3
{
.template_bg_3
{
background-color
:
skyblue
!important
background-color
:
#9cdaff
!important
}
}
\ No newline at end of file
src/components/confirmationOrderDownLoad.vue
View file @
09fe2929
...
@@ -214,7 +214,7 @@
...
@@ -214,7 +214,7 @@
<div
class=
"zidingyi"
v-if=
"showType==3&&loadNone==false&&vshowC"
>
<div
class=
"zidingyi"
v-if=
"showType==3&&loadNone==false&&vshowC"
>
<div
v-html=
"feature.featureContent"
></div>
<div
v-html=
"feature.featureContent"
></div>
</div>
</div>
<div
class=
"template-box"
v-if=
"(showType
==4||showType==5
)&&loadNone==false&&vshowC"
>
<div
class=
"template-box"
v-if=
"(showType
>=4
)&&loadNone==false&&vshowC"
>
<div
v-if=
"vshowC"
class=
"module-title"
>
<div
v-if=
"vshowC"
class=
"module-title"
>
<h2>
行程特色
</h2>
<h2>
行程特色
</h2>
<div
class=
"short-line"
></div>
<div
class=
"short-line"
></div>
...
@@ -648,7 +648,7 @@
...
@@ -648,7 +648,7 @@
let
tcid
=
this
.
$route
.
query
.
tcid
;
let
tcid
=
this
.
$route
.
query
.
tcid
;
let
UploadUrl
=
this
.
domainManager
().
UploadUrl
let
UploadUrl
=
this
.
domainManager
().
UploadUrl
let
_this
=
this
let
_this
=
this
if
(
this
.
showType
===
4
||
this
.
showType
===
5
)
{
// 判断是否为行程特色
if
(
this
.
showType
>=
4
)
{
// 判断是否为行程特色
$
.
ajax
({
//调用是否已经存在文件夹接口判断是否进行上传图片操作
$
.
ajax
({
//调用是否已经存在文件夹接口判断是否进行上传图片操作
url
:
UploadUrl
+
'/Upload/GetImage?filePath=Feature/'
+
tcid
,
url
:
UploadUrl
+
'/Upload/GetImage?filePath=Feature/'
+
tcid
,
type
:
"POST"
,
type
:
"POST"
,
...
@@ -674,7 +674,7 @@
...
@@ -674,7 +674,7 @@
let
cName
=
''
let
cName
=
''
if
(
_this
.
showType
==
4
){
if
(
_this
.
showType
==
4
){
cName
=
'.feature-box'
cName
=
'.feature-box'
}
else
if
(
_this
.
showType
==
5
){
}
else
if
(
_this
.
showType
>
4
){
cName
=
'.travle_page'
cName
=
'.travle_page'
}
}
if
(
cName
!=
''
){
if
(
cName
!=
''
){
...
...
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @
09fe2929
...
@@ -254,18 +254,18 @@
...
@@ -254,18 +254,18 @@
imgUrl
:
Travelslider
,
imgUrl
:
Travelslider
,
TypeState
:
5
TypeState
:
5
},
},
//
{
{
//
ckTitle: "行程特色-粉",
ckTitle
:
"行程特色-粉"
,
//
isShow: false,
isShow
:
false
,
//
imgUrl: Travelslider,
imgUrl
:
Travelslider
,
//
TypeState: 6
TypeState
:
6
//
},
},
//
{
{
//
ckTitle: "行程特色-蓝",
ckTitle
:
"行程特色-蓝"
,
//
isShow: false,
isShow
:
false
,
//
imgUrl: Travelslider,
imgUrl
:
Travelslider
,
//
TypeState: 7
TypeState
:
7
//
}
}
],
//tab数组
],
//tab数组
templateColorArray
:[
templateColorArray
:[
...
@@ -396,7 +396,8 @@
...
@@ -396,7 +396,8 @@
}
}
setTimeout
(()
=>
{
setTimeout
(()
=>
{
try
{
try
{
alert
(
document
.
getElementById
(
"newFeatureBox"
).
innerHTML
)
console
.
log
(
document
.
getElementById
(
"newFeatureBox"
).
innerHTML
)
FeatureData
.
FeatureHtml
=
document
.
getElementById
(
"newFeatureBox"
).
innerHTML
;
FeatureData
.
FeatureHtml
=
document
.
getElementById
(
"newFeatureBox"
).
innerHTML
;
}
catch
(
err
)
{
}
catch
(
err
)
{
}
}
...
...
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
View file @
09fe2929
...
@@ -884,7 +884,7 @@
...
@@ -884,7 +884,7 @@
<div
class=
"travel_restaurant_1"
>
<div
class=
"travel_restaurant_1"
>
<div
class=
"restaurant_1_header"
v-if=
"item === 0"
>
<div
class=
"restaurant_1_header"
v-if=
"item === 0"
>
<img
class=
"restaurant_1_header_bg"
:src=
"`$
{domainManager().ViittoFileUrl}/FeatureDefault/template_top_${templateType}.jpg`">
<img
class=
"restaurant_1_header_bg"
:src=
"`$
{domainManager().ViittoFileUrl}/FeatureDefault/template_top_${templateType}.jpg`">
<img
class=
"restaurant_1_header_bg2"
:src=
"`$
{domainManager().ViittoFileUrl}/FeatureDefault/template_title
2
_${templateType}.jpg`">
<img
class=
"restaurant_1_header_bg2"
:src=
"`$
{domainManager().ViittoFileUrl}/FeatureDefault/template_title
3
_${templateType}.jpg`">
<div
class=
"restaurant_1_header_title"
>
<div
class=
"restaurant_1_header_title"
>
<div>
<div>
<div>
品尝
</div>
<div>
品尝
</div>
...
...
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