吃个甘蔗嚼一年 3 年前
父节点
当前提交
466eba59b3

+ 1
- 0
src/pages/MineUserAll/RefundMoney/CheckRefund/style.less 查看文件

405
       background: #274291;
405
       background: #274291;
406
       border-radius: 12px;
406
       border-radius: 12px;
407
       color: @whiteColor;
407
       color: @whiteColor;
408
+      margin-bottom: 2em;
408
     }
409
     }
409
   }
410
   }
410
 
411
 

+ 3
- 0
src/pages/MineUserAll/RefundMoney/index.jsx 查看文件

28
   const getList = () => {
28
   const getList = () => {
29
     setFirst(false)
29
     setFirst(false)
30
     setHasNextPage(false);
30
     setHasNextPage(false);
31
+    Taro.showLoading()
31
     getOrderSub({
32
     getOrderSub({
32
       pageNum,
33
       pageNum,
33
       pageSize: 10,
34
       pageSize: 10,
39
       );
40
       );
40
       setHasNextPage(res.current < res.pages);
41
       setHasNextPage(res.current < res.pages);
41
       setPull(false);
42
       setPull(false);
43
+      Taro.hideLoading();
44
+
42
     });
45
     });
43
   };
46
   };
44
 
47
 

+ 1
- 1
src/pages/PayOrder/Card/index.jsx 查看文件

41
           <text className='title-money-payOrder'>
41
           <text className='title-money-payOrder'>
42
             ¥{formatPrice(item.actualPrice || item.unitPrice)}元
42
             ¥{formatPrice(item.actualPrice || item.unitPrice)}元
43
             <text className='title-money-2-payOrder'>
43
             <text className='title-money-2-payOrder'>
44
-              门市价{item.standardPrice}元
44
+              门市价{(item.standardPrice / 100).toFixed(2)}元
45
             </text>
45
             </text>
46
           </text>
46
           </text>
47
           <view className='title-time-payOrder'>
47
           <view className='title-time-payOrder'>

+ 3
- 0
src/pages/RoomOrder/components/RoomForm/index.jsx 查看文件

27
 
27
 
28
 
28
 
29
   return (
29
   return (
30
+
30
     <View className='from-room'  >
31
     <View className='from-room'  >
32
+
31
       <mp-form >
33
       <mp-form >
32
         <mp-cells title='入住人信息填写' footer='  '>
34
         <mp-cells title='入住人信息填写' footer='  '>
33
           <mp-cell prop='customerName' title='姓名:' extClass=''>
35
           <mp-cell prop='customerName' title='姓名:' extClass=''>
39
         </mp-cells>
41
         </mp-cells>
40
       </mp-form>
42
       </mp-form>
41
     </View>
43
     </View>
44
+
42
   )
45
   )
43
 }
46
 }

+ 19
- 12
src/pages/RoomOrder/index.jsx 查看文件

23
   }
23
   }
24
 
24
 
25
   const handleSubmit = (e) => {
25
   const handleSubmit = (e) => {
26
-    
26
+
27
     // 订阅消息
27
     // 订阅消息
28
     withSubscribeMessage('hotel_check_out', () => {
28
     withSubscribeMessage('hotel_check_out', () => {
29
       for (let i = 0, len = formData.length; i < len; i++) {
29
       for (let i = 0, len = formData.length; i < len; i++) {
36
           return;
36
           return;
37
         }
37
         }
38
       }
38
       }
39
-  
39
+
40
       personSubmit(roomOrderId, formData).then(a => {
40
       personSubmit(roomOrderId, formData).then(a => {
41
         Taro.navigateBack({
41
         Taro.navigateBack({
42
           delta: 1
42
           delta: 1
43
         })
43
         })
44
-      })      
44
+      })
45
     })
45
     })
46
 
46
 
47
   }
47
   }
57
 
57
 
58
   const FormCard = new Array(CarNumber).fill(0)
58
   const FormCard = new Array(CarNumber).fill(0)
59
   return (
59
   return (
60
-    <view>
60
+    <view className='scroll-www'>
61
+
61
       <CustomNav title={taRoomContent?.roomName} />
62
       <CustomNav title={taRoomContent?.roomName} />
62
-      {
63
-        FormCard.map((_, index) => {
64
-          return (
65
-            <RoomForm key={(index)} onChange={(e) => handleChange(e, index)} />
66
-          )
67
-        })
68
-      }
69
-      <button className='button-OK' onClick={handleSubmit} >确定</button>
63
+
64
+      <scroll-view scroll-y style='height: calc(100vh - 176rpx);' >
65
+
66
+        {
67
+          FormCard.map((_, index) => {
68
+            return (
69
+
70
+              <RoomForm key={(index)} onChange={(e) => handleChange(e, index)} />
71
+            )
72
+          })
73
+        }
74
+        <button className='button-OK' onClick={handleSubmit} >确定</button>
75
+      </scroll-view>
70
 
76
 
71
     </view>
77
     </view>
78
+
72
   )
79
   )
