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
66da1f5f
Commit
66da1f5f
authored
Apr 23, 2025
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
11
parent
5e35a849
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1144 additions
and
1150 deletions
+1144
-1150
orders.vue
pages/AggregateOrders/components/orders.vue
+6
-7
order.vue
pages/hotel/order.vue
+4
-3
orderdetails.vue
pages/hotel/orderdetails.vue
+1134
-1140
No files found.
pages/AggregateOrders/components/orders.vue
View file @
66da1f5f
...
...
@@ -209,12 +209,12 @@
let
msg
=
null
// #ifdef MP-DI
console
.
log
(
item
.
goodsType
,
'==========='
)
console
.
log
(
item
.
goodsType
,
'==========='
)
msg
=
`OrderNo=
${
item
.
orderNo
}
`
if
(
item
.
goodsType
>
0
&&
item
.
goodsType
<
4
)
url
=
`jiuzhai/jz_SureOrder?`
//线路
else
if
(
item
.
goodsType
>
3
&&
item
.
goodsType
<
8
)
{
//景点门票
}
else
if
(
item
.
goodsType
>
7
&&
item
.
goodsType
<
12
)
{
//酒店住宿
url
=
`hotel/orderdetails?
`
url
=
`hotel/orderdetails?
orderId=`
+
item
.
erpOrderId
;
}
else
if
(
item
.
goodsType
>
11
&&
item
.
goodsType
<
15
)
{
//目的地用车
}
else
if
(
item
.
goodsType
==
15
)
url
=
`visa/visa_SureOrder?`
//签证
else
if
(
item
.
goodsType
==
16
)
url
=
`airTicket/airTicketOrderDetail?`
//机票
...
...
@@ -225,9 +225,8 @@
else
if
(
item
.
goodsType
==
4
)
{
//景点门票
}
else
if
(
item
.
goodsType
==
3
)
{
//酒店住宿
}
else
if
(
item
.
goodsType
==
7
)
{
//酒店住宿
url
=
`hotel/orderdetails?`
}
else
if
(
item
.
goodsType
==
9
)
{
//酒店住宿
url
=
`hotel/orderdetails?orderId=`
+
item
.
erpOrderId
;
}
else
if
(
item
.
goodsType
==
5
)
{
//目的地用车
}
else
if
(
item
.
goodsType
==
6
)
url
=
`visa/visa_SureOrder?`
//签证
else
if
(
item
.
goodsType
==
1
)
{
//机票
...
...
pages/hotel/order.vue
View file @
66da1f5f
...
...
@@ -487,7 +487,7 @@
icon
:
'none'
,
title
:
'订单创建成功'
}
)
this
.
goPayHandler
(
res
.
data
.
OrderNo
);
this
.
goPayHandler
(
res
.
data
);
}
else
{
uni
.
showToast
({
title
:
res
.
message
,
...
...
@@ -498,7 +498,8 @@
}
}
);
}
,
goPayHandler
(
OrderNo
)
{
goPayHandler
(
item
)
{
let
OrderNo
=
item
.
OrderNo
;
let
that
=
this
;
uni
.
requestPayment
({
provider
:
"wxpay"
,
...
...
@@ -529,7 +530,7 @@
}
);
setTimeout
(()
=>
{
uni
.
redirectTo
({
url
:
"/pages/hotel/orderdetails?
OrderNo="
+
OrderNo
,
url
:
"/pages/hotel/orderdetails?
orderId="
+
item
.
ErpOrderId
,
}
);
}
,
100
);
}
,
...
...
pages/hotel/orderdetails.vue
View file @
66da1f5f
This diff is collapsed.
Click to expand it.
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