Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

config/dev.js

@@ -4,7 +4,7 @@ module.exports = {
   },
   defineConstants: {
     // HOST: '"http://192.168.89.147:8080"',
-    HOST: '"https://sgl-v2.njyunzhi.com"',
+    HOST: '"http://sgl-v2-test.njyunzhi.com"',
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
   },
   mini: {},

src/app.less

@@ -42,6 +42,7 @@
   background: transparent;
   border: none;
   outline: none;
+  line-height: 88px;
 
   &::after {
     border: none;

src/components/CollectList/MyCollect/index.jsx

@@ -17,6 +17,8 @@ export default (props) => {
   const targetType = item.targetType
   const star = parseFloat(((item.sweetScore + item.environmentScore + item.serviceScore) / 3).toFixed(1));
 
+
+
   const handleDetail = () => {
     targetType == "shop_package" ? Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` })
       : targetType == "tourist" ? Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` })
@@ -66,7 +68,7 @@ export default (props) => {
                 />
                 <CouponMedia.Body >
                   <View className='cpn-card-text'>
-                    {item.lng}
+                    {(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}
                   </View>
                   <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
                     <Text className='cpn-card-text_mn'>￥{`${formatPrice(item.averagePrice)}元`}</Text>

src/components/CompoentsOrder/OrderCard/index.jsx

@@ -117,7 +117,7 @@ export default (props) => {
       }
       {
         //待支付可以左滑删除
-        item.status === 0 ? <SlideView del onDelete={() => handeDelete(item)} >
+        item.status === 0 ? <SlideView del onDelete={() => handeDelete(item)}  className='dzf'>
           <CouponCard onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` }) }} action={PayAction}>
             <CouponMedia>
               <CouponMedia.Header

src/components/CompoentsOrder/OrderCard/style.less

@@ -41,7 +41,11 @@
     }
   }
 }
-
+.dzf{
+  .slideview-content{
+    margin:20px 0;
+  }
+}
 .OrderNumber {
   font-size: 20px;
   color: #666666;

src/components/CompoentsOrder/complete/index.jsx

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

src/components/CouponCard/Media/style.less

@@ -1,7 +1,5 @@
-
 .coupun-media {
   display: flex;
-
   &_header {
     flex: none;
     box-sizing: border-box;

src/components/ShopUnused/index.jsx

@@ -1,7 +1,6 @@
 import Taro from '@tarojs/taro'
-import { useState, useEffect } from 'react'
 import { compressImage } from '@/utils'
-
+import { View, Text,Image } from '@tarojs/components'
 import formatTimes from '@/utils/formatTime'
 
 
@@ -11,28 +10,32 @@ import './style.less'
 export default (props) => {
   const { item } = props
 
-
-
-  useEffect(() => {
-
-  }, [])
-
   return (
-    <view className='orderCard'>
-      <view style={{ overflow: 'hidden' }}>
-        <view className='orderId'>订单编号：{item.orderId}</view>
-        <view className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:mm')}</view>
-      </view>
-      <view className='order'>
-        <image className='orderImg' src={compressImage(item.poster)} mode='aspectFit' />
-        <view className='orderRight'>
-          <view className='foodName'>{item.description}</view>
-          <view className='price'>合计金额：￥<text style={{ fontSize: '24rpx' }}>{((item.actualPrice / 100) - (item.cashback / 100) - (item.commissionCharge / 100)).toFixed(2)}</text>元 <text className='pnum'>数量：<text>1</text>张</text> </view>
-          <view>已下单：等待客户上门就餐</view>
-        </view>
-        <view className='line' />
-        <view className='phone'>客户手机：<text>{item.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}</text></view>
-      </view>
-    </view>
+    <View className='orderCard2'>
+      <View className='hardtop'>
+        <View className='orderId'>订单编号：{item.orderId}</View>
+        <View className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:mm')}</View>
+      </View>
+      <View className='order'>
+        <View className='orderTop'>
+          <Image className='orderImg' src={compressImage(item.poster)} mode='aspectFit' />
+          <View className='orderRight'>
+            <View className='foodName'>{item.description}</View>
+            <View className='price'>
+              <Text className='priceleft'>
+                合计金额：￥
+                <Text style={{ fontSize: '24rpx' }}>
+                  {((item.actualPrice / 100) - (item.cashback / 100) - (item.commissionCharge / 100)).toFixed(2)}
+                </Text>元
+              </Text>
+              <Text className='pnum'>数量：1张</Text>
+            </View>
+            <View className='tips'>已下单：等待客户上门就餐</View>
+          </View>
+        </View>
+        <View className='line' />
+        <View className='phone'>客户手机：{item.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}</View>
+      </View>
+    </View>
   )
 }

src/components/ShopUnused/style.less

@@ -1,89 +1,76 @@
-.orderCard {
-  margin-bottom: 20px;
-  .orderId {
-    font-size: 20px;
+.orderCard2{
+  .hardtop{
     color: #666666;
-    line-height: 44px;
-    float: left;
-    margin: 60px 0 0 0;
-  }
-  .orderTime {
+    line-height: 44px;    
     font-size: 20px;
-    color: #666666;
-    line-height: 44px;
-    float: right;
-    margin: 60px 0 0 0;
+    position: relative;
+    margin: 20px 0;
+    .orderId{
+      display: inline-block;
+    }
+    .orderTime{
+      position: absolute;
+      right: 30px;
+      display: inline-block;
+      justify-self: right;
+    }
   }
-  .order {
-    background: #ffffff;
+  .order{
     box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
     border-radius: 12px;
     padding: 20px;
-    .orderImg {
-      width: 194px;
-      height: 194px;
-      border-radius: 22px;
-      float: left;
-      margin: 0 26px 0 0;
-    }
-    .orderRight {
-      .foodName {
-        font-size: 24px;
-        color: #333333;
-        margin-top: 40px;
+    margin: 0 5px;
+    .orderTop{
+      display: flex;
+      .orderImg{
+        flex: none;
+        width: 194px;
+        height: 194px;
+        margin-right: 25px;
+        margin-bottom: 30px;
       }
-      .price {
-        font-size: 20px;
-        font-weight: bold;
-        color: #202020;
-        margin: 0 0 10px 0;
-        .pnum {
+      .orderRight{
+        flex: auto;
+        .foodName{
+          font-size: 24px;
           color: #333333;
-          font-weight: 400;
-          margin-left: 47px;
+          line-height: 40px;
+          margin-top: 30px;
+        }
+        .price{
+          font-size: 20px;
+          font-weight: bold;
+          color: #202020;
+          line-height: 44px;
+          display: flex;
+          .priceleft{
+            flex: 1;
+          }
+          .pnum {
+            color: #333333;
+            flex: 1;
+            font-weight: 400;
+          }
+        }
+        .tips{
+          font-size: 20px;
+          font-weight: bold;
+          color: #FF3434;
+          line-height: 44px;
         }
-      }
-      .price + view {
-        font-size: 20px;
-        font-weight: bold;
-        color: #ff3434;
-        line-height: 44px;
-        margin-bottom: 35px;
-        height: 19px;
       }
     }
-    .line {
-      margin-top: 30px;
-
+    .line{
       width: 100%;
       height: 2px;
       background: #000;
       opacity: 0.1;
+      margin-bottom: 30px;
     }
-    .phone {
-      font-size: 24px;
-      color: #666666;
-      line-height: 44px;
-      height: 23px;
-      margin: 37px 0;
-    }
-    .button-OK {
-      width: 160px;
-      height: 40px;
-      background: #1a3b83;
-      line-height: 40px;
-      border-radius: 12px;
-      font-size: 23px;
-      color: #ffffff;
-      position: relative;
-      right: -8em;
-      top: -2em;
-    }
-    .tripTime {
+    .phone{
       font-size: 24px;
       color: #666666;
       line-height: 44px;
-      margin-bottom: 30px;
     }
   }
-}
+}

src/components/ShopUsed/index.jsx

@@ -1,6 +1,6 @@
 import Taro from '@tarojs/taro'
 import { setGetVerifiedOrder } from '@/services/shopBoss'
-import { View, Text, Image } from '@tarojs/components'
+import { View, Text, Image,Button } from '@tarojs/components'
 import { compressImage } from '@/utils'
 import { useState } from 'react'
 import formatTimes from '@/utils/formatTime'
@@ -31,26 +31,59 @@ export default (props) => {
 
 
   return (
-    <View className='orderCard'>
-      <View style={{ overflow: 'hidden' }}>
+    // <View className='orderCard'>
+    //   <View style={{ overflow: 'hidden' }}>
+    //     <View className='orderId'>订单编号：{item.orderId}</View>
+    //     <View className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:mm') || ''}</View>
+    //   </View>
+    //   <View className='order'>
+    //     <Image className='orderImg' src={compressImage(item.poster)} mode='aspectFit' />
+    //     <View className='orderRight'>
+    //       <View className='foodName'>{item.description}</View>
+    //       <View className='price'>合计金额：￥<Text style={{ fontSize: '24rpx' }}>{((item.actualPrice / 100) - (item.cashback / 100) - (item.commissionCharge / 100)).toFixed(2)}</Text>元 <Text className='pnum'>数量：<Text>1</Text>张</Text> </View>
+    //     </View>
+    //     <View className='veri_Date' > 核销时间：{formatTimes(item.verifiedDate, 'yyyy-MM-dd hh:mm')}</View>
+    //     <View className='line' />
+    //     <View className='phone'>客户手机：<Text>{item.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}</Text>
+    //       {
+    //         !item.isConfirmVerified && <button className='Button-OK' onClick={confirmOrder} style={{ display: buttonStyle }}  >确认核销</button>
+    //       }
+    //     </View>
+    //   </View>
+    // </View>
+
+    <View className='orderCard3'>
+      <View className='hardtop'>
         <View className='orderId'>订单编号：{item.orderId}</View>
-        <View className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:mm') || ''}</View>
+        <View className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:mm')}</View>
       </View>
       <View className='order'>
-        <Image className='orderImg' src={compressImage(item.poster)} mode='aspectFit' />
-        <View className='orderRight'>
-          <View className='foodName'>{item.description}</View>
-          <View className='price'>合计金额：￥<Text style={{ fontSize: '24rpx' }}>{((item.actualPrice / 100) - (item.cashback / 100) - (item.commissionCharge / 100)).toFixed(2)}</Text>元 <Text className='pnum'>数量：<Text>1</Text>张</Text> </View>
+        <View className='orderTop'>
+          <Image className='orderImg' src={compressImage(item.poster)} mode='aspectFit' />
+          <View className='orderRight'>
+            <View className='foodName'>{item.description}</View>
+            <View className='price'>
+              <Text className='priceleft'>
+                合计金额：￥
+                <Text style={{ fontSize: '24rpx' }}>
+                  {((item.actualPrice / 100) - (item.cashback / 100) - (item.commissionCharge / 100)).toFixed(2)}
+                </Text>元
+              </Text>
+              <Text className='pnum'>数量：1张</Text>
+            </View>
+            <View className='veri_Date' > 核销时间：{formatTimes(item.verifiedDate, 'yyyy-MM-dd hh:mm')}</View>
+          </View>
         </View>
-        <View className='veri_Date' > 核销时间：{formatTimes(item.verifiedDate, 'yyyy-MM-dd hh:mm')}</View>
         <View className='line' />
-        <View className='phone'>客户手机：<Text>{item.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}</Text>
+        <View className='phone'>
+          客户手机：{item.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}
           {
-            !item.isConfirmVerified && <button className='Button-OK' onClick={confirmOrder} style={{ display: buttonStyle }}  >确认核销</button>
+            !item.isConfirmVerified && <Button className='Button-OK' onClick={confirmOrder} style={{ display: buttonStyle }}  >确认核销</Button>
           }
         </View>
       </View>
     </View>
+
   )
 }
 

src/components/ShopUsed/style.less

@@ -1,104 +1,88 @@
-.orderCard {
-  margin-bottom: 20px;
-  .orderId {
-    font-size: 20px;
+.orderCard3{
+  .hardtop{
     color: #666666;
-    line-height: 44px;
-    float: left;
-    margin: 60px 0 32px 0;
-  }
-  .orderTime {
+    line-height: 44px;    
     font-size: 20px;
-    color: #666666;
-    line-height: 44px;
-    float: right;
-    margin: 60px 0 32px 0;
+    position: relative;
+    margin: 20px 0;
+    .orderId{
+      display: inline-block;
+    }
+    .orderTime{
+      position: absolute;
+      right: 30px;
+      display: inline-block;
+      justify-self: right;
+    }
   }
-  .order {
-    background: #ffffff;
+  .order{
     box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
     border-radius: 12px;
     padding: 20px;
-    .orderImg {
-      width: 194px;
-      height: 194px;
-      border-radius: 22px;
-      float: left;
-      margin: 0 26px 30px 0;
-    }
-    .orderRight {
-      .foodName {
-        font-size: 24px;
-        color: #333333;
+    margin: 0 5px;
+    .orderTop{
+      display: flex;
+      .orderImg{
+        flex: none;
+        width: 194px;
+        height: 194px;
+        margin-right: 25px;
+        margin-bottom: 30px;
       }
-      .price {
-        font-size: 20px;
-        font-weight: bold;
-        color: #202020;
-        line-height: 44px;
-        height: 19px;
-        .pnum {
+      .orderRight{
+        flex: auto;
+        .foodName{
+          font-size: 24px;
           color: #333333;
-          font-weight: 400;
-          margin-left: 47px;
+          line-height: 40px;
+          margin-top: 30px;
+        }
+        .price{
+          font-size: 20px;
+          font-weight: bold;
+          color: #202020;
+          line-height: 44px;
+          display: flex;
+          .priceleft{
+            flex: 1;
+          }
+          .pnum {
+            color: #333333;
+            flex: 1;
+            font-weight: 400;
+          }
+        }        
+        .veri_Date {
+          color: red;
+          letter-spacing: 1px;
+          font-size: 30px;
         }
-      }
-      .price + view {
-        font-size: 20px;
-        font-weight: bold;
-        color: #ff3434;
-        line-height: 44px;
-        margin-bottom: 35px;
-        height: 19px;
       }
     }
-    .veri_Date {
-      color: red;
-      letter-spacing: 1px;
-      font-size: 30px;
-      padding-top: 20px;
-    }
-    .line {
-      margin-top: 30px;
-
+    .line{
       width: 100%;
       height: 2px;
       background: #000;
       opacity: 0.1;
-      margin-top: 30px;
-    }
-    .phone {
-      font-size: 24px;
-      color: #666666;
-      line-height: 44px;
-      height: 23px;
-      margin: 37px 0;
-      // .Button-OK{
-      //   font-size: 28px;
-      //   color: #C0C8D3;
-      //   line-height: 34px;
-      //   text-align: center;
-      //   padding:40px 0 100px 0;
-      // }
+      margin-bottom: 30px;
     }
-
-    .tripTime {
+    .phone{
       font-size: 24px;
       color: #666666;
-      line-height: 44px;
-      margin-bottom: 30px;
+      line-height: 44px;  
+      position: relative;  
+      button {
+        width: 160px;
+        position: absolute;
+        right: 60px;
+        top: 0;
+        height: 40px;
+        background: #1a3b83;
+        line-height: 40px;
+        border-radius: 12px;
+        font-size: 23px;
+        color: #ffffff;
+      }
     }
   }
-}
-button {
-  width: 160px;
-  height: 40px;
-  background: #1a3b83;
-  line-height: 40px;
-  border-radius: 12px;
-  font-size: 23px;
-  color: #ffffff;
-  position: relative;
-  right: -8em;
-  top: -2em;
-}
+}

src/components/SlideView/index.jsx

@@ -56,7 +56,7 @@ export default (props) => {
             const { height } = res[0]
             if (height && height !== contentHeightRef.current) {
               setActStyle({
-                height: `calc(${height}px - 10px)`,
+                height: `calc(${height}px - 30px)`,
               })
               contentHeightRef.current = height
             }

src/components/tip/index.less

@@ -1,7 +1,7 @@
 .tip{
   padding:23px 0 22px 31px;
   height: 70px;
-
+  flex: none;
   .tipicon{
     width: 17px;
     height: 19px;

src/hotel/components/shareRoom/ShareRoom.jsx

@@ -1,10 +1,9 @@
-import React from 'react'
-import Popup from '@/components/Popup'
+import React, { useState } from 'react'
 import Taro from '@tarojs/taro'
 import { Input, Button, View, Picker, Label } from '@tarojs/components'
+import Popup from '@/components/Popup'
 import { shareRoom } from '@/services/landlord'
 import './ShareRoom.less'
-import { useState } from 'react'
 
 
 export default (props) => {
@@ -12,6 +11,8 @@ export default (props) => {
   const [startDate, setStartDate] = useState('')
   const [endDate, setEndDate] = useState('')
   const [roomNum, setRoomNum] = useState('')
+  const [loading, setLoading] = useState(false)
+
   const handelStartDate = (e) => {
     setStartDate(e.detail.value)
   }
@@ -19,10 +20,11 @@ export default (props) => {
     setEndDate(e.detail.value)
   }
   const handelShare = () => {
+    setLoading(true)
     var myDate = new Date();
     shareRoom({
       hotelId: room.hotelId,
-      personNum: roomNum == '' ? 0 : roomNum, 
+      personNum: roomNum == '' ? 0 : roomNum,
       roomId: room.roomId,
       startDate: startDate == '' ? myDate.toLocaleDateString() : startDate,
       endDate: endDate == '' ? myDate.toLocaleDateString() : endDate
@@ -31,8 +33,8 @@ export default (props) => {
       setStartDate('')
       setEndDate('')
       setRoomNum()
+      setLoading(false)
     })
-
   }
   return (
     <Popup show={showCutover} onClose={onClose}>
@@ -58,7 +60,7 @@ export default (props) => {
         </View>
         <View>
           <Button className='cancel' onClick={onClose}>取消</Button>
-          <Button className='btn' onClick={handelShare}>分享</Button>
+          <Button className='btn' onClick={handelShare} loading={loading} disabled={loading}>分享</Button>
         </View>
       </View>
     </Popup>

src/hotel/pages/landlord/roomOrder/roomOrder.jsx

@@ -3,6 +3,7 @@ import React, { useState, useEffect, useRef } from 'react'
 import CustomNav from '@/components/CustomNav'
 import Taro from '@tarojs/taro'
 import { useModel } from '@/store'
+import SpinBox from "@/components/Spin/SpinBox";
 import copy from '@/assets/icons/landlord/copy.png'
 import { Input, Button, View, Picker, Label, Image } from '@tarojs/components'
 import { getRoomOrderList,getHotelDetail } from '@/services/landlord'
@@ -13,11 +14,14 @@ export default withLayout((props) => {
   const { hotelId, roomId, roomName } = props.router.params
   const [detail, setDetail] = useState([])
   const { setHotel } = useModel('hotel')
+  const [loading, setLoading] = useState(false)
 
   useEffect(() => {
+    setLoading(true)
     if (roomId) {
       getRoomOrderList({ roomId: roomId }).then((res) => {
         setDetail(res.records || [])
+        setLoading(false)
       })
     }
   }, [roomId])
@@ -35,7 +39,7 @@ export default withLayout((props) => {
       data: val,
       success: e => {
         Taro.showToast({
-          title: '入住人姓名已复制',
+          title: '姓名已复制',
           icon: 'success',
           duration: 2000,
         })
@@ -48,7 +52,7 @@ export default withLayout((props) => {
       data: val,
       success: e => {
         Taro.showToast({
-          title: '入住人电话已复制',
+          title: '电话已复制',
           icon: 'success',
           duration: 2000,
         })
@@ -61,6 +65,7 @@ export default withLayout((props) => {
       <view className='index-navbar'>
         <CustomNav title={roomName ? decodeURIComponent(roomName) : '房间名'} />
       </view>
+      <SpinBox loading={loading}>
       <scroll-view scrollY style={{ height: 'calc(100vh - 65px)' }}>
 
         {
@@ -89,6 +94,7 @@ export default withLayout((props) => {
         }
 
       </scroll-view>
+    </SpinBox>
     </View>
   )
 })

src/pages/MineUserAll/ContactMe/index.jsx

@@ -58,7 +58,7 @@ export default withLayout((props) => {
           <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' />
         </view>
         <view className='button-info'>
-          <Button className='button-box' onClick={submit} loading={loading}  >提交</Button>
+          <Button className='button-box' onClick={submit} loading={loading}  disabled={loading} >提交</Button>
           <Button className='button-box-Cancel' onClick={back} >取消</Button>
         </view>
       </view>

src/pages/details/foodDetails/foodDetails.jsx

@@ -227,7 +227,7 @@ export default withLayout((props) => {
                     display: extend == "" ? "none" : "",
                   }}
                 >
-                  <view className='title' style={{ margin: '50px 0 0 0' }} >
+                  <view className='title' style={{ margin: '50px 0 40px 0' }} >
                     <image src={titlezs} />
                     <text>本店指南</text>
                   </view>

src/pages/index/tabs/Guide.jsx

@@ -61,7 +61,7 @@ export default (props) => {
     goContent()
   })
 
-  const geiZy = () => {
+  const getGuidelist = () => {
     setLoading(true)
     getExtendContent('room', roomId, { pageSize: 500 }).then((res) => {
       // setExtend(res.records || [])
@@ -82,8 +82,8 @@ export default (props) => {
         setLoading(false)
       })
       //更多指引
-      geiZy()
-      getRecommendList({ location: roomGps }).then((res) => {
+      getGuidelist()
+      getRecommendList({ location: taRoomContent.location || '' }).then((res) => {
         setPackage(res || [])
         setLoading(false)
       })
@@ -102,7 +102,7 @@ export default (props) => {
     if (taRoomContent?.parkingAddress === "") {
       setParkingButtonStyle('none')
     }
-  }, [roomId, taRoomContent?.wifiPassword, taRoomContent?.parkingAddress, location])
+  }, [roomId, taRoomContent?.wifiPassword, taRoomContent?.parkingAddress, location, taRoomContent.location])
 
 
   const goRoomMap = () => {
@@ -169,23 +169,24 @@ export default (props) => {
                 </view>
               </view>
               {/* --------房屋位置-------- */}
-              {
-                !taRoomContent.location ? <view></view>
-                  :
-                  <view className='room-box-info-HouLocation'>
-                    <view className='room-bi-name-HouLocation' >
-                      <view className='room-bin-title-HouLocation'>房屋位置</view>
-                      <view className='room-bint-nameInfo-HouLocation'>
-                        <view className='room-bint-nameInfo-bool-HouLocation' >{taRoomContent?.address}</view>
-                        <view className='room-bintn-button-HouLocation' onClick={() => { goRoomMap() }} style={{ display: wifiButtonStyle }}>
-                          <image className='room-bintn-image-HouLocation' src={GPS} />
-                          <text className='room-bintn-text-HouLocation'>去这里</text>
-                        </view>
-                      </view>
+
+
+              <view className='room-box-info-HouLocation'>
+                <view className='room-bi-name-HouLocation' >
+                  <view className='room-bin-title-HouLocation'>房屋位置</view>
+                  <view className='room-bint-nameInfo-HouLocation'>
+                    <view className='room-bint-nameInfo-bool-HouLocation' >{taRoomContent?.address}</view>
+                    <view className='room-bintn-button-HouLocation' onClick={() => { goRoomMap() }} style={{ display: wifiButtonStyle }}>
+                      <image className='room-bintn-image-HouLocation' src={GPS} />
+                      <text className='room-bintn-text-HouLocation'>去这里</text>
                     </view>
                   </view>
+                </view>
+              </view>
+
+
+
 
-              }
 
 
               {/* --------停车场-------- */}
@@ -208,19 +209,31 @@ export default (props) => {
 
 
               {/* --------无线网-------- */}
-              <view className='room-box-info-WIFIContent'>
-                <view className='room-bi-name-WIFIContent' >
-                  <view className='room-bin-title-WIFIContent'>WiFi信息</view>
-                  <view className='room-bint-nameInfo-WIFIContent'>
-                    <view className='room-bint-nameInfo-bool-WIFIContent-wifi' >名称：{taRoomContent?.wifiName}</view>
-                    <view className='room-bint-nameInfo-bool-WIFIContent-password' >密码：{taRoomContent?.wifiPassword}</view>
-                    <view className='room-bintn-button-WIFIContent' onClick={() => { wifiCopy() }} style={{ display: wifiButtonStyle }}>
-                      <image className='room-bintn-image-WIFIContent' src={copy_logo} />
-                      <text className='room-bintn-text-WIFIContent'>复制</text>
+
+
+              {
+                !taRoomContent.wifiName && !taRoomContent.wifiPassword ? <view></view>
+                  :
+
+                  <view className='room-box-info-WIFIContent'>
+                    <view className='room-bi-name-WIFIContent' >
+                      <view className='room-bin-title-WIFIContent'>WiFi信息</view>
+                      <view className='room-bint-nameInfo-WIFIContent'>
+                        <view className='room-bint-nameInfo-bool-WIFIContent-wifi' >名称：{taRoomContent?.wifiName}</view>
+                        <view className='room-bint-nameInfo-bool-WIFIContent-password' >密码：{taRoomContent?.wifiPassword}</view>
+                        <view className='room-bintn-button-WIFIContent' onClick={() => { wifiCopy() }} style={{ display: wifiButtonStyle }}>
+                          <image className='room-bintn-image-WIFIContent' src={copy_logo} />
+                          <text className='room-bintn-text-WIFIContent'>复制</text>
+                        </view>
+                      </view>
                     </view>
                   </view>
-                </view>
-              </view>
+
+              }
+
+
+
+
 
               <view className='Guide-Content-box'  >
                 <view className='title-image' style={{ display: guideStyle }} >

src/pages/index/tabs/Mine.jsx

@@ -50,6 +50,7 @@ export default (props) => {
       lang: 'zh_CN',
       desc: "获取你的昵称、头像、地区及性别",
       success: (res) => {
+        console.log("🚀 ~ file: Mine.jsx ~ line 53 ~ handleGetUserProfile ~ res", res)
         const data = {
           ...res,
           sessionKey,

src/pages/index/tabs/Recommend.jsx

@@ -11,7 +11,7 @@ import { getIndexType, getResourceList } from '@/services/home'
 import Card from '../components/Card'
 import './less/Recommend.less'
 
-const listStyle = { height: 'calc(100% - 145px)' }
+const listStyle = { height: '100%' }
 
 export default (props) => {
   const { router, person, location } = props
@@ -80,8 +80,7 @@ export default (props) => {
   // })
 
   return (
-    // <view style={{ height: '100%', overflow: 'hidden',display:'flex',flexDirection:'column' }}>
-    <view style={{ height: '100%', overflow: 'hidden' }}>
+    <view style={{ height: '100%', overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
       <view className='search' onClick={onSearch} >
         <input className='searchInput' disabled />
         <image className='searchicon' src={iconsearch} />

src/pages/index/tabs/less/Recommend.less

@@ -1,6 +1,7 @@
 .search{
     padding: 10px 30px 0 30px;
     position: relative;
+    flex: none;
     .searchInput{    
         height: 68px;
         background: #F8F8F8;
@@ -27,12 +28,6 @@
       letter-spacing: 0.2em;
     }
 }
-// .waterfall{
-//   column-count: 2;      //分两列
-//   column-gap: 30px;    //列间距
-//   background-color: #F8F8F8;
-//   padding:30px 30px 0 30px; 
-// }
 .botton{
   font-size: 28px;
   color: #C0C8D3;
@@ -43,6 +38,7 @@
 .index-tabs {
   padding-left: 95px;
   position: relative;
+  flex: none;
   .position{
     position: absolute;
     left: 36px;

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -154,7 +154,6 @@ export default (props) => {
           {/* 已核销 */}
           {activeTab === 1 &&
             <view style={{ height: '45vh' }}>
-
               <List
                 style={{ height: '100%' }}
                 noData={<NoData />}

src/shop/components/ShopKeeper/shopKeeper.less

@@ -51,99 +51,6 @@
     }
   }
 }
-.storexx {
-  text-align: center;
-  height: 300px;
-  background: #ffffff;
-  box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
-  border-radius: 24px;
-  padding: 20px 30px 34px 40px;
-
-  box-sizing: border-box;
-  .storeName {
-    height: 26px;
-    font-size: 28px;
-    font-weight: bold;
-    color: #202020;
-    margin-bottom: 25px;
-  }
-  .User-info-cutover {
-    position: absolute;
-    top: 60px;
-    right: 60px;
-    .User-info-cutover-image {
-      width: 36px;
-      height: 36px;
-    }
-  }
-  .tip {
-    height: 23px;
-    font-size: 24px;
-    color: #666666;
-    margin-bottom: 25px;
-  }
-  .sleft {
-    float: left;
-    .lword {
-      height: 25px;
-      font-size: 26px;
-      color: #666666;
-      margin-bottom: 25px;
-      margin-left: 1px;
-    }
-    .yearMoney {
-      height: 30px;
-      font-size: 28px;
-      font-weight: bold;
-      color: #202020;
-      text {
-        font-size: 40px;
-        color: #ff3434;
-      }
-      .micon {
-        width: 38px;
-        height: 22px;
-        margin-left: 19px;
-      }
-    }
-  }
-  .line {
-    width: 2px;
-    height: 128px;
-    border-right: 2px dotted #202020;
-    opacity: 0.5;
-    position: absolute;
-    left: calc(50% - 1px);
-    display: block;
-  }
-  .sright {
-    float: right;
-    text-align: left;
-    .rword {
-      font-size: 26px;
-      color: #666666;
-      margin: 0 1px 27px 0;
-      text-align: center;
-    }
-    .monthMoney {
-      height: 24px;
-      font-size: 28px;
-      font-weight: bold;
-      color: #202020;
-      line-height: 24px;
-      text {
-        font-size: 40px;
-        color: #ff3434;
-      }
-      .micon2 {
-        width: 38px;
-        height: 22px;
-        margin-left: 23px;
-        margin-bottom: -2px;
-      }
-    }
-  }
-}
 
 .index-tabs {
   width: 100%;