。

src/components/MoreGuide/index.jsx

@@ -1,21 +1,18 @@
-import { Video } from '@tarojs/components';
-import { useState } from 'react';
+import { Video, View, Image } from '@tarojs/components';
 import { compressImage } from '@/utils'
 import './style.less'
 
 export default (props) => {
-  const { item, } = props
-
-
+  const { item } = props
   return (
     <>
       {
         item.contentType == 'image' ?
-          <image src={compressImage(item.content)} mode='widthFix' style={{ width: '100%' }} className='image-content' /> :
+          <Image src={compressImage(item.content)} mode='widthFix' style={{ width: '100%' }} className='image-content' /> :
           item.contentType == 'text' ?
-            <view style={{ marginBottom: '5px' }}>
-              <view className='storezn'>{item.content}</view>
-            </view>
+            <View style={{ marginBottom: '5px' }}>
+              <View className='storezn'>{item.content}</View>
+            </View>
             :
             <Video
               controls
@@ -24,7 +21,6 @@ export default (props) => {
               loop={false}
               muted={false} style={{ width: "100%", height: '200px' }} src={item.content}
             >
-
             </Video>
       }
     </>

src/hotel/components/HouseManage/houseManage.jsx

@@ -100,6 +100,7 @@ export default React.forwardRef((props, ref) => {
     getShareMessage: () => {
       const { shareImage, roomOrderId } = shareDataRef.current
       setShowCard(false)
+      console.log(`/pages/index/index?tab=1&roomId=${room.roomId}&roomOrderId=${roomOrderId}&fromType=hotel&recommender=${hotel.hotelId}`)
       return {
         title: `欢迎来到${room.roomName}`,
         path: `/pages/index/index?tab=1&roomId=${room.roomId}&roomOrderId=${roomOrderId}&fromType=hotel&recommender=${hotel.hotelId}`,

src/pages/index/tabs/Guide.jsx

@@ -1,16 +1,13 @@
 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, View } from "@tarojs/components";
+import { Image, View,Text } 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'
 import BlackSpot from '@/assets/icons/GuideCheck/BlackSpot.png'
-import { getRecommendList, getExtendContent } from '@/services/home'
+import { getExtendContent } from '@/services/home'
 import { getTaRoom, goToRoomForm } from '@/services/taRoom​'
-import useTrackClick from '@/utils/hooks/useTrackClick'
 import { useModel } from "@/store";
 import Customized from '../components/Customized'
 import './GuideCss/style.less'
@@ -21,7 +18,6 @@ export default (props) => {
   let { roomId, roomOrderId } = router.params
   const [extend, setExtend] = useState([])
   const [ifroomId, setIfroomId] = useState('havenot')
-  const [spackage, setPackage] = useState([])
   const [loading, setLoading] = useState(false)
 
   const { roomId: rid } = useModel('hotel')
@@ -30,8 +26,6 @@ export default (props) => {
     roomId = rid
   }
 
-  const trackClick = useTrackClick(router)
-
   const [taRoomContent, setTaRoomContent] = useState([])
 
   const goContent = () => {
@@ -46,10 +40,6 @@ export default (props) => {
     }
   }
 
-  useEffect(() => {
-    goContent()
-  }, [roomId, roomOrderId])
-
   useDidShow(() => {
     goContent()
   })
@@ -74,17 +64,6 @@ export default (props) => {
       })
       //更多指引
       getGuidelist()
-      getRecommendList({ location: taRoomContent.location || '' }).then((res) => {
-        setPackage(res || [])
-        setLoading(false)
-      })
-    } else {
-      setLoading(true)
-      getRecommendList({ location: location }).then((res) => {
-        setPackage(res || [])
-        setLoading(false)
-      })
-      return
     }
   }, [roomId, taRoomContent?.wifiPassword, taRoomContent?.parkingAddress, location, taRoomContent.location])
 
@@ -133,89 +112,87 @@ export default (props) => {
     Taro.redirectTo({ url: '/pages/index/index' })
   }
   return (
-      <scroll-view scrollY style={{ height: '100%' }}  >
-        <view className='Guide-Home-box'>
-          {/* 有民宿的情况下 */}
-          {
-            ifroomId === 'reality' && (
-              <SpinBox loading={loading}>
-                <view className='room-box-info-ROOM'>
-                  <view className='room-bi-name-ROOM' >
-                    <view className='room-bin-title-ROOM'>房屋名称</view>
-                    <view className='room-bint-nameInfo-ROOM'>{taRoomContent?.roomName}
-                    </view>
-                  </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() }}>
-                        <image className='room-bintn-image-HouLocation' src={GPS} />
-                        <text className='room-bintn-text-HouLocation'>去这里</text>
-                      </view>
-                    </view>
-                  </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() }}>
-                            <image className='room-bintn-image-Parking' src={GPS} />
-                            <text className='room-bintn-text-Parking'>去这里</text>
-                          </view>
-                        </view>
-                      </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() }}>
-                            <image className='room-bintn-image-WIFIContent' src={copy_logo} />
-                            <text className='room-bintn-text-WIFIContent'>复制</text>
-                          </view>
-                        </view>
-                      </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>
-                        {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
-                      </view>
-                    </view>
-                }
-              </SpinBox>
-            )
-          }
-          <view className='Guide-Content-box'>
-            <Customized />
-          </view>
-          <view className={`Guide-bottom-box ${ifroomId === 'reality' ? '' : 'Guide-bottom-two'}`}>
-            <Image mode='widthFix' style={{ width: '100%' }} src='http://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/hotel_guide_help.png' onClick={goIndex} />
-
-          </view>
-        </view>
-
-      </scroll-view>
+    <scroll-view scrollY style={{ height: '100%' }}  >
+      <View className='Guide-Home-box'>
+        {/* 有民宿的情况下 */}
+        {
+          ifroomId === 'reality' && (
+            <SpinBox loading={loading}>
+              <View className='room-box-info-ROOM'>
+                <View className='room-bi-name-ROOM' >
+                  <View className='room-bin-title-ROOM'>房屋名称</View>
+                  <View className='room-bint-nameInfo-ROOM'>{taRoomContent?.roomName}
+                  </View>
+                </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() }}>
+                      <Image className='room-bintn-image-HouLocation' src={GPS} />
+                      <Text className='room-bintn-text-HouLocation'>去这里</Text>
+                    </View>
+                  </View>
+                </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() }}>
+                          <Image className='room-bintn-image-Parking' src={GPS} />
+                          <Text className='room-bintn-text-Parking'>去这里</Text>
+                        </View>
+                      </View>
+                    </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() }}>
+                          <Image className='room-bintn-image-WIFIContent' src={copy_logo} />
+                          <Text className='room-bintn-text-WIFIContent'>复制</Text>
+                        </View>
+                      </View>
+                    </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>
+                      {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
+                    </View>
+                  </View>
+              }
+            </SpinBox>
+          )
+        }
+        <View className='Guide-Content-box'>
+          <Customized />
+        </View>
+        <View className={`Guide-bottom-box ${ifroomId === 'reality' ? '' : 'Guide-bottom-two'}`}>
+          <Image mode='widthFix' style={{ width: '100%' }} src='http://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/hotel_guide_help.png' onClick={goIndex} />
+        </View>
+      </View>
+    </scroll-view>
   )
 }

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

@@ -258,6 +258,7 @@
     }
   }
   .Guide-Content-box {
+    margin: 30px 0 60px 0;
     .title-image {
       display: flex;
       height: 40px;