Merg

src/components/BadgeTag/index.jsx

@@ -12,13 +12,8 @@ export default (props) => {
 
   const icon = type === 'food' ||type=='shop'? food :type=='tourist'?mjTip : glTip;
 
-  const style = {
-    top,
-    left
-  }
-
   return (
-    <View className='badge-tag-box' style={style}>
+    <View className='badge-tag-box' style={{top:top,left:left,zIndex:1}}>
       <Image src={icon} className='badge-icon' />
     </View>
   )

src/components/CouponCard/Media/style.less

@@ -5,7 +5,6 @@
     box-sizing: border-box;
     width: 184px;
     position: relative;
-
     padding: 0 20px 40px 0;
   }
 

src/hotel/pages/components/Extend/index.jsx

@@ -62,7 +62,7 @@ export default (props) => {
     newstr = newstr.substr(0, i + 1);
     return newstr;
   }
-  const [content2,setContent2]=useState(content)
+  const [content2, setContent2] = useState(content)
   const handelEdit = () => {
     if (javaTrim(content2) == '') {
       Taro.showToast({
@@ -73,7 +73,7 @@ export default (props) => {
     }
     setContent(content2)
     const date = {
-      content:content2,
+      content: content2,
       contentType: 'text'
     }
     update(item.extId, { ...item, ...date })

src/hotel/pages/landlord/addRoom/addRoom.jsx

@@ -1,5 +1,5 @@
 import withLayout from '@/layouts'
-import Taro, { useDidShow } from '@tarojs/taro'
+import Taro from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import { View, Input, Button, Label, Textarea, Text, Image } from '@tarojs/components';
 import { useEffect, useState } from "react"

src/pages/details/foodDetails/foodDetails.jsx

@@ -159,7 +159,7 @@ export default withLayout((props) => {
           </view>
       }
 
-      <SpinBox loading={loading} className='index-container' style={{ padding: '0 30rpx' }}>
+      <SpinBox loading={loading} className='index-container' style={{ padding: '0 30rpx', background: '#F8F8F8'  }}>
         <scroll-view
           scrollY={isScroll}
           style={{ height: '100%' }}

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -111,7 +111,7 @@ export default withLayout((props) => {
       }
 
 
-      <SpinBox loading={loading} style={{ overflow: 'hidden', padding: '0 30rpx', height: '100%', background: '#F8F8F8' }}>
+      <SpinBox loading={loading} className='index-container' style={{ padding: '0 30rpx', background: '#F8F8F8' }}>
         <scroll-view scrollY style={{ height: '100%' }}>
           <view className='storeDetails'>
             <View className='huadong'>

src/pages/index/index.jsx

@@ -4,7 +4,6 @@ import React, { useState, useEffect } from 'react'
 import Taro, { useDidShow } from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import logo from '@/assets/icons/comm/logo_small.png'
-
 import { getHotelDetail } from '@/services/landlord'
 import { getTaRoom } from '@/services/taRoom​'
 import withLayout from '@/layouts'
@@ -71,7 +70,6 @@ export default withLayout((props) => {
           settitleLogo(e?.logo || logo)
         })
       })
-
     }
   }, [roomId, hotelId])
 

src/pages/index/tabs/Guide.jsx

@@ -1,9 +1,9 @@
-import { useState, useEffect, useRef } from "react";
+import { useState, useEffect } from "react";
 import Taro, { useDidShow } from '@tarojs/taro'
 import MoreGuide from "@/components/MoreGuide";
 import BossCard from '@/components/BossCard'
 import SpinBox from "@/components/Spin/SpinBox";
-import {Image } from "@tarojs/components";
+import { Image } from "@tarojs/components";
 import GPS from '@/assets/icons/GuideCheck/GPS.png'
 import copy_logo from '@/assets/icons/GuideCheck/copy_logo.png'
 import Cup from '@/assets/icons/GuideCheck/Cup.png'
@@ -33,12 +33,6 @@ export default (props) => {
   const trackClick = useTrackClick(router)
 
   const [taRoomContent, setTaRoomContent] = useState([])
-  //没有停车 wifi的就不显示按钮
-  const [wifiButtonStyle, setWifiButtonStyle] = useState('')
-  const [parkingButtonStyle, setParkingButtonStyle] = useState('')
-  const [guideStyle, setGuideStyle] = useState('')
-  const parkingGps = taRoomContent.parkingLocation || []
-  const roomGps = taRoomContent.location || []
 
   const goContent = () => {
     if (roomOrderId) {
@@ -52,7 +46,6 @@ export default (props) => {
     }
   }
 
-
   useEffect(() => {
     goContent()
   }, [roomId, roomOrderId])
@@ -64,11 +57,9 @@ export default (props) => {
   const getGuidelist = () => {
     setLoading(true)
     getExtendContent('room', roomId, { pageSize: 500 }).then((res) => {
-      // setExtend(res.records || [])
-      setExtend(res.records)
+      setExtend(res.records || [])
       setIfroomId('reality')
       setLoading(false)
-
     })
     setLoading(true)
   }
@@ -92,16 +83,9 @@ export default (props) => {
       getRecommendList({ location: location }).then((res) => {
         setPackage(res || [])
         setLoading(false)
-
       })
       return
     }
-    if (taRoomContent?.wifiPassword === "") {
-      setWifiButtonStyle('none')
-    }
-    if (taRoomContent?.parkingAddress === "") {
-      setParkingButtonStyle('none')
-    }
   }, [roomId, taRoomContent?.wifiPassword, taRoomContent?.parkingAddress, location, taRoomContent.location])
 
 
@@ -145,8 +129,8 @@ export default (props) => {
       }
     })
   }
