flx

src/pages/MineUserAll/RefundMoney/CheckRefund/style.less

@@ -405,6 +405,7 @@
       background: #274291;
       border-radius: 12px;
       color: @whiteColor;
+      margin-bottom: 2em;
     }
   }
 

src/pages/MineUserAll/RefundMoney/index.jsx

@@ -28,6 +28,7 @@ export default withLayout((props) => {
   const getList = () => {
     setFirst(false)
     setHasNextPage(false);
+    Taro.showLoading()
     getOrderSub({
       pageNum,
       pageSize: 10,
@@ -39,6 +40,8 @@ export default withLayout((props) => {
       );
       setHasNextPage(res.current < res.pages);
       setPull(false);
+      Taro.hideLoading();
+
     });
   };
 

src/pages/PayOrder/Card/index.jsx

@@ -41,7 +41,7 @@ export default (props) => {
           <text className='title-money-payOrder'>
             ￥{formatPrice(item.actualPrice || item.unitPrice)}元
             <text className='title-money-2-payOrder'>
-              门市价{item.standardPrice}元
+              门市价{(item.standardPrice / 100).toFixed(2)}元
             </text>
           </text>
           <view className='title-time-payOrder'>

src/pages/RoomOrder/components/RoomForm/index.jsx

@@ -27,7 +27,9 @@ export default (props) => {
 
 
   return (
+
     <View className='from-room'  >
+
       <mp-form >
         <mp-cells title='入住人信息填写' footer='  '>
           <mp-cell prop='customerName' title='姓名：' extClass=''>
@@ -39,5 +41,6 @@ export default (props) => {
         </mp-cells>
       </mp-form>
     </View>
+
   )
 }

src/pages/RoomOrder/index.jsx

@@ -23,7 +23,7 @@ export default withLayout((props) => {
   }
 
   const handleSubmit = (e) => {
-    
+
     // 订阅消息
     withSubscribeMessage('hotel_check_out', () => {
       for (let i = 0, len = formData.length; i < len; i++) {
@@ -36,12 +36,12 @@ export default withLayout((props) => {
           return;
         }
       }
-  
+
       personSubmit(roomOrderId, formData).then(a => {
         Taro.navigateBack({
           delta: 1
         })
-      })      
+      })
     })
 
   }
@@ -57,17 +57,24 @@ export default withLayout((props) => {
 
   const FormCard = new Array(CarNumber).fill(0)
   return (
-    <view>
+    <view className='scroll-www'>
+
       <CustomNav title={taRoomContent?.roomName} />
-      {
-        FormCard.map((_, index) => {
-          return (
-            <RoomForm key={(index)} onChange={(e) => handleChange(e, index)} />
-          )
-        })
-      }
-      <button className='button-OK' onClick={handleSubmit} >确定</button>
+
+      <scroll-view scroll-y style='height: calc(100vh - 176rpx);' >
+
+        {
+          FormCard.map((_, index) => {
+            return (
+
+              <RoomForm key={(index)} onChange={(e) => handleChange(e, index)} />
+            )
+          })
+        }
+        <button className='button-OK' onClick={handleSubmit} >确定</button>
+      </scroll-view>
 
     </view>
+
   )
 })

src/pages/RoomOrder/style.less

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

src/pages/details/foodDetails/foodDetails.jsx

@@ -240,6 +240,7 @@ export default withLayout((props) => {
                 <view
                   style={{
                     position: "relative",
+                    marginTop: '5em',
                     display: extend == "" ? "none" : "",
                   }}
                 >

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -110,7 +110,7 @@ export default withLayout((props) => {
               {
                 imglist.map((item) =>
                   <SwiperItem>
-                    <image src={item.url}  mode='aspectFit' className='storeImage' >
+                    <image src={item.url} mode='aspectFit' className='storeImage' >
                       <view className='tpPage'>
                         <text>{index + 1}/{imglist.length}</text>
                       </view>
@@ -152,7 +152,7 @@ export default withLayout((props) => {
               <image src={showMore} className='moreTip' />
             </view>
           </view>
-          <view style={{ position: 'relative', display: recommend == '' ? 'none' : '' }}>
+          <view style={{ position: 'relative', marginTop: '6em', display: recommend == '' ? 'none' : '' }}>
             <view className='title'>
               <image src={titlems} />老板推荐好吃的
             </view>

src/pages/index/tabs/Guide.jsx

@@ -24,7 +24,6 @@ export default (props) => {
   const [spackage, setPackage] = useState([])
 
   const { roomId: rid } = useModel('hotel')
-  console.log("🚀 ~ file: Guide.jsx ~ line 27 ~ rid", rid)
 
   if (!roomId && rid) {
     roomId = rid
@@ -60,18 +59,19 @@ export default (props) => {
   }
 
 
-  useDidShow(() => {
+  useEffect(() => {
     if (roomOrderId) {
       goToRoomForm(roomOrderId).then((res) => {
-        if (res.status !== 0) {
+        console.log("🚀 ~ file: Guide.jsx ~ line 65 ~ goToRoomForm ~ res", res)
+
+        if (res.status !== 1 && res.personNum > 0) {
           Taro.navigateTo({
             url: `/pages/RoomOrder/index?roomOrderId=${roomOrderId}&status=${res.status}&roomId=${roomId}`,
           })
-
         }
       })
     }
-  })
+  }, [roomId, roomOrderId])
 
 
   useEffect(() => {