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
8d190f77
Commit
8d190f77
authored
Mar 06, 2025
by
罗超
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'B2C' of
http://gitlab.oytour.com/zk123/jz_travel
into B2C
parents
5f3867ff
8857e049
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
flightDetail.vue
pages/airTicket/flightDetail.vue
+1
-2
jz_Reserve.vue
pages/jiuzhai/jz_Reserve.vue
+1
-1
No files found.
pages/airTicket/flightDetail.vue
View file @
8d190f77
...
@@ -331,7 +331,6 @@
...
@@ -331,7 +331,6 @@
created
()
{
created
()
{
this
.
mainColor
=
this
.
$uiConfig
.
mainColor
this
.
mainColor
=
this
.
$uiConfig
.
mainColor
this
.
customer
=
uni
.
getStorageSync
(
"b2b_user"
);
this
.
customer
=
uni
.
getStorageSync
(
"b2b_user"
);
console
.
log
(
this
.
customer
,
'----'
)
this
.
getUserCouponList
()
this
.
getUserCouponList
()
// #ifdef MP-DI
// #ifdef MP-DI
let
employeeId
=
this
.
customer
.
salesBaseInfo
&&
this
.
customer
.
salesBaseInfo
.
employeeId
?
this
.
customer
.
salesBaseInfo
.
employeeId
:
0
let
employeeId
=
this
.
customer
.
salesBaseInfo
&&
this
.
customer
.
salesBaseInfo
.
employeeId
?
this
.
customer
.
salesBaseInfo
.
employeeId
:
0
...
@@ -523,7 +522,7 @@
...
@@ -523,7 +522,7 @@
var
CustomerId
=
0
var
CustomerId
=
0
//#ifdef MP-DI
//#ifdef MP-DI
PriceNum
=
this
.
flight
.
B2CPrice
PriceNum
=
this
.
flight
.
B2CPrice
DirectCustomerId
=
this
.
c
reateBy
.
CreateBy
DirectCustomerId
=
this
.
c
ustomer
.
customerId
//#endif
//#endif
//#ifdef MP-AG
//#ifdef MP-AG
PriceNum
=
this
.
flight
.
B2CPrice
PriceNum
=
this
.
flight
.
B2CPrice
...
...
pages/jiuzhai/jz_Reserve.vue
View file @
8d190f77
...
@@ -1097,7 +1097,7 @@
...
@@ -1097,7 +1097,7 @@
var
DirectCustomerId
=
0
var
DirectCustomerId
=
0
// #ifdef MP-DI
// #ifdef MP-DI
price
=
this
.
currentPriceInfo
.
b2CPrice
;
price
=
this
.
currentPriceInfo
.
b2CPrice
;
DirectCustomerId
=
this
.
CreateBy
DirectCustomerId
=
this
.
customer
.
customerId
// #endif
// #endif
// #ifdef MP-AG
// #ifdef MP-AG
price
=
this
.
currentPriceInfo
.
b2BPrice
;
price
=
this
.
currentPriceInfo
.
b2BPrice
;
...
...
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