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
7e915e1c
Commit
7e915e1c
authored
Sep 05, 2023
by
liudong1993
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
08a862b2
bb30d2fb
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
1498 additions
and
614 deletions
+1498
-614
UpgradedVersion.css
src/assets/css/UpgradedVersion.css
+28
-15
BillModule.vue
...ponents/FinancialModule/FinancialSubmodule/BillModule.vue
+1
-1
ItineraryFeatures.vue
src/components/LeaveGroupDownload/ItineraryFeatures.vue
+12
-5
TourFareDescription.vue
src/components/LeaveGroupDownload/TourFareDescription.vue
+3
-7
VisaInformation.vue
src/components/LeaveGroupDownload/VisaInformation.vue
+34
-26
index.vue
src/components/LeaveGroupDownload/index.vue
+2
-2
OpTripList.vue
src/components/TravelManager/TravelList/OpTripList.vue
+2
-2
SaleTripList.vue
src/components/TravelManager/TravelList/SaleTripList.vue
+3
-3
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+1
-1
TravelControlListSale.vue
...onents/TravelManager/TravelList/TravelControlListSale.vue
+2
-2
TripDownLoadCommon.vue
src/components/commonPage/TripDownLoadCommon.vue
+1
-1
confirmationOrderDownLoadNew.vue
src/components/confirmationOrderDownLoadNew.vue
+323
-19
TravelNotice.vue
...ents/newTravelmanager/TravelGroupControl/TravelNotice.vue
+8
-5
UpgradedVersionDetails.vue
...elGroupControl/UpgradedVersion/UpgradedVersionDetails.vue
+79
-10
MasterMapList.vue
...GroupControl/UpgradedVersion/components/MasterMapList.vue
+645
-182
featureControls.vue
...oupControl/UpgradedVersion/components/featureControls.vue
+4
-2
subheading.vue
...velGroupControl/UpgradedVersion/components/subheading.vue
+99
-16
featureHome.vue
...anager/TravelGroupControl/UpgradedVersion/featureHome.vue
+49
-7
index.vue
...ravelmanager/TravelGroupControl/UpgradedVersion/index.vue
+102
-34
otherJourney.vue
...nager/TravelGroupControl/UpgradedVersion/otherJourney.vue
+19
-46
salesVolumeRank.vue
src/components/rank/salesVolumeRank.vue
+72
-223
index.js
src/plug/index.js
+9
-5
No files found.
src/assets/css/UpgradedVersion.css
View file @
7e915e1c
...
...
@@ -233,13 +233,13 @@ img {
height
:
930px
;
bottom
:
290px
;
left
:
0
;
overflow
:
hidden
;
}
.featureHome-left-one
img
{
width
:
100%
;
height
:
100%
;
display
:
block
;
object-fit
:
cover
;
/* object-fit: cover; */
}
.featureHome-right
{
...
...
@@ -457,9 +457,12 @@ img {
.MasterMapList-1
img
{
left
:
0
;
top
:
0
;
width
:
100%
;
height
:
100%
;
object-fit
:
cover
;
/* object-fit: cover; */
}
.MasterMapList-1
img
.width
{
width
:
100%
;
height
:
auto
;
}
.MasterMapList-4
.MasterMapList-2
{
...
...
@@ -474,7 +477,7 @@ img {
}
.MasterMapList-8-oneL
{
width
:
7
76
px
;
width
:
7
61
px
;
height
:
427px
;
}
...
...
@@ -492,7 +495,7 @@ img {
}
.MasterMapList-8-oneR
{
width
:
24
0
px
;
width
:
24
4
px
;
}
.MasterMapList-7
.MasterMapList-8-oneR
{
...
...
@@ -552,8 +555,8 @@ img {
}
.UpgradedVersionDetails-imgOne
{
left
:
0
;
top
:
0
;
/*
left: 0;
top: 0;
*/
width
:
312px
;
height
:
312px
;
border-radius
:
50%
;
...
...
@@ -563,9 +566,9 @@ img {
.UpgradedVersionDetails-imgOne
img
{
left
:
0
;
top
:
0
;
width
:
100%
;
/* width: 100%; */
height
:
100%
;
object-fit
:
cover
;
/* object-fit: cover; */
}
.UpgradedVersionDetails-detailsTop
{
...
...
@@ -573,7 +576,7 @@ img {
height
:
56px
;
background
:
url("http://imgfile.oytour.com/Static/NewTripFeature/detailsTop.png")
no-repeat
center
;
background-size
:
100%
100%
;
left
:
1
3
6px
;
left
:
1
4
6px
;
bottom
:
-84px
;
}
...
...
@@ -655,8 +658,8 @@ img {
}
.UpgradedVersionDetails1
{
left
:
1
6
px
;
top
:
1
22
px
;
left
:
1
1
px
;
top
:
1
55
px
;
}
/**/
...
...
@@ -884,9 +887,13 @@ img {
.subIdeImg1relative
img
{
left
:
0
;
top
:
0
;
width
:
100%
;
/* width: 100%; */
height
:
100%
;
object-fit
:
cover
;
/* object-fit: cover; */
}
.subIdeImg1relative
img
.width
{
width
:
100%
;
height
:
auto
;
}
.subIdeImgForm1Box
{
...
...
@@ -1123,3 +1130,9 @@ img {
bottom
:
0
;
color
:
#e95252
;
}
.cursorInitial
{
cursor
:
initial
}
.UpgradedVersion-box
>
img
{
pointer-events
:
none
!important
;
}
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @
7e915e1c
...
...
@@ -14,7 +14,7 @@
.rb_top_row
._r_time
span
{
color
:
#333333
}
._r_mb5
{
margin-bottom
:
5px
;}
.Receipt_table
{
width
:
100%
;
font-size
:
14px
;
text-align
:
center
}
.Receipt_table
th
{
font-weight
:
200
!important
}
/* .Receipt_table th{font-weight: 200 !important} */
.Receipt_table
tr
th
,
.Receipt_table
tr
td
{
background-color
:
white
}
._r_mt10
{
margin-top
:
10px
;}
.Receipt_box.color_blur
{
color
:
#106BAF
;}
...
...
src/components/LeaveGroupDownload/ItineraryFeatures.vue
View file @
7e915e1c
<
template
>
<div
id=
"pdf_2"
>
<div
id=
"pdf_2"
v-if=
"vshowC"
>
<div
class=
"template-box"
>
<div
id=
"gernalCanvas"
style=
"margin:auto;width:100%"
v-html=
"feature.featureHtml"
>
</div>
<div
class=
"slider"
v-if=
"showType==1"
>
<img
v-for=
"(i,index) in feature.featureImgList"
:key=
"index"
:src=
"i.url"
style=
"width:100%;"
>
</div>
<div
class=
"zidingyi"
v-if=
"showType==3"
>
<div
v-html=
"feature.featureContent"
></div>
</div>
<div
v-if=
"showType>=4"
id=
"gernalCanvas"
style=
"margin:auto;width:100%"
v-html=
"feature.featureHtml"
>
</div>
</div>
</div>
</div>
</
template
>
<
script
>
...
...
@@ -14,6 +20,8 @@
},
props
:
[
'feature'
,
'vshowC'
,
'showType'
],
data
()
{
return
{
...
...
@@ -41,4 +49,3 @@
};
</
script
>
src/components/LeaveGroupDownload/TourFareDescription.vue
View file @
7e915e1c
<
template
>
<div
id=
"pdf_5"
>
<div
class=
"module-title"
>
<div
style=
"font-size:36px;margin-top:40px;text-align:center;margin-bottom:20px;"
>
<div
class=
"module-title"
v-if=
'vshowE'
>
<div
style=
"font-size:36px;margin-top:40px;text-align:center;margin-bottom:20px;"
>
团费说明
</div>
</div>
...
...
@@ -48,9 +46,7 @@
</div>
<template
v-if=
'vshowF&&(feature.shopRemark||(dataList.shopList && dataList.shopList.length>0&&vshowF))'
>
<div
class=
"module-title"
>
<div
style=
"font-size:36px;margin-top:40px;text-align:center;margin-bottom:20px;"
>
<div
style=
"font-size:36px;margin-top:40px;text-align:center;margin-bottom:20px;"
>
购物说明
</div>
</div>
...
...
src/components/LeaveGroupDownload/VisaInformation.vue
View file @
7e915e1c
<
template
>
<div
id=
"pdf_6"
>
<div
class=
"module-title"
v-if=
"vshowG"
>
<div
style=
"font-size:36px;font-weight:bolder;margin-top:40px;text-align:center;margin-bottom:20px;"
>
<div
style=
"font-size:36px;font-weight:bolder;margin-top:40px;text-align:center;margin-bottom:20px;"
>
签证
</div>
</div>
...
...
@@ -17,10 +15,19 @@
<div
v-html=
"feature.visaRemark"
></div>
</div>
</div>
<div
v-if=
'vshowI'
class=
"module-title"
>
<div
style=
"font-size:36px;font-weight:bolder;margin-top:40px;text-align:center;margin-bottom:20px;"
>
同行备注
</div>
</div>
<div
v-if=
'vshowI'
class=
"expense"
>
<div
class=
"left"
></div>
<div
class=
"right"
>
<div
v-html=
"feature.b2BRemark"
></div>
</div>
</div>
<div
class=
"module-title"
v-if=
"vshowM"
>
<div
style=
"font-size:36px;font-weight:bolder;margin-top:40px;text-align:center;margin-bottom:20px;"
>
<div
style=
"font-size:36px;font-weight:bolder;margin-top:40px;text-align:center;margin-bottom:20px;"
>
旅客信息
</div>
</div>
...
...
@@ -52,27 +59,28 @@
</
template
>
<
script
>
import
Header
from
"./components/header"
;
export
default
{
components
:
{
Header
},
props
:
[
"vshowG"
,
"vshowM"
,
"vshowJ"
,
"feature"
,
"orderMsg"
],
data
()
{
return
{};
},
import
Header
from
"./components/header"
;
export
default
{
components
:
{
Header
},
props
:
[
"vshowG"
,
"vshowM"
,
"vshowJ"
,
"feature"
,
"orderMsg"
,
"vshowI"
],
data
()
{
return
{};
},
methods
:
{},
computed
:
{},
watch
:
{
feature
:
{
handler
(
val
,
oldVal
)
{},
deep
:
true
,
immediate
:
true
}
},
mounted
()
{}
};
methods
:
{},
computed
:
{},
watch
:
{
feature
:
{
handler
(
val
,
oldVal
)
{},
deep
:
true
,
immediate
:
true
}
},
mounted
()
{}
};
</
script
>
<
style
></
style
>
src/components/LeaveGroupDownload/index.vue
View file @
7e915e1c
...
...
@@ -71,10 +71,10 @@
</tr>
</tbody>
</table>
<div
class=
"trip-v3-title small-margin"
>
<div
class=
"trip-v3-title small-margin"
v-if=
"vshowL"
>
<h2>
集合地点
&
联系人
</h2>
</div>
<table
class=
"baseTable trip-v3-base"
>
<table
class=
"baseTable trip-v3-base"
v-if=
"vshowL"
>
<tbody>
<tr>
<td
class=
"essential-item jianju"
>
...
...
src/components/TravelManager/TravelList/OpTripList.vue
View file @
7e915e1c
...
...
@@ -128,9 +128,9 @@
<el-button
@
click=
"goToOpenTravel('TravelManager2',item.ID)"
type=
"primary"
>
{{
$t
(
'Operation.Op_tripUpdate'
)
}}
</el-button>
<el-button
@
click=
"copyTravelInfo(item.ID)"
type=
"primary"
>
{{
$t
(
'Operation.Op_tripCopy'
)
}}
</el-button>
<el-button
@
click=
"goUrlR('confirmationOrderDownLoad',item)"
type=
"primary"
>
<el-button
@
click=
"goUrlR('confirmationOrderDownLoad
New
',item)"
type=
"primary"
>
{{
$t
(
'Operation.Op_tripDownLoad'
)
}}
</el-button>
<el-button
v-if=
"item.TCNUMS==''"
@
click=
"delConfig(item.ID)"
type=
"primary"
>
{{
$t
(
'system.table_delete'
)
}}
</el-button>
...
...
src/components/TravelManager/TravelList/SaleTripList.vue
View file @
7e915e1c
...
...
@@ -29,7 +29,7 @@
<li>
<span>
<em>
{{
$t
(
'visa.v_tuanhao'
)
}}
</em>
<el-input
maxlength=
"50"
v-model=
"queryMsg.TCNUMS"
class=
"permiss-input w150"
<el-input
maxlength=
"50"
v-model=
"queryMsg.TCNUMS"
class=
"permiss-input w150"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</span>
</li>
...
...
@@ -101,12 +101,12 @@
<div
class=
"el-col"
>
<div
class=
"d7"
>
<el-button
v-if=
"item.CreateBy==CurrentUserId && item.ShareTeamType
<0
"
@
click=
"goToOpenTravel('TravelManager3',item.ID)"
type=
"primary"
>
{{
$t
(
'Operation.Op_tripUpdate'
)
}}
</el-button>
<!--
<el-button
v-if=
"item.CreateBy==CurrentUserId"
@
click=
"goToOpenTravel('TravelManager5',item.ID)"
type=
"primary"
>
{{
$t
(
'Operation.Op_tripUpdate'
)
}}
</el-button>
-->
<el-button
@
click=
"copyTravelInfo(item.ID)"
type=
"primary"
>
{{
$t
(
'Operation.Op_tripCopy'
)
}}
</el-button>
<el-button
v-if=
"item.TCNUMS==''&&item.CreateBy==CurrentUserId"
@
click=
"delConfig(item.ID)"
type=
"primary"
>
{{
$t
(
'system.table_delete'
)
}}
</el-button>
<!--
<el-button
@
click=
"goUrlR('SalesconfirmationOrder',item)"
type=
"primary"
>
行程下载
</el-button>
-->
<el-button
@
click=
"goUrlR('confirmationOrderDownLoad',item)"
type=
"primary"
>
<el-button
@
click=
"goUrlR('confirmationOrderDownLoad
New
',item)"
type=
"primary"
>
{{
$t
(
'Operation.Op_tripDownLoad'
)
}}
</el-button>
</div>
</div>
...
...
src/components/TravelManager/TravelList/TravelControlList.vue
View file @
7e915e1c
...
...
@@ -1086,7 +1086,7 @@
@
click
.
native=
"goTeamBalance(item.TCID,item.OutBranchId)"
>
{{$t('Operation.Op_shouzhiDetail')}}
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"goUrlR('confirmationOrderDownLoad',item)"
>
<el-dropdown-item
@
click
.
native=
"goUrlR('confirmationOrderDownLoad
New
',item)"
>
{{$t('Operation.Op_tripDownLoad')}}
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"removeTeamInfo(item.TCID)"
>
{{$t('system.table_delete')}}
</el-dropdown-item>
...
...
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @
7e915e1c
...
...
@@ -783,7 +783,7 @@
<el-dropdown-item
@
click
.
native=
"goTeamBalance(item.TCID,item.OutBranchId)"
>
{{$t('Operation.Op_shouzhiDetail')}}
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"goUrlR('confirmationOrderDownLoad',item)"
>
@
click
.
native=
"goUrlR('confirmationOrderDownLoad
New
',item)"
>
{{$t('Operation.Op_tripDownLoad')}}
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"removeTeamInfo(item.TCID)"
>
{{$t('system.table_delete')}}
</el-dropdown-item>
...
...
@@ -1558,7 +1558,7 @@
}
});
},
goUrlR
(
path
,
TCID
,
ConfigId
,
cityId
)
{
goUrlR
(
path
,
item
)
{
var
cityId
=
item
.
StartCityID
;
if
(
item
.
IsUnion
==
1
&&
item
.
UnionTypeStr
==
2
)
{
cityId
=
item
.
UnionCityId
;
...
...
src/components/commonPage/TripDownLoadCommon.vue
View file @
7e915e1c
...
...
@@ -165,7 +165,7 @@
data
()
{
return
{
TripLayer
:
{},
TripPath
:
"confirmationOrderDownLoad"
TripPath
:
"confirmationOrderDownLoad
New
"
};
},
methods
:
{
...
...
src/components/confirmationOrderDownLoadNew.vue
View file @
7e915e1c
This diff is collapsed.
Click to expand it.
src/components/newTravelmanager/TravelGroupControl/TravelNotice.vue
View file @
7e915e1c
...
...
@@ -60,7 +60,8 @@
<td>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('system.table_edit')"
placement=
"top-start"
v-if=
"(selfItem.IsShow==0)"
>
<el-button
type=
"primary"
icon=
"el-icon-edit"
circle
@
click=
"getCityList('',selfItem),SelfpayingShow(selfItem)"
></el-button>
<el-button
type=
"primary"
icon=
"el-icon-edit"
circle
@
click=
"getCityList('',selfItem),SelfpayingShow(selfItem)"
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('pub.saveBtn')"
placement=
"top-start"
v-if=
"selfItem.IsShow==1"
>
...
...
@@ -367,6 +368,9 @@
var
qmsg
=
{
QCountry
:
this
.
CountryID
};
if
(
this
.
PostConfig
.
LineId
==
168
)
{
qmsg
.
QCountry
=
""
;
}
this
.
apipost
(
"Shopping_Post_GetList"
,
qmsg
,
...
...
@@ -467,14 +471,13 @@
CodeLevel
:
3
,
Name
:
''
,
};
if
(
selfItem
.
CityName
!=
''
)
{
postMsg
.
Name
=
selfItem
.
CityName
;
if
(
selfItem
.
CityName
!=
''
)
{
postMsg
.
Name
=
selfItem
.
CityName
;
}
if
(
query
!=
''
)
{
postMsg
.
Name
=
query
;
}
this
.
apipost
(
"dict_get_Destination_GetCityExtList"
,
postMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
selfItem
.
CityList
=
res
.
data
.
data
;
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/UpgradedVersionDetails.vue
View file @
7e915e1c
...
...
@@ -7,23 +7,31 @@
:isDeletePage=
"FeatureData.isDeletePage"
:pagesType=
"3"
@
toAddPages=
"toAddPages"
@
toDeletePages=
"toDeletePages"
>
</FeatureControls>
<input
type=
"file"
style=
"display:none"
:id=
"'GouDetaFile_'+(index * 2 + 1)+'_0'"
@
change=
"uploadpic"
>
</div>
</div>
<div
class=
"UpgradedVersionDetails-box column"
v-for=
"(item,i) in FeatureData.dataObj.SubList"
>
<div
class=
"UpgradedVersionDetails-imgbox row-aic UpgradedVersion-Hover"
>
<div
class=
"UpgradedVersionDetails-img relative"
>
<div
class=
"UpgradedVersionDetails1 absolute z-index
1
"
>
<FeatureControls
v-if=
"FeatureData"
:index=
"index"
:FeatureData=
"FeatureData"
:ControlsType=
"'
column
'"
isImg=
"1"
:isUploadImg=
"true"
<div
class=
"UpgradedVersionDetails1 absolute z-index
3
"
>
<FeatureControls
v-if=
"FeatureData"
:index=
"index"
:FeatureData=
"FeatureData"
:ControlsType=
"'
row
'"
isImg=
"1"
:isUploadImg=
"true"
:isSelectImg=
"true"
@
toUploadImg=
"UploadImg(i)"
@
toSelectImg=
"SelectImg(i)"
@
toAddImg=
"AddImg"
@
toDeleteImg=
"DeleteImg(i)"
/>
@
toDeleteImg=
"DeleteImg(i)"
:x=
"312"
:y=
"312"
/>
<input
type=
"file"
style=
"display:none"
:id=
"'GouDetaFile_'+(FeatureData * 2 + 1)+'_'+i+'_'+index"
@
change=
"uploadpic"
>
</div>
<div
class=
"UpgradedVersionDetails-imgOne bjE6"
>
<template
v-if=
"item.ImgList&&item.ImgList.length>0"
>
<img
:src=
"item.ImgList[0].url"
/>
</
template
>
<div
class=
"UpgradedVersionDetails-imgOne relative bjE6"
:id=
"'viewSpotBox_' + (FeatureData * 4) +'_deta_'+i+index"
>
<VueDraggableResizable
v-if=
"item.ImgList&&item.ImgList.length>0"
:w=
"312"
:h=
"312"
:ref=
"'viewSpotVds_' + FeatureData * 4 + '_deta_'+i+index"
tabindex=
"0"
:resizable=
"false"
:active=
"false"
:parent=
"false"
axis=
"x"
@
activated=
"onActivated(FeatureData * 4, i)"
:x=
"item.ImgList[0].x"
:y=
"item.ImgList[0].y"
:z=
"2"
@
dragstop=
"onViewSpotDragstopX"
>
<img
v-if=
"item.ImgList[0].url"
:src=
"item.ImgList[0].url"
:id=
"'viewSpotImg_' + FeatureData * 4 + '_deta_'+i+index"
/>
<!--
<img
:src=
"item.ImgList[0].url"
:id=
"'viewSpotImg_' + FeatureData * 4 + 'deta_'+i+index"
/>
-->
</VueDraggableResizable>
<template
v-else
>
<img
src=
"http://imgfile.oytour.com/Static/NewTripFeature/homeBj.png"
/>
<img
src=
"http://imgfile.oytour.com/Static/NewTripFeature/homeBj.png"
/>
</
template
>
</div>
<div
class=
"UpgradedVersionDetails-detailsTop absolute"
></div>
...
...
@@ -66,12 +74,14 @@
import
vEditDiv
from
"../TravelTemp/VEditDiv"
;
import
FeatureControls
from
"./components/featureControls"
;
import
DMCchooseImg
from
"../../../commonPage/DMCchooseImg.vue"
;
import
VueDraggableResizable
from
"vue-draggable-resizable"
;
export
default
{
components
:
{
DMCchooseImg
,
MasterMapList
,
vEditDiv
,
FeatureControls
,
VueDraggableResizable
},
props
:
[
'index'
,
...
...
@@ -102,12 +112,67 @@
},
isShowScenicImg
:
false
,
MasterMapIndex
:
null
,
//主图下标
imgIndex
:
null
};
},
methods
:
{
onActivated
(
i
,
j
)
{
this
.
imgIndex
=
j
;
},
onViewSpotDragstopX
(
x
,
y
)
{
let
imgWidth
=
document
.
querySelector
(
"#viewSpotImg_"
+
(
this
.
FeatureItem
*
4
)
+
"_deta_"
+
this
.
imgIndex
+
this
.
index
).
width
;
let
boxWidth
=
document
.
querySelector
(
"#viewSpotBox_"
+
(
this
.
FeatureItem
*
4
)
+
"_deta_"
+
this
.
imgIndex
+
this
.
index
).
offsetWidth
;
let
cha
=
boxWidth
-
imgWidth
;
if
(
cha
<=
0
)
{
if
(
x
<
0
&&
x
<
cha
)
{
x
=
cha
;
}
else
if
(
x
>
0
)
{
x
=
0
;
}
}
else
{
if
(
x
<
0
)
{
x
=
0
;
}
else
if
(
x
>
0
&&
x
>
cha
)
{
x
=
cha
;
}
}
this
.
FeatureData
.
dataObj
.
SubList
[
this
.
imgIndex
].
x
=
x
;
this
.
$refs
[
"viewSpotVds_"
+
(
this
.
FeatureData
*
4
)
+
"_deta_"
+
this
.
imgIndex
+
this
.
index
][
0
].
_data
.
left
=
x
;
},
onViewSpotDragstop
(
x
,
y
)
{
let
imgHeight
=
document
.
querySelector
(
"#viewSpotImg_"
+
(
this
.
FeatureData
*
4
)
+
"_deta_"
+
this
.
imgIndex
+
this
.
index
).
height
;
let
boxHeight
=
document
.
querySelector
(
"#viewSpotBox_"
+
(
this
.
FeatureData
*
4
)
+
"_deta_"
+
this
.
imgIndex
+
this
.
index
).
offsetHeight
;
let
cha
=
boxHeight
-
imgHeight
;
if
(
cha
<=
0
)
{
if
(
y
<
0
&&
y
<
cha
)
{
y
=
cha
;
}
else
if
(
y
>
0
)
{
y
=
0
;
}
}
else
{
if
(
y
<
0
)
{
y
=
0
;
}
else
if
(
y
>
0
&&
y
>
cha
)
{
y
=
cha
;
}
}
this
.
FeatureData
.
dataObj
.
SubList
[
this
.
imgIndex
].
y
=
y
;
this
.
$refs
[
"viewSpotVds_"
+
(
this
.
FeatureData
*
4
)
+
"_deta_"
+
this
.
imgIndex
+
this
.
index
][
0
].
_data
.
top
=
y
;
},
UploadImg
(
index
)
{
this
.
MasterMapIndex
=
index
document
.
querySelector
(
`#GouDetaFile_
${(
this
.
index
*
2
+
1
)}
_0
`
).
click
();
document
.
querySelector
(
`#GouDetaFile_
${(
this
.
FeatureData
*
2
+
1
)}
_
${
index
}
_
${
this
.
index
}
`
).
click
();
},
uploadpic
(
e
)
{
let
that
=
this
;
...
...
@@ -125,6 +190,8 @@
let
allPath
=
that
.
domainManager
().
ViittoFileUrl
+
x
.
data
.
FilePath
;
let
i
=
e
.
target
.
id
.
split
(
"_"
)[
2
];
that
.
FeatureData
.
dataObj
.
SubList
[
that
.
MasterMapIndex
].
ImgList
[
0
].
url
=
allPath
that
.
FeatureData
.
dataObj
.
SubList
[
that
.
MasterMapIndex
].
ImgList
[
0
].
x
=
0
that
.
FeatureData
.
dataObj
.
SubList
[
that
.
MasterMapIndex
].
ImgList
[
0
].
y
=
0
that
.
$message
.
success
(
'上传成功'
);
});
};
...
...
@@ -158,6 +225,8 @@
getDMCimg
(
selectImgArr
)
{
let
Path
=
selectImgArr
[
0
].
Path
this
.
FeatureData
.
dataObj
.
SubList
[
this
.
MasterMapIndex
].
ImgList
[
0
].
url
=
Path
this
.
FeatureData
.
dataObj
.
SubList
[
this
.
MasterMapIndex
].
ImgList
[
0
].
x
=
0
this
.
FeatureData
.
dataObj
.
SubList
[
this
.
MasterMapIndex
].
ImgList
[
0
].
y
=
0
this
.
isShowScenicImg
=
false
}
},
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/MasterMapList.vue
View file @
7e915e1c
This diff is collapsed.
Click to expand it.
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue
View file @
7e915e1c
<
template
>
<div
class=
"featureControls"
>
<div
class=
"row-aic featureControls-bottom featureControls-bottomOne"
v-if=
"ControlsType=='row'"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"上传图"
placement=
"top"
>
<div
@
click=
"toUploadImg"
v-if=
"isUploadImg"
>
<i
class=
"el-icon-upload2"
></i>
...
...
@@ -22,6 +21,9 @@
<i
class=
"el-icon-delete"
></i>
</div>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"尺寸"
placement=
"top"
v-if=
"x&&y"
>
<div
class=
"cursorInitial fz14"
>
{{
x
}}
*
{{
y
}}
</div>
</el-tooltip>
</div>
<div
class=
"column featureControls-bottom featureControls-bottomTwo"
v-else
>
<template
v-if=
"!isImg&&!isTemplate"
>
...
...
@@ -74,7 +76,7 @@
},
props
:
[
'index'
,
'FeatureData'
,
'ControlsType'
,
'isImg'
,
'pagesType'
,
'isDeletePage'
,
'isUploadImg'
,
'isSelectImg'
,
'isAddImg'
,
'isDeleteImg'
,
'isTemplate'
,
'Template'
'isUploadImg'
,
'isSelectImg'
,
'isAddImg'
,
'isDeleteImg'
,
'isTemplate'
,
'Template'
,
'x'
,
'y'
],
data
()
{
return
{
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/subheading.vue
View file @
7e915e1c
...
...
@@ -59,31 +59,56 @@
<div
class=
"UpgradedVersion-subIdeImgForm1 absolute z-index2"
:class=
"[Template==1?'':Template==2?'subIdeImgForm2':'subIdeImgForm3']"
>
<div
class=
"subIdeImg1 bjE6 UpgradedVersion-Hover"
>
<div
class=
"subIdeImg1relative relative UpgradedVersion-Hover"
>
<div
class=
"subIdeImgForm1Box absolute"
>
<FeatureControls
v-if=
"FeatureData"
:index=
"index"
:FeatureData=
"FeatureData"
:isImg=
"1"
:isUploadImg=
"true"
<div
class=
"subIdeImg1relative relative UpgradedVersion-Hover"
:id=
"'viewSpotBox_' + (FeatureData * 4) + 'subheading_0'+index"
>
<div
class=
"subIdeImgForm1Box absolute z-index3"
>
<FeatureControls
v-if=
"FeatureData"
:index=
"index"
:FeatureData=
"FeatureData"
:ControlsType=
"'row'"
:isImg=
"1"
:isUploadImg=
"true"
:isSelectImg=
"true"
:isDeleteImg=
"false"
@
toUploadImg=
"toUploadImg(0)"
@
toSelectImg=
"toSelectImg(0)"
@
toAddImg=
"toAddImg"
@
toDeleteImg=
"toDeleteImg(0)"
/>
@
toAddImg=
"toAddImg"
@
toDeleteImg=
"toDeleteImg(0)"
:x=
"Template>2?178:250"
:y=
"187"
/>
</div>
<template
v-if=
"FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>0"
>
<img
:src=
"FeatureData.dataObj.SubList[0].url"
/>
</
template
>
<!--
<img
:src=
"FeatureData.dataObj.SubList[0].url"
/>
-->
<VueDraggableResizable
v-if=
"FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>0&&Template!=3"
:w=
"Template>2?178:250"
:h=
"187"
:ref=
"'viewSpotVds_' + FeatureData * 4 + 'subheading_0'+index"
tabindex=
"0"
:resizable=
"false"
:active=
"false"
:parent=
"false"
axis=
"y"
@
activated=
"onActivated(FeatureData * 4, 0)"
:x=
"FeatureData.dataObj.SubList[0].x"
:y=
"FeatureData.dataObj.SubList[0].y"
:z=
"2"
@
dragstop=
"onViewSpotDragstop"
>
<img
v-if=
"FeatureData.dataObj.SubList[0].url"
class=
"absolute"
:src=
"FeatureData.dataObj.SubList[0].url"
:id=
"'viewSpotImg_' + FeatureData * 4 + 'subheading_0'+index"
/>
</VueDraggableResizable>
<VueDraggableResizable
v-if=
"FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>0&&Template==3"
:w=
"Template>2?178:250"
:h=
"187"
:ref=
"'viewSpotVds_' + FeatureData * 4 + 'subheading_0'+index"
tabindex=
"0"
:resizable=
"false"
:active=
"false"
:parent=
"false"
axis=
"x"
@
activated=
"onActivated(FeatureData * 4, 0)"
:x=
"FeatureData.dataObj.SubList[0].x"
:y=
"FeatureData.dataObj.SubList[0].y"
:z=
"2"
@
dragstop=
"onViewSpotDragstopX"
>
<img
v-if=
"FeatureData.dataObj.SubList[0].url"
class=
"absolute"
:src=
"FeatureData.dataObj.SubList[0].url"
:id=
"'viewSpotImg_' + FeatureData * 4 + 'subheading_0'+index"
/>
</VueDraggableResizable>
</div>
</div>
</div>
<!-- subIdeImgForm2-two 食 subIdeImgForm3-two 景 -->
<div
class=
"UpgradedVersion-subIdeImgForm1 absolute z-index2"
:class=
"[Template==1?'':Template==2?'subIdeImgForm2-two':'subIdeImgForm3-two']"
>
<div
class=
"subIdeImg1 bjE6 UpgradedVersion-Hover"
>
<div
class=
"subIdeImg1 bjE6 UpgradedVersion-Hover"
:id=
"'viewSpotBox_' + (FeatureData * 4) + 'subheading_1'+index"
>
<div
class=
"subIdeImg1relative relative"
>
<div
class=
"subIdeImgForm1Box absolute"
>
<FeatureControls
v-if=
"FeatureData"
:index=
"index"
:FeatureData=
"FeatureData"
:isImg=
"1"
:isUploadImg=
"true"
<div
class=
"subIdeImgForm1Box absolute
z-index3
"
>
<FeatureControls
v-if=
"FeatureData"
:index=
"index"
:FeatureData=
"FeatureData"
:
ControlsType=
"'row'"
:
isImg=
"1"
:isUploadImg=
"true"
:isSelectImg=
"true"
:isDeleteImg=
"false"
@
toUploadImg=
"toUploadImg(1)"
@
toSelectImg=
"toSelectImg(1)"
@
toAddImg=
"toAddImg"
@
toDeleteImg=
"toDeleteImg(1)"
/>
@
toAddImg=
"toAddImg"
@
toDeleteImg=
"toDeleteImg(1)"
:x=
"Template==1?331:250"
:y=
"187"
/>
</div>
<
template
v-if=
"FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>1 "
>
<img
:src=
"FeatureData.dataObj.SubList[1].url"
/>
</
template
>
<VueDraggableResizable
v-if=
"FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>1"
:w=
"Template==1?331:250"
:h=
"187"
:ref=
"'viewSpotVds_' + FeatureData * 4 + 'subheading_1'+index"
tabindex=
"0"
:resizable=
"false"
:active=
"false"
:parent=
"false"
axis=
"y"
@
activated=
"onActivated(FeatureData * 4, 1)"
:x=
"FeatureData.dataObj.SubList[1].x"
:y=
"FeatureData.dataObj.SubList[1].y"
:z=
"2"
@
dragstop=
"onViewSpotDragstop"
>
<img
v-if=
"FeatureData.dataObj.SubList[1].url"
class=
"absolute"
:class=
"[Template==1?'width':'']"
:src=
"FeatureData.dataObj.SubList[1].url"
:id=
"'viewSpotImg_' + FeatureData * 4 + 'subheading_1'+index"
/>
</VueDraggableResizable>
</div>
</div>
</div>
...
...
@@ -104,10 +129,12 @@
<
script
>
import
vEditDiv
from
"../../TravelTemp/VEditDiv"
;
import
FeatureControls
from
"./featureControls"
;
import
VueDraggableResizable
from
"vue-draggable-resizable"
;
export
default
{
components
:
{
vEditDiv
,
FeatureControls
FeatureControls
,
VueDraggableResizable
},
props
:
[
'Template'
,
...
...
@@ -118,10 +145,66 @@
],
data
()
{
return
{
currentIndex
:
null
,
imgIndex
:
null
};
},
methods
:
{
onActivated
(
i
,
j
)
{
this
.
currentIndex
=
i
;
this
.
imgIndex
=
j
;
},
onViewSpotDragstopX
(
x
,
y
)
{
let
imgWidth
=
document
.
querySelector
(
"#viewSpotImg_"
+
(
this
.
FeatureItem
*
4
)
+
"subheading_"
+
this
.
imgIndex
+
this
.
index
).
width
;
let
boxWidth
=
document
.
querySelector
(
"#viewSpotBox_"
+
(
this
.
FeatureItem
*
4
)
+
"subheading_"
+
this
.
imgIndex
+
this
.
index
).
offsetWidth
;
let
cha
=
boxWidth
-
imgWidth
;
if
(
cha
<=
0
)
{
if
(
x
<
0
&&
x
<
cha
)
{
x
=
cha
;
}
else
if
(
x
>
0
)
{
x
=
0
;
}
}
else
{
if
(
x
<
0
)
{
x
=
0
;
}
else
if
(
x
>
0
&&
x
>
cha
)
{
x
=
cha
;
}
}
this
.
FeatureData
.
dataObj
.
SubList
[
this
.
imgIndex
].
x
=
x
;
this
.
$refs
[
"viewSpotVds_"
+
(
this
.
FeatureData
*
4
)
+
"subheading_"
+
this
.
imgIndex
+
this
.
index
].
_data
.
left
=
x
;
},
onViewSpotDragstop
(
x
,
y
)
{
let
imgHeight
=
document
.
querySelector
(
"#viewSpotImg_"
+
(
this
.
FeatureData
*
4
)
+
"subheading_"
+
this
.
imgIndex
+
this
.
index
).
height
;
let
boxHeight
=
document
.
querySelector
(
"#viewSpotBox_"
+
(
this
.
FeatureData
*
4
)
+
"subheading_"
+
this
.
imgIndex
+
this
.
index
).
offsetHeight
;
let
cha
=
boxHeight
-
imgHeight
;
if
(
cha
<=
0
)
{
if
(
y
<
0
&&
y
<
cha
)
{
y
=
cha
;
}
else
if
(
y
>
0
)
{
y
=
0
;
}
}
else
{
if
(
y
<
0
)
{
y
=
0
;
}
else
if
(
y
>
0
&&
y
>
cha
)
{
y
=
cha
;
}
}
this
.
FeatureData
.
dataObj
.
SubList
[
this
.
imgIndex
].
y
=
y
;
this
.
$refs
[
"viewSpotVds_"
+
(
this
.
FeatureData
*
4
)
+
"subheading_"
+
this
.
imgIndex
+
this
.
index
].
_data
.
top
=
y
;
},
toUploadImg
(
index
)
{
this
.
$emit
(
'toUploadImg'
,
index
,
'模版图'
)
},
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome.vue
View file @
7e915e1c
...
...
@@ -17,7 +17,8 @@
<div
class=
"featureHome-vToolBar-one absolute z-index3"
>
<FeatureControls
:index=
"index"
:FeatureData=
"FeatureItem"
:ControlsType=
"'row'"
:isTemplate=
"false"
:isUploadImg=
"true"
:isSelectImg=
"true"
:isAddImg=
"false"
:isDeleteImg=
"false"
@
toUploadImg=
"UploadImg"
@
toSelectImg=
"SelectImg"
@
toAddImg=
"AddImg"
@
toDeleteImg=
"DeleteImg"
></FeatureControls>
@
toSelectImg=
"SelectImg"
@
toAddImg=
"AddImg"
@
toDeleteImg=
"DeleteImg"
:x=
"697"
:y=
"930"
></FeatureControls>
<input
type=
"file"
style=
"display:none"
:id=
"'homefile_'+(FeatureItem * 2 + 1) + '_'+index"
@
change=
"uploadpic"
>
</div>
<div
class=
"featureHome-vToolBar-two absolute z-index3"
>
...
...
@@ -27,10 +28,15 @@
</FeatureControls>
</div>
<div
class=
"featureHome-left-one bjF6 absolute z-index2"
>
<template
v-if=
"FeatureItem.dataObj.ImgList&&FeatureItem.dataObj.ImgList.length>0"
>
<img
:src=
"FeatureItem.dataObj.ImgList[0].url"
/>
</
template
>
<div
class=
"featureHome-left-one bjF6 absolute z-index2"
:id=
"'viewSpotBox_' + (FeatureItem * 4 + 1) + '_' +index"
>
<VueDraggableResizable
v-if=
"FeatureItem.dataObj.ImgList&&FeatureItem.dataObj.ImgList.length>0"
:w=
"697"
:h=
"930"
:ref=
"'viewSpotVds_' + (FeatureItem * 4 + 1) + '_'+index"
tabindex=
"0"
:resizable=
"false"
:active=
"false"
:parent=
"false"
axis=
"x"
@
activated=
"onActivated(FeatureItem * 4 + 1, index)"
:x=
"FeatureItem.dataObj.ImgList[0].x"
:y=
"0"
:z=
"2"
@
dragstop=
"onViewSpotDragstopY"
>
<img
:src=
"FeatureItem.dataObj.ImgList[0].url"
:id=
"'viewSpotImg_' + (FeatureItem * 4 + 1) + '_'+index"
/>
</VueDraggableResizable>
</div>
<div
class=
"featureHome-left-two absolute z-index1"
:style=
"
{'background':TripColor}">
<vEditDiv
:canEdit=
'canEdit'
v-model=
"FeatureItem.dataObj.DetailsName"
></vEditDiv>
...
...
@@ -81,11 +87,13 @@
import
vEditDiv
from
"../TravelTemp/VEditDiv"
;
import
FeatureControls
from
"./components/featureControls"
;
import
DMCchooseImg
from
"../../../commonPage/DMCchooseImg.vue"
;
import
VueDraggableResizable
from
"vue-draggable-resizable"
;
export
default
{
components
:
{
vEditDiv
,
FeatureControls
,
DMCchooseImg
DMCchooseImg
,
VueDraggableResizable
},
props
:
[
'TripColor'
,
...
...
@@ -103,10 +111,40 @@
queryName
:
''
,
queryId
:
0
,
},
borderBox
:
''
borderBox
:
''
,
currentIndex
:
null
,
imgIndex
:
null
};
},
methods
:
{
onActivated
(
i
,
j
)
{
this
.
currentIndex
=
i
;
this
.
imgIndex
=
j
;
},
onViewSpotDragstopY
(
x
,
y
)
{
let
imgWidth
=
document
.
querySelector
(
"#viewSpotImg_"
+
(
this
.
FeatureItem
*
2
+
1
)
+
"_"
+
this
.
index
).
width
;
let
boxWidth
=
document
.
querySelector
(
"#viewSpotBox_"
+
(
this
.
FeatureItem
*
2
+
1
)
+
"_"
+
this
.
index
).
offsetWidth
;
let
cha
=
boxWidth
-
imgWidth
;
if
(
cha
<=
0
)
{
if
(
x
<
0
&&
x
<
cha
)
{
x
=
cha
;
}
else
if
(
x
>
0
)
{
x
=
0
;
}
}
else
{
if
(
x
<
0
)
{
x
=
0
;
}
else
if
(
x
>
0
&&
x
>
cha
)
{
x
=
cha
;
}
}
this
.
FeatureItem
.
dataObj
.
ImgList
[
0
].
x
=
x
;
this
.
$refs
[
"viewSpotVds_"
+
(
this
.
FeatureItem
*
2
+
1
)
+
"_"
+
this
.
index
].
_data
.
left
=
x
;
},
UploadImg
()
{
document
.
querySelector
(
`#homefile_
${(
this
.
FeatureItem
*
2
+
1
)}
_
${
this
.
index
}
`
).
click
();
},
...
...
@@ -126,6 +164,8 @@
let
allPath
=
that
.
domainManager
().
ViittoFileUrl
+
x
.
data
.
FilePath
;
let
i
=
e
.
target
.
id
.
split
(
"_"
)[
2
];
that
.
FeatureItem
.
dataObj
.
ImgList
[
0
].
url
=
allPath
that
.
FeatureItem
.
dataObj
.
ImgList
[
0
].
x
=
0
that
.
FeatureItem
.
dataObj
.
ImgList
[
0
].
y
=
0
that
.
$message
.
success
(
'上传成功'
);
});
};
...
...
@@ -152,6 +192,8 @@
},
getDMCimg
(
selectImgArr
)
{
this
.
FeatureItem
.
dataObj
.
ImgList
[
0
].
url
=
selectImgArr
[
0
].
Path
;
this
.
FeatureItem
.
dataObj
.
ImgList
[
0
].
x
=
0
this
.
FeatureItem
.
dataObj
.
ImgList
[
0
].
y
=
0
this
.
isShowScenicImg
=
false
;
}
},
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @
7e915e1c
...
...
@@ -158,7 +158,7 @@
else
if
(
pageData
.
pageType
==
3
)
{
pageData
.
pageTitle
=
"食详情"
;
this
.
getDetailsData
(
tripObj
,
newObj
);
}
//宿
}
//宿
else
if
(
pageData
.
pageType
==
4
)
{
pageData
.
pageTitle
=
"宿"
;
this
.
getHotelData
(
tripObj
,
newObj
);
...
...
@@ -258,13 +258,17 @@
tempImgUrl
=
tripObj
.
scenicArray
[
0
].
ImgList
[
0
].
url
;
}
newObj
.
ImgList
=
[{
url
:
tempImgUrl
url
:
tempImgUrl
,
x
:
0
,
y
:
0
,
}];;
newObj
.
MainDesc
=
tripObj
.
scenicArray
[
0
].
MainDesc
;
}
else
{
newObj
.
DetailsName
=
"景点介绍"
;
newObj
.
ImgList
=
[{
url
:
this
.
homeBg2
url
:
this
.
homeBg2
,
x
:
0
,
y
:
0
,
}];
newObj
.
MainDesc
=
"景点描述"
;
}
...
...
@@ -274,7 +278,9 @@
newObj
.
MainName
=
"日本旅行专家"
;
newObj
.
SubName
=
"『印象日本』日本豪华游代名词"
;
newObj
.
ImgList
=
[{
url
:
this
.
homeBg1
url
:
this
.
homeBg1
,
x
:
0
,
y
:
0
,
}];
newObj
.
MainDesc
=
"描述信息"
;
},
...
...
@@ -283,7 +289,9 @@
var
dinnerObj
=
{
MainName
:
"行程特色餐1"
,
ImgList
:
[{
url
:
this
.
dinner1
url
:
this
.
dinner1
,
x
:
0
,
y
:
0
,
}],
MainDesc
:
"行程特色餐1描述"
};
...
...
@@ -313,7 +321,9 @@
newObj
.
SubList
.
push
({
MainName
:
dItem
.
MainName
,
ImgList
:
[{
url
:
tempUrl
url
:
tempUrl
,
x
:
0
,
y
:
0
,
}],
MainDesc
:
dItem
.
MainDesc
});
...
...
@@ -328,7 +338,9 @@
newObj
.
SubList
.
push
({
MainName
:
dItem
.
MainName
,
ImgList
:
[{
url
:
tempUrl2
url
:
tempUrl2
,
x
:
0
,
y
:
0
,
}],
MainDesc
:
dItem
.
MainDesc
});
...
...
@@ -340,7 +352,9 @@
newObj
.
SubList
.
push
({
MainName
:
dItem
.
MainName
,
ImgList
:
[{
url
:
tempUrl3
url
:
tempUrl3
,
x
:
0
,
y
:
0
,
}],
MainDesc
:
dItem
.
MainDesc
});
...
...
@@ -359,13 +373,19 @@
newObj
.
SubName
=
"特色酒店"
;
newObj
.
MainName
=
"行程酒店"
;
newObj
.
ImgList
=
[{
url
:
this
.
homeBg1
url
:
this
.
homeBg1
,
x
:
0
,
y
:
0
,
}];
newObj
.
MainDesc
=
"行程酒店描述信息"
;
newObj
.
SubList
=
[{
url
:
this
.
homeBg3
url
:
this
.
homeBg3
,
x
:
0
,
y
:
0
,
},
{
url
:
this
.
homeBg3
url
:
this
.
homeBg3
,
x
:
0
,
y
:
0
,
}];
if
(
tripObj
.
hotelArray
&&
tripObj
.
hotelArray
.
length
>
0
)
{
newObj
.
MainName
=
tripObj
.
hotelArray
[
0
].
MainName
;
...
...
@@ -376,22 +396,32 @@
if
(
tripObj
.
hotelArray
[
0
].
ImgList
&&
tripObj
.
hotelArray
[
0
].
ImgList
.
length
>
2
)
{
newObj
.
SubList
=
[];
newObj
.
SubList
.
push
({
url
:
tripObj
.
hotelArray
[
0
].
ImgList
[
1
].
url
url
:
tripObj
.
hotelArray
[
0
].
ImgList
[
1
].
url
,
x
:
0
,
y
:
0
,
});
newObj
.
SubList
.
push
({
url
:
tripObj
.
hotelArray
[
0
].
ImgList
[
2
].
url
url
:
tripObj
.
hotelArray
[
0
].
ImgList
[
2
].
url
,
x
:
0
,
y
:
0
,
});
}
else
if
(
tripObj
.
hotelArray
[
0
].
ImgList
&&
tripObj
.
hotelArray
[
0
].
ImgList
.
length
>
1
)
{
newObj
.
SubList
=
[];
newObj
.
SubList
.
push
({
url
:
tripObj
.
hotelArray
[
0
].
ImgList
[
1
].
url
url
:
tripObj
.
hotelArray
[
0
].
ImgList
[
1
].
url
,
x
:
0
,
y
:
0
,
});
newObj
.
SubList
.
push
({
url
:
this
.
homeBg3
url
:
this
.
homeBg3
,
x
:
0
,
y
:
0
,
});
}
newObj
.
ImgList
=
[{
url
:
tempHotelImg
url
:
tempHotelImg
,
x
:
0
,
y
:
0
,
}];
newObj
.
MainDesc
=
tripObj
.
hotelArray
[
0
].
MainDesc
;
}
...
...
@@ -400,13 +430,19 @@
getDinnerData
(
tripObj
,
newObj
)
{
newObj
.
SubName
=
"特色餐食"
;
newObj
.
SubList
=
[{
url
:
this
.
homeBg3
url
:
this
.
homeBg3
,
x
:
0
,
y
:
0
,
},
{
url
:
this
.
homeBg3
url
:
this
.
homeBg3
,
x
:
0
,
y
:
0
,
}];
newObj
.
MainName
=
"行程餐食"
;
newObj
.
ImgList
=
[{
url
:
this
.
dinner4
,
x
:
0
,
y
:
0
,
}];
newObj
.
MainDesc
=
"行程餐食描述"
;
if
(
tripObj
.
dinnerArray
&&
tripObj
.
dinnerArray
.
length
>
0
)
{
...
...
@@ -418,23 +454,33 @@
if
(
tripObj
.
dinnerArray
[
0
].
ImgList
&&
tripObj
.
dinnerArray
[
0
].
ImgList
.
length
>
2
)
{
newObj
.
SubList
=
[];
newObj
.
SubList
.
push
({
url
:
tripObj
.
dinnerArray
[
0
].
ImgList
[
1
].
url
url
:
tripObj
.
dinnerArray
[
0
].
ImgList
[
1
].
url
,
x
:
0
,
y
:
0
,
});
newObj
.
SubList
.
push
({
url
:
tripObj
.
dinnerArray
[
0
].
ImgList
[
2
].
url
url
:
tripObj
.
dinnerArray
[
0
].
ImgList
[
2
].
url
,
x
:
0
,
y
:
0
,
});
}
if
(
tripObj
.
dinnerArray
[
0
].
ImgList
&&
tripObj
.
dinnerArray
[
0
].
ImgList
.
length
>
1
)
{
newObj
.
SubList
=
[];
newObj
.
SubList
.
push
({
url
:
tripObj
.
dinnerArray
[
0
].
ImgList
[
1
].
url
url
:
tripObj
.
dinnerArray
[
0
].
ImgList
[
1
].
url
,
x
:
0
,
y
:
0
,
});
newObj
.
SubList
.
push
({
url
:
this
.
homeBg3
url
:
this
.
homeBg3
,
x
:
0
,
y
:
0
,
});
}
newObj
.
ImgList
=
[{
url
:
tempDinnerImg
url
:
tempDinnerImg
,
x
:
0
,
y
:
0
,
}];
newObj
.
MainDesc
=
tripObj
.
dinnerArray
[
0
].
MainDesc
;
}
...
...
@@ -443,13 +489,19 @@
getScenicData
(
tripObj
,
newObj
)
{
newObj
.
SubName
=
"特色景点"
;
newObj
.
SubList
=
[{
url
:
this
.
homeBg3
url
:
this
.
homeBg3
,
x
:
0
,
y
:
0
,
},
{
url
:
this
.
homeBg3
url
:
this
.
homeBg3
,
x
:
0
,
y
:
0
,
}];
newObj
.
MainName
=
"行程景点"
;
newObj
.
ImgList
=
[{
url
:
this
.
homeBg1
url
:
this
.
homeBg1
,
x
:
0
,
y
:
0
,
}];
newObj
.
MainDesc
=
"行程景点描述信息"
;
if
(
tripObj
.
scenicArray
&&
tripObj
.
scenicArray
.
length
>
0
)
{
...
...
@@ -461,22 +513,32 @@
if
(
tripObj
.
scenicArray
[
0
].
ImgList
&&
tripObj
.
scenicArray
[
0
].
ImgList
.
length
>
2
)
{
newObj
.
SubList
=
[];
newObj
.
SubList
.
push
({
url
:
tripObj
.
scenicArray
[
0
].
ImgList
[
1
].
url
url
:
tripObj
.
scenicArray
[
0
].
ImgList
[
1
].
url
,
x
:
0
,
y
:
0
,
});
newObj
.
SubList
.
push
({
url
:
tripObj
.
scenicArray
[
0
].
ImgList
[
2
].
url
url
:
tripObj
.
scenicArray
[
0
].
ImgList
[
2
].
url
,
x
:
0
,
y
:
0
,
});
}
else
if
(
tripObj
.
scenicArray
[
0
].
ImgList
&&
tripObj
.
scenicArray
[
0
].
ImgList
.
length
>
1
)
{
newObj
.
SubList
=
[];
newObj
.
SubList
.
push
({
url
:
tripObj
.
scenicArray
[
0
].
ImgList
[
1
].
url
url
:
tripObj
.
scenicArray
[
0
].
ImgList
[
1
].
url
,
x
:
0
,
y
:
0
,
});
newObj
.
SubList
.
push
({
url
:
this
.
homeBg3
url
:
this
.
homeBg3
,
x
:
0
,
y
:
0
,
});
}
newObj
.
ImgList
=
[{
url
:
tempScenicImg
url
:
tempScenicImg
,
x
:
0
,
y
:
0
,
}];
newObj
.
MainDesc
=
tripObj
.
scenicArray
[
0
].
MainDesc
;
}
...
...
@@ -509,7 +571,9 @@
if
(
sItem
.
NewImaArray
&&
sItem
.
NewImaArray
.
length
>
0
)
{
sItem
.
NewImaArray
.
forEach
(
iItem
=>
{
tempImgList
.
push
({
url
:
iItem
.
Url
url
:
iItem
.
Url
,
x
:
0
,
y
:
0
,
});
})
}
...
...
@@ -534,7 +598,9 @@
if
(
sItem
.
ImaArray
&&
sItem
.
ImaArray
.
length
>
0
)
{
sItem
.
ImaArray
.
forEach
(
iItem
=>
{
tempImgList
.
push
({
url
:
iItem
.
Url
url
:
iItem
.
Url
,
x
:
0
,
y
:
0
,
});
})
}
...
...
@@ -558,7 +624,9 @@
if
(
sItem
.
ImaArray
&&
sItem
.
ImaArray
.
length
>
0
)
{
sItem
.
ImaArray
.
forEach
(
iItem
=>
{
tempImgList
.
push
({
url
:
iItem
.
Url
url
:
iItem
.
Url
,
x
:
0
,
y
:
0
,
});
})
}
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/otherJourney.vue
View file @
7e915e1c
...
...
@@ -4,12 +4,12 @@
<!-- 主图 -->
<div
class=
"MasterMapList-boxRelative absolute z-index1"
:class=
"[FeatureItem.pageType==2?'':'UpgradedVersion-Hover']"
>
<div
class=
"MasterMapList-box-one absolute"
>
<div
class=
"MasterMapList-box-one absolute"
v-if=
"(FeatureItem.pageType!=2&&FeatureItem.dataObj.ImgList
&&FeatureItem.dataObj.ImgList.length!=9)||FeatureItem.pageType==2"
>
<FeatureControls
:index=
"index"
:FeatureData=
"FeatureItem"
:ControlsType=
"'row'"
:isUploadImg=
"FeatureItem.pageType==2?true:false"
:isSelectImg=
"FeatureItem.pageType==2?true:false"
:isAddImg=
"FeatureItem.pageType==2?false:
FeatureItem.pageType!=2&&FeatureItem.dataObj.ImgList
&&FeatureItem.dataObj.ImgList.length!=9?true:false"
:isDeleteImg=
"false"
@
toUploadImg=
"UploadImg"
@
toSelectImg=
"SelectImg"
@
toAddImg=
"AddImg"
@
toDeleteImg=
"DeleteImg"
></FeatureControls>
FeatureItem.pageType!=2?true:false"
:isDeleteImg=
"false"
@
toUploadImg=
"UploadImg"
@
toSelectImg=
"SelectImg"
@
toAddImg=
"AddImg"
@
toDeleteImg=
"DeleteImg"
:x=
"FeatureItem.pageType==2?1019:''"
:y=
"FeatureItem.pageType==2?577:''"
></FeatureControls>
<input
type=
"file"
style=
"display:none"
:id=
"'introducefile_'+(FeatureItem * 2 + 1) + '_'+index"
@
change=
"uploadpic"
>
</div>
<div
class=
"MasterMapList-box-two absolute z-index3"
>
...
...
@@ -84,7 +84,6 @@
},
MasterMapIndex
:
null
,
//主图下标
StencilDrawing
:
false
,
//是否是模版图
imglistArry
:[],
homeBg3
:
"https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg"
,
dinner2
:
"http://imgfile.oytour.com/Static/NewTripFeature/dinner2.jpg"
,
homeBg1
:
"https://imgfile.oytour.com/Static/NewTripFeature/homeBg1.jpg"
,
...
...
@@ -92,33 +91,6 @@
},
methods
:
{
getList
()
{
//初始化弹窗图片列表
let
obj
=
{
url
:
'http://192.168.10.214:8120/image/index?filePath=/Upload/DMC/20180722/636678151855193385.jpg&process=resize,m_filt,w_160,h_'
}
this
.
imglistArry
=
[];
this
.
apipost
(
"hotel_post_GetPicList"
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
imglistArry
=
res
.
data
.
data
.
pageData
;
this
.
imglistArry
.
forEach
(
x
=>
{
x
.
isShowImgDiv
=
true
;
})
this
.
msg
.
total
=
res
.
data
.
data
.
count
;
if
(
this
.
imglistArry
&&
this
.
imglistArry
.
length
>
0
){
obj
.
url
=
this
.
imglistArry
[
0
].
Path
}
this
.
FeatureItem
.
dataObj
.
ImgList
.
push
(
obj
)
}
else
{
this
.
FeatureItem
.
dataObj
.
ImgList
.
push
(
obj
)
}
},
null
);
},
UploadImg
(
index
,
type
)
{
this
.
MasterMapIndex
=
index
?
index
:
0
if
(
type
)
this
.
StencilDrawing
=
true
...
...
@@ -167,30 +139,31 @@
},
AddImg
()
{
let
obj
=
{
url
:
this
.
FeatureItem
.
pageType
==
4
?
this
.
homeBg3
:
this
.
FeatureItem
.
pageType
==
5
?
this
.
dinner2
:
this
.
homeBg1
url
:
this
.
FeatureItem
.
pageType
==
4
?
this
.
homeBg3
:
this
.
FeatureItem
.
pageType
==
5
?
this
.
dinner2
:
this
.
homeBg1
,
x
:
0
,
y
:
0
,
}
this
.
FeatureItem
.
dataObj
.
ImgList
.
push
(
obj
)
return
if
(
this
.
FeatureItem
.
pageType
==
4
||
this
.
FeatureItem
.
pageType
==
5
||
this
.
FeatureItem
.
pageType
==
6
){
if
(
this
.
FeatureItem
.
pageType
==
4
){
this
.
choseType
=
1
}
else
if
(
this
.
FeatureItem
.
pageType
==
5
){
this
.
choseType
=
2
}
else
if
(
this
.
FeatureItem
.
pageType
==
6
){
this
.
choseType
=
3
}
else
{
this
.
choseType
=
0
}
this
.
getList
()
}
this
.
FeatureItem
.
dataObj
.
ImgList
.
forEach
(
x
=>
{
x
.
x
=
0
x
.
y
=
0
});
},
DeleteImg
(
index
,
type
)
{
if
(
type
)
this
.
StencilDrawing
=
true
else
this
.
StencilDrawing
=
false
if
(
this
.
StencilDrawing
)
{
this
.
FeatureItem
.
dataObj
.
SubList
.
splice
(
index
,
1
)
this
.
FeatureItem
.
dataObj
.
SubList
.
forEach
(
x
=>
{
x
.
x
=
0
x
.
y
=
0
});
}
else
{
this
.
FeatureItem
.
dataObj
.
ImgList
.
splice
(
index
,
1
)
this
.
FeatureItem
.
dataObj
.
ImgList
.
forEach
(
x
=>
{
x
.
x
=
0
x
.
y
=
0
});
}
},
toAddPages
()
{
...
...
src/components/rank/salesVolumeRank.vue
View file @
7e915e1c
...
...
@@ -111,66 +111,76 @@
</li>
</ul>
</div>
<v-table
v-if=
"isReady"
is-horizontal-resize
column-width-drag
style=
"width: 100%"
:columns=
"columns"
:table-data=
"tableData"
:filter-method=
"filterMethod"
:total=
"total"
:pageSize=
"pageSize"
:pageIndex=
"pageIndex"
:handleCurrentChange=
"handleCurrentChanges"
:multiple-sort=
"multipleSort"
:is-loading=
"loading"
sort-always
@
sort-change=
"sortChange"
@
on-custom-comp=
"customCompFunc"
></v-table>
<el-table
v-if=
"isReady"
ref=
"singleTable"
:data=
"tableData"
style=
"width: 100%"
>
<el-table-column
type=
"index"
label=
"序号"
width=
"50"
>
</el-table-column>
<el-table-column
property=
"name"
label=
"名称"
width=
"80"
>
</el-table-column>
<el-table-column
property=
"SumPreferPrice"
label=
"销售额"
width=
""
sortable
>
<template
slot-scope=
"scope"
>
<div
class=
"clickText"
@
click=
"goUrl('salesVolumeRankEntryForm',scope.row)"
>
{{
scope
.
row
.
SumPreferPrice
}}
</div>
</
template
>
</el-table-column>
<el-table-column
property=
"income"
label=
"收款金额"
width=
""
sortable
>
<
template
slot-scope=
"scope"
>
<div
class=
"clickText"
@
click=
"goUrl('salesVolumeRankEntryForm',scope.row)"
>
{{
scope
.
row
.
income
}}
</div>
</
template
>
</el-table-column>
<el-table-column
property=
"notInCome"
label=
"未收金额"
width=
""
sortable
>
<
template
slot-scope=
"scope"
>
<div
class=
"clickText"
@
click=
"goUrl('salesVolumeRankEntryForm',scope.row)"
>
{{
scope
.
row
.
notInCome
}}
</div>
</
template
>
</el-table-column>
<el-table-column
property=
"peopleCount"
label=
"正常收客数"
width=
""
sortable
>
</el-table-column>
<el-table-column
property=
"CalcheCount"
label=
"取消收客数"
width=
""
sortable
>
</el-table-column>
<el-table-column
property=
"totalGuestNum"
label=
"单项收客数"
width=
""
>
</el-table-column>
<el-table-column
property=
"avgPrice"
label=
"客单价"
width=
""
sortable
>
</el-table-column>
<el-table-column
property=
"zanBi"
label=
"销售额占比"
width=
""
>
</el-table-column>
</el-table>
</div>
</template>
<
script
>
import
Vue
from
"vue"
;
import
moment
from
'moment'
// 自定义列组件
Vue
.
component
(
"table-operation"
,
{
template
:
`<span>
<a href="" @click.stop.prevent="update(rowData,index)">
<span>{{content}}</span></a></span>
`
,
props
:
{
rowData
:
{
type
:
Object
,
},
field
:
{
type
:
String
,
},
index
:
{
type
:
Number
,
},
},
data
()
{
return
{
content
:
""
,
};
},
mounted
()
{
if
(
this
.
field
===
"SumPreferPrice"
)
{
this
.
content
=
this
.
rowData
[
"SumPreferPrice"
];
}
else
if
(
this
.
field
===
"income"
)
{
this
.
content
=
this
.
rowData
[
"income"
];
}
else
{
this
.
content
=
this
.
rowData
.
notInCome
.
toFixed
(
2
);
}
},
methods
:
{
update
(
rowData
,
index
)
{
this
.
$emit
(
'on-custom-comp'
,
rowData
);
},
},
});
export
default
{
data
()
{
return
{
...
...
@@ -239,6 +249,9 @@ export default {
//this.pageSize = this.calcPageSize(40); 此页不需要分页
},
methods
:
{
goUrl
(
name
,
rowData
){
if
(
name
==
'salesVolumeRankEntryForm'
)
this
.
customCompFunc
(
rowData
)
},
customCompFunc
(
rowData
)
{
this
.
$router
.
push
({
path
:
"/salesVolumeRankEntryForm"
,
...
...
@@ -260,174 +273,6 @@ export default {
});
},
initColumns
()
{
this
.
isReady
=
false
;
let
that
=
this
;
let
no
=
{
title
:
this
.
$t
(
"active.ad_xuhao"
),
width
:
50
,
titleAlign
:
"center"
,
columnAlign
:
"center"
,
formatter
:
function
(
rowData
,
rowIndex
,
pagingIndex
,
field
)
{
return
rowIndex
+
1
;
},
isResize
:
false
,
};
let
account
=
{
field
:
"name"
,
title
:
this
.
$t
(
"system.query_airName"
),
width
:
80
,
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
,
result
:
""
,
// filterMultiple: false,
// filters: [{}],
// type: "text"
};
let
sumMoney
=
{
field
:
"SumPreferPrice"
,
title
:
this
.
$t
(
"sm.salemoney"
),
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
,
width
:
80
,
orderBy
:
"desc"
,
componentName
:
"table-operation"
,
formatter
:
function
(
rowData
,
rowIndex
,
pagingIndex
,
field
)
{
// if (that.authority.indexOf("Sales_Volume_Rank_Show") == -1) {
// let content = "";
// for (let i = 0; i
<
rowData
[
"income"
].
length
;
i
++
)
{
// content += "*";
// }
// return content;
// } else {
return
`
${
rowData
[
"SumPreferPrice"
].
toFixed
(
2
)}
`
;
//}
},
};
let
moneyCount
=
{
field
:
"income"
,
title
:
this
.
$t
(
"fnc.skjine"
),
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
,
width
:
80
,
orderBy
:
""
,
componentName
:
"table-operation"
,
formatter
:
function
(
rowData
,
rowIndex
,
pagingIndex
,
field
)
{
// if (that.authority.indexOf("Sales_Volume_Rank_Show") == -1) {
// let content = "";
// for (let i = 0; i
<
rowData
[
"income"
].
length
;
i
++
)
{
// content += "*";
// }
// return content;
// } else {
return
`
${
rowData
[
"income"
]}
`
;
//}
},
};
let
notIncome
=
{
field
:
"notInCome"
,
title
:
this
.
$t
(
"fnc.wsjine"
),
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
,
width
:
80
,
orderBy
:
""
,
componentName
:
"table-operation"
,
formatter
:
function
(
rowData
,
rowIndex
,
pagingIndex
,
field
)
{
// if (that.authority.indexOf("Sales_Volume_Rank_Show") == -1) {
// let content = "";
// for (let i = 0; i
<
rowData
[
"income"
].
length
;
i
++
)
{
// content += "*";
// }
// return `
<
span
style
=
'color:red'
>
$
{
content
}
<
/span>`
;
// } else {
return
`<span style='color:red'>
${
rowData
.
notInCome
.
toFixed
(
2
)}
</span>`
;
//}
},
};
let
pCount
=
{
field
:
"peopleCount"
,
title
:
this
.
$t
(
"sm.sks"
),
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
,
width
:
80
,
orderBy
:
""
,
};
let
cCount
=
{
field
:
"CalcheCount"
,
title
:
this
.
$t
(
"sm.exitsks"
),
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
,
width
:
80
,
orderBy
:
""
,
};
let
avgPCount
=
{
field
:
"avgPeopleCount"
,
title
:
this
.
$t
(
"sm.personsks"
),
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
,
width
:
80
,
orderBy
:
""
,
};
let
customerNum
=
{
field
:
"totalGuestNum"
,
title
:
"单项收客数"
,
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
,
width
:
80
,
};
let
unitPrice
=
{
field
:
"avgPrice"
,
title
:
this
.
$t
(
"sm.keprice"
),
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
,
width
:
80
,
orderBy
:
""
,
formatter
:
function
(
rowData
,
rowIndex
,
pagingIndex
,
field
)
{
// if (that.authority.indexOf("Sales_Volume_Rank_Show") == -1) {
// let content = "";
// for (let i = 0; i
<
rowData
[
"avgPrice"
].
length
;
i
++
)
{
// content += "*";
// }
// return content;
// } else {
return
rowData
[
"avgPrice"
].
toFixed
(
2
);
// }
},
};
let
proportion
=
{
field
:
"zanBi"
,
title
:
this
.
$t
(
"sm.xiaoshouzb"
),
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
,
width
:
80
,
};
this
.
columns
=
[];
this
.
columns
.
push
(
no
);
this
.
columns
.
push
(
account
);
this
.
columns
.
push
(
sumMoney
);
this
.
columns
.
push
(
moneyCount
);
this
.
columns
.
push
(
notIncome
);
this
.
columns
.
push
(
pCount
);
this
.
columns
.
push
(
cCount
);
if
(
this
.
activeName
!=
"first"
&&
this
.
activeName
!=
"four"
)
{
unitPrice
.
title
=
this
.
$t
(
"sm.renxiaoshou"
);
this
.
columns
.
push
(
avgPCount
);
}
this
.
columns
.
push
(
customerNum
);
this
.
columns
.
push
(
unitPrice
);
this
.
columns
.
push
(
proportion
);
this
.
isReady
=
true
;
},
initData
()
{
...
...
@@ -620,4 +465,8 @@ export default {
.el-date-editor
.el-range-separator
{
font-size
:
12px
;
}
.clickText
{
color
:
#33B3FF
;
cursor
:
pointer
;
}
</
style
>
src/plug/index.js
View file @
7e915e1c
...
...
@@ -119,6 +119,7 @@ export default {
let
lxymallUrl
=
''
;
//国内游api
let
crmUrl
=
""
;
//crm API
let
locationName
=
window
.
location
.
hostname
;
let
ocrUrl
=
"http://192.168.10.68:8888"
;
// domainUrl = "http://192.168.10.238:8083"; // 刘东电脑
// domainUrl = "http://192.168.10.226"; //春姐
domainUrl
=
"http://192.168.10.128"
;
//奎哥
...
...
@@ -137,16 +138,19 @@ export default {
domainUrl
=
"http://testapi.oytour.com"
;
mallUrl
=
"https://mallapi.oytour.com"
;
lxymallUrl
=
"https://erpmallapi.oytour.com"
;
crmUrl
=
"http://testcrm.oytour.com"
crmUrl
=
"http://testcrm.oytour.com"
;
ocrUrl
=
"http://ocr.oytour.com"
;
}
else
if
(
locationName
.
indexOf
(
'oytour'
)
!==
-
1
)
{
domainUrl
=
"http://reborn.oytour.com"
;
mallUrl
=
"https://mallapi.oytour.com"
;
lxymallUrl
=
"https://erpmallapi.oytour.com"
;
crmUrl
=
"http://crm.oytour.com"
crmUrl
=
"http://crm.oytour.com"
;
ocrUrl
=
"http://ocr.oytour.com"
;
}
var
obj
=
{
//主地址
DomainUrl
:
domainUrl
,
ocrUrl
:
ocrUrl
,
//行程下载地址
//常用提交数据URL
PostUrl
:
domainUrl
+
"/api/common/post"
,
//上传文件URL
...
...
@@ -253,7 +257,7 @@ export default {
//HTTP提交数据
Vue
.
prototype
.
apipost
=
function
(
cmd
,
msg
,
successCall
,
faildCall
,
isOnline
,
isTerminate
)
{
if
(
this
.
$route
.
name
.
indexOf
(
'login'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'clientConfirm'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'confirmationOrderDownLoad'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'PrintPage'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'confirmationOrderDownLoad
New
'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'PrintPage'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'TravelContractConfirm'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'ViittoContractConfirm'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'OrderProfitLossList'
)
===
-
1
)
{
...
...
@@ -682,7 +686,7 @@ export default {
//请求Java接口
Vue
.
prototype
.
apiJavaPost
=
function
(
cmd
,
msg
,
successCall
,
faildCall
)
{
if
(
this
.
$route
.
name
.
indexOf
(
'login'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'confirmationOrderDownLoad'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'PrintPage'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'clientConfirm'
)
===
-
1
)
{
if
(
this
.
$route
.
name
.
indexOf
(
'login'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'confirmationOrderDownLoad
New
'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'PrintPage'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'clientConfirm'
)
===
-
1
)
{
let
previousPathInfo
=
{
path
:
this
.
$route
.
name
,
query
:
this
.
$route
.
query
...
...
@@ -739,7 +743,7 @@ export default {
},
//请求资产管理接口
Vue
.
prototype
.
apiJavaPostZc
=
function
(
cmd
,
msg
,
successCall
,
faildCall
)
{
if
(
this
.
$route
.
name
.
indexOf
(
'login'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'confirmationOrderDownLoad'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'PrintPage'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'clientConfirm'
)
===
-
1
)
{
if
(
this
.
$route
.
name
.
indexOf
(
'login'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'confirmationOrderDownLoad
New
'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'PrintPage'
)
===
-
1
&&
this
.
$route
.
name
.
indexOf
(
'clientConfirm'
)
===
-
1
)
{
let
previousPathInfo
=
{
path
:
this
.
$route
.
name
,
...
...
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