Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
jz_Travel
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
zhengke
jz_Travel
Commits
3d43da31
Commit
3d43da31
authored
Jun 02, 2021
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
3956de1b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
8 deletions
+33
-8
detail.vue
pages/hotel/detail.vue
+23
-2
list.vue
pages/hotel/list.vue
+5
-1
order.vue
pages/hotel/order.vue
+2
-2
jz_LineDetail.vue
pages/jiuzhai/jz_LineDetail.vue
+3
-3
No files found.
pages/hotel/detail.vue
View file @
3d43da31
...
...
@@ -97,12 +97,12 @@
<view
class=
"date-box flex"
@
click=
"showTimePopup=true"
>
<view
class=
"date"
>
<text>
{{
startDay
}}
</text>
<text
class=
"date-week"
>
{{
getWeek
(
roomMsg
.
StartDate
)
}}
</text>
<text
class=
"date-week"
>
{{
dayObj
.
startWeek
}}
</text>
</view>
<view
class=
"hr-line"
></view>
<view
class=
"date"
>
<text>
{{
endDay
}}
</text>
<text
class=
"date-week"
>
{{
getWeek
(
roomMsg
.
EndDate
)
}}
</text>
<text
class=
"date-week"
>
{{
dayObj
.
endWeek
}}
</text>
</view>
<view
class=
"ver-line"
></view>
<view
class=
"date"
>
...
...
@@ -303,6 +303,27 @@
this
.
endDay
=
tempDay
.
endDay
;
this
.
day
=
tempDay
.
day
;
this
.
dayObj
=
tempDay
;
}
else
{
let
d1
=
new
Date
();
let
d
=
new
Date
();
let
d2
=
new
Date
(
d
.
setDate
(
d
.
getDate
()
+
1
))
let
startWeek
=
"周"
+
"日一二三四五六"
.
charAt
(
new
Date
().
getDay
());
let
endWeek
=
"周"
+
"日一二三四五六"
.
charAt
(
new
Date
().
getDay
()
+
1
);
var
obj
=
{
start
:
`
${
d1
.
getFullYear
()}
-
${
d1
.
getMonth
()
+
1
}
-
${
d1
.
getDate
()}
`
,
end
:
`
${
d2
.
getFullYear
()}
-
${
d2
.
getMonth
()
+
1
}
-
${
d2
.
getDate
()}
`
,
startDay
:
`
${
d1
.
getMonth
()
+
1
}
-
${
d1
.
getDate
()}
`
,
endDay
:
`
${
d2
.
getMonth
()
+
1
}
-
${
d2
.
getDate
()}
`
,
day
:
1
,
startWeek
:
startWeek
,
endWeek
:
endWeek
}
this
.
roomMsg
.
StartDate
=
obj
.
start
;
this
.
roomMsg
.
EndDate
=
obj
.
end
;
this
.
startDay
=
obj
.
startDay
;
this
.
endDay
=
obj
.
endDay
;
this
.
day
=
obj
.
day
;
this
.
dayObj
=
obj
;
}
if
(
this
.
id
>
0
)
{
this
.
getHotelDetail
(
this
.
id
);
...
...
pages/hotel/list.vue
View file @
3d43da31
...
...
@@ -178,12 +178,16 @@
let
d1
=
new
Date
();
let
d
=
new
Date
();
let
d2
=
new
Date
(
d
.
setDate
(
d
.
getDate
()
+
1
))
let
startWeek
=
"周"
+
"日一二三四五六"
.
charAt
(
new
Date
().
getDay
());
let
endWeek
=
"周"
+
"日一二三四五六"
.
charAt
(
new
Date
().
getDay
()
+
1
);
var
obj
=
{
start
:
`
${
d1
.
getFullYear
()}
-
${
d1
.
getMonth
()
+
1
}
-
${
d1
.
getDate
()}
`
,
end
:
`
${
d2
.
getFullYear
()}
-
${
d2
.
getMonth
()
+
1
}
-
${
d2
.
getDate
()}
`
,
startDay
:
`
${
d1
.
getMonth
()
+
1
}
-
${
d1
.
getDate
()}
`
,
endDay
:
`
${
d2
.
getMonth
()
+
1
}
-
${
d2
.
getDate
()}
`
,
day
:
1
day
:
1
,
startWeek
:
startWeek
,
endWeek
:
endWeek
}
this
.
dayObj
=
obj
;
uni
.
setStorage
({
...
...
pages/hotel/order.vue
View file @
3d43da31
...
...
@@ -3,12 +3,12 @@
<view
class=
"hotel-order"
>
<view
class=
"o-head"
>
<view
class=
"o-timer flex"
>
<view
class=
"time-item"
>
{{
getDate
(
dayObj
.
start
)
}}
{{
getWeek
(
dayObj
.
end
)
}}
</view>
<view
class=
"time-item"
>
{{
getDate
(
dayObj
.
start
)
}}
{{
dayObj
.
startWeek
}}
</view>
<view
class=
"time-split"
>
<view>
{{
dayObj
.
day
}}
晚
</view>
<image
style=
"width: 66rpx;"
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622098352000_930.png"
mode=
"widthFix"
></image>
</view>
<view
class=
"time-item"
>
{{
getDate
(
dayObj
.
end
)
}}
{{
getWeek
(
dayObj
.
end
)
}}
</view>
<view
class=
"time-item"
>
{{
getDate
(
dayObj
.
end
)
}}
{{
dayObj
.
endWeek
}}
</view>
</view>
<view
class=
"room-name"
>
{{
HotelInfo
.
HotelName
}}
</view>
<view
class=
"room-remark"
>
{{
RoomInfo
.
BreakfastTypeStr
}}
|
{{
RoomInfo
.
BedTypeStr
}}
|
{{
RoomInfo
.
RoomSize
}}
㎡ |
{{
RoomInfo
.
HasWindowStr
}}
</view>
...
...
pages/jiuzhai/jz_LineDetail.vue
View file @
3d43da31
...
...
@@ -35,7 +35,7 @@
</view>
<view
class=
"jz_TopPrice"
>
<view
class=
"jz_LineTitle"
>
<text
class=
"jz_renmin"
>
¥
</text><text
class=
"jz_B2bPrice"
>
{{
dataList
.
currentPriceInfo
.
b2B
Price
}}
</text>
<text
class=
"jz_renmin"
>
¥
</text><text
class=
"jz_B2bPrice"
>
{{
$utils
.
getretailer
()
==
true
?
dataList
.
currentPriceInfo
.
b2BPrice
:
dataList
.
currentPriceInfo
.
b2C
Price
}}
</text>
<text
style=
"color:#999999;font-size:24rpx;font-weight: 400;"
>
/人起
</text>
<text
style=
"color:#999999;font-size:24rpx;font-weight: 400;margin-left: 30rpx;"
>
2728人出游
</text>
</view>
...
...
@@ -81,7 +81,7 @@
<text>
余
</text>
<text
style=
"font-size: 28rpx;font-weight: 600;"
>
{{
item
.
remainNum
}}
</text>
</view>
<view
style=
"color:#FF3166;font-size:26rpx;"
>
¥
{{
item
.
b2B
Price
}}
</view>
<view
style=
"color:#FF3166;font-size:26rpx;"
>
¥
{{
$utils
.
getretailer
()
==
true
?
item
.
b2BPrice
:
item
.
b2C
Price
}}
</view>
</view>
</
template
>
<view
class=
"jz_StartList"
:class=
"{'active':delMsg.tcid==customerDate.tcid}"
@
click=
"openDate"
>
...
...
@@ -266,7 +266,7 @@
<view
class=
"jz_OrderDiv"
>
<view
style=
"color:#FF3166;font-weight:bold;"
>
<text
style=
"font-size:22rpx;"
>
¥
</text>
<text
style=
"font-size:40rpx;"
>
{{
dataList.currentPriceInfo.b2B
Price}}
</text>
<text
style=
"font-size:40rpx;"
>
{{
$utils.getretailer()==true? dataList.currentPriceInfo.b2BPrice:dataList.currentPriceInfo.b2C
Price}}
</text>
<text
style=
"font-size:22rpx;"
>
/起
</text>
</view>
<view
style=
"display:flex;align-items: center;"
>
...
...
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