-  const goIndex=()=>{
-    Taro.redirectTo({url:'/pages/index/index'})
+  const goIndex = () => {
+    Taro.redirectTo({ url: '/pages/index/index' })
   }
   return (
     <scroll-view scrollY style={{ height: '100%' }}  >
@@ -171,36 +155,27 @@ export default (props) => {
                 </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 }}>
+                    <view className='room-bintn-button-HouLocation' onClick={() => { goRoomMap() }}>
                       <image className='room-bintn-image-HouLocation' src={GPS} />
                       <text className='room-bintn-text-HouLocation'>去这里</text>
                     </view>
                   </view>
                 </view>
               </view>
-
-
-
-
-
-
               {/* --------停车场-------- */}
               {
-                !taRoomContent.parkingLocation ? <view></view>
-                  :
+                !taRoomContent.parkingLocation ?null:
                   <view className='room-box-info-Parking'>
                     <view className='room-bi-name-Parking' >
                       <view className='room-bin-title-Parking'>停车位置</view>
                       <view className='room-bint-nameInfo-Parking'>
                         <view className='room-bint-nameInfo-bool-Parking' >{taRoomContent?.parkingAddress}</view>
-                        <view className='room-bintn-button-Parking' onClick={() => { goParkMap() }} style={{ display: wifiButtonStyle }}>
+                        <view className='room-bintn-button-Parking' onClick={() => { goParkMap() }}>
                           <image className='room-bintn-image-Parking' src={GPS} />
                           <text className='room-bintn-text-Parking'>去这里</text>
                         </view>
@@ -208,44 +183,35 @@ export default (props) => {
                     </view>
                   </view>
               }
-
-
               {/* --------无线网-------- */}
-
-
               {
-                !taRoomContent.wifiName && !taRoomContent.wifiPassword ? <view></view>
-                  :
-
+                !taRoomContent.wifiName && !taRoomContent.wifiPassword ?null:
                   <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 }}>
+                        <view className='room-bintn-button-WIFIContent' onClick={() => { wifiCopy() }}>
                           <image className='room-bintn-image-WIFIContent' src={copy_logo} />
                           <text className='room-bintn-text-WIFIContent'>复制</text>
                         </view>
                       </view>
                     </view>
                   </view>
-
               }
-
-
-
-
-
-              <view className='Guide-Content-box'  >
-                <view className='title-image' style={{ display: guideStyle }} >
-                  <image mode='scaleToFill' className='title-image-cup' src={BlackSpot} />
-                  <text className='title-title-boss' >更多指引</text>
-                </view>
-                <view style={{ padding: '0 30rpx', boxSizing: 'border-box' }}>
-                  {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
-                </view>
-              </view>
+              {
+                extend.length === 0 ? null :
+                  <view className='Guide-Content-box'  >
+                    <view className='title-image'>
+                      <image mode='scaleToFill' className='title-image-cup' src={BlackSpot} />
+                      <text className='title-title-boss' >更多指引</text>
+                    </view>
+                    <view style={{ padding: '0 30rpx', boxSizing: 'border-box' }}>
+                      {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
+                    </view>
+                  </view>
+              }
             </SpinBox>
           )
         }
