Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
lumastoreapp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xieyishang
lumastoreapp
Commits
8dbba93d
Commit
8dbba93d
authored
Apr 27, 2020
by
xieyishang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sss~
parent
b4b2f831
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
6 deletions
+22
-6
pages/hotelOrder/hotelOrder.vue
pages/hotelOrder/hotelOrder.vue
+4
-4
pages/specs/specs.vue
pages/specs/specs.vue
+2
-1
pages/specsShop/specsShop.vue
pages/specsShop/specsShop.vue
+9
-1
utils/api/hotel.js
utils/api/hotel.js
+7
-0
No files found.
pages/hotelOrder/hotelOrder.vue
View file @
8dbba93d
...
...
@@ -62,7 +62,7 @@
<
!--
<view
class=
"btns iusbg isend ml-20"
v-if=
'item.order_status==1'
:data-orderid=
"item.order_id"
@
tap=
"method"
>
确认人住
</view>
--
>
<
view
class=
"btns iusbg isend ml-20"
v-if=
'item.order_status=="等待入住"'
:data-orderid=
"item.order_id"
@
tap=
"affirmIntakefun"
>
确认人住
</view
>
<!--
<navigator
url=
"/pages/myStore/HotelRefundExamine?id=11"
class=
"btns iusbg isend"
>
立即处理
</navigator>
-->
<!--
<view
class=
"ali-c"
v-if=
"tabactive==0"
>
-->
...
...
@@ -84,7 +84,7 @@
<
script
>
// import { shopHotel,complete} from "@/utils/api/shop.js";
import
empty
from
"
@/components/empty/empty.vue
"
;
import
{
hotelStatus
,
hotelOrder
,
hotelConsentRefund
,
hotelRefuseRefund
}
from
"
@/utils/api/hotel.js
"
;
import
{
hotelStatus
,
hotelOrder
,
hotelConsentRefund
,
hotelRefuseRefund
,
affirmIntake
}
from
"
@/utils/api/hotel.js
"
;
export
default
{
components
:{
...
...
@@ -136,7 +136,7 @@
}
},
//确认核销 确认入驻接口
method
(
e
){
affirmIntakefun
(
e
){
var
that
=
this
;
var
orderid
=
e
.
currentTarget
.
dataset
.
orderid
;
uni
.
showModal
({
...
...
@@ -150,7 +150,7 @@
success
:
(
res
)
=>
{
if
(
res
.
cancel
)
{
}
else
{
complete
(
orderid
).
then
(
res
=>
{
affirmIntake
({
order_id
:
orderid
}
).
then
(
res
=>
{
if
(
res
.
code
==-
2
){
uni
.
showToast
({
title
:
res
.
msg
,
...
...
pages/specs/specs.vue
View file @
8dbba93d
...
...
@@ -6,7 +6,8 @@
<view
class=
"specslist"
>
<view
class=
"specsItemdata flex ali-c jus-b"
v-for=
"(item,index) in specsList"
:key=
"index"
>
<view
class=
"flex1"
>
<view
class=
"specsname"
>
{{
TypeList
[
item
.
type_id
].
name
}}
{{
item
.
name
}}
</view>
<view
class=
"specsname"
v-if=
"TypeList[item.type_id]"
>
{{
TypeList
[
item
.
type_id
].
name
}}
{{
item
.
name
}}
</view>
<view
class=
"specsname"
v-else
>
{{
item
.
name
}}
</view>
<view
class=
"spectag twoline"
>
{{
item
.
spec_item
}}
</view>
</view>
<view
class=
"issysbtns"
>
...
...
pages/specsShop/specsShop.vue
View file @
8dbba93d
...
...
@@ -218,7 +218,15 @@
this
.
goodsSpec_goodsType
=
res
.
data
.
goodsType
;
this
.
goodsSpec_info
=
res
.
data
.
info
;
this
.
endobjdata
=
res
.
data
.
info
;
//之前的数据 默认值
let
endobjdata
=
res
.
data
.
info
;
endobjdata
=
endobjdata
.
map
((
item
,
index
)
=>
{
item
.
price
=
item
.
s_price
;
return
item
;
});
console
.
info
(
endobjdata
,
"
endobjdata
"
);
this
.
endobjdata
=
endobjdata
;
//res.data.info;//之前的数据 默认值
}
else
{
this
.
$api
.
msg
(
res
.
msg
);
}
...
...
utils/api/hotel.js
View file @
8dbba93d
...
...
@@ -76,3 +76,10 @@ export function hotelRefuseRefund(data)
}
//因为小程序和APP 都没有做酒店的退款
//酒店商家确认客户入住
export
function
affirmIntake
(
data
)
{
return
request
.
post
(
"
order/affirmIntake
"
,
data
,{
noAuth
:
false
});
}
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