李志伟 3 年之前
父節點
當前提交
3617c488e4

+ 1
- 4
src/components/CompoentsOrder/complete/index.jsx 查看文件

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

+ 8
- 6
src/hotel/components/shareRoom/ShareRoom.jsx 查看文件

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

+ 8
- 2
src/hotel/pages/landlord/roomOrder/roomOrder.jsx 查看文件

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

+ 1
- 1
src/pages/MineUserAll/ContactMe/index.jsx 查看文件

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' />
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
         </view>
59
         </view>
60
         <view className='button-info'>
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
           <Button className='button-box-Cancel' onClick={back} >取消</Button>
62
           <Button className='button-box-Cancel' onClick={back} >取消</Button>
63
         </view>
63
         </view>
64
       </view>
64
       </view>