@@ -258,8 +224,8 @@ export default (props) => {
         <view style={{ marginTop: '10rpx', paddingBottom: '60rpx' }}>
           {(spackage || []).map((item, index) => <BossCard det={item} st={parseFloat(item.score.toFixed(1))} key={(index)} trackClick={trackClick} taRoomContent={taRoomContent} item={item} />)}
         </view>
-        <Image mode='widthFix' style={{width:'100%'}} src='http://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/hotel_guide_help.png' onClick={goIndex}/>
+        <Image mode='widthFix' style={{ width: '100%' }} src='http://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/hotel_guide_help.png' onClick={goIndex} />
       </view>
     </scroll-view>
   )
-}
+}

src/pages/index/tabs/GuideCss/style.less

@@ -1,15 +1,12 @@
 @whiteColor: #fff;
 
 .Guide-Home-box {
-  // width: 333333333333px;
   width: 94%;
   margin: auto;
 
   .room-box-info-ROOM {
-    width: 97%;
     display: flex;
-    margin-top: 35px;
-    margin: auto;
+    padding: 10px;
     .room-bi-name-ROOM {
       width: 100%;
 
@@ -32,10 +29,8 @@
   }
   // -----------------房屋位置
   .room-box-info-HouLocation {
-    width: 97%;
     display: flex;
-    margin-top: 35px;
-    margin: auto;
+    padding: 10px;
 
     .room-bi-name-HouLocation {
       width: 100%;
@@ -90,10 +85,8 @@
   // -----------------停车场位置
 
   .room-box-info-Parking {
-    width: 97%;
     display: flex;
-    margin-top: 35px;
-    margin: auto;
+    padding: 10px;
     .room-bi-name-Parking {
       width: 100%;
 
@@ -147,10 +140,8 @@
   // -----------------WIFI
 
   .room-box-info-WIFIContent {
-    width: 97%;
     display: flex;
-    margin-top: 35px;
-    margin: auto;
+    padding: 10px;
     .room-bi-name-WIFIContent {
       width: 100%;
 
@@ -318,8 +309,6 @@
     
   //攻略卡片.
   .Raiders-box-one {
-    // width: 100%;
-    // // background-color: black;
     margin-bottom: 60px;
     display: flex;
 

src/pages/index/tabs/Recommend.jsx

@@ -4,20 +4,16 @@ import iconsearch from '@/assets/icons/housemantj/search.png'
 import locationimg from '@/assets/icons/housemantj/location.png'
 import Tip from '@/components/tip'
 import List from '@/components/List';
-import NoData from '@/components/NoData'
-import Waterfall from '@/components/MasonryLayout/Waterfall';
 import MasonryLayout from '@/components/MasonryLayout';
 import { getIndexType, getResourceList } from '@/services/home'
 import { random } from '@/utils'
 import Card from '../components/Card'
 import './less/Recommend.less'
 import { OfficialAccount } from '@tarojs/components'
-
 const listStyle = { height: '100%' }
 
 export default (props) => {
   const { router, person, location } = props
-
   const listClass = useMemo(() => random('f'), [])
   const [activeTab, setActiveTab] = useState(0)
   const [typeList, setTypeList] = useState([])
@@ -27,7 +23,6 @@ export default (props) => {
   const rfTimes = useRef(0)
 
   // 获取资源表信息
-  // const [alllist, setAllList] = useState([])
   const [listData, setListData] = useState({ list: [], rfTimes: 0 })
 
 
@@ -49,13 +44,11 @@ export default (props) => {
   const handleDataChange = (value, e) => {
     if (e.paramsChanged) {
       rfTimes.current += 1
-
       //如果context有的话代表他滚动了   那么切换tab页就置顶
       if (listRef.current?.context) {
         listRef.current.context.scrollTo({ top: 0 })
       }
     }
-
     setListData({ list: value, rfTimes: rfTimes.current })
   }
 
@@ -64,7 +57,6 @@ export default (props) => {
     getIndexType({ pageSize: 20 }).then((res) => {
       setTypeList(res.records || [])
       details(1, res.records[0].typeId)
-
     })
   }, [])
 
@@ -124,4 +116,4 @@ export default (props) => {
       </view>
     </view>
   )
-}
+}