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
b6ddd8cb
Commit
b6ddd8cb
authored
May 12, 2025
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化酒店下单服务人员选项
parent
558f3ccf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
7 deletions
+31
-7
orders.vue
pages/AggregateOrders/components/orders.vue
+1
-1
hotelInfor.vue
pages/hotel/components/hotelInfor.vue
+5
-5
hotelRoom.vue
pages/hotel/components/hotelRoom.vue
+25
-1
No files found.
pages/AggregateOrders/components/orders.vue
View file @
b6ddd8cb
...
@@ -141,7 +141,7 @@
...
@@ -141,7 +141,7 @@
const
diff
=
x
.
orderTime
+
5
*
60
*
1000
-
now
;
// 5分钟倒计时
const
diff
=
x
.
orderTime
+
5
*
60
*
1000
-
now
;
// 5分钟倒计时
let
remainingSeconds
=
Math
.
max
(
diff
,
0
);
// 确保不出现负数
let
remainingSeconds
=
Math
.
max
(
diff
,
0
);
// 确保不出现负数
x
.
remainingSeconds
=
Math
.
floor
(
remainingSeconds
/
1000
)
x
.
remainingSeconds
=
Math
.
floor
(
remainingSeconds
/
1000
)
console
.
log
(
"=========3333
"
,
x
.
remainingSeconds
)
// console.log("支付倒计时
",x.remainingSeconds)
if
(
x
.
remainingSeconds
)
this
.
initCountdown
(
x
)
if
(
x
.
remainingSeconds
)
this
.
initCountdown
(
x
)
}
}
});
});
...
...
pages/hotel/components/hotelInfor.vue
View file @
b6ddd8cb
...
@@ -25,12 +25,12 @@
...
@@ -25,12 +25,12 @@
</view>
</view>
<view
class=
"hotelInforCB"
>
<view
class=
"hotelInforCB"
>
联系电话:
联系电话:
<text>
<text>
{{
dataList
.
telephone
}}
{{
dataList
.
telephone
}}
<img
</text>
class=
"hotelInforPhone"
<img
v-if=
"dataList.telephone&&dataList.telephone.length
<12
"
class=
"hotelInforPhone"
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638763341462574374.png"
/>
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638763341462574374.png"
/>
</text>
</view>
</view>
<view
class=
"row hotelInforCAddress"
>
<view
class=
"row hotelInforCAddress"
>
<view>
详细地址:
</view>
<view>
详细地址:
</view>
...
...
pages/hotel/components/hotelRoom.vue
View file @
b6ddd8cb
...
@@ -130,6 +130,28 @@
...
@@ -130,6 +130,28 @@
</view>
</view>
</view>
</view>
</view>
</view>
<!-- #ifdef MP-AG -->
<view
class=
"line-flex row-sbas-n col"
style=
"padding: 30rpx; background: #fff;margin-top: 20rpx;border-radius: 18rpx;"
v-if=
"createBy==0&&SaleList&&SaleList.length>1"
@
click=
"showSalePreviwe=true,showSaleType=1"
>
<text
style=
"font-size: 28rpx; color: #111; font-weight: 500"
>
服务人员
</text>
<text
style=
"
font-size: 22rpx;
color: #999;
margin-left: 30rpx;
flex: 1;
"
></text>
<view
class=
"SaleNameTetx row"
>
<view>
<text
v-if=
"msg.SaleName"
>
{{ msg.SaleName }}
</text>
<text
v-else
style=
"color: #999"
>
请选择
</text>
</view>
<u-icon
name=
"arrow-down"
size=
"24"
></u-icon>
</view>
</view>
<!-- #endif -->
</view>
</view>
<u-popup
v-model=
"showSalePreviwe"
mode=
"bottom"
border-radius=
"50"
length=
"60%"
:safe-area-inset-bottom=
"true"
>
<u-popup
v-model=
"showSalePreviwe"
mode=
"bottom"
border-radius=
"50"
length=
"60%"
:safe-area-inset-bottom=
"true"
>
<orderService
:msg=
"msg"
:list=
"SaleList"
@
goReserce=
"goReserce"
></orderService>
<orderService
:msg=
"msg"
:list=
"SaleList"
@
goReserce=
"goReserce"
></orderService>
...
@@ -171,6 +193,7 @@
...
@@ -171,6 +193,7 @@
createBy
:
0
,
createBy
:
0
,
showSalePreviwe
:
false
,
showSalePreviwe
:
false
,
subItem
:
null
,
subItem
:
null
,
showSaleType
:
0
,
};
};
},
},
watch
:
{
watch
:
{
...
@@ -264,7 +287,7 @@
...
@@ -264,7 +287,7 @@
setTimeout
(()
=>
{
setTimeout
(()
=>
{
this
.
showSalePreviwe
=
false
this
.
showSalePreviwe
=
false
},
500
)
},
500
)
this
.
goUrl
()
if
(
!
this
.
showSaleType
)
this
.
goUrl
()
},
},
getSale
()
{
getSale
()
{
if
(
!
this
.
b2bUser
.
customerId
)
return
if
(
!
this
.
b2bUser
.
customerId
)
return
...
@@ -374,6 +397,7 @@
...
@@ -374,6 +397,7 @@
return
mealtypeName
;
return
mealtypeName
;
},
},
setOrder
(
subItem
)
{
setOrder
(
subItem
)
{
this
.
showSaleType
=
0
this
.
subItem
=
subItem
this
.
subItem
=
subItem
// #ifdef MP-AG
// #ifdef MP-AG
if
(
this
.
SaleList
&&
this
.
SaleList
.
length
>
1
&&
this
.
msg
.
SaleId
==
0
&&
this
.
createBy
==
0
)
{
if
(
this
.
SaleList
&&
this
.
SaleList
.
length
>
1
&&
this
.
msg
.
SaleId
==
0
&&
this
.
createBy
==
0
)
{
...
...
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