Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
Athena
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
华国豪
Athena
Commits
fb518a4c
Commit
fb518a4c
authored
Mar 13, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
‘阿里oss图片修改本地图片路径’
parent
e5dbff32
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
oneday.vue
src/components/commonPage/oneday.vue
+4
-4
confirmationOrderDownLoad.vue
src/components/global/confirmationOrderDownLoad.vue
+2
-2
detailTwo.vue
src/components/mall/detailTwo.vue
+1
-1
index.js
src/plugins/index.js
+1
-1
No files found.
src/components/commonPage/oneday.vue
View file @
fb518a4c
...
@@ -22,10 +22,10 @@
...
@@ -22,10 +22,10 @@
<div
class=
"item big"
style=
'margin-bottom:20px;'
>
<div
class=
"item big"
style=
'margin-bottom:20px;'
>
<div
class=
"left"
>
<div
class=
"left"
>
<img
v-if=
"day.details[0].img!='' && day.details[0].scenicJson"
:style=
"
{'top':day.details[0].scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(day.details[0].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
<img
v-if=
"day.details[0].img!='' && day.details[0].scenicJson"
:style=
"
{'top':day.details[0].scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(day.details[0].img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" />
<img
v-else
src=
"https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/DefalutImage/DMC/defaultairline.png
"
/>
<img
v-else
:src=
"`$
{domainManager().ViittoFileUrl}/Upload/DefalutImage/DMC/defaultairline.png`
" />
<img
v-else-if=
"day.dayNum==1 && day.details[0].img==''"
src=
'https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/nll.jpg
'
/>
<img
v-else-if=
"day.dayNum==1 && day.details[0].img==''"
:src=
'`$
{domainManager().ViittoFileUrl}/Upload/PictureMaterial/Web/nll.jpg`
' />
<img
v-else-if=
"day.islast && day.details[0].img==''"
src=
'https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/nll.jpg
'
/>
<img
v-else-if=
"day.islast && day.details[0].img==''"
:src=
'`$
{domainManager().ViittoFileUrl}/Upload/PictureMaterial/Web/nll.jpg`
' />
<img
v-else
src=
'https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/activy.jpg
'
/>
<img
v-else
:src=
'`$
{domainManager().ViittoFileUrl}/Upload/PictureMaterial/Web/activy.jpg`
' />
</div>
</div>
<div
class=
"right"
>
<div
class=
"right"
>
<div
class=
"details"
>
<div
class=
"details"
>
...
...
src/components/global/confirmationOrderDownLoad.vue
View file @
fb518a4c
...
@@ -1455,7 +1455,7 @@
...
@@ -1455,7 +1455,7 @@
<div
id=
'pdfDom'
style=
"padding:0 20px;"
>
<div
id=
'pdfDom'
style=
"padding:0 20px;"
>
<div
id=
"pdf_1"
>
<div
id=
"pdf_1"
>
<div
class=
"logo-div"
>
<div
class=
"logo-div"
>
<img
:src=
"TripLayer.vshowJ===true?
'https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/headerImg.jpg':'https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/headerImg2.jpg'
"
>
<img
:src=
"TripLayer.vshowJ===true?
`$
{domainManager().ViittoFileUrl}/Upload/PictureMaterial/Web/headerImg.jpg` : `${domainManager().ViittoFileUrl}/Upload/PictureMaterial/Web/headerImg2.jpg`
">
</div>
</div>
<div
class=
"website"
>
<div
class=
"website"
>
<div
class=
"website-line"
></div>
<div
class=
"website-line"
></div>
...
@@ -1896,7 +1896,7 @@
...
@@ -1896,7 +1896,7 @@
</tr>
</tr>
</table> -->
</table> -->
<div
v-if=
'TripLayer.vshowJ'
class=
"footer-div"
>
<div
v-if=
'TripLayer.vshowJ'
class=
"footer-div"
>
<img
src=
"https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/TravelControlTripIcon20.png
"
/>
<img
:src=
"`${domainManager().ViittoFileUrl}/Upload/PictureMaterial/Web/TravelControlTripIcon20.png`
"
/>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
src/components/mall/detailTwo.vue
View file @
fb518a4c
...
@@ -899,7 +899,7 @@ export default {
...
@@ -899,7 +899,7 @@ export default {
this
.
feature
=
data
.
feature
;
this
.
feature
=
data
.
feature
;
this
.
isDirect
=
data
.
isDirect
;
this
.
isDirect
=
data
.
isDirect
;
if
(
data
.
videoStr
)
{
if
(
data
.
videoStr
)
{
let
path
=
data
.
videoStr
.
indexOf
(
'http'
)
>
-
1
?
data
.
videoStr
:
'https://reborndev.oss-cn-hangzhou.aliyuncs.com'
+
data
.
videoStr
;
let
path
=
data
.
videoStr
.
indexOf
(
'http'
)
>
-
1
?
data
.
videoStr
:
domainManager
().
ViittoFileUrl
+
data
.
videoStr
;
this
.
VideoStr
=
path
;
this
.
VideoStr
=
path
;
}
}
// console.log(data.priceList[0].priceFlight)
// console.log(data.priceList[0].priceFlight)
...
...
src/plugins/index.js
View file @
fb518a4c
...
@@ -32,7 +32,7 @@ export default {
...
@@ -32,7 +32,7 @@ export default {
PostUrl
:
domainUrl
+
"/api/common/post"
,
PostUrl
:
domainUrl
+
"/api/common/post"
,
// javaUrl: "http://192.168.2.16:9000",
// javaUrl: "http://192.168.2.16:9000",
javaUrl
:
"http://47.96.12.235:9001"
,
//测试接口
javaUrl
:
"http://47.96.12.235:9001"
,
//测试接口
ViittoFileUrl
:
locationName
.
indexOf
(
'oytour'
)
!==
-
1
||
locationName
.
indexOf
(
'viitto'
)
!==-
1
?
"http://imgfile.oytour.com"
:
'http://192.168.2.214:8130'
,
LocalFileStreamDownLoadUrl
:
domainUrl
+
"/api/file/GetFileFromWebApi"
,
LocalFileStreamDownLoadUrl
:
domainUrl
+
"/api/file/GetFileFromWebApi"
,
};
};
return
obj
;
return
obj
;
...
...
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