73
 })
80
 })

+ 3
- 2
src/pages/RoomOrder/style.less 查看文件

1
 button {
1
 button {
2
   width: calc(100% - 60px);
2
   width: calc(100% - 60px);
3
   height: 92px;
3
   height: 92px;
4
-  background: #1A3B83;
4
+  background: #1a3b83;
5
   margin: 0 auto;
5
   margin: 0 auto;
6
   line-height: 92px;
6
   line-height: 92px;
7
   border-radius: 12px;
7
   border-radius: 12px;
8
   font-size: 40px;
8
   font-size: 40px;
9
   color: #ffffff;
9
   color: #ffffff;
10
   margin-top: 2em;
10
   margin-top: 2em;
11
-}
11
+  margin-bottom: 4em;
12
+}

+ 1
- 0
src/pages/details/foodDetails/foodDetails.jsx 查看文件

240
                 <view
240
                 <view
241
                   style={{
241
                   style={{
242
                     position: "relative",
242
                     position: "relative",
243
+                    marginTop: '5em',
243
                     display: extend == "" ? "none" : "",
244
                     display: extend == "" ? "none" : "",
244
                   }}
245
                   }}
245
                 >
246
                 >

+ 2
- 2
src/pages/details/mjDetails/sceneryDetails.jsx 查看文件

110
               {
110
               {
111
                 imglist.map((item) =>
111
                 imglist.map((item) =>
112
                   <SwiperItem>
112
                   <SwiperItem>
113
-                    <image src={item.url}  mode='aspectFit' className='storeImage' >
113
+                    <image src={item.url} mode='aspectFit' className='storeImage' >
114
                       <view className='tpPage'>
114
                       <view className='tpPage'>
115
                         <text>{index + 1}/{imglist.length}</text>
115
                         <text>{index + 1}/{imglist.length}</text>
116
                       </view>
116
                       </view>
152
               <image src={showMore} className='moreTip' />
152
               <image src={showMore} className='moreTip' />
153
             </view>
153
             </view>
154
           </view>
154
           </view>
155
-          <view style={{ position: 'relative', display: recommend == '' ? 'none' : '' }}>
155
+          <view style={{ position: 'relative', marginTop: '6em', display: recommend == '' ? 'none' : '' }}>
156
             <view className='title'>
156
             <view className='title'>
157
               <image src={titlems} />老板推荐好吃的
157
               <image src={titlems} />老板推荐好吃的
158
             </view>
158
             </view>

+ 5
- 5
src/pages/index/tabs/Guide.jsx 查看文件

24
   const [spackage, setPackage] = useState([])
24
   const [spackage, setPackage] = useState([])
25
 
25
 
26
   const { roomId: rid } = useModel('hotel')
26
   const { roomId: rid } = useModel('hotel')
27
-  console.log("🚀 ~ file: Guide.jsx ~ line 27 ~ rid", rid)
28
 
27
 
29
   if (!roomId && rid) {
28
   if (!roomId && rid) {
30
     roomId = rid
29
     roomId = rid
60
   }
59
   }
61
 
60
 
62
 
61
 
63
-  useDidShow(() => {
62
+  useEffect(() => {
64
     if (roomOrderId) {
63
     if (roomOrderId) {
65
       goToRoomForm(roomOrderId).then((res) => {
64
       goToRoomForm(roomOrderId).then((res) => {
66
-        if (res.status !== 0) {
65
+        console.log("🚀 ~ file: Guide.jsx ~ line 65 ~ goToRoomForm ~ res", res)
66
+
67
+        if (res.status !== 1 && res.personNum > 0) {
67
           Taro.navigateTo({
68
           Taro.navigateTo({
68
             url: `/pages/RoomOrder/index?roomOrderId=${roomOrderId}&status=${res.status}&roomId=${roomId}`,
69
             url: `/pages/RoomOrder/index?roomOrderId=${roomOrderId}&status=${res.status}&roomId=${roomId}`,
69
           })
70
           })
70
-
71
         }
71
         }
72
       })
72
       })
73
     }
73
     }
74
-  })
74
+  }, [roomId, roomOrderId])
75
 
75
 
76
 
76
 
77
   useEffect(() => {
77
   useEffect(() => {