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
1bff0265
Commit
1bff0265
authored
Jun 10, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
删除打印信息
parent
3341b495
Hide whitespace changes
Inline
Side-by-side
Showing
28 changed files
with
1 addition
and
57 deletions
+1
-57
CustomizedTourism.vue
src/components/DependentTravel/CustomizedTourism.vue
+0
-3
DesignScheme.vue
src/components/DependentTravel/DesignScheme.vue
+0
-1
IndependentList.vue
src/components/DependentTravel/IndependentList.vue
+0
-4
IndependentTravel.vue
src/components/DependentTravel/IndependentTravel.vue
+0
-1
Home.vue
src/components/Home.vue
+0
-3
LocalCuisineDetails.vue
src/components/LocalTour/LocalCuisineDetails.vue
+0
-1
Localtourhome.vue
src/components/LocalTour/Localtourhome.vue
+0
-3
ChooseCity.vue
src/components/Ticket/ChooseCity.vue
+0
-3
ChooseCity1.vue
src/components/Ticket/ChooseCity1.vue
+0
-3
EditTicketOrder.vue
src/components/Ticket/EditTicketOrder.vue
+0
-3
FillItinerary.vue
src/components/Ticket/FillItinerary.vue
+0
-4
Pay.vue
src/components/Ticket/Pay.vue
+0
-2
TicketList.vue
src/components/Ticket/TicketList.vue
+0
-4
LocalTourCalendar.vue
src/components/mall/LocalTourCalendar.vue
+1
-2
newcalendar.vue
src/components/mall/newcalendar.vue
+0
-2
FoodOrder.vue
src/components/newPersonalCenter/block/model/FoodOrder.vue
+0
-1
FoodTable.vue
...ewPersonalCenter/block/model/OrderInfoModel/FoodTable.vue
+0
-1
NewTKtable.vue
...wPersonalCenter/block/model/OrderInfoModel/NewTKtable.vue
+0
-1
ScenTable.vue
...ewPersonalCenter/block/model/OrderInfoModel/ScenTable.vue
+0
-1
TCTable.vue
.../newPersonalCenter/block/model/OrderInfoModel/TCTable.vue
+0
-1
VisaTable.vue
...ewPersonalCenter/block/model/OrderInfoModel/VisaTable.vue
+0
-2
ScenOrder(废).vue
...components/newPersonalCenter/block/model/ScenOrder(废).vue
+0
-1
TDDOrder.vue
src/components/newPersonalCenter/block/model/TDDOrder.vue
+0
-1
TQOrder.vue
src/components/newPersonalCenter/block/model/TQOrder.vue
+0
-1
TdOrder.vue
src/components/newPersonalCenter/block/model/TdOrder.vue
+0
-1
TkOrder.vue
src/components/newPersonalCenter/block/model/TkOrder.vue
+0
-5
TscenOrder.vue
src/components/newPersonalCenter/block/model/TscenOrder.vue
+0
-1
TzOrder.vue
src/components/newPersonalCenter/block/model/TzOrder.vue
+0
-1
No files found.
src/components/DependentTravel/CustomizedTourism.vue
View file @
1bff0265
...
...
@@ -423,7 +423,6 @@ export default {
}
})
});
console
.
log
(
"this.datades"
,
this
.
datades
)
}
else
{}
},
err
=>
{})
},
...
...
@@ -448,8 +447,6 @@ export default {
this
.
loading
=
true
;
this
.
apiJavaPost
(
'/api/b2b/free/getTravelCustomOrderInfo'
,{
customId
:
this
.
customId
},
res
=>
{
this
.
loading
=
false
;
// console.log("GetStatus父组件");
console
.
log
(
res
);
if
(
res
.
data
.
resultCode
==
1
){
this
.
dataInfo
=
res
.
data
.
data
;
this
.
tcid
=
this
.
dataInfo
.
tcid
;
...
...
src/components/DependentTravel/DesignScheme.vue
View file @
1bff0265
...
...
@@ -329,7 +329,6 @@ export default {
}
})
});
console
.
log
(
"this.datades"
,
this
.
datades
);
}
else
{}
},
err
=>
{})
},
...
...
src/components/DependentTravel/IndependentList.vue
View file @
1bff0265
...
...
@@ -230,7 +230,6 @@ export default {
created
(){
if
(
this
.
$route
.
query
.
lineteamId
){
this
.
listmsg
.
lineId
=
this
.
$route
.
query
.
lineteamId
;
console
.
log
(
"this.listmsg.lineId"
,
this
.
listmsg
.
lineId
)
}
this
.
isLogin
=
this
.
$store
.
state
.
isLogin
;
if
(
this
.
isLogin
==
1
){
...
...
@@ -343,7 +342,6 @@ export default {
this
.
MonthDateList
.
push
(
obj
)
})
// console.log("MonthDateList",this.MonthDateList)
},
// 选择天数
SelectDay
(
id
){
...
...
@@ -360,7 +358,6 @@ export default {
if
(
this
.
companyId
!=-
1
){
this
.
apipost
(
'b2b_get_GetFreeSearchItem'
,{
'companyId'
:
this
.
companyId
},
r
=>
{
this
.
linesList
=
r
.
data
.
data
.
lineTeam
;
console
.
log
(
"this.linesList"
,
this
.
linesList
)
this
.
startCityList
=
r
.
data
.
data
.
startCity
;
this
.
tripDayList
=
r
.
data
.
data
.
tripDay
;
},
null
)
...
...
@@ -385,7 +382,6 @@ export default {
}
this
.
loading
=
true
;
this
.
apipost
(
'b2b_get_GetB2BFreePageList'
,
this
.
listmsg
,
res
=>
{
// console.log("res",res);
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
){
this
.
datalist
=
res
.
data
.
data
.
pageData
;
...
...
src/components/DependentTravel/IndependentTravel.vue
View file @
1bff0265
...
...
@@ -398,7 +398,6 @@ export default {
this
.
apipost
(
'b2b_get_GetB2BFreeRecommendPageList'
,
this
.
commonmsg2
,
res
=>
{
console
.
log
(
"HotCrash"
,
res
);
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
HotCrashList
=
res
.
data
.
data
.
pageData
;
this
.
HotCrashList
.
forEach
(
item
=>
{
...
...
src/components/Home.vue
View file @
1bff0265
...
...
@@ -885,9 +885,6 @@ export default {
},
methods
:
{
goLocalDes
(
idDes
,
obj
){
// console.log(idDes);
// console.log(obj);
// return;
let
path
=
'detailTwo'
path
=
`
${
path
}
/
${
encodeURIComponent
(
idDes
)}
/
${
obj
.
tcid
}
`
;
this
.
$router
.
push
({
path
})
...
...
src/components/LocalTour/LocalCuisineDetails.vue
View file @
1bff0265
...
...
@@ -299,7 +299,6 @@ export default {
this
.
currentMonthDays
=
moment
(
this
.
tomonth
).
daysInMonth
();
this
.
dateMsg
.
startDate
=
`
${
this
.
tomonth
}
-01`
;
this
.
dateMsg
.
endDate
=
`
${
this
.
tomonth
}
-
${
this
.
currentMonthDays
}
`
;
console
.
log
(
"this.dateMsg"
,
this
.
dateMsg
)
this
.
dateMsg
.
idDes
=
this
.
tcidDes
;
this
.
apiJavaPost
(
'/api/b2b/food/getFoodMealPriceList'
,
this
.
dateMsg
,
res
=>
{
...
...
src/components/LocalTour/Localtourhome.vue
View file @
1bff0265
...
...
@@ -394,7 +394,6 @@ export default {
},
getFoodCountryItem
(){
this
.
apiJavaPost
(
'/api/b2b/food/getFoodCountryItem'
,{},
res
=>
{
// console.log(res);
if
(
res
.
data
.
resultCode
==
1
){
this
.
foodcountryList
=
res
.
data
.
data
;
if
(
this
.
foodcountryList
.
length
>
0
){
...
...
@@ -487,7 +486,6 @@ export default {
this
.
dayLoad
=
false
;
if
(
res
.
data
.
resultCode
==
1
){
this
.
abroadList
=
res
.
data
.
data
.
pageData
;
// console.log("this.abroadList",this.abroadList);
}
else
{
this
.
Error
(
res
.
data
.
message
);
...
...
@@ -499,7 +497,6 @@ export default {
this
.
apiJavaPost
(
'/api/b2b/dayTrip/getLineItem'
,{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
lineTeamList
=
res
.
data
.
data
;
// console.log("this.lineTeamList",this.lineTeamList);
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
...
...
src/components/Ticket/ChooseCity.vue
View file @
1bff0265
...
...
@@ -61,7 +61,6 @@ export default {
getCountryList
()
{
//获取国家
let
msg
=
{};
this
.
apipost
(
'dict_post_Destination_GetCountry'
,
msg
,
res
=>
{
// console.log(res);
this
.
countryList
=
res
.
data
.
data
;
},
err
=>
{})
},
...
...
@@ -69,9 +68,7 @@ export default {
this
.
msg
=
{
Id
:
country
.
ID
};
// this.cityInfo=country;
this
.
apipost
(
'dict_post_Destination_GetChildList'
,
this
.
msg
,
res
=>
{
// console.log(res);
if
(
res
.
data
.
data
.
length
==
0
){
this
.
$emit
(
"CityInfo"
,
country
);
this
.
$emit
(
"CityCompClose"
,
'close'
);
...
...
src/components/Ticket/ChooseCity1.vue
View file @
1bff0265
...
...
@@ -61,7 +61,6 @@ export default {
getCountryList
()
{
//获取国家
let
msg
=
{};
this
.
apipost
(
'dict_post_Destination_GetCountry'
,
msg
,
res
=>
{
// console.log(res);
this
.
countryList
=
res
.
data
.
data
;
},
err
=>
{})
},
...
...
@@ -69,9 +68,7 @@ export default {
this
.
msg
=
{
Id
:
country
.
ID
};
// this.cityInfo=country;
this
.
apipost
(
'dict_post_Destination_GetChildList'
,
this
.
msg
,
res
=>
{
// console.log(res);
if
(
res
.
data
.
data
.
length
==
0
){
this
.
$emit
(
"CityInfo1"
,
country
);
this
.
$emit
(
"CityCompClose1"
,
'close'
);
...
...
src/components/Ticket/EditTicketOrder.vue
View file @
1bff0265
...
...
@@ -227,7 +227,6 @@ export default {
this
.
apipost
(
"b2b_get_GetCountryForSMAirTick"
,
{},
res
=>
{
// console.log(res)
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
countroylist
=
res
.
data
.
data
;
}
...
...
@@ -239,7 +238,6 @@ export default {
//获取订单详情
GetDes
(){
this
.
apiJavaPost
(
'/api/dmc/airticket/getB2BAirticketInfo'
,{
AirOrderId
:
this
.
AirOrderId
},
res
=>
{
// console.log("机票详情",res)
this
.
getlistSigel
=
res
.
data
.
data
;
this
.
getlistSigel
.
synum
=
this
.
getlistSigel
.
airTicketScatterNum
-
this
.
getlistSigel
.
useScatterNum
;
...
...
@@ -249,7 +247,6 @@ export default {
//获取机票订单详情
GetTicketDes
(){
this
.
apiJavaPost
(
'/api/dmc/airticket/GetB2BAirtickOrderInfo'
,{
AirOrderId
:
this
.
AirOrderId
},
res
=>
{
// console.log("获取机票订单详情",res)
this
.
personNum
=
res
.
data
.
data
;
...
...
src/components/Ticket/FillItinerary.vue
View file @
1bff0265
...
...
@@ -264,7 +264,6 @@ export default {
this
.
apipost
(
"b2b_get_GetCountryForSMAirTick"
,
{},
res
=>
{
// console.log(res)
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
countroylist
=
res
.
data
.
data
;
}
...
...
@@ -276,7 +275,6 @@ export default {
//获取订单详情
GetDes
(){
this
.
apiJavaPost
(
'/api/dmc/airticket/getB2BAirticketInfo'
,{
AirTicketId
:
this
.
AirTicketId
},
res
=>
{
// console.log("订单",res)
this
.
getlistSigel
=
res
.
data
.
data
;
this
.
getlistSigel
.
synum
=
this
.
getlistSigel
.
airTicketScatterNum
-
this
.
getlistSigel
.
useScatterNum
;
...
...
@@ -397,7 +395,6 @@ export default {
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
)
}
// console.log("下单",res);
},
null
)
...
...
@@ -413,7 +410,6 @@ export default {
this
.
apipost
(
"sell_get_GetCustomerToSellInfo"
,
{},
res
=>
{
// console.log(res)
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
SellInfoList
=
res
.
data
.
data
;
this
.
personNum
.
enterID
=
this
.
SellInfoList
[
0
].
EmployeeId
;
...
...
src/components/Ticket/Pay.vue
View file @
1bff0265
...
...
@@ -215,7 +215,6 @@ export default {
},
Code
(
str
)
{
this
.
payway
=
str
?
this
.
payway
=
str
:
this
.
payway
;
console
.
log
(
"this.payway"
,
this
.
payway
)
this
.
codeLoading
=
true
;
this
.
code_ts
=
""
;
this
.
zfbpay_imgcode
=
false
;
...
...
@@ -225,7 +224,6 @@ export default {
"OnlinePay_post_GetCodeUrlForAirB2B"
,
this
.
code
,
res
=>
{
// console.log(res)
this
.
codeLoading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
codeInfo
=
res
.
data
.
data
;
...
...
src/components/Ticket/TicketList.vue
View file @
1bff0265
...
...
@@ -511,7 +511,6 @@ export default {
"airline_get_GetB2BAirLineList"
,
{},
res
=>
{
// console.log(res)
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
airlineList
=
res
.
data
.
data
;
}
...
...
@@ -525,7 +524,6 @@ export default {
let
num
=
moment
(
val
,
"YYYY-MM-DD"
).
format
(
"E"
);
this
.
choose_info
.
qFlightDateEnd
=
moment
(
val
).
format
(
"YYYY-MM-DD"
);
},
// moment("2018-10-29",'YYYY-MM-DD').format('E')
handleChange
()
{},
Search
()
{
this
.
choose_info
.
departure_city
=
this
.
choose_info
.
departure_cityname
==
""
?
0
:
this
.
choose_info
.
departure_city
;
...
...
@@ -655,7 +653,6 @@ export default {
"/api/dmc/airticket/getB2BAirticketList"
,
this
.
choose_info
,
res
=>
{
// console.log(res);
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
datalist
=
res
.
data
.
data
.
pageData
;
...
...
@@ -700,7 +697,6 @@ export default {
};
monthArray
.
push
(
dateDict
);
}
// console.log("monthArray",monthArray)
//数组去重,获取有几个月
var
hash
=
{};
monthArray
=
monthArray
.
reduce
(
function
(
item
,
next
)
{
...
...
src/components/mall/LocalTourCalendar.vue
View file @
1bff0265
...
...
@@ -135,8 +135,7 @@ export default {
this
.
priceData
=
list
[
0
];
let
day
=
this
.
day
;
let
currentYear
=
day
.
substring
(
0
,
4
);
//当前年份
let
currentMonth
=
day
.
substring
(
5
,
7
);
//当前月份
// console.log("currentMonth",currentMonth)
let
currentMonth
=
day
.
substring
(
5
,
7
);
//当前月份
let
date
=
new
Date
();
let
strDate
=
date
.
getDate
();
let
strMonth
=
(
date
.
getMonth
()
+
1
).
toString
();
...
...
src/components/mall/newcalendar.vue
View file @
1bff0265
...
...
@@ -107,7 +107,6 @@ export default {
// this.getYearMonthDay();
},
methods
:{
selectDate
(
item
){
// console.log(item);
if
(
item
.
price
==
"0.00"
){
return
;
}
else
{
...
...
@@ -119,7 +118,6 @@ export default {
let
day
=
this
.
day
;
let
currentYear
=
day
.
substring
(
0
,
4
);
//当前年份
let
currentMonth
=
day
.
substring
(
5
,
7
);
//当前月份
// console.log("currentMonth",currentMonth)
let
date
=
new
Date
();
let
strDate
=
date
.
getDate
();
let
strMonth
=
(
date
.
getMonth
()
+
1
).
toString
();
...
...
src/components/newPersonalCenter/block/model/FoodOrder.vue
View file @
1bff0265
...
...
@@ -123,7 +123,6 @@ export default {
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
tableData
=
res
.
data
.
data
.
pageData
;
console
.
log
(
"美食订单"
,
this
.
tableData
)
this
.
totalCount
=
res
.
data
.
data
.
pageCount
;
this
.
Count
=
res
.
data
.
data
.
count
;
this
.
orderLoading
=
false
;
...
...
src/components/newPersonalCenter/block/model/OrderInfoModel/FoodTable.vue
View file @
1bff0265
...
...
@@ -276,7 +276,6 @@ export default {
};
},
mounted
()
{
// console.log("tableData",this.tableData)
},
methods
:
{
Exit
(
item
){
...
...
src/components/newPersonalCenter/block/model/OrderInfoModel/NewTKtable.vue
View file @
1bff0265
...
...
@@ -554,7 +554,6 @@ export default {
};
},
mounted
()
{
console
.
log
(
"机票122"
,
this
.
tableData
)
},
methods
:
{
ShowDes
(
index
){
...
...
src/components/newPersonalCenter/block/model/OrderInfoModel/ScenTable.vue
View file @
1bff0265
...
...
@@ -294,7 +294,6 @@ export default {
};
},
mounted
()
{
// console.log("tableData",this.tableData)
},
methods
:
{
Pay
(
item
){
...
...
src/components/newPersonalCenter/block/model/OrderInfoModel/TCTable.vue
View file @
1bff0265
...
...
@@ -328,7 +328,6 @@ export default {
};
},
mounted
()
{
// console.log("tableData",this.tableData)
},
methods
:
{
enter
:
function
(
t
)
{
...
...
src/components/newPersonalCenter/block/model/OrderInfoModel/VisaTable.vue
View file @
1bff0265
...
...
@@ -328,11 +328,9 @@ export default {
};
},
mounted
()
{
// console.log("tableData",this.tableData)
},
methods
:
{
Exit
(
item
){
console
.
log
(
item
)
this
.
$confirm
(
"确认取消订单?"
,
'提示'
,
{
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
...
...
src/components/newPersonalCenter/block/model/ScenOrder(废).vue
View file @
1bff0265
...
...
@@ -135,7 +135,6 @@ export default {
getList
(){
this
.
apiJavaPost
(
'/api/b2b/scenic/getTicketCouponsOrder'
,
this
.
form
,
res
=>
{
this
.
loading
=
false
;
// console.log("景点门票",res.data.data);
this
.
tableData
=
res
.
data
.
data
.
pageData
;
this
.
totalCount
=
res
.
data
.
data
.
count
;
},
null
)
...
...
src/components/newPersonalCenter/block/model/TDDOrder.vue
View file @
1bff0265
...
...
@@ -129,7 +129,6 @@ export default {
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
tableData
=
res
.
data
.
data
.
pageData
;
console
.
log
(
"当地游订单"
,
this
.
tableData
)
this
.
totalCount
=
res
.
data
.
data
.
pageCount
;
this
.
Count
=
res
.
data
.
data
.
count
;
this
.
orderLoading
=
false
;
...
...
src/components/newPersonalCenter/block/model/TQOrder.vue
View file @
1bff0265
...
...
@@ -150,7 +150,6 @@ export default {
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
tableData
=
res
.
data
.
data
.
pageData
;
console
.
log
(
"签证订单"
,
this
.
tableData
)
this
.
totalCount
=
res
.
data
.
data
.
pageCount
;
this
.
Count
=
res
.
data
.
data
.
count
;
this
.
orderLoading
=
false
;
...
...
src/components/newPersonalCenter/block/model/TdOrder.vue
View file @
1bff0265
...
...
@@ -129,7 +129,6 @@ export default {
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
tableData
=
res
.
data
.
data
.
pageData
;
console
.
log
(
"定制游订单"
,
this
.
tableData
)
this
.
totalCount
=
res
.
data
.
data
.
pageCount
;
this
.
Count
=
res
.
data
.
data
.
count
;
this
.
orderLoading
=
false
;
...
...
src/components/newPersonalCenter/block/model/TkOrder.vue
View file @
1bff0265
...
...
@@ -176,7 +176,6 @@ export default {
// 推送接口
this
.
apipost
(
"airline_get_GetB2BAirLineList"
,
msg
,
res
=>
{
// console.log(res)
},
err
=>
{
}
...
...
@@ -210,7 +209,6 @@ export default {
this
.
List
();
},
handlePay
(
index
,
row
){
// console.log("row",row)
this
.
$router
.
push
({
name
:
"Pay"
,
query
:
{
...
...
@@ -223,14 +221,12 @@ export default {
this
.
List
();
},
handleEdit
(
index
,
row
){
// console.log("row",row)
this
.
$router
.
push
({
path
:
`/EditTicketOrder/
${
row
.
id
}
`
})
},
List
(){
this
.
loading
=
true
;
// console.log(this.form)
if
(
this
.
form
.
time
){
this
.
form
.
startTime
=
this
.
form
.
time
[
0
];
this
.
form
.
endTime
=
this
.
form
.
time
[
1
];
...
...
@@ -240,7 +236,6 @@ export default {
this
.
form
.
endTime
=
""
;
}
this
.
apiJavaPost
(
'/api/dmc/airticket/GetB2BAirtickOrderPageList'
,
this
.
form
,
res
=>
{
// console.log(res);
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
){
this
.
tableData
=
res
.
data
.
data
.
pageData
;
...
...
src/components/newPersonalCenter/block/model/TscenOrder.vue
View file @
1bff0265
...
...
@@ -119,7 +119,6 @@ export default {
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
tableData
=
res
.
data
.
data
.
pageData
;
console
.
log
(
"门票订单"
,
this
.
tableData
)
this
.
totalCount
=
res
.
data
.
data
.
pageCount
;
this
.
Count
=
res
.
data
.
data
.
count
;
this
.
orderLoading
=
false
;
...
...
src/components/newPersonalCenter/block/model/TzOrder.vue
View file @
1bff0265
...
...
@@ -142,7 +142,6 @@ export default {
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
tableData
=
res
.
data
.
data
.
pageData
;
console
.
log
(
"自由行订单"
,
this
.
tableData
);
this
.
totalCount
=
res
.
data
.
data
.
pageCount
;
this
.
Count
=
res
.
data
.
data
.
count
;
...
...
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