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
052415b7
Commit
052415b7
authored
Mar 23, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
888b0147
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
27 additions
and
12 deletions
+27
-12
OrderList.vue
src/components/Hotel/reservation/OrderList.vue
+1
-1
OrderList.vue
src/components/Hotel/singleProduct/components/OrderList.vue
+1
-1
hotelDetails.vue
...omponents/Hotel/singleProduct/components/hotelDetails.vue
+1
-1
CharterPreview.vue
src/components/busManagement/BookAcar/CharterPreview.vue
+18
-3
Details.vue
src/components/busManagement/BookAcar/components/Details.vue
+1
-1
list.vue
src/components/busManagement/BookAcar/list.vue
+1
-1
echoMap.vue
src/components/public/echoMap.vue
+1
-1
leftNav.vue
src/components/public/leftNav.vue
+1
-1
OrderDetails.vue
...nents/scenicSpot/Singleticket/components/OrderDetails.vue
+1
-1
OrderList.vue
src/components/scenicSpot/reservation/OrderList.vue
+1
-1
No files found.
src/components/Hotel/reservation/OrderList.vue
View file @
052415b7
...
@@ -529,7 +529,7 @@
...
@@ -529,7 +529,7 @@
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<div
class=
"row justify-sb mt mb20"
v-if=
"item.OrderStatus!=3"
>
<div
class=
"row justify-sb mt mb20"
v-if=
"item.OrderStatus!=3"
>
<div
class=
"row pt20"
style=
"margin-right: 10px;"
v-if=
"item.GuestFileList.length > 0||((item.CustomerPayType==1 || item.CustomerPayType==3)&&pagesTitle)"
>
<div
class=
"row pt20"
style=
"margin-right: 10px;
width: 300px;
"
v-if=
"item.GuestFileList.length > 0||((item.CustomerPayType==1 || item.CustomerPayType==3)&&pagesTitle)"
>
<!-- <i class="el-icon-warning cF57A98 fz15 mr"></i> -->
<!-- <i class="el-icon-warning cF57A98 fz15 mr"></i> -->
<div
class=
"column"
>
<div
class=
"column"
>
<!-- <div class="wrap fz12 c9e" v-if="x.CustomerPayType == 2 || x.CustomerPayType == 3">
<!-- <div class="wrap fz12 c9e" v-if="x.CustomerPayType == 2 || x.CustomerPayType == 3">
...
...
src/components/Hotel/singleProduct/components/OrderList.vue
View file @
052415b7
...
@@ -523,7 +523,7 @@
...
@@ -523,7 +523,7 @@
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<div
class=
"row justify-sb mt mb20"
v-if=
"item.OrderStatus!=3"
>
<div
class=
"row justify-sb mt mb20"
v-if=
"item.OrderStatus!=3"
>
<div
class=
"row pt20"
v-if=
"item.GuestFileList.length > 0"
>
<div
class=
"row pt20"
style=
"width: 300px;"
v-if=
"item.GuestFileList.length > 0"
>
<!-- <i class="el-icon-warning cF57A98 fz15 mr"></i> -->
<!-- <i class="el-icon-warning cF57A98 fz15 mr"></i> -->
<div
class=
"column"
>
<div
class=
"column"
>
<!-- <div class="wrap fz12 c9e">
<!-- <div class="wrap fz12 c9e">
...
...
src/components/Hotel/singleProduct/components/hotelDetails.vue
View file @
052415b7
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
<div
class=
"Img-right-box"
v-if=
"images.length>2"
>
<div
class=
"Img-right-box"
v-if=
"images.length>2"
>
<div
class=
"Img-right-num"
v-if=
"images.length>3"
@
click=
"showImageHandler"
>
<div
class=
"Img-right-num"
v-if=
"images.length>3"
@
click=
"showImageHandler"
>
<span
class=
"fz20 text-weight-bold"
>
+
</span>
<span
class=
"fz20 text-weight-bold"
>
+
</span>
<span
class=
"text-h5 text-weight-bold"
>
{{
h
.
List
.
length
-
3
}}
</span>
<span
class=
"text-h5 text-weight-bold"
>
{{
images
.
length
-
3
}}
</span>
</div>
</div>
<el-image
<el-image
style=
"width: 100%; height: 100%"
style=
"width: 100%; height: 100%"
...
...
src/components/busManagement/BookAcar/CharterPreview.vue
View file @
052415b7
...
@@ -78,6 +78,7 @@
...
@@ -78,6 +78,7 @@
display
:
flex
;
display
:
flex
;
flex-direction
:
row
;
flex-direction
:
row
;
margin-bottom
:
15px
;
margin-bottom
:
15px
;
border
:
0
;
}
}
.time-box.center
{
.time-box.center
{
align-items
:
center
;
align-items
:
center
;
...
@@ -225,15 +226,29 @@
...
@@ -225,15 +226,29 @@
font-size
:
14px
;
font-size
:
14px
;
}
}
.right-form-list
{
.right-form-list
{
display
:
flex
;
flex-direction
:
column
;
padding
:
20px
0
;
padding
:
20px
0
;
}
}
.right-list
{
.right-list
{
display
:
flex
;
display
:
flex
;
flex-direction
:
row
;
justify-content
:
space-between
;
justify-content
:
space-between
;
align-items
:
center
;
align-items
:
center
;
margin-bottom
:
6px
;
margin-bottom
:
6px
;
}
}
.right-list-left
{
flex
:
1
;
display
:
flex
;
flex-wrap
:
wrap
;
}
.leftText
{
width
:
150px
;
text-overflow
:
ellipsis
;
overflow
:
hidden
;
}
.right-list-right
{
.right-list-right
{
flex-shrink
:
0
;
font-size
:
13px
;
font-size
:
13px
;
color
:
#181C32
;
color
:
#181C32
;
}
}
...
@@ -338,7 +353,7 @@
...
@@ -338,7 +353,7 @@
<el-tag
class=
"time-box-width"
:type=
"x.checked?'':'info'"
style=
"margin-right: 10px;cursor: pointer;"
<el-tag
class=
"time-box-width"
:type=
"x.checked?'':'info'"
style=
"margin-right: 10px;cursor: pointer;"
@
click=
"msg.OrderId?changeDetailListHandler(x,4,msg.OrderId):changeDetailListHandler(x,4,msg.OrderId)"
>
@
click=
"msg.OrderId?changeDetailListHandler(x,4,msg.OrderId):changeDetailListHandler(x,4,msg.OrderId)"
>
<a>
{{
x
.
Address
}}
</a>
<a>
{{
x
.
Address
}}
</a>
<span>
{{
x
.
Range
}}
k
m范围
</span>
<span>
{{
x
.
Range
}}
m范围
</span>
</el-tag>
</el-tag>
</
template
>
</
template
>
</div>
</div>
...
@@ -537,8 +552,8 @@
...
@@ -537,8 +552,8 @@
<
template
v-if=
"isCheck"
>
<
template
v-if=
"isCheck"
>
<template
v-for=
"x in types"
>
<template
v-for=
"x in types"
>
<div
class=
"right-list"
v-if=
"x.checked"
>
<div
class=
"right-list"
v-if=
"x.checked"
>
<div>
<div
class=
"right-list-left"
>
<el-tag
size=
"mini"
type=
"danger"
>
{{
x
.
CarName
}}
</el-tag>
<el-tag
class=
"leftText"
size=
"mini"
type=
"danger"
>
{{
x
.
CarName
}}
</el-tag>
</div>
</div>
<div
class=
"right-list-right"
>
<div
class=
"right-list-right"
>
{{
x
.
B2BPrice
.
toFixed
(
2
)
}}
x
{{
x
.
num
}}
辆
{{
x
.
B2BPrice
.
toFixed
(
2
)
}}
x
{{
x
.
num
}}
辆
...
...
src/components/busManagement/BookAcar/components/Details.vue
View file @
052415b7
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
<div
class=
"Img-right-box"
v-if=
"images.length>2"
>
<div
class=
"Img-right-box"
v-if=
"images.length>2"
>
<div
class=
"Img-right-num"
v-if=
"images.length>3"
@
click=
"showImageHandler"
>
<div
class=
"Img-right-num"
v-if=
"images.length>3"
@
click=
"showImageHandler"
>
<span
class=
"fz20 text-weight-bold"
>
+
</span>
<span
class=
"fz20 text-weight-bold"
>
+
</span>
<span
class=
"text-h5 text-weight-bold"
>
{{
t
.
PicPathList
.
length
-
3
}}
</span>
<span
class=
"text-h5 text-weight-bold"
>
{{
images
.
length
-
3
}}
</span>
</div>
</div>
<el-image
<el-image
style=
"width: 100%; height: 100%"
style=
"width: 100%; height: 100%"
...
...
src/components/busManagement/BookAcar/list.vue
View file @
052415b7
...
@@ -351,7 +351,7 @@
...
@@ -351,7 +351,7 @@
},
},
// 详情
// 详情
showCardHandler
(
x
){
showCardHandler
(
x
){
this
.
detailsObj
=
x
this
.
detailsObj
=
JSON
.
parse
(
JSON
.
stringify
(
x
))
this
.
showDetails
=
true
this
.
showDetails
=
true
},
},
getAirportList
()
{
getAirportList
()
{
...
...
src/components/public/echoMap.vue
View file @
052415b7
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
:center=
"center"
:zoom=
"zoom"
:scroll-wheel-zoom=
"true"
:center=
"center"
:zoom=
"zoom"
:scroll-wheel-zoom=
"true"
@
click=
"getClickInfo"
@
moving=
"syncCenterAndZoom"
@
moveend=
"syncCenterAndZoom"
@
zoomend=
"syncCenterAndZoom"
>
@
click=
"getClickInfo"
@
moving=
"syncCenterAndZoom"
@
moveend=
"syncCenterAndZoom"
@
zoomend=
"syncCenterAndZoom"
>
<bm-view
style=
"width: 100%; height:300px;"
></bm-view>
<bm-view
style=
"width: 100%; height:300px;"
></bm-view>
<bm-marker
:position=
"
{lng: center.lng, lat: center.lat}
"
<bm-marker
:position=
"
center
"
:dragging=
"true"
:dragging=
"true"
animation=
"BMAP_ANIMATION_BOUNCE"
>
animation=
"BMAP_ANIMATION_BOUNCE"
>
<bm-label
v-if=
"radius>0"
content=
"接送点范围"
:position=
"center"
:labelStyle=
"
{color: 'red', fontSize : '16px','border':'0px','margin-top':'20px'}" title="Hover me"/>
<bm-label
v-if=
"radius>0"
content=
"接送点范围"
:position=
"center"
:labelStyle=
"
{color: 'red', fontSize : '16px','border':'0px','margin-top':'20px'}" title="Hover me"/>
...
...
src/components/public/leftNav.vue
View file @
052415b7
...
@@ -214,7 +214,7 @@
...
@@ -214,7 +214,7 @@
// http://testb2b.oytour.com
// http://testb2b.oytour.com
// http://www.oytour.com
// http://www.oytour.com
// window.open("http://testb2b.oytour.com/#/"+ pageName +"?uid="+encodeURIComponent(this.EnCodeWord), "_blank");
// window.open("http://testb2b.oytour.com/#/"+ pageName +"?uid="+encodeURIComponent(this.EnCodeWord), "_blank");
window
.
open
(
"http://
www
.oytour.com/#/"
+
pageName
+
"?uid="
+
encodeURIComponent
(
this
.
EnCodeWord
),
"_blank"
);
window
.
open
(
"http://
t
.oytour.com/#/"
+
pageName
+
"?uid="
+
encodeURIComponent
(
this
.
EnCodeWord
),
"_blank"
);
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
}
}
...
...
src/components/scenicSpot/Singleticket/components/OrderDetails.vue
View file @
052415b7
...
@@ -63,7 +63,7 @@
...
@@ -63,7 +63,7 @@
<div
class=
"Img-right-box"
v-if=
"images.length>2"
>
<div
class=
"Img-right-box"
v-if=
"images.length>2"
>
<div
class=
"Img-right-num"
v-if=
"images.length>3"
@
click=
"showImageHandler"
>
<div
class=
"Img-right-num"
v-if=
"images.length>3"
@
click=
"showImageHandler"
>
<span
class=
"fz20 text-weight-bold"
>
+
</span>
<span
class=
"fz20 text-weight-bold"
>
+
</span>
<span
class=
"text-h5 text-weight-bold"
>
{{
t.PicPathList
.length - 3 }}
</span>
<span
class=
"text-h5 text-weight-bold"
>
{{
images
.length - 3 }}
</span>
</div>
</div>
<el-image
<el-image
style=
"width: 100%; height: 100%"
style=
"width: 100%; height: 100%"
...
...
src/components/scenicSpot/reservation/OrderList.vue
View file @
052415b7
...
@@ -616,7 +616,7 @@
...
@@ -616,7 +616,7 @@
</el-table>
</el-table>
<div
class=
"row justify-sb mt mb20"
>
<div
class=
"row justify-sb mt mb20"
>
<div
class=
"column px15 bjFFF3E0 radius5 flex-g pa relative"
>
<div
class=
"column px15 bjFFF3E0 radius5 flex-g pa relative"
style=
"width: 300px;"
>
<div
class=
"fz12 row justify-sb"
v-if=
"item.MailingState != 4"
>
<div
class=
"fz12 row justify-sb"
v-if=
"item.MailingState != 4"
>
<span>
{{ item.MailingState > 1 ? '收货地址:' : '自取地址:' }}
</span>
<span>
{{ item.MailingState > 1 ? '收货地址:' : '自取地址:' }}
</span>
<div
:class=
"{ 'cF1416C': item.MailingState == 2, 'c02C854': item.MailingState == 3 }"
>
<div
:class=
"{ 'cF1416C': item.MailingState == 2, 'c02C854': item.MailingState == 3 }"
>
...
...
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