Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
bigwood
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
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
罗超
bigwood
Commits
33381cff
Commit
33381cff
authored
Dec 19, 2022
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
e8c481bd
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
184 additions
and
57 deletions
+184
-57
scattered.ts
src/api/scattered.ts
+9
-0
OrderList.vue
src/components/hotel/order/list/OrderList.vue
+0
-1
dictionary.ts
src/config/dictionary.ts
+4
-0
index.ts
src/i18n/zh-TW/index.ts
+1
-0
HotelSure.vue
src/pages/scattered/HotelSure.vue
+162
-54
hotelDetails.vue
src/pages/scattered/hotelDetails.vue
+0
-1
hotelRate.ts
src/utils/hotelRate.ts
+1
-1
validate.ts
src/utils/validate.ts
+7
-0
No files found.
src/api/scattered.ts
View file @
33381cff
import
{
HttpResponse
}
from
'../@types'
import
{
HttpResponse
}
from
'../@types'
import
request
from
'./request'
import
request
from
'./request'
import
requestJava
from
'./requestJava'
class
HotelService
{
class
HotelService
{
//兑换优惠券
static
async
updateUseCouponBycod
(
param
:
any
):
Promise
<
HttpResponse
>
{
return
requestJava
(
'/api/b2b/user/updateUseCouponBycod'
,
param
)
}
//获取优惠券
static
async
getUserCanUseCouponList
(
param
:
any
):
Promise
<
HttpResponse
>
{
return
requestJava
(
'/api/b2b/user/getUserCanUseCouponList'
,
param
)
}
//获取相似数据
//获取相似数据
static
async
GetHotelHotelBooking
(
param
:
any
):
Promise
<
HttpResponse
>
{
static
async
GetHotelHotelBooking
(
param
:
any
):
Promise
<
HttpResponse
>
{
return
request
(
'dmc_post_Get_GetJAPAN_HotelBooking'
,
param
)
return
request
(
'dmc_post_Get_GetJAPAN_HotelBooking'
,
param
)
...
...
src/components/hotel/order/list/OrderList.vue
View file @
33381cff
...
@@ -409,7 +409,6 @@ export default defineComponent({
...
@@ -409,7 +409,6 @@ export default defineComponent({
methods
.
initOrders
()
methods
.
initOrders
()
},
},
modify
(
id
:
number
)
{
modify
(
id
:
number
)
{
//location.href =
currentRouter
.
push
(
'/hotel/modify/'
+
id
)
currentRouter
.
push
(
'/hotel/modify/'
+
id
)
},
},
handleFinish
(
options
:
{
file
:
UploadFileInfo
;
event
?:
ProgressEvent
})
{
handleFinish
(
options
:
{
file
:
UploadFileInfo
;
event
?:
ProgressEvent
})
{
...
...
src/config/dictionary.ts
View file @
33381cff
...
@@ -68,6 +68,10 @@ class DirtionmaryHelper {
...
@@ -68,6 +68,10 @@ class DirtionmaryHelper {
* 散客预约酒店缓存客房下单是详情数据
* 散客预约酒店缓存客房下单是详情数据
*/
*/
static
readonly
SCATTERED_HOTEL_ORDER
=
"scatteredhotelorder"
static
readonly
SCATTERED_HOTEL_ORDER
=
"scatteredhotelorder"
/**
* 散客预约酒店缓存客房下单成功的详情数据
*/
static
readonly
SCATTERED_HOTEL_ORDER_MSG
=
"scatteredhotelordermsg"
/**
/**
* 用户是否在中国
* 用户是否在中国
...
...
src/i18n/zh-TW/index.ts
View file @
33381cff
...
@@ -755,6 +755,7 @@ export default {
...
@@ -755,6 +755,7 @@ export default {
inputlabel6
:
''
,
inputlabel6
:
''
,
inputlabel7
:
''
,
inputlabel7
:
''
,
inputlabel8
:
''
,
inputlabel8
:
''
,
Errorruzhushu
:
'入住人数与总入住数不匹配'
}
}
}
}
...
...
src/pages/scattered/HotelSure.vue
View file @
33381cff
This diff is collapsed.
Click to expand it.
src/pages/scattered/hotelDetails.vue
View file @
33381cff
...
@@ -538,7 +538,6 @@
...
@@ -538,7 +538,6 @@
showImageHandler
(
url
:
string
)
{
showImageHandler
(
url
:
string
)
{
data
.
currentImage
=
url
data
.
currentImage
=
url
data
.
showImagePriview
=
true
data
.
showImagePriview
=
true
console
.
log
(
'==='
)
}
}
}
}
...
...
src/utils/hotelRate.ts
View file @
33381cff
...
@@ -143,7 +143,7 @@ const useHotel={
...
@@ -143,7 +143,7 @@ const useHotel={
}
}
return
rates
return
rates
},
},
// 散客下单周一至周
天
// 散客下单周一至周
日
getHotelWeek
():
HotelArea
[]{
getHotelWeek
():
HotelArea
[]{
let
rates
=
[]
as
HotelArea
[]
let
rates
=
[]
as
HotelArea
[]
for
(
let
i
=
1
;
i
<
8
;
i
++
){
for
(
let
i
=
1
;
i
<
8
;
i
++
){
...
...
src/utils/validate.ts
View file @
33381cff
...
@@ -32,6 +32,13 @@ export function isEmail(account:string):boolean {
...
@@ -32,6 +32,13 @@ export function isEmail(account:string):boolean {
let
regexp
=
new
RegExp
(
'/^(([^<>()
\
[
\
]
\\
.,;:
\
[email protected]"]+(
\
.[^<>()
\
[
\
]
\\
.,;:
\
[email protected]"]+)*)|(".+"))@((
\
[[0-9]{1,3}
\
.[0-9]{1,3}
\
.[0-9]{1,3}
\
.[0-9]{1,3}])|(([a-zA-Z
\
-0-9]+
\
.)+[a-zA-Z]{2,}))$/'
);
let
regexp
=
new
RegExp
(
'/^(([^<>()
\
[
\
]
\\
.,;:
\
[email protected]"]+(
\
.[^<>()
\
[
\
]
\\
.,;:
\
[email protected]"]+)*)|(".+"))@((
\
[[0-9]{1,3}
\
.[0-9]{1,3}
\
.[0-9]{1,3}
\
.[0-9]{1,3}])|(([a-zA-Z
\
-0-9]+
\
.)+[a-zA-Z]{2,}))$/'
);
serchfind
=
regexp
.
test
(
account
);
serchfind
=
regexp
.
test
(
account
);
return
serchfind
return
serchfind
}
export
function
isPhone
(
account
:
string
):
boolean
{
let
serchfind
:
boolean
;
let
regexp
=
new
RegExp
(
'/^((13|14|15|16|17|18|19)[0-9]{1}
\
d{8})$/'
);
serchfind
=
regexp
.
test
(
account
);
return
serchfind
}
}
/** 比对数组是否相同 */
/** 比对数组是否相同 */
...
...
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