李志伟 3 년 전
부모
커밋
a350fbaabb
4개의 변경된 파일17개의 추가작업 그리고 11개의 파일을 삭제
  1. 1
    1
      src/components/List/index.jsx
  2. 8
    3
      src/hotel/components/shareRoom/ShareRoom.jsx
  3. 4
    7
      src/pages/RoomOrder/index.jsx
  4. 4
    0
      src/pages/index/tabs/Guide.jsx

+ 1
- 1
src/components/List/index.jsx 파일 보기

@@ -127,7 +127,7 @@ export default React.forwardRef((props, ref) => {
127 127
   useEffect(() => {
128 128
     Taro.nextTick(() => {
129 129
       Taro.createSelectorQuery().select(`.${uqCls}`).node(function (res) {
130
-        contextRef.current = res.node
130
+        contextRef.current = res?.node
131 131
       }).exec()
132 132
     })
133 133
   }, [])

+ 8
- 3
src/hotel/components/shareRoom/ShareRoom.jsx 파일 보기

@@ -19,15 +19,20 @@ export default (props) => {
19 19
   const handelEndDate = (e) => {
20 20
     setEndDate(e.detail.value)
21 21
   }
22
+  const nowDate=()=>{
23
+    var myDate = new Date();
24
+    let mouth=myDate.getUTCMonth()<9?'0'+(myDate.getUTCMonth()+1):(myDate.getUTCMonth()+1)
25
+    let day=myDate.getDate()<10?'0'+myDate.getDate():myDate.getDate
26
+    return myDate.getUTCFullYear()+'-'+mouth+'-'+day
27
+  }
22 28
   const handelShare = () => {
23 29
     setLoading(true)
24
-    var myDate = new Date();
25 30
     shareRoom({
26 31
       hotelId: room.hotelId,
27 32
       personNum: roomNum == '' ? 0 : roomNum,
28 33
       roomId: room.roomId,
29
-      startDate: startDate == '' ? myDate.toLocaleDateString() : startDate,
30
-      endDate: endDate == '' ? myDate.toLocaleDateString() : endDate
34
+      startDate: startDate == '' ? nowDate() : startDate,
35
+      endDate: endDate == '' ? nowDate() : endDate
31 36
     }).then((res) => {
32 37
       onFinish(res)
33 38
       setStartDate('')

+ 4
- 7
src/pages/RoomOrder/index.jsx 파일 보기

@@ -43,18 +43,15 @@ export default withLayout((props) => {
43 43
           return;
44 44
         }
45 45
       }
46
-      personSubmit(roomOrderId, formData).then(a => {
47
-        // Taro.navigateBack({
48
-        //   delta: 1
49
-        // })
50
-        setLoading(false)
51
-
46
+      personSubmit(roomOrderId, formData).then(a => {        
52 47
         Taro.reLaunch({
53 48
           url: `/pages/index/index?tab=1&roomId=${roomId}`
54 49
         })
55 50
       })
56 51
     })
57
-
52
+    setTimeout(()=>{
53
+      setLoading(false)
54
+    },1000)
58 55
   }
59 56
 
60 57
   useEffect(() => {

+ 4
- 0
src/pages/index/tabs/Guide.jsx 파일 보기

@@ -31,6 +31,7 @@ export default (props) => {
31 31
   const goContent = () => {
32 32
     if (roomOrderId) {
33 33
       goToRoomForm(roomOrderId).then((res) => {
34
+        console.log(res)
34 35
         if (res.status !== 1 && res.personNum > 0) {
35 36
           Taro.reLaunch({
36 37
             url: `/pages/RoomOrder/index?roomOrderId=${roomOrderId}&status=${res.status}&roomId=${roomId}`,
@@ -43,6 +44,9 @@ export default (props) => {
43 44
   useDidShow(() => {
44 45
     goContent()
45 46
   })
47
+  useEffect(()=>{
48
+    goContent()
49
+  },[])
46 50
 
47 51
   const getGuidelist = () => {
48 52
     setLoading(true)