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
59a4da6d
Commit
59a4da6d
authored
Aug 28, 2023
by
youjie
Browse files
Options
Browse Files
Download
Plain Diff
no message
parents
3863cfc7
a4e806a7
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
214 additions
and
48 deletions
+214
-48
VisaProductOrder.vue
src/components/SalesVisa/components/VisaProductOrder.vue
+17
-8
visaOrderList.vue
src/components/SalesVisa/components/visaOrderList.vue
+50
-1
index.vue
...ravelmanager/TravelGroupControl/UpgradedVersion/index.vue
+147
-39
No files found.
src/components/SalesVisa/components/VisaProductOrder.vue
View file @
59a4da6d
...
@@ -306,25 +306,25 @@
...
@@ -306,25 +306,25 @@
<li>
<li>
<span>
<span>
<em>
{{
$t
(
'fnc.danhao'
)
}}
</em>
<em>
{{
$t
(
'fnc.danhao'
)
}}
</em>
<el-input
class=
'w2
2
0'
v-model=
'msg.VisaTCNUM'
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
<el-input
class=
'w2
0
0'
v-model=
'msg.VisaTCNUM'
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</span>
</span>
</li>
</li>
<li>
<li>
<span>
<span>
<em>
订单ID
</em>
<em>
订单ID
</em>
<el-input
class=
'w2
2
0'
v-model=
'msg.OrderId'
placeholder=
"请输入订单ID"
></el-input>
<el-input
class=
'w2
0
0'
v-model=
'msg.OrderId'
placeholder=
"请输入订单ID"
></el-input>
</span>
</span>
</li>
</li>
<li>
<li>
<span>
<span>
<em>
{{
$t
(
'hotel.product_name'
)
}}
</em>
<em>
{{
$t
(
'hotel.product_name'
)
}}
</em>
<el-input
class=
'w2
2
0'
v-model=
'msg.Name'
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
<el-input
class=
'w2
0
0'
v-model=
'msg.Name'
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</span>
</span>
</li>
</li>
<li>
<li>
<span>
<span>
<em>
订单状态
</em>
<em>
订单状态
</em>
<el-select
v-model=
'msg.VisaOrderStatus'
>
<el-select
class=
'w200'
v-model=
'msg.VisaOrderStatus'
>
<el-option
label=
"不限"
value=
"0"
key=
'0'
></el-option>
<el-option
label=
"不限"
value=
"0"
key=
'0'
></el-option>
<el-option
label=
"正常"
value=
"1"
key=
'1'
></el-option>
<el-option
label=
"正常"
value=
"1"
key=
'1'
></el-option>
<el-option
label=
"取消"
value=
"2"
key=
'2'
></el-option>
<el-option
label=
"取消"
value=
"2"
key=
'2'
></el-option>
...
@@ -334,7 +334,7 @@
...
@@ -334,7 +334,7 @@
<li>
<li>
<span>
<span>
<em>
完结状态
</em>
<em>
完结状态
</em>
<el-select
v-model=
'msg.IsFinish'
>
<el-select
class=
'w200'
v-model=
'msg.IsFinish'
>
<el-option
label=
"不限"
value=
"0"
key=
'0'
></el-option>
<el-option
label=
"不限"
value=
"0"
key=
'0'
></el-option>
<el-option
label=
"已完结"
value=
"1"
key=
'1'
></el-option>
<el-option
label=
"已完结"
value=
"1"
key=
'1'
></el-option>
<el-option
label=
"未完结"
value=
"2"
key=
'2'
></el-option>
<el-option
label=
"未完结"
value=
"2"
key=
'2'
></el-option>
...
@@ -343,7 +343,7 @@
...
@@ -343,7 +343,7 @@
<li
v-if=
"pagesTitle!='销售'"
>
<li
v-if=
"pagesTitle!='销售'"
>
<span>
<span>
<em>
业务员
</em>
<em>
业务员
</em>
<el-select
filterable
v-model=
'msg.CreateBy'
>
<el-select
class=
'w200'
filterable
v-model=
'msg.CreateBy'
>
<el-option
:value=
"0"
label=
"不限"
></el-option>
<el-option
:value=
"0"
label=
"不限"
></el-option>
<el-option
v-for=
'item in EmployeeList'
:label=
'item.EmName'
:value=
'item.EmployeeId'
<el-option
v-for=
'item in EmployeeList'
:label=
'item.EmName'
:value=
'item.EmployeeId'
:key=
'item.EmployeeId'
>
:key=
'item.EmployeeId'
>
...
@@ -354,7 +354,7 @@
...
@@ -354,7 +354,7 @@
<li>
<li>
<span>
<span>
<em>
OP
</em>
<em>
OP
</em>
<el-select
filterable
v-model=
'msg.OpEmpId'
>
<el-select
class=
'w200'
filterable
v-model=
'msg.OpEmpId'
>
<el-option
:value=
"0"
label=
"不限"
></el-option>
<el-option
:value=
"0"
label=
"不限"
></el-option>
<el-option
v-for=
'item in EmployeeList'
:label=
'item.EmName'
:value=
'item.EmployeeId'
<el-option
v-for=
'item in EmployeeList'
:label=
'item.EmName'
:value=
'item.EmployeeId'
:key=
'item.EmployeeId'
>
:key=
'item.EmployeeId'
>
...
@@ -365,7 +365,7 @@
...
@@ -365,7 +365,7 @@
<li
v-if=
"pagesTitle!='销售'"
>
<li
v-if=
"pagesTitle!='销售'"
>
<span>
<span>
<em>
公司
</em>
<em>
公司
</em>
<el-select
filterable
class=
"w217"
v-model=
"msg.RB_Branch_Id"
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
class=
'w200'
filterable
v-model=
"msg.RB_Branch_Id"
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
:value=
"-1"
label=
"不限"
></el-option>
<el-option
:value=
"-1"
label=
"不限"
></el-option>
<el-option
v-for=
"item in layerCompanyList"
:label=
"item.BName"
:value=
"item.Id"
:key=
"item.Id"
>
<el-option
v-for=
"item in layerCompanyList"
:label=
"item.BName"
:value=
"item.Id"
:key=
"item.Id"
>
</el-option>
</el-option>
...
@@ -379,6 +379,13 @@
...
@@ -379,6 +379,13 @@
-
<el-date-picker
v-model=
'msg.EndDate'
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
></el-date-picker>
-
<el-date-picker
v-model=
'msg.EndDate'
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
></el-date-picker>
</span>
</span>
</li>
</li>
<li>
<span>
<em>
完结日期
</em>
<el-date-picker
v-model=
'msg.FinishSDate'
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
></el-date-picker>
-
<el-date-picker
v-model=
'msg.FinishEDate'
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
></el-date-picker>
</span>
</li>
<li>
<li>
<button
class=
"hollowFixedBtn"
@
click=
"getList()"
>
{{
$t
(
'pub.searchBtn'
)
}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"getList()"
>
{{
$t
(
'pub.searchBtn'
)
}}
</button>
</li>
</li>
...
@@ -528,6 +535,8 @@
...
@@ -528,6 +535,8 @@
pageSize
:
12
,
pageSize
:
12
,
StartDate
:
''
,
StartDate
:
''
,
EndDate
:
''
,
EndDate
:
''
,
FinishSDate
:
''
,
FinishEDate
:
''
,
SendStartDate
:
''
,
SendStartDate
:
''
,
SendEndDate
:
''
,
SendEndDate
:
''
,
Name
:
''
,
Name
:
''
,
...
...
src/components/SalesVisa/components/visaOrderList.vue
View file @
59a4da6d
...
@@ -823,6 +823,11 @@
...
@@ -823,6 +823,11 @@
v-loading=
"scope.row.loading"
>
v-loading=
"scope.row.loading"
>
<span
class=
"c059FF6"
>
完结
</span>
<span
class=
"c059FF6"
>
完结
</span>
</div>
</div>
<div
v-if=
"IsSupperOrderEdit&&pagesTitle!='销售'&&scope.row.isFinish==1"
class=
"row-c cursor-pointer radius5 change py5"
@
click=
'setOPEmpId(scope.row)'
v-loading=
"scope.row.loading"
>
<span
class=
"c059FF6"
>
修改OP
</span>
</div>
<div
class=
"row-c cursor-pointer radius5 change py5"
<div
class=
"row-c cursor-pointer radius5 change py5"
v-if=
"IsSupperOrderEdit&&!scope.row.commissionMoney&&!scope.row.opCommission&&pagesTitle!='销售'"
v-if=
"IsSupperOrderEdit&&!scope.row.commissionMoney&&!scope.row.opCommission&&pagesTitle!='销售'"
@
click=
"queryObj=scope.row,showTransferOrder=true"
>
@
click=
"queryObj=scope.row,showTransferOrder=true"
>
...
@@ -960,6 +965,18 @@
...
@@ -960,6 +965,18 @@
<el-button
size=
"mini"
type=
"danger"
@
click=
"PerferPrice"
>
确 定
</el-button>
<el-button
size=
"mini"
type=
"danger"
@
click=
"PerferPrice"
>
确 定
</el-button>
</span>
</span>
</el-dialog>
</el-dialog>
<el-dialog
title=
"修改OP"
:visible
.
sync=
"EditOPVisible"
width=
"400px"
>
<div>
<el-select
v-model=
"OPEmpId"
filterable
size=
mini
>
<el-option
v-for=
"item in OPEmpList"
:key=
"item.EmployeeId"
:label=
"item.EmName"
:value=
"item.EmployeeId"
>
</el-option>
</el-select>
</div>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
size=
"mini"
@
click=
"EditOPVisible = false"
>
取 消
</el-button>
<el-button
size=
"mini"
type=
"danger"
@
click=
"sureOPEmp"
>
确 定
</el-button>
</span>
</el-dialog>
<offset
:isShow=
"cdState"
:obj=
"queryObj"
@
close=
"cdState=false"
></offset>
<offset
:isShow=
"cdState"
:obj=
"queryObj"
@
close=
"cdState=false"
></offset>
<TransferOrder
v-if=
"showTransferOrder"
:isShow=
"showTransferOrder"
:obj=
"queryObj"
<TransferOrder
v-if=
"showTransferOrder"
:isShow=
"showTransferOrder"
:obj=
"queryObj"
@
success=
"showTransferOrder=false,$emit('success')"
@
close=
"showTransferOrder=false"
></TransferOrder>
@
success=
"showTransferOrder=false,$emit('success')"
@
close=
"showTransferOrder=false"
></TransferOrder>
...
@@ -1067,7 +1084,11 @@
...
@@ -1067,7 +1084,11 @@
TotalPrice
:
0
,
TotalPrice
:
0
,
PeopleNum
:
0
PeopleNum
:
0
},
},
IsSupperOrderEdit
:
false
IsSupperOrderEdit
:
false
,
EditOPVisible
:
false
,
OPEmpId
:
0
,
OPOrderId
:
0
,
OPEmpList
:
[]
};
};
},
},
watch
:
{
watch
:
{
...
@@ -1556,6 +1577,33 @@
...
@@ -1556,6 +1577,33 @@
this
.
copyId
=
0
;
this
.
copyId
=
0
;
},
2000
);
},
2000
);
},
},
GetOPEmpList
()
{
let
userInfo
=
this
.
getLocalStorage
();
this
.
apipost
(
'admin_get_EmployeeGetList'
,
{
GroupId
:
userInfo
.
RB_Group_id
,
DepartmentId
:
232
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
OPEmpList
=
res
.
data
.
data
;
}
},
err
=>
{})
},
setOPEmpId
(
item
)
{
this
.
EditOPVisible
=
true
;
this
.
OPOrderId
=
item
.
id
;
},
sureOPEmp
()
{
if
(
this
.
OPEmpId
<=
0
){
this
.
Info
(
'请选择OP!'
)
return
}
this
.
apipost
(
'dmc_post_SetVisaOrderFinishEmp'
,
{
VisaOrderIds
:
this
.
OPOrderId
,
EmpId
:
this
.
OPEmpId
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
EditOPVisible
=
false
;
this
.
Success
(
res
.
data
.
message
)
this
.
$emit
(
'success'
);
}
else
{
this
.
Error
(
res
.
data
.
message
)
}
},
err
=>
{})
},
},
},
mounted
()
{
mounted
()
{
this
.
qjGroupId
=
this
.
QjGroupId
();
this
.
qjGroupId
=
this
.
QjGroupId
();
...
@@ -1567,6 +1615,7 @@
...
@@ -1567,6 +1615,7 @@
if
(
ActionMenuCode
.
indexOf
(
'isEditAmount'
)
!=
-
1
)
{
if
(
ActionMenuCode
.
indexOf
(
'isEditAmount'
)
!=
-
1
)
{
this
.
IsSupperOrderEdit
=
true
this
.
IsSupperOrderEdit
=
true
}
}
this
.
GetOPEmpList
()
}
}
};
};
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @
59a4da6d
...
@@ -13,15 +13,15 @@
...
@@ -13,15 +13,15 @@
<headerTitle
:FeatureItem=
"item"
:TripColor=
"TripColor"
></headerTitle>
<headerTitle
:FeatureItem=
"item"
:TripColor=
"TripColor"
></headerTitle>
<!-- 介绍、宿食景页 -->
<!-- 介绍、宿食景页 -->
<otherJourney
:index=
"index"
:FeatureItem=
"item"
:TripColor=
"TripColor"
@
toAddPages=
"AddPages"
<otherJourney
:index=
"index"
:FeatureItem=
"item"
:TripColor=
"TripColor"
@
toAddPages=
"AddPages"
@
toDeletePages=
"DeletePages"
@
setTemplate=
"setTemplate"
v-if=
"item.pageType!=1
&&item.pageType!=3
"
></otherJourney>
@
toDeletePages=
"DeletePages"
@
setTemplate=
"setTemplate"
v-if=
"item.pageType!=1"
></otherJourney>
<!-- 食详情页 -->
<!-- 食详情页 -->
<UpgradedVersionDetails
:index=
"index"
:FeatureData=
"item"
:TripColor=
"TripColor"
@
toAddPages=
"AddPages"
<UpgradedVersionDetails
:index=
"index"
:FeatureData=
"item"
:TripColor=
"TripColor"
@
toAddPages=
"AddPages"
@
toDeletePages=
"DeletePages"
v-if=
"item.
pageType==3
"
></UpgradedVersionDetails>
@
toDeletePages=
"DeletePages"
v-if=
"item.
name=='食详情'
"
></UpgradedVersionDetails>
<!-- otherJourney-footer 食景 食详情 -->
<!-- otherJourney-footer 食景 食详情 -->
<div
v-if=
"item.
pageType!=1"
:class=
"
{'otherJourney-footer':item.pageType==5||item.pageType==6||item.pageType==3
}">
<div
v-if=
"item.
name!='首页'"
:class=
"
{'otherJourney-footer':item.name=='食'||item.name=='景'||item.name=='食详情'
}">
<div
class=
"otherJourney-introduceFooter absolute z-index1 row-aic"
<div
class=
"otherJourney-introduceFooter absolute z-index1 row-aic"
:style=
"
{'background':item.
pageType==5||item.pageType==6||item.pageType==3
?TripColor:''}">
:style=
"
{'background':item.
name=='食'||item.name=='景'||item.name=='食详情'
?TripColor:''}">
<template
v-if=
"item.
pageType!==5&&item.pageType!==6&&item.pageType==3
"
>
<template
v-if=
"item.
name!=='食'&&item.name!=='景'&&item.name!=='食详情'
"
>
<div
class=
"introduceFooterBJ introduceFooterOne"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"introduceFooterBJ introduceFooterOne"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"introduceFooterBJ introduceFootertTwo"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"introduceFooterBJ introduceFootertTwo"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"introduceFooter-text row-aic"
>
<div
class=
"introduceFooter-text row-aic"
>
...
@@ -66,41 +66,41 @@
...
@@ -66,41 +66,41 @@
pageTitle
:
'首页'
,
pageTitle
:
'首页'
,
pageType
:
1
,
pageType
:
1
,
pageTemplate
:
0
,
pageTemplate
:
0
,
isDeletePage
:
tru
e
,
isDeletePage
:
fals
e
,
dataObj
:
{},
dataObj
:
{},
},
},
{
{
pageTitle
:
'介绍'
,
pageTitle
:
'介绍'
,
pageType
:
2
,
pageType
:
2
,
pageTemplate
:
0
,
pageTemplate
:
0
,
isDeletePage
:
tru
e
,
isDeletePage
:
fals
e
,
dataObj
:
{},
dataObj
:
{},
},
},
{
{
pageTitle
:
'食详情'
,
pageTitle
:
'食详情'
,
pageType
:
3
,
pageType
:
3
,
pageTemplate
:
0
,
pageTemplate
:
0
,
isDeletePage
:
tru
e
,
isDeletePage
:
fals
e
,
dataObj
:
{},
dataObj
:
{},
},
},
{
{
pageTitle
:
'宿'
,
pageTitle
:
'宿'
,
pageType
:
4
,
pageType
:
4
,
isDeletePage
:
tru
e
,
isDeletePage
:
fals
e
,
pageTemplate
:
1
,
pageTemplate
:
1
,
dataObj
:
{},
dataObj
:
{},
},
},
{
{
pageTitle
:
'食'
,
pageTitle
:
'食'
,
pageType
:
5
,
pageType
:
5
,
isDeletePage
:
tru
e
,
isDeletePage
:
fals
e
,
pageTemplate
:
2
,
pageTemplate
:
2
,
dataObj
:
{},
dataObj
:
{},
},
},
{
{
pageTitle
:
'景'
,
pageTitle
:
'景'
,
pageType
:
6
,
pageType
:
6
,
isDeletePage
:
tru
e
,
isDeletePage
:
fals
e
,
pageTemplate
:
3
,
pageTemplate
:
3
,
dataObj
:
{},
dataObj
:
{},
}
}
...
@@ -108,9 +108,6 @@
...
@@ -108,9 +108,6 @@
};
};
},
},
methods
:
{
methods
:
{
getImgList
()
{
},
getPageObj
()
{
getPageObj
()
{
var
pageObj
=
{
var
pageObj
=
{
pageTitle
:
'首页'
,
//页面名称
pageTitle
:
'首页'
,
//页面名称
...
@@ -130,8 +127,8 @@
...
@@ -130,8 +127,8 @@
}
}
this
.
pageList
.
splice
(
index
,
0
,
this
.
pageData
)
this
.
pageList
.
splice
(
index
,
0
,
this
.
pageData
)
},
},
DeletePages
(
index
)
{
DeletePages
(
index
,
FeatureData
)
{
this
.
pageList
.
splice
(
index
,
1
)
this
.
pageList
.
splice
(
1
,
index
)
},
},
setTemplate
(
index
,
TemplateType
)
{
setTemplate
(
index
,
TemplateType
)
{
this
.
pageList
[
index
].
Template
=
TemplateType
this
.
pageList
[
index
].
Template
=
TemplateType
...
@@ -159,7 +156,8 @@
...
@@ -159,7 +156,8 @@
if
(
JSON
.
stringify
(
oldJson
)
!==
"{}"
&&
oldJson
)
{
if
(
JSON
.
stringify
(
oldJson
)
!==
"{}"
&&
oldJson
)
{
}
else
{
}
else
{
this
.
getTripData
();
var
tripObj
=
this
.
getTripData
();
console
.
log
(
"tripObj"
,
tripObj
);
this
.
pageList
.
forEach
(
pItem
=>
{
this
.
pageList
.
forEach
(
pItem
=>
{
var
newObj
=
this
.
getDetailsObj
();
var
newObj
=
this
.
getDetailsObj
();
newObj
.
LineName
=
this
.
FeatureData
.
LineName
;
newObj
.
LineName
=
this
.
FeatureData
.
LineName
;
...
@@ -168,8 +166,15 @@
...
@@ -168,8 +166,15 @@
newObj
.
LineShortName
=
this
.
FeatureData
.
LineShortName
;
newObj
.
LineShortName
=
this
.
FeatureData
.
LineShortName
;
//首页
//首页
if
(
pItem
.
pageType
==
1
)
{
if
(
pItem
.
pageType
==
1
)
{
newObj
.
MainName
=
"大阪 京都 富士山 伊豆 都 H"
;
//地区1
newObj
.
MainName
=
tripObj
.
cityStr
;
//地区1
newObj
.
SubName
=
"冲绳 大阪城公园湖 伊豆 H"
;
//地区2
newObj
.
SubName
=
tripObj
.
cityStr2
;
//地区2
if
(
tripObj
.
scenicArray
&&
tripObj
.
scenicArray
.
length
>
0
)
{
newObj
.
DetailsName
=
tripObj
.
scenicArray
[
0
].
MainName
;
newObj
.
ShadowName
=
"遇见最美好的自己"
;
newObj
.
SubShadowName
=
"在古老的日本樱花街道"
;
newObj
.
ImgList
=
tripObj
.
scenicArray
[
0
].
ImgList
;
newObj
.
MainDesc
=
tripObj
.
scenicArray
[
0
].
MainDesc
;
}
else
{
newObj
.
DetailsName
=
"浅草寺 Senso-ji Temple"
;
newObj
.
DetailsName
=
"浅草寺 Senso-ji Temple"
;
newObj
.
ShadowName
=
"遇见最美好的自己"
;
newObj
.
ShadowName
=
"遇见最美好的自己"
;
newObj
.
SubShadowName
=
"在古老的日本樱花街道"
;
newObj
.
SubShadowName
=
"在古老的日本樱花街道"
;
...
@@ -179,6 +184,7 @@
...
@@ -179,6 +184,7 @@
newObj
.
MainDesc
=
newObj
.
MainDesc
=
"东京最著名、最古老的寺庙,也是日本的门脸、浅草的象征。频繁的庙会活动让你零距离感受日本江户风俗。据说寺内有一座在公元628年偶然被当地渔民打捞上来的观音金像,每年都有许多人前来寺庙祈福保平安。院内有雷门、五重塔等著名古迹;还有90余家商铺的仲见世商店街,可以买到当地特产和吉祥物。在浅草寺可以求签问凶吉,如果不走运抽到了“凶”,和当地人一样系在抽签的地方就可以驱散霉运了。"
;
"东京最著名、最古老的寺庙,也是日本的门脸、浅草的象征。频繁的庙会活动让你零距离感受日本江户风俗。据说寺内有一座在公元628年偶然被当地渔民打捞上来的观音金像,每年都有许多人前来寺庙祈福保平安。院内有雷门、五重塔等著名古迹;还有90余家商铺的仲见世商店街,可以买到当地特产和吉祥物。在浅草寺可以求签问凶吉,如果不走运抽到了“凶”,和当地人一样系在抽签的地方就可以驱散霉运了。"
;
}
}
}
//介绍页面
//介绍页面
else
if
(
pItem
.
pageType
==
2
)
{
else
if
(
pItem
.
pageType
==
2
)
{
newObj
.
MainName
=
"日本旅行专家"
;
newObj
.
MainName
=
"日本旅行专家"
;
...
@@ -191,6 +197,9 @@
...
@@ -191,6 +197,9 @@
}
}
//详情页面
//详情页面
else
if
(
pItem
.
pageType
==
3
)
{
else
if
(
pItem
.
pageType
==
3
)
{
if
(
tripObj
.
dinnerArray
&&
tripObj
.
dinnerArray
.
length
>
0
)
{
}
var
dinnerObj
=
{
var
dinnerObj
=
{
MainName
:
"特色餐1"
,
MainName
:
"特色餐1"
,
ImgList
:
[{
ImgList
:
[{
...
@@ -198,20 +207,29 @@
...
@@ -198,20 +207,29 @@
}],
}],
MainDesc
:
"特色餐描述"
MainDesc
:
"特色餐描述"
};
};
newObj
.
SubList
.
push
(
dinnerObj
);
newObj
.
SubList
.
push
(
dinnerObj
);
newObj
.
SubList
.
push
(
dinnerObj
);
newObj
.
SubList
.
push
(
dinnerObj
);
newObj
.
SubList
.
push
(
dinnerObj
);
newObj
.
SubList
.
push
(
dinnerObj
);
}
}
//酒店
//酒店
else
if
(
pItem
.
pageType
==
4
)
{
else
if
(
pItem
.
pageType
==
4
)
{
if
(
tripObj
.
hotelArray
&&
tripObj
.
hotelArray
.
length
>
0
)
{
newObj
.
MainName
=
tripObj
.
hotelArray
[
0
].
MainName
;
newObj
.
SubName
=
"特色酒店"
;
newObj
.
ImgList
=
tripObj
.
hotelArray
[
0
].
ImgList
;
newObj
.
MainDesc
=
tripObj
.
hotelArray
[
0
].
MainDesc
;
}
else
{
newObj
.
MainName
=
"富士山花园酒店"
;
newObj
.
MainName
=
"富士山花园酒店"
;
newObj
.
SubName
=
"特色酒店"
;
newObj
.
SubName
=
"特色酒店"
;
newObj
.
ImgList
=
[{
newObj
.
ImgList
=
[{
url
:
"https://imgfile.oytour.com/Upload/DMC/202305290204327370000000012.jpg"
url
:
"https://imgfile.oytour.com/Upload/DMC/202305290204327370000000012.jpg"
}];
}];
newObj
.
MainDesc
=
"新大谷INN东京位于山手线大崎车站徒步一分钟,离品川,涉谷,原宿,都非常近,方便购物 观光,酒店房间干净 舒适,"
;
newObj
.
MainDesc
=
"新大谷INN东京位于山手线大崎车站徒步一分钟,离品川,涉谷,原宿,都非常近,方便购物 观光,酒店房间干净 舒适,"
;
}
}
//餐
}
//餐
else
if
(
pItem
.
pageType
==
5
)
{
else
if
(
pItem
.
pageType
==
5
)
{
newObj
.
MainName
=
"箱根湖畔日式料理"
;
newObj
.
MainName
=
"箱根湖畔日式料理"
;
newObj
.
SubName
=
"特色餐食"
;
newObj
.
SubName
=
"特色餐食"
;
newObj
.
ImgList
=
[{
newObj
.
ImgList
=
[{
...
@@ -237,8 +255,12 @@
...
@@ -237,8 +255,12 @@
//获取行程信息
//获取行程信息
getTripData
()
{
getTripData
()
{
var
cityArray
=
[];
var
cityArray
=
[];
var
scenicArray
=
[];
var
hotelArray
=
[];
var
dinnerArray
=
[];
if
(
this
.
FeatureData
&&
this
.
FeatureData
.
DayList
&&
this
.
FeatureData
.
DayList
.
length
>
0
)
{
if
(
this
.
FeatureData
&&
this
.
FeatureData
.
DayList
&&
this
.
FeatureData
.
DayList
.
length
>
0
)
{
this
.
FeatureData
.
DayList
.
forEach
(
dItem
=>
{
this
.
FeatureData
.
DayList
.
forEach
(
dItem
=>
{
//城市
if
(
dItem
.
TrafficObj
&&
dItem
.
TrafficObj
.
SubTraffic
&&
dItem
.
TrafficObj
.
SubTraffic
.
length
>
0
)
{
if
(
dItem
.
TrafficObj
&&
dItem
.
TrafficObj
.
SubTraffic
&&
dItem
.
TrafficObj
.
SubTraffic
.
length
>
0
)
{
dItem
.
TrafficObj
.
SubTraffic
.
forEach
(
tItem
=>
{
dItem
.
TrafficObj
.
SubTraffic
.
forEach
(
tItem
=>
{
if
(
tItem
.
StartCityName
&&
tItem
.
StartCityName
!=
''
&&
!
cityArray
.
includes
(
tItem
if
(
tItem
.
StartCityName
&&
tItem
.
StartCityName
!=
''
&&
!
cityArray
.
includes
(
tItem
...
@@ -251,13 +273,99 @@
...
@@ -251,13 +273,99 @@
}
}
});
});
}
}
//景点
if
(
dItem
.
ScenicArray
&&
dItem
.
ScenicArray
.
length
>
0
)
{
dItem
.
ScenicArray
.
forEach
(
sItem
=>
{
var
tempImgList
=
[];
if
(
sItem
.
NewImaArray
&&
sItem
.
NewImaArray
.
length
>
0
)
{
sItem
.
NewImaArray
.
forEach
(
iItem
=>
{
tempImgList
.
push
({
url
:
iItem
.
Url
});
});
})
}
var
sObj
=
{
MainName
:
sItem
.
CouponsName
,
MainDesc
:
sItem
.
Description
,
ImgList
:
tempImgList
,
SourceType
:
6
}
var
temoScenic
=
scenicArray
.
find
(
x
=>
x
.
MainName
==
sObj
.
MainName
)
if
(
!
temoScenic
)
{
scenicArray
.
push
(
sObj
)
}
}
});
}
if
(
dItem
.
HotelArray
&&
dItem
.
HotelArray
.
length
>
0
)
{
dItem
.
HotelArray
.
forEach
(
sItem
=>
{
var
tempImgList
=
[];
if
(
sItem
.
ImaArray
&&
sItem
.
ImaArray
.
length
>
0
)
{
sItem
.
ImaArray
.
forEach
(
iItem
=>
{
tempImgList
.
push
({
url
:
iItem
.
Url
});
})
}
var
hObj
=
{
MainName
:
sItem
.
HotelName
,
MainDesc
:
sItem
.
Description
,
ImgList
:
tempImgList
,
SourceType
:
4
}
var
tempHotel
=
hotelArray
.
find
(
x
=>
x
.
MainName
==
hObj
.
MainName
)
if
(
!
tempHotel
)
{
hotelArray
.
push
(
hObj
);
}
});
}
if
(
dItem
.
DinnerArray
&&
dItem
.
DinnerArray
.
length
>
0
)
{
dItem
.
DinnerArray
.
forEach
(
sItem
=>
{
if
(
sItem
.
DinnerId
>
0
)
{
var
tempImgList
=
[];
if
(
sItem
.
ImaArray
&&
sItem
.
ImaArray
.
length
>
0
)
{
sItem
.
ImaArray
.
forEach
(
iItem
=>
{
tempImgList
.
push
({
url
:
iItem
.
Url
});
})
}
var
dObj
=
{
MainName
:
sItem
.
DinnerName
,
MainDesc
:
sItem
.
Description
,
ImgList
:
tempImgList
,
SourceType
:
5
};
var
tempDinner
=
dinnerArray
.
find
(
x
=>
x
.
MainName
==
dObj
.
MainName
)
if
(
!
tempDinner
)
{
dinnerArray
.
push
(
dObj
)
}
}
});
}
});
}
var
cityStr
=
""
;
var
cityStr2
=
""
;
var
cityArray1
=
[];
var
cityArray2
=
[];
if
(
cityArray
&&
cityArray
.
length
>
0
)
{
if
(
cityArray
&&
cityArray
.
length
>
0
)
{
var
num
=
cityArray
.
length
/
2
;
var
num
=
cityArray
.
length
/
2
;
console
.
log
(
"num"
,
num
)
for
(
var
i
=
0
;
i
<
num
;
i
++
)
{
cityArray1
.
push
(
cityArray
[
i
]);
}
cityStr
=
cityArray1
.
join
(
" "
);
for
(
var
j
=
num
;
j
<
cityArray
.
length
;
j
++
)
{
cityArray2
.
push
(
cityArray
[
j
]);
}
cityStr2
=
cityArray2
.
join
(
" "
);
}
return
{
cityStr
,
cityStr2
,
hotelArray
,
scenicArray
,
dinnerArray
,
}
}
console
.
log
(
"cityArray,"
,
cityArray
);
}
}
},
},
computed
:
{
computed
:
{
...
...
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