李志伟 3 years ago
parent
commit
3617c488e4

+ 1
- 4
src/components/CompoentsOrder/complete/index.jsx View File

@@ -1,11 +1,8 @@
1 1
 import React, { useState, useEffect } from "react";
2
-import Taro, { useDidShow, AtSwipeAction } from "@tarojs/taro";
2
+import Taro, { useDidShow } from "@tarojs/taro";
3 3
 import { getOrderSub, deleteOrder } from "@/services/payOrder";
4
-import { View } from "@tarojs/components";
5 4
 import NoData from '@/components/NoData'
6 5
 import SpinBox from "@/components/Spin/SpinBox";
7
-
8
-import ico_delete from '../../../assets/icons/ProCard/ico_delete.png'
9 6
 import AlreadyUsed from "../AlreadyUsed";
10 7
 import OrderCard from '../OrderCard'
11 8
 import "./style.less";

+ 8
- 6
src/hotel/components/shareRoom/ShareRoom.jsx View File

@@ -1,10 +1,9 @@
1
-import React from 'react'
2
-import Popup from '@/components/Popup'
1
+import React, { useState } from 'react'
3 2
 import Taro from '@tarojs/taro'
4 3
 import { Input, Button, View, Picker, Label } from '@tarojs/components'
4
+import Popup from '@/components/Popup'
5 5
 import { shareRoom } from '@/services/landlord'
6 6
 import './ShareRoom.less'
7
-import { useState } from 'react'
8 7
 
9 8
 
10 9
 export default (props) => {
@@ -12,6 +11,8 @@ export default (props) => {
12 11
   const [startDate, setStartDate] = useState('')
13 12
   const [endDate, setEndDate] = useState('')
14 13
   const [roomNum, setRoomNum] = useState('')
14
+  const [loading, setLoading] = useState(false)
15
+
15 16
   const handelStartDate = (e) => {
16 17
     setStartDate(e.detail.value)
17 18
   }
@@ -19,10 +20,11 @@ export default (props) => {
19 20
     setEndDate(e.detail.value)
20 21
   }
21 22
   const handelShare = () => {
23
+    setLoading(true)
22 24
     var myDate = new Date();
23 25
     shareRoom({
24 26
       hotelId: room.hotelId,
25
-      personNum: roomNum == '' ? 0 : roomNum, 
27
+      personNum: roomNum == '' ? 0 : roomNum,
26 28
       roomId: room.roomId,
27 29
       startDate: startDate == '' ? myDate.toLocaleDateString() : startDate,
28 30
       endDate: endDate == '' ? myDate.toLocaleDateString() : endDate
@@ -31,8 +33,8 @@ export default (props) => {
31 33
       setStartDate('')
32 34
       setEndDate('')
33 35
       setRoomNum()
36
+      setLoading(false)
34 37
     })
35
-
36 38
   }
37 39
   return (
38 40
     <Popup show={showCutover} onClose={onClose}>
@@ -58,7 +60,7 @@ export default (props) => {
58 60
         </View>
59 61
         <View>
60 62
           <Button className='cancel' onClick={onClose}>取消</Button>
61
-          <Button className='btn' onClick={handelShare}>分享</Button>
63
+          <Button className='btn' onClick={handelShare} loading={loading} disabled={loading}>分享</Button>
62 64
         </View>
63 65
       </View>
64 66
     </Popup>

+ 8
- 2
src/hotel/pages/landlord/roomOrder/roomOrder.jsx View File

@@ -3,6 +3,7 @@ import React, { useState, useEffect, useRef } from 'react'
3 3
 import CustomNav from '@/components/CustomNav'
4 4
 import Taro from '@tarojs/taro'
5 5
 import { useModel } from '@/store'
6
+import SpinBox from "@/components/Spin/SpinBox";
6 7
 import copy from '@/assets/icons/landlord/copy.png'
7 8
 import { Input, Button, View, Picker, Label, Image } from '@tarojs/components'
8 9
 import { getRoomOrderList,getHotelDetail } from '@/services/landlord'
@@ -13,11 +14,14 @@ export default withLayout((props) => {
13 14
   const { hotelId, roomId, roomName } = props.router.params
14 15
   const [detail, setDetail] = useState([])
15 16
   const { setHotel } = useModel('hotel')
17
+  const [loading, setLoading] = useState(false)
16 18
 
17 19
   useEffect(() => {
20
+    setLoading(true)
18 21
     if (roomId) {
19 22
       getRoomOrderList({ roomId: roomId }).then((res) => {
20 23
         setDetail(res.records || [])
24
+        setLoading(false)
21 25
       })
22 26
     }
23 27
   }, [roomId])
@@ -35,7 +39,7 @@ export default withLayout((props) => {
35 39
       data: val,
36 40
       success: e => {
37 41
         Taro.showToast({
38
-          title: '入住人姓名已复制',
42
+          title: '姓名已复制',
39 43
           icon: 'success',
40 44
           duration: 2000,
41 45
         })
@@ -48,7 +52,7 @@ export default withLayout((props) => {
48 52
       data: val,
49 53
       success: e => {
50 54
         Taro.showToast({
51
-          title: '入住人电话已复制',
55
+          title: '电话已复制',
52 56
           icon: 'success',
53 57
           duration: 2000,
54 58
         })
@@ -61,6 +65,7 @@ export default withLayout((props) => {
61 65
       <view className='index-navbar'>
62 66
         <CustomNav title={roomName ? decodeURIComponent(roomName) : '房间名'} />
63 67
       </view>
68
+      <SpinBox loading={loading}>
64 69
       <scroll-view scrollY style={{ height: 'calc(100vh - 65px)' }}>
65 70
 
66 71
         {
@@ -89,6 +94,7 @@ export default withLayout((props) => {
89 94
         }
90 95
 
91 96
       </scroll-view>
97
+    </SpinBox>
92 98
     </View>
93 99
   )
94 100
 })

+ 1
- 1
src/pages/MineUserAll/ContactMe/index.jsx View File

@@ -58,7 +58,7 @@ export default withLayout((props) => {
58 58
           <Image mode='aspectFit' src='https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20210918145337.png' />
59 59
         </view>
60 60
         <view className='button-info'>
61
-          <Button className='button-box' onClick={submit} loading={loading}  >提交</Button>
61
+          <Button className='button-box' onClick={submit} loading={loading}  disabled={loading} >提交</Button>
62 62
           <Button className='button-box-Cancel' onClick={back} >取消</Button>
63 63
         </view>
64 64
       </view>