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
8c93043d
Commit
8c93043d
authored
Mar 12, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
上传修改
parent
02fda4ec
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
10 additions
and
101 deletions
+10
-101
leaderTaskBoard.vue
src/components/LeaderManagement/leaderTaskBoard.vue
+1
-1
restaurantInfoManage.vue
src/components/Restaurant/restaurantInfoManage.vue
+1
-1
TravelFeature.vue
...onents/TravelManager/TravelGroupControl/TravelFeature.vue
+0
-91
dinnerTrip_Direct.vue
...onents/TravelManager/travelLineTrip/dinnerTrip_Direct.vue
+1
-1
scienTrip_Direct.vue
...ponents/TravelManager/travelLineTrip/scienTrip_Direct.vue
+1
-1
oneday.vue
src/components/commonPage/oneday.vue
+2
-2
HotelTrip.vue
src/components/newTravelmanager/travelLineTrip/HotelTrip.vue
+2
-2
travelDaysTrip.vue
...onents/newTravelmanager/travelLineTrip/travelDaysTrip.vue
+1
-1
scenicSpotInfoManage.vue
src/components/scenicSpot/scenicSpotInfoManage.vue
+1
-1
No files found.
src/components/LeaderManagement/leaderTaskBoard.vue
View file @
8c93043d
...
...
@@ -471,7 +471,7 @@ export default {
leaderAndGuid
:
""
,
defaultImg
:
'this.src="'
+
require
(
"../../assets/img/default_head_img.jpg"
)
+
'"'
,
imgBeforeFile
:
this
.
domainManager
().
Ali
Url
,
imgBeforeFile
:
this
.
domainManager
().
ViittoFile
Url
,
loading
:
false
,
total
:
0
,
dataList
:
""
,
...
...
src/components/Restaurant/restaurantInfoManage.vue
View file @
8c93043d
...
...
@@ -1201,7 +1201,7 @@
obj
.
Path
=
x
;
obj
.
PicID
=
0
;
obj
.
ShowPath
=
this
.
domainManager
().
Ali
Url
+
this
.
domainManager
().
ViittoFile
Url
+
x
+
"?x-oss-process=image/resize,l_140"
;
this
.
DiningImageArray
.
push
(
obj
);
...
...
src/components/TravelManager/TravelGroupControl/TravelFeature.vue
View file @
8c93043d
...
...
@@ -117,64 +117,6 @@
</div>
</div>
<div
v-if=
"FeatureData.FeatureType===FeatureTypeState.travelSpecial"
>
<!--
<span
class=
"userDeSpan"
>
效果预览(可进行单张修改)
</span>
-->
<!--
<div
id=
"travelSpecial"
>
<div
class=
"travelSpecial"
>
<div
v-for=
"(option, index) in this.travelsList"
:key=
"index"
>
<div
class=
"special_header"
v-if=
"index%3===0"
>
<img
crossorigin=
"Anonymous"
src=
"https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/top-pic.png"
>
<div>
<vEditDiv
v-model=
"FeatureData.Subtitle"
></vEditDiv>
<div>
<span>
◆
</span>
<vEditDiv
v-model=
"FeatureData.Title"
></vEditDiv>
</div>
<div
class=
"special_portrait"
>
<img
crossorigin=
"Anonymous"
src=
"https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/plane.png"
>
</div>
<img
crossorigin=
"Anonymous"
src=
"https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/logo.png"
>
<div
class=
"special_title"
>
<div>
行程特色
</div>
<div>
▼
</div>
</div>
</div>
</div>
<div
class=
"special_content"
v-if=
"option.length!==0"
>
<component
:is=
"option.temp"
:travelsObj=
"option"
></component>
<div
v-if=
"del_show===true"
class=
"special_del"
>
<span
class=
"iconfont icon-shanchu"
@
click=
"delFeature(index)"
></span>
</div>
</div>
<div
class=
"special_footer"
v-if=
"index%3===2||index===travelsList.length-1"
>
<div>
<img
crossorigin=
"Anonymous"
src=
"https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/line.png"
>
<div>
感动·与世界同步
</div>
</div>
<div>
<div>
{{
FeatureData
.
LineName
}}
</div>
<div>
<img
crossorigin=
"Anonymous"
src=
"https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/bottom_pic.png"
>
</div>
</div>
</div>
</div>
</div>
</div>
-->
<new-feature
ref=
'newFeature'
:data=
'FeatureData'
></new-feature>
</div>
<div
v-if=
"FeatureData.FeatureType===FeatureTypeState.travelSpecial2"
>
...
...
@@ -372,39 +314,6 @@ export default {
err
=>
{}
)
},
1000
)
// this.h2c(document.getElementById("travelSpecial"), {
// useCORS: true,
// logging: false
// }).then(canvas => {
// let imgUrl = canvas.toDataURL("image/png");
// let blob = this.base64ToBlob(imgUrl);
// let newArr = [];
// newArr.push(blob);
// let fileName = `${this.uuid(10, 10)}.png`;
// let user = JSON.parse(window.localStorage.userInfo);
// let path = `/Upload/TravelFeature/${user.EmployeeId}/${fileName}`;
// var that = this;
// this.uploadBlob(path, newArr, x => {
// if (x.res.statusCode === 200) {
// postData.Feature.FeatureHtmlImage =
// "http://reborndev.oss-cn-hangzhou.aliyuncs.com" + path;
// this.apipost(
// "travel_post_SetFeature",
// postData,
// res => {
// if (res.data.resultCode == 1) {
// }
// },
// err => {}
// );
// } else {
// this.Error("生成图片失败");
// }
// });
// });
// }
},
//切换tab事件
clickFeature
(
item
)
{
...
...
src/components/TravelManager/travelLineTrip/dinnerTrip_Direct.vue
View file @
8c93043d
...
...
@@ -272,7 +272,7 @@ export default {
var
dinnerImgList
=
obj
.
PicPath
.
split
(
","
);
for
(
var
i
=
0
;
i
<
dinnerImgList
.
length
;
i
++
)
{
var
fileObj
=
this
.
$commonUtils
.
FileObject
();
fileObj
.
Url
=
this
.
domainManager
().
Ali
Url
+
dinnerImgList
[
i
];
fileObj
.
Url
=
this
.
domainManager
().
ViittoFile
Url
+
dinnerImgList
[
i
];
fileObj
.
Name
=
""
;
this
.
subItemObj
.
childItem
.
ImaArray
.
push
(
fileObj
);
}
...
...
src/components/TravelManager/travelLineTrip/scienTrip_Direct.vue
View file @
8c93043d
...
...
@@ -250,7 +250,7 @@
for
(
var
i
=
0
;
i
<
scenImgList
.
length
;
i
++
)
{
var
fileObj
=
that
.
$commonUtils
.
FileObject
();
if
(
scenImgList
[
i
]
!=
""
)
{
fileObj
.
Url
=
that
.
domainManager
().
Ali
Url
+
scenImgList
[
i
];
fileObj
.
Url
=
that
.
domainManager
().
ViittoFile
Url
+
scenImgList
[
i
];
fileObj
.
Name
=
""
;
that
.
subItemObj
.
childItem
.
ImaArray
.
push
(
fileObj
);
}
...
...
src/components/commonPage/oneday.vue
View file @
8c93043d
...
...
@@ -24,8 +24,8 @@
<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=
"domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'"
/>
<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
src=
'https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/activy.jpg'
/>
<img
v-else-if=
"day.islast && day.details[0].img==''"
:src=
"domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'"
/>
<img
v-else
:src=
"domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/activy.jpg'"
/>
</div>
<div
class=
"right"
>
<div
class=
"details"
>
...
...
src/components/newTravelmanager/travelLineTrip/HotelTrip.vue
View file @
8c93043d
...
...
@@ -398,7 +398,7 @@
for
(
var
i
=
0
;
i
<
dinnerImgList
.
length
;
i
++
)
{
if
(
dinnerImgList
[
i
]
!=
""
)
{
var
fileObj
=
this
.
$commonUtils
.
FileObject
();
fileObj
.
Url
=
this
.
domainManager
().
Ali
Url
+
dinnerImgList
[
i
];
fileObj
.
Url
=
this
.
domainManager
().
ViittoFile
Url
+
dinnerImgList
[
i
];
fileObj
.
Name
=
""
;
dinnerObj
.
ImaArray
.
push
(
fileObj
);
}
...
...
@@ -465,7 +465,7 @@
for
(
var
i
=
0
;
i
<
dinnerImgList
.
length
;
i
++
)
{
if
(
dinnerImgList
[
i
]
!=
""
)
{
var
fileObj
=
this
.
$commonUtils
.
FileObject
();
fileObj
.
Url
=
this
.
domainManager
().
Ali
Url
+
dinnerImgList
[
i
];
fileObj
.
Url
=
this
.
domainManager
().
ViittoFile
Url
+
dinnerImgList
[
i
];
fileObj
.
Name
=
""
;
dinnerObj
.
ImaArray
.
push
(
fileObj
);
}
...
...
src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue
View file @
8c93043d
...
...
@@ -586,7 +586,7 @@
};
if
(
s
.
PicPath
!=
""
)
{
let
picPath
=
s
.
PicPath
.
split
(
","
)[
0
];
scenicImg
.
Url
=
this
.
domainManager
().
Ali
Url
+
picPath
;
scenicImg
.
Url
=
this
.
domainManager
().
ViittoFile
Url
+
picPath
;
scenicImg
.
fileName
=
picPath
;
}
scenic
.
NewImaArray
.
push
(
scenicImg
);
...
...
src/components/scenicSpot/scenicSpotInfoManage.vue
View file @
8c93043d
...
...
@@ -1112,7 +1112,7 @@
obj
.
Path
=
x
;
obj
.
PicID
=
0
;
obj
.
ShowPath
=
this
.
domainManager
().
Ali
Url
+
this
.
domainManager
().
ViittoFile
Url
+
x
+
"?x-oss-process=image/resize,l_140"
;
this
.
TicketCouponsImageArray
.
push
(
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