Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
million
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
viitto
million
Commits
d7913f80
Commit
d7913f80
authored
Jul 16, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
094b21a0
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
257 deletions
+22
-257
Search.vue
src/pages/Search.vue
+0
-1
orderlist.vue
src/pages/usercenter/orderlist.vue
+2
-4
orderlistInfo.vue
src/pages/usercenter/orderlistInfo.vue
+0
-237
passengerList.vue
src/pages/usercenter/passengerList.vue
+18
-13
routes.js
src/router/routes.js
+2
-2
No files found.
src/pages/Search.vue
View file @
d7913f80
...
...
@@ -1342,7 +1342,6 @@
msg
.
priceOrderByField
=
2
;
}
}
console
.
log
(
"asdfad"
)
this
.
apipost
(
"b2b_get_GetB2BTravelPageList"
,
msg
,
res
=>
{
...
...
src/pages/usercenter/orderlist.vue
View file @
d7913f80
...
...
@@ -162,7 +162,7 @@
</div>
</
template
>
<ul
class=
"order-list"
>
<li
v-for=
"(item,index) in DataList"
:key=
"index"
@
click=
"CommonJump('/order
listI
nfo/'+item.orderId,{})"
>
<li
v-for=
"(item,index) in DataList"
:key=
"index"
@
click=
"CommonJump('/order
i
nfo/'+item.orderId,{})"
>
<a
class=
"order_link"
>
<div
class=
"order_tour"
>
<div
class=
"tour-name"
>
...
...
@@ -285,9 +285,7 @@
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
DataList
=
res
.
data
.
data
.
pageData
;
this
.
pageCount
=
res
.
data
.
data
.
pageCount
;
}
else
{
}
}
},
null
);
...
...
src/pages/usercenter/orderlistInfo.vue
deleted
100644 → 0
View file @
094b21a0
<
style
>
.order_detail
{
margin
:
0
auto
20px
;
width
:
100%
;
max-width
:
800px
;
padding
:
40px
20px
;
}
.order_content
{
color
:
#666
;
font-size
:
15px
;
background-color
:
#fff
;
box-shadow
:
0
2px
4px
0
rgba
(
10
,
8
,
8
,
.5
);
}
.order_header
{
display
:
flex
;
align-items
:
center
;
background-color
:
#00afff
;
}
.header_content
{
flex-basis
:
60%
;
padding
:
30px
;
color
:
#fff
;
font-weight
:
600
;
}
.tour_code
{
margin-bottom
:
5px
;
}
.tour_name
{
font-size
:
22px
;
}
.order_content
.d_list
{
padding
:
20px
30px
;
display
:
flex
;
flex-flow
:
row
wrap
;
}
.order_content
.d_list
:not
(
:last-child
)
{
border-bottom
:
1px
solid
#eee
;
}
.d_list
.d_row
{
padding
:
10px
0
;
flex
:
1
50%
;
}
.d_row
.d_title
{
display
:
block
;
color
:
#333
;
padding
:
0
5px
;
}
.d_content
{
padding-top
:
2px
;
color
:
#999
;
padding
:
0
5px
;
}
.d-block-title
{
padding-bottom
:
10px
;
font-weight
:
700
;
color
:
#333
;
}
.d-row-between
{
display
:
flex
;
padding
:
5px
0
;
flex
:
1
100%
;
justify-content
:
space-between
;
}
.order-price
.d-title
{
display
:
flex
;
flex-basis
:
85px
;
}
.total-price
{
margin-top
:
5px
;
padding-top
:
10px
;
border-top
:
1px
dashed
#eee
;
font-weight
:
700
;
}
.d-Mytitle
{
display
:
flex
;
flex-basis
:
85px
;
color
:
#333
;
}
.total-price
b
{
color
:
#ff9a14
;
font-size
:
24px
;
line-height
:
1
;
}
.d_titleBtm
{
color
:
#333
;
padding
:
0
5px
;
}
.d_contentBtm
{
padding-top
:
2px
;
color
:
#999
;
padding
:
0
5px
;
}
.detail-footer
{
display
:
flex
;
padding
:
0
10px
;
}
.detail-footer
>*
{
flex
:
1
;
margin
:
20px
10px
;
}
</
style
>
<
template
>
<q-page>
<div
class=
"order_detail"
>
<div
class=
"order_content"
>
<div
class=
"order_header"
>
<div
class=
"header_content"
>
<div
class=
"tour_code"
>
{{
InfoData
.
OrderId
}}
</div>
<div
class=
"tour_name"
>
123
</div>
</div>
</div>
<div
class=
"d_list"
>
<div
class=
"d_row"
>
<div
class=
"d_title"
>
<i
class=
"iconfont icontext"
></i>
訂購日期
</div>
<div
class=
"d_content"
>
{{
toTime
(
InfoData
.
CreateDate
)
}}
</div>
</div>
<div
class=
"d_row"
>
<div
class=
"d_title"
>
<i
class=
"iconfont iconhangbanxinxicopy"
></i>
出團日期
</div>
<div
class=
"d_content"
>
2020/07/06
</div>
</div>
<div
class=
"d_row"
>
<div
class=
"d_title"
>
<i
class=
"iconfont icontime"
></i>
訂單狀態
</div>
<div
class=
"d_content"
>
2020/07/06
</div>
</div>
<div
class=
"d_row"
>
<div
class=
"d_title"
>
<i
class=
"iconfont iconfazhuangtai"
></i>
付款狀態
</div>
<div
class=
"d_content"
>
2020/07/06
</div>
</div>
</div>
<div
class=
"d_list order-price"
>
<div
class=
"d-block-title"
>
付款資訊
</div>
<div
class=
"d-row-between"
>
<div
class=
"d-Mytitle"
>
成人
</div>
<div
class=
"d_content"
>
15,900
</div>
<div
class=
"d_content"
>
X 1
</div>
<div
class=
"d-content"
>
15,900
</div>
</div>
<div
class=
"d-row-between total-price"
>
<div
class=
"d-Mytitle"
>
總計
</div>
<div
class=
"d_content"
>
<b>
15,900
</b>
</div>
</div>
</div>
<div
class=
"d_list"
>
<div
class=
"d-row-between"
>
<div
class=
"d_titleBtm"
>
備註
</div>
<div
class=
"d_contentBtm"
>
{{
InfoData
.
Remarks
}}
</div>
</div>
</div>
<div
class=
"detail-footer"
>
<q-btn
color=
"primary"
style=
"height:50px;font-size:17px;font-weight:bold;"
label=
"前往付款"
/>
<q-btn
color=
"amber"
@
click=
"CommonJump('/passengerList/'+InfoData.OrderId+'',
{})"
style="height:50px;font-size:17px;font-weight:bold;" label="填寫旅客資料" />
</div>
</div>
</div>
</q-page>
</
template
>
<
script
>
export
default
{
props
:
[],
data
()
{
return
{
orderId
:
0
,
InfoData
:
{},
};
},
created
()
{
if
(
this
.
$route
.
params
.
id
)
{
this
.
orderId
=
this
.
$route
.
params
.
id
;
}
},
mounted
()
{
this
.
getdemandInfo
()
},
methods
:
{
getdemandInfo
()
{
if
(
this
.
orderId
>
0
)
{
this
.
$q
.
loading
.
show
()
this
.
apipost
(
"sellorder_post_GetOrderEntity"
,
{
ID
:
this
.
orderId
},
res
=>
{
this
.
$q
.
loading
.
hide
()
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
InfoData
=
res
.
data
.
data
.
model
;
console
.
log
(
"this.InfoData"
,
this
.
InfoData
);
}
},
err
=>
{}
);
}
},
toTime
(
date
)
{
if
(
date
)
{
return
date
.
replace
(
"T"
,
" "
);
}
},
},
};
</
script
>
src/pages/usercenter/passengerList.vue
View file @
d7913f80
...
...
@@ -259,31 +259,28 @@
<div
class=
"order-info"
>
<div
class=
"order-info-block"
>
<div
class=
"order_tour_title"
>
【台灣虎航 早去午回】東京自由行5日 淺草集市廣場飯店Agora Place Asakusa(含稅、飯店早餐、WIFI機)[含稅]
【
{{
GuestObj
.
TCNUM
}}
(
{{
GuestObj
.
TCID
}}
)】
{{
GuestObj
.
Title
}}
</div>
<div
class=
"tour-desc"
>
<div
class=
"tour-cover"
>
<div
class=
"tour_img"
style=
'background-image: url("http://imgfile.oytour.com/static/websiteimg/default_scence2.jpg");'
>
:style=
"
{backgroundImage:`url('${GuestObj.CoverImg}')`}"
>
</div>
</div>
<div
class=
"tour_content"
>
<ul
class=
"tour-detail-list"
>
<li>
<span>
銷售說明
</span>
0
</li>
<li>
<span>
訂單編號
</span>
B575187833
<span>
訂單編號
</span>
{{
GuestObj
.
OrderId
}}
</li>
<li>
<span>
旅遊日期
</span>
2020-10-13
<span>
旅遊日期
</span>
{{
GuestObj
.
GroupStartDateStr
}}
</li>
<li>
<span>
出發成員
</span>
1位成人 (共1
人)
<span>
出發成員
</span>
{{
GuestObj
.
ManNum
}}
位成人 (共
{{
GuestObj
.
GuestNum
}}
人)
</li>
<li>
<span>
團費總計
</span>
$15900
<span>
團費總計
</span>
{{
GuestObj
.
PreferPrice
}}
</li>
</ul>
</div>
...
...
@@ -596,7 +593,8 @@
value
:
2
,
label
:
"素食"
}
]
],
GuestObj
:
{},
//旅客信息
};
},
created
()
{
...
...
@@ -605,12 +603,19 @@
}
},
mounted
()
{
this
.
getTravelGuest
();
this
.
getTravelGuest
();
},
methods
:
{
//获取旅客信息
getTravelGuest
()
{
this
.
apipost
(
"sellorder_get_GetTravelGuestList"
,
{
OrderId
:
this
.
orderId
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
GuestObj
=
res
.
data
.
data
;
console
.
log
(
"GuestObj"
,
this
.
GuestObj
);
}
});
}
},
};
...
...
src/router/routes.js
View file @
d7913f80
...
...
@@ -54,9 +54,9 @@ const routes = [{
import
(
'pages/usercenter/orderlist.vue'
)
},
{
path
:
'/order
listI
nfo/:id'
,
//订单详情
path
:
'/order
i
nfo/:id'
,
//订单详情
component
:
()
=>
import
(
'pages/usercenter/order
listI
nfo.vue'
)
import
(
'pages/usercenter/order
i
nfo.vue'
)
},
{
path
:
'/passengerList/:id'
,
//旅客名单
...
...
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