great

package.json

@@ -42,7 +42,6 @@
     "@tarojs/runtime": "3.3.2",
     "@tarojs/taro": "3.3.2",
     "@zjxpcyc/react-tiny-store": "^1.0.0",
-    "moment": "^2.29.1",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"
   },

src/components/BossCard/index.jsx

@@ -0,0 +1,70 @@
+import withLayout from '@/layouts'
+import useSave from "@/utils/hooks/useSave"
+import image from '@/assets/icons/ProCard/8kb.jpg'
+import AuthPage from '@/components/AuthPage'
+import moment from 'moment'
+import { useState, useEffect } from 'react'
+import { Button, Radio, Input } from '@tarojs/components'
+import food from '@/assets/icons/ProCard/food.png'
+import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
+import OrderMolded from '@/components/OrderMolded'
+import Popup from '@/components/Popup'
+
+
+
+import './style.less'
+
+export default (props) => {
+  const { } = props
+
+  return (
+
+    <view class='container'>
+      <view class='wrapper'>
+        <view class='left-complete-one'>
+          <image className='left-image-1' src={ProCard_hot}></image>
+          <view className='left-viewText'>
+            返现￥16.00
+          </view>
+          {/* 评分 */}
+          <view className='card-box-star'>
+            {
+              scoreList.map((_, index) => {
+                const src = (index + '0.1') < score ? starOn : starOff
+                return (
+                  <image className='card-star-image' key={index} src={src} />
+                )
+              })
+            }
+            <text className='card-star-text' >{score}</text>
+          </view>
+          <view className='title-image'>
+            <image className='image-1' mode='scaleToFill' src={image}></image>
+            <image className='image-2' src={food}></image>
+          </view>
+          <view className='title-content'>
+            <view className='Pro-title'>
+              <view className='title-text'>【橘里橘啊换行啊啊啊气咖啡店】新鲜出炉啦!</view>
+            </view>
+            <text className='title-money' >￥6990元<text className='title-money-2'>门市价78元</text></text>
+            <view className='title-position-on'>
+              <image className='title-position' src={position} />
+              <text className='title-position-image'>南京市/秦淮区</text>
+              <image className='title-on' src={imageSrc} />
+              <text onClick={() => AddCollect()} className='title-on-text'>{value}</text>
+            </view>
+          </view>
+        </view>
+        <view class='right-complete-two'>
+          <view className='right-content'>
+            {/* <view className='right-number'>×1</view> */}
+            <image className='right-image' src={Pay} />
+            <view className='right-title'>支付</view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+
+  )
+}

src/components/BossCard/style.less

@@ -0,0 +1,299 @@
+@whiteColor: #fff;
+@Image-ProCard_hot: "../../assets/icons/ProCard/ProCard_hot.png";
+.container {
+  width: 100%;
+  .item-center-Number {
+    width: 100%;
+    margin-top: 30px;
+    .buy-num-minus {
+      display: inline-block;
+      width: 60px;
+      height: 60px;
+      background: #ffffff;
+      border: 1px solid #999999;
+      border-radius: 8px 0px 0px 8px;
+    }
+    .buy-num-input {
+      display: inline-block;
+      width: 90px;
+      height: 60px;
+      font-size: 28px;
+      font-weight: 400;
+      color: #202020;
+      background: #ffffff;
+      border: 1px solid #999999;
+      position: relative;
+      top: 26px;
+    }
+    .buy-num-add {
+      display: inline-block;
+
+      width: 60px;
+      height: 60px;
+      background: #ffffff;
+      border: 1px solid #999999;
+      border-radius: 0px 8px 8px 0px;
+    }
+  }
+  .buy-button-box {
+    width: 100%;
+    margin: 40px 0 0 0;
+
+    .button-Cancel {
+      display: inline-block;
+      width: 236px;
+      height: 78px;
+      border: 2px solid #274291;
+      font-size: 30px;
+      font-weight: bold;
+      color: #274291;
+      border-radius: 12px;
+      margin-right: 80px;
+    }
+    .button-OK {
+      display: inline-block;
+
+      width: 236px;
+      height: 78px;
+      background: #274291;
+      border-radius: 12px;
+      font-size: 30px;
+      font-weight: bold;
+      color: #ffffff;
+    }
+  }
+  .wrapper {
+    display: flex;
+    position: relative;
+    // margin-top: 600px;
+    margin: 30px auto;
+    width: 700px;
+
+    // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
+    // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));
+    filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));
+
+    .left-complete-one {
+      padding-top: 87px;
+      padding-bottom: 43px;
+      position: relative;
+      display: flex;
+      background: @whiteColor;
+      background: radial-gradient(
+            circle at top right,
+            transparent 15px,
+            @whiteColor 0
+          )
+          top right,
+        radial-gradient(circle at bottom right, transparent 15px, @whiteColor 0)
+          bottom right;
+      background-size: 100% 60%;
+      background-repeat: no-repeat;
+
+      width: 573px;
+      border-radius: 15px 0px 0px 15px;
+      // border-radius: 12px;
+
+      align-items: center;
+      .left-image-1 {
+        width: 145px;
+        height: 44px;
+        position: absolute;
+        top: 22px;
+      }
+      .left-viewText {
+        // background-image: url(@Image-ProCard_hot);
+        // width: 287px;
+        width: auto;
+        height: 44.3px;
+        position: absolute;
+        left: 1px;
+        top: 28px;
+        font-size: 24px;
+        color: @whiteColor;
+        font-weight: 600;
+      }
+      //图片
+      .title-image {
+        width: 145px;
+        margin-left: 20px;
+        border-radius: 24px;
+        overflow: hidden;
+        position: relative;
+        .image-1 {
+          width: 100%;
+          height: 145px;
+        }
+        .image-2 {
+          width: 89px;
+          height: 34px;
+          position: absolute;
+          left: 0;
+          top: 0;
+        }
+      }
+      // 商品标题
+      .title-content {
+        // padding: 84px 0 56px 20px;
+        padding-left: 18px;
+
+        .Pro-title {
+          .title-text {
+            width: 375px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box; //必须要
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            word-break: break-all; /* 多出文本省略号代替 */
+            text-align: left;
+            font-size: 24px;
+            padding-bottom: 10px;
+          }
+        }
+        .title-money {
+          padding-top: 34px;
+          font-size: 24px;
+          // color: red;
+          font-weight: 800;
+        }
+        .title-money-2 {
+          font-size: 18px;
+          color: #666;
+          padding-left: 10px;
+          text-decoration: line-through;
+        }
+
+        .title-time {
+          font-size: 24px;
+          padding-top: 20px;
+          color: #c0c8d3;
+        }
+      }
+    }
+  }
+
+  .right-complete-two {
+    background: @whiteColor;
+    background: radial-gradient(
+          circle at top left,
+          transparent 15px,
+          @whiteColor 0
+        )
+        top left,
+      radial-gradient(circle at bottom left, transparent 15px, @whiteColor 0)
+        bottom left;
+    background-size: 100% 60%;
+    background-repeat: no-repeat;
+    width: 129px;
+    border-radius: 0 15px 15px 0;
+    position: relative;
+    //右面部分
+    .right-content {
+      // width: 100px;
+      // height: 80px;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      // border: 1px solid red;
+
+      .right-number {
+        width: 40px;
+        font-size: 20px;
+        border-radius: 4px;
+        border: 2px solid #999;
+        margin: auto;
+        text-align: center;
+      }
+
+      .right-title {
+        font-weight: 700;
+        font-size: 24px;
+        padding-top: 20px;
+        text-align: center;
+      }
+    }
+  }
+  //线条
+  .right-complete-two::after {
+    content: "";
+    position: absolute;
+    top: 15px;
+    margin: 26px auto;
+    height: 70%;
+    border-left: 1px dashed #595959;
+  }
+
+  .view-button {
+
+    position: fixed;
+    bottom: 0px;
+
+    .Card-number-box {
+      .Card-number {
+        width: 100%;
+        height: 96px;
+        background-color: @whiteColor;
+      }
+      .Card-user {
+        width: 100%;
+        height: 96px;
+        background-color: @whiteColor;
+      }
+    }
+    .button-box-button-box {
+      position: relative;
+      .button-text-image {
+        width: 144;
+        height: 45px;
+        position: absolute;
+        top: -35px;
+        left: 267px;
+        right: 305px;
+        z-index: 1;
+        .button-text-money-hot {
+          position: absolute;
+          width: 144px;
+          height: 43px;
+          line-height: 43px;
+          font-size: 24px;
+          font-weight: bold;
+          color: @whiteColor;
+        }
+        .button-image {
+          width: 143px;
+          height: 43px;
+        }
+        .button-text-money {
+          position: absolute;
+          margin-top: -8;
+          width: 157px;
+          font-size: 18px;
+          font-weight: 400;
+          text-decoration: line-through;
+          color: @whiteColor;
+        }
+      }
+      .button-box-one {
+        font-size: 30px;
+        line-height: 92px;
+        margin-top: 3em;
+        background-color: #274190;
+        border-radius: 12px;
+        width: 690px;
+        height: 92px;
+        color: @whiteColor;
+        // position: absolute;
+        bottom: 40px;
+        right: 0;
+        left: 0;
+        .button-text-one {
+          right: 133px;
+          font-size: 30px;
+          padding-left: 220px;
+        }
+      }
+    }
+  }
+}

src/components/Card/index.jsx

@@ -1,8 +0,0 @@
-
-import './style.less'
-
-export default (props) => {
-
-    return <view className='card'>{props.children}</view>
-
-}

src/components/Card/style.less

@@ -1,6 +0,0 @@
-.card {
-    width: 100%;
-    background: #FFFFFF;
-    box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
-    border-radius: 24px;
-}

src/components/MoreGuide/index.jsx

@@ -0,0 +1,26 @@
+import { Video } from '@tarojs/components';
+import './style.less'
+
+export default (props) => {
+  const { item } = props
+  return (
+    <>{
+      item.contentType == 'image' ?
+        <image src={item.content} mode='widthFix' style={{ width: '100%' }} className='image-content' /> :
+        item.contentType == 'text' ?
+          <view style={{ marginBottom: '5px' }}>
+            <view className='storezn'>{item.content}</view>
+          </view> :
+          <Video
+            controls
+            autoplay={false}
+            loop={false}
+            muted={false} style={{ width: "100%", height: '200px' }} src={item.content}></Video>
+
+    }
+
+    </>
+  )
+}
+
+

src/components/MoreGuide/style.less

@@ -0,0 +1,11 @@
+
+.image-content{
+  border-radius: 10px
+}
+  .storezn{
+    font-size: 28px;
+    font-weight: 400;
+    color: #202020;
+    line-height: 54px;
+    padding-bottom: 10px;
+  }

src/components/Popup/index.jsx

@@ -2,10 +2,10 @@
 import './style.less'
 
 export default (props) => {
-  const { show, mask = true,  onClose } = props
+  const { show, mask = true, onClose, maskClosable } = props
 
   return (
-    <mp-dialog extClass='x-popup'  buttons={[]} show={show} mask={mask} maskClosable={true} onClose={onClose}>
+    <mp-dialog extClass='x-popup' buttons={[]} show={show} mask={mask} maskClosable={maskClosable} onClose={onClose}>
       {props.children}
     </mp-dialog>
   )

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

@@ -0,0 +1,42 @@
+import { useState, useEffect } from 'react'
+import Taro from '@tarojs/taro'
+import { Text, Input } from '@tarojs/components'
+import './style.less'
+
+
+
+export default (props) => {
+  const { onChange } = props
+
+  const [customerName, setCustomerName] = useState()
+  const [customerPhone, setCustomerPhone] = useState()
+
+  const handeInput = (e, key) => {
+    const value = e.detail.value
+
+    if (key === 'customerName') {
+      setCustomerName(value)
+    } else {
+      setCustomerPhone(value)
+    }
+  }
+
+  useEffect(() => {
+    onChange({ customerName, customerPhone })
+  }, [customerName, customerPhone])
+
+  return (
+    <view className='from-room'  >
+      <mp-form >
+        <mp-cells title='请填写姓名手机号' footer='  '>
+          <mp-cell prop='customerName' title='姓名：' extClass=''>
+            <input onInput={(e) => handeInput(e, 'customerName')} focus dataField='name' className='weui-input' placeholder='请输入姓名' />
+          </mp-cell>
+          <mp-cell prop='customerPhone' title='手机号：' extClass=''>
+            <input type='number' onInput={(e) => handeInput(e, 'customerPhone')} dataField='mobile' className='weui-input' placeholder='请输入手机号' />
+          </mp-cell>
+        </mp-cells>
+      </mp-form>
+    </view>
+  )
+}

src/pages/RoomOrder/components/RoomForm/style.less

@@ -0,0 +1,9 @@
+.from-room{
+  width: 100%;
+  background: #FFFFFF;
+  box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
+  border-radius: 24px;
+}
+.weui-agree .weui-agree__text {
+  display: inline;
+}

src/pages/RoomOrder/index.config.js

@@ -0,0 +1,16 @@
+export default {
+  navigationBarTitleText: '',
+  navigationStyle: 'custom',
+
+  usingComponents: {
+    "mp-checkbox-group": "weui-miniprogram/checkbox-group/checkbox-group",
+    "mp-checkbox": "weui-miniprogram/checkbox/checkbox",
+    "mp-cells": "weui-miniprogram/cells/cells",
+    "mp-dialog": "weui-miniprogram/dialog/dialog",
+    "mp-cells": "weui-miniprogram/cells/cells",
+    "mp-cell": "weui-miniprogram/cell/cell",
+    "mp-form": "weui-miniprogram/form/form"
+  }
+
+
+}

src/pages/RoomOrder/index.jsx

@@ -0,0 +1,91 @@
+import Taro from "@tarojs/taro"
+import { useEffect, useState } from "react"
+import CustomNav from '@/components/CustomNav'
+import withLayout from '@/layouts'
+import { getTaRoom, goToRoomForm, personSubmit } from '@/services/taRoom​'
+import RoomForm from './components/RoomForm'
+import './style.less'
+
+
+
+
+
+export default withLayout((props) => {
+  const { router, person } = props
+  const { roomId, roomOrderId, status } = router.params
+  const [taRoomContent, setTaRoomContent] = useState([])
+  const [orderContent, setOrderContent] = useState([])
+
+  const CarNumber = orderContent?.personNum
+  const [formData, setFormData] = useState([])
+
+  const handleChange = (e, inx) => {
+    formData[inx] = e;
+    setFormData([...formData])
+  }
+
+  const handleSubmit = (e) => {
+    console.log('原数组', formData)
+
+    var arrr = [...formData]
+    let Phone = /^[1][3,4,5,7,8,9][0-9]{9}$/;
+
+    for (let i = 0, len = arrr.length; i < len; i++) {
+      console.log('For后数组', arrr[i])
+      let numPhone = 0
+      let userName = 0
+
+      formData.map((item, index) => {
+        userName = item.customerName
+        numPhone = item.customerPhone
+      })
+      if (userName === undefined) {
+        console.log('没有名字');
+      } else {
+        if (!Phone.test(numPhone)) {
+          console.log('手机号格式不正确')
+          return false;
+        } else {
+          console.log('成功----------')
+          return true;
+        }
+      }
+
+
+
+
+
+      //   personSubmit(roomId, { ...formData }).then((res) => {
+      //     console.log('----------------------', res);
+      //   })
+
+    }
+  }
+
+
+
+  useEffect(() => {
+    getTaRoom(roomId).then((res) => {
+      setTaRoomContent(res)
+    })
+    goToRoomForm(roomOrderId).then((res) => {
+      setOrderContent(res)
+    })
+  }, [roomId, roomOrderId])
+
+  const FormCard = new Array(CarNumber).fill(0)
+  return (
+    <view>
+      <CustomNav title={taRoomContent?.roomName} />
+      {
+        FormCard.map((_, index) => {
+          return (
+            <RoomForm key={(index)} onChange={(e) => handleChange(e, index)} />
+          )
+        })
+      }
+      <button className='button-OK' onClick={handleSubmit} >确定</button>
+
+    </view>
+  )
+})

src/pages/RoomOrder/style.less

@@ -0,0 +1,10 @@
+button {
+  width: 690px;
+  height: 92px;
+  background: #1A3B83;
+  margin: 0 auto;
+  line-height: 92px;
+  border-radius: 12px;
+  font-size: 40px;
+  color: #ffffff;
+}

src/pages/TobeShop/style.less

@@ -329,7 +329,6 @@
     }
     .button-OK {
       display: inline-block;
-
       width: 236px;
       height: 78px;
       background: #274291;

src/pages/details/components/Extend/extend.jsx

@@ -0,0 +1,19 @@
+import { Video } from '@tarojs/components';
+
+export default (props) => {
+  const { item } = props
+  return (
+    <>{
+      item.contentType == 'image' ?
+        <image src={item.content} mode='widthFix' style={{ width: '100%' }} /> :
+        item.contentType == 'text' ?
+          <view className='storezn'>{item.content}</view> :
+          <Video
+            controls
+            autoplay={false}
+            loop={false}
+            muted={false} style={{ width: "100%", height: '200px' }} src={item.content}></Video>
+    }
+    </>
+  )
+}

src/pages/details/components/extend.jsx

@@ -1,18 +0,0 @@
-import { Video} from '@tarojs/components';
-
-export default (props) => {
-  const { item } = props
-  return (
-    <>{
-      item.contentType == 'image' ?
-        <image src={item.content} mode="widthFix" style={{width:'100%'}}/> :
-        item.contentType == 'text' ?
-          <view className='storezn'>{item.content}</view> :
-          <Video controls={true}
-          autoplay={false}
-          loop={false}
-          muted={false} style={{width:"100%",height:'200px'} } src={item.content} ></Video>
-    }
-    </>
-  )
-}

src/pages/details/foodDetails/foodDetails.jsx

@@ -17,7 +17,7 @@ import collection from '../../../assets/icons/housemantj/景点收藏.png'
 import hongxin from '../../../assets/icons/housemantj/已收藏.png'
 import './foodDetails.less'
 import Taro from '@tarojs/taro'
-import Extend from '../components/extend'
+import Extend from '../components/Extend/extend'
 import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
 import { useRef } from 'react';
@@ -97,6 +97,7 @@ export default withLayout((props) => {
       setAllpgNum(res.total)
     })
     getExtendContent('shop', id).then((res) => {
+      console.log('targetId targetId targetId targetId targetId targetId targetId targetId targetId ', res);
       setExtend(res.records || [])
       setAllextNum(res.total)
       setNewextNum(res.records.length)

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -15,7 +15,7 @@ import { getTouristDetail, getExtendContent, getRecommendList } from '@/services
 import { Swiper, SwiperItem } from '@tarojs/components';
 import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
-import Extend from '../components/extend'
+import Extend from '../components/Extend/extend'
 import Cards from '@/components/foodCards/foodCards.jsx'
 import Taro from '@tarojs/taro'
 import './sceneryDetails.less'

src/pages/index/index.jsx

@@ -35,7 +35,7 @@ export default withLayout((props) => {
       </view>
       <view className='index-container'>
         {currentTab === 0 && <Recommend />}
-        {currentTab === 1 && <Guide />}
+        {currentTab === 1 && <Guide person={person} router={router} />}
         {/* {currentTab === 2 && <Strategy />} */}
         {currentTab === 2 && <Mine person={person} />}
       </view>

src/pages/index/tabs/Guide.jsx

@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useState, useEffect, useRef } from "react";
 import withLayout from '@/layouts'
 import Taro from '@tarojs/taro'
 import image from '@/assets/icons/ProCard/8kb.jpg'
@@ -13,10 +13,11 @@ import Cup from '@/assets/icons/GuideCheck/Cup.png'
 import BlackSpot from '@/assets/icons/GuideCheck/BlackSpot.png'
 import starOn from '@/assets/icons/GuideCheck/starOn.png'
 import starOff from '@/assets/icons/GuideCheck/starOff.png'
-import loveOn from '@/assets/icons/GuideCheck/loveOn.png'
-import Raiders from '@/assets/icons/GuideCheck/Raiders.png'
-import RaidersImage from '@/assets/icons/GuideCheck/RaidersImage.jpg'
-import articleCardImage from '@/assets/icons/GuideCheck/articleCardImage.png'
+import { getTouristDetail, getExtendContent, getRecommendList } from '@/services/home'
+import sleep from '@/assets/icons/GuideCheck/sleep_logo.png'
+import { getTaRoom, goToRoomForm } from '@/services/taRoom​'
+
+import MoreGuide from "@/components/MoreGuide";
 import './GuideCss/style.less'
 
 
@@ -27,8 +28,97 @@ const score = '3.9'
 
 export default (props) => {
   const { router, person } = props
+  const { roomId, location, roomOrderId } = router.params
   const [value, setVaule] = useState('已收藏')
   const [imageSrc, setImageSrc] = useState(starOn)
+  const [extend, setExtend] = useState([])
+  const [ifroomId, setIfroomId] = useState('havenot')
+  // 住宿经纬度
+  const Roomlog = useRef('')
+  const Roomlat = useRef('')
+  // 停车场经纬度
+  const Parklog = useRef('')
+  const Parklat = useRef('')
+
+  const [taRoomContent, setTaRoomContent] = useState([])
+
+  useEffect(() => {
+    if (roomOrderId) {
+      goToRoomForm(roomOrderId).then((res) => {
+        console.log("🚀 ~ file: Guide.jsx ~ line 48 ~ goToRoomForm ~ res", res)
+        if (res.status !== 1) {
+          Taro.navigateTo({
+            url: `/pages/RoomOrder/index?roomOrderId=${roomOrderId}&status=${res.status}&roomId=${roomId}`,
+          })
+        }
+      })
+    }
+  }, [roomOrderId])
+
+  useEffect(() => {
+
+    if (roomId) {
+      getTaRoom(roomId).then((res) => {
+        Roomlog.current = (res.location).toString().split(',')[0]
+        Roomlat.current = (res.location).toString().split(',')[1]
+        Parklog.current = (res.parkingLocation).toString().split(',')[0]
+        Parklat.current = (res.parkingLocation).toString().split(',')[1]
+        setTaRoomContent(res || [])
+        console.log(res);
+      })
+      getExtendContent('room', roomId).then((res) => {
+        setExtend(res.records || [])
+        setIfroomId('reality')
+      })
+
+
+    } else {
+      console.log('房源没有ID');
+    }
+    // getRecommendList({ location: location }).then((res) => {
+    //   setRecommend(res || [])
+    // })
+  }, [roomId])
+
+
+  const goRoomMap = () => {
+    Taro.openLocation({
+      longitude: Roomlog.current - 0,
+      latitude: Roomlat.current - 0,
+      name: taRoomContent.roomName,
+      address: taRoomContent.address,
+      scale: 12,
+    })
+  }
+
+  const goParkMap = () => {
+    Taro.openLocation({
+      longitude: Parklog.current - 0,
+      latitude: Parklat.current - 0,
+      name: taRoomContent.parkingAddress,
+      address: taRoomContent.parkingAddress,
+      scale: 12,
+    })
+  }
+
+
+
+
+  const wifiCopy = () => {
+    Taro.setClipboardData({
+      data: taRoomContent?.wifiPassword,
+      success: e => {
+        Taro.showToast({
+          title: '密码已复制',
+          icon: 'success',
+          duration: 2000,
+        })
+      }
+    })
+  }
+
+
+
 
 
   const AddCollect = () => {
@@ -44,70 +134,78 @@ export default (props) => {
     <scroll-view scroll-y style='height: 77vh;' >
 
       <view className='Guide-Home-box'>
-        {/* <view className='Guide-image-text-box'>
-          <image className='Guide-images' src={sleep} />
-          <view className='Guide-text'>休息一下，休息一下~</view>
-        </view> */}
-        {/* 图片结束 */}
-        {/* 有民宿的情况下 */}
-        <view className='MessageCard'>
-          <view className='MessageCard-title1'>
-            <text className='MessageCard-left'>----------</text>
-            名称
-            <text className='MessageCard-right'>----------</text>
-          </view>
-          <view className='MessageCard-content'>
-            <view className='MessageCard-name' >皇冠假日酒店-2507</view>
-          </view>
-        </view>
-        {/* 有民宿的情况下 */}
-        <view className='MessageCard'>
-          <view className='MessageCard-title1'>
-            <text className='MessageCard-left'>----------</text>
-            民宿位置
-            <text className='MessageCard-right'>----------</text>
-          </view>
-          <view className='MessageCard-content'>
-            <view className='MessageCard-name' >精悦SHOS-北门</view>
-            <view className='MessageCard-info' >江苏省南京市秦淮区XXXXXX路</view>
-          </view>
-          <view className='MessageCard-button'>
-            <image className='MessageCard-image' src={GoHere} />
-            <text className='MessageCard-text'>去这里</text>
-          </view>
-        </view>
-        {/* 有民宿的情况下 */}
-        <view className='MessageCard'>
-          <view className='MessageCard-title1'>
-            <text className='MessageCard-left'>----------</text>
-            停车位置
-            <text className='MessageCard-right'>----------</text>
-          </view>
-          <view className='MessageCard-content'>
-            <view className='MessageCard-name' >江苏通讯大厦停车厂</view>
-            <view className='MessageCard-info' >江苏省南京市秦淮区集庆路</view>
-          </view>
-          <view className='MessageCard-button'>
-            <image className='MessageCard-image' src={Taxi} />
-            <text className='MessageCard-text'>去这里</text>
-          </view>
-        </view>
+        {
+          ifroomId === 'havenot' && (
+            <view className='Guide-image-text-box'>
+              <image className='Guide-images' src={sleep} />
+              <view className='Guide-text'>休息一下，休息一下~</view>
+            </view>
+          )
+        }
         {/* 有民宿的情况下 */}
-        <view className='MessageCard'>
-          <view className='MessageCard-title1'>
-            <text className='MessageCard-left'>----------</text>
-            WiFi信息
-            <text className='MessageCard-right'>----------</text>
-          </view>
-          <view className='MessageCard-content'>
-            <view className='MessageCard-name' >名称：2507</view>
-            <view className='MessageCard-info' >密码：15s1x5s5</view>
-          </view>
-          <view className='MessageCard-button'>
-            <image className='MessageCard-image' src={WiFi} />
-            <text className='MessageCard-text'>复制</text>
-          </view>
-        </view>
+        {
+          ifroomId === 'reality' && (
+            <view>
+
+              <view className='MessageCard'>
+                <view className='MessageCard-title1'>
+                  <text className='MessageCard-left'>----------</text>
+                  名称
+                  <text className='MessageCard-right'>----------</text>
+                </view>
+                <view className='MessageCard-content'>
+                  <view className='MessageCard-name' >{taRoomContent?.roomName}</view>
+                </view>
+              </view>
+              <view className='MessageCard'>
+                <view className='MessageCard-title1'>
+                  <text className='MessageCard-left'>----------</text>
+                  民宿位置
+                  <text className='MessageCard-right'>----------</text>
+                </view>
+                <view className='MessageCard-content'>
+                  <view className='MessageCard-name' >{taRoomContent?.address}</view>
+                </view>
+                <view className='MessageCard-button-RoomName'>
+                  <image className='MessageCard-image' src={GoHere} />
+                  <text className='MessageCard-text' onClick={() => { goRoomMap() }} >去这里</text>
+                </view>
+              </view>
+              <view className='MessageCard'>
+                <view className='MessageCard-title1'>
+                  <text className='MessageCard-left'>----------</text>
+                  停车位置
+                  <text className='MessageCard-right'>----------</text>
+                </view>
+                <view className='MessageCard-content'>
+                  <view className='MessageCard-name' >{taRoomContent?.parkingAddress}</view>
+                </view>
+                <view className='MessageCard-button-Park'>
+                  <image className='MessageCard-image' src={Taxi} />
+                  <text className='MessageCard-text' onClick={() => { goParkMap() }} >去这里</text>
+                </view>
+              </view>
+              <view className='MessageCard'>
+                <view className='MessageCard-title1'>
+                  <text className='MessageCard-left'>----------</text>
+                  WiFi信息
+                  <text className='MessageCard-right'>----------</text>
+                </view>
+                <view className='MessageCard-content'>
+                  <view className='MessageCard-name' >名称：{taRoomContent?.wifiName}</view>
+                  <view className='MessageCard-info' ><text className='MessageCard-name'>密码：</text>{taRoomContent?.wifiPassword}</view>
+                </view>
+                <view className='MessageCard-button'>
+                  <image className='MessageCard-image' src={WiFi} />
+                  <text className='MessageCard-text' onClick={() => { wifiCopy() }}>复制</text>
+                </view>
+              </view>
+            </view>
+
+          )
+        }
+
+
         {/* 更多指引开始 */}
         <view className='Guide-Content-box'>
           <view className='title-image'>
@@ -115,25 +213,7 @@ export default (props) => {
             <text className='title-title-boss' >更多指引</text>
           </view>
         </view>
-        <view className='articleCard'>
-          <view className='articleCard-title'>
-            <text className='articleCard-left'>--------</text>
-            南京市·普通公寓里的独立房间
-            <text className='articleCard-right'>--------</text>
-          </view>
-          <view className='articleCard-content'>
-            <image className='articleCard-image' src={articleCardImage} />
-          </view>
-          <view className='articleCard-textarea'>
-            <view className='articleCard-textarea-title' >位置：<text className='articleCard-textarea-content'>地处繁华街区，餐饮、娱乐选择丰富
-              毗邻虹桥CBD，世贸商城展馆，百盛城市购物中心金虹桥购物中心，虹桥艺术中心，领馆聚集区，商务活动频繁，购物、聚会、聚餐、观看演出、表演电影，各项活动一应俱全。
-            </text></view>
-            <view className='articleCard-textarea-title' >出行信息：<text className='articleCard-textarea-content'>地处繁华街区，餐饮、娱乐选择丰富
-              地铁2号线娄山关路站下车3号口出步行5分钟可以到达。周边公交车众多，四通八达，叫车也非常便捷快速。2号线去虹桥机场、虹桥高铁站勻为直达，无需换乘，非常便捷快速，耗时在20分钟左右（4-5站即可抵达）.
-
-            </text></view>
-          </view>
-        </view>
+        {extend?.map((item, index) => <MoreGuide key={(index)} item={item} />)}
         {/* 更多指引结束 */}
         <view className='Guide-Content-box'>
           <view className='title-image'>
@@ -212,7 +292,6 @@ export default (props) => {
                 <view className='title-text'>【橘里橘啊换行啊啊啊气咖啡店】新鲜出炉啦!</view>
               </view>
               <text className='title-money' >￥6990元<text className='title-money-2'>门市价78元</text></text>
-              {/* ProCard区域定位 */}
               <view className='title-position-on'>
                 <image className='title-position' src={position} />
                 <text className='title-position-image'>南京市/秦淮区</text>
@@ -230,14 +309,12 @@ export default (props) => {
           </view>
         </view>
         {/* 卡片------------- */}
-        <view className='Guide-Content-box-two'>
+        {/* <view className='Guide-Content-box-two'>
           <view className='title-image-two'>
             <image mode='scaleToFill' className='title-image-cup-two' src={Cup} />
             <text className='title-title-boss-two' >老板推荐的攻略</text>
           </view>
         </view>
-        {/* 小标题结束 */}
-        {/* 攻略卡片 */}
         <view className='Raiders-box-one'>
           <view className='Raiders-imageLove'>
             <image className='Raiders-image-Raiders' src={Raiders} />
@@ -265,8 +342,7 @@ export default (props) => {
               <text className='Raiders-on-text'>￥8888/人</text>
             </view>
           </view>
-          {/* <view className='Raiders-box'></view> */}
-        </view>
+        </view> */}
       </view>
     </scroll-view>
 

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

@@ -55,6 +55,54 @@
         padding-top: 19px;
       }
     }
+    .MessageCard-button-RoomName{
+      width: 168px;
+      height: 60px;
+      border: 2px solid #000000;
+      border-radius: 12px;
+      position: relative;
+      text-align: center;
+      display: inline-block;
+      left: 1.5em;
+      .MessageCard-image {
+        width: 30px;
+        height: 30px;
+        padding-top: 12px;
+        padding-right: 5px;
+      }
+      .MessageCard-text {
+        line-height: 30px;
+        width: 87px;
+        height: 28px;
+        font-size: 30px;
+        font-weight: bold;
+        color: #202020;
+      }
+    }
+    .MessageCard-button-Park{
+      width: 168px;
+      height: 60px;
+      border: 2px solid #000000;
+      border-radius: 12px;
+      position: relative;
+      text-align: center;
+      display: inline-block;
+      left: 1.5em;
+      .MessageCard-image {
+        width: 30px;
+        height: 30px;
+        padding-top: 12px;
+        padding-right: 5px;
+      }
+      .MessageCard-text {
+        line-height: 30px;
+        width: 87px;
+        height: 28px;
+        font-size: 30px;
+        font-weight: bold;
+        color: #202020;
+      }
+    }
     .MessageCard-button {
       width: 168px;
       height: 60px;
@@ -155,9 +203,10 @@
     }
   }
   .Guide-Content-box {
+    margin: 2em 0;
     .title-image {
       display: flex;
-      width: 270px;
+      // width: 270px;
       height: 40px;
       .title-image-cup {
         width: 32px;
@@ -514,4 +563,5 @@
       }
     }
   }
+
 }

src/routes.js

@@ -54,6 +54,10 @@ const mainPages = [
     title: '套餐核销',
     page: 'pages/TobeShop/index',
   },
+  {
+    title: '入住指引跳转表单',
+    page: 'pages/RoomOrder/index'
+  }
 ];
 
 // 商户管理页面shop/pages/spread/spreadIndex
@@ -75,8 +79,8 @@ const hotelPages = [
 ];
 
 // 所有的页面
-const routes = mainPages.concat(shopPages.map(x => ({...x, root: 'shop'})))
-                        .concat(hotelPages.map(x => ({...x, root: 'hotel'})))
+const routes = mainPages.concat(shopPages.map(x => ({ ...x, root: 'shop' })))
+  .concat(hotelPages.map(x => ({ ...x, root: 'hotel' })))
 
 // 主包
 const pages = mainPages.map(x => x.page);

src/services/home.js

@@ -12,99 +12,99 @@ export const getIndexType = (params) => request('/tdType', { params })
  * 获取新闻公告列表
  * @returns 
  */
- export const getTipList = (params) => request('/notification', { params })
+export const getTipList = (params) => request('/notification', { params })
 /**
  * 获取资源列表
  * @returns 
  * params 搜索条件放这里
  */
- export const getResourceList = (params) => request('/resource', { params })
+export const getResourceList = (params) => request('/resource', { params })
 
 /**
  * 加入收藏
  * @param {*} data 
  * @returns 
  */
- export const saveCollection = (targetType,targetId) => request(`/${targetType}/save/${targetId}`, { method: 'post' })
+export const saveCollection = (targetType, targetId) => request(`/${targetType}/save/${targetId}`, { method: 'post' })
 
 /**
  * 取消收藏
  * @param {*} data 
  * @returns 
  */
- export const removeCollection = (targetType,targetId) => request(`/${targetType}/save/${targetId}`, { method: 'delete'})
- 
+export const removeCollection = (targetType, targetId) => request(`/${targetType}/save/${targetId}`, { method: 'delete' })
+
 /**
  * 获取收藏
  * @param {*} data 
  * @returns 
  */
- export const getCollection = (targetType,targetId) => request(`/${targetType}/save/${targetId}`)
+export const getCollection = (targetType, targetId) => request(`/${targetType}/save/${targetId}`)
 
 /**
  * 商铺详情
  * @param {*} id 
  * @returns 
  */
- export const getShopDetail = (id) => request(`/shop/${id}`)
- /**
- * 获取商铺套餐列表
- * @returns 
- */
-  export const getShopPackage = (id,params) => request(`/shop/${id}/package`,{params})
+export const getShopDetail = (id) => request(`/shop/${id}`)
+/**
+* 获取商铺套餐列表
+* @returns 
+*/
+export const getShopPackage = (id, params) => request(`/shop/${id}/package`, { params })
 
-  /**
- * 套餐详情
- * @param {*} id 
- * @returns 
- */
- export const getShopPackageDetail = (id) => request(`/taShopPackage/${id}`)
- 
- /**
- * 获取套餐定位
- * @param {*} id 
- * @returns 
- */
-   export const getShopcity = (id) => request(`/city/${id}`)
+/**
+* 套餐详情
+* @param {*} id 
+* @returns 
+*/
+export const getShopPackageDetail = (id) => request(`/taShopPackage/${id}`)
+
+/**
+* 获取套餐定位
+* @param {*} id 
+* @returns 
+*/
+export const getShopcity = (id) => request(`/city/${id}`)
+
+/**
+* 本店指南
+* @param {*} id 
+* @returns 
+*/
+export const getExtendContent = (type, id, params) => request(`/${type}/${id}/content`, { params })
 
- /**
- * 本店指南
- * @param {*} id 
- * @returns 
- */
-  export const getExtendContent = (type,id,params) => request(`/${type}/${id}/content`,{params})
- 
 /**
  * 景点详情
  * @param {*} id 
  * @returns 
  */
- export const getTouristDetail = (id) => request(`/tourist/${id}`)
+export const getTouristDetail = (id) => request(`/tourist/${id}`)
 
 /**
  * 获取推荐套餐列表
  * @returns 
  * params 搜索条件放这里
  */
- export const getRecommendList = (params) => request('/package/recommend', { params })
+export const getRecommendList = (params) => request('/package/recommend', { params })
+
 
 
 
- 
 /**
  * 爆赞
  * @param {*} data 
  * @returns 
  */
- export const saveLike = (targetType,targetId) => request(`/${targetType}/like/${targetId}`, { method: 'post' })
+export const saveLike = (targetType, targetId) => request(`/${targetType}/like/${targetId}`, { method: 'post' })
 
 /**
  * 取消爆赞
  * @param {*} data 
  * @returns 
  */
- export const removeLike = (targetType,targetId) => request(`/${targetType}/like/${targetId}`, { method: 'delete'})
- 
+export const removeLike = (targetType, targetId) => request(`/${targetType}/like/${targetId}`, { method: 'delete' })
+
 //缺少套餐订单生成
 
 
@@ -113,4 +113,4 @@ export const getIndexType = (params) => request('/tdType', { params })
  * 获取搜索列表
  * @returns 
  */
- export const getIndexSearch  = (params) => request('/taSearch', { params })
+export const getIndexSearch = (params) => request('/taSearch', { params })

src/services/taRoom​.js

@@ -0,0 +1,33 @@
+
+import request from '@/utils/request'
+
+
+
+
+/**
+ * 房源
+ * @param {*} id 
+ * @returns 
+ */
+
+export const getTaRoom = (id) => request(`/taRoom/${id}`)
+
+
+
+
+/**
+ * 跳转表单页面
+ * @param {*} id 
+ * @returns 
+ */
+
+export const goToRoomForm = (id) => request(`/roomOrder/${id}`)
+
+
+/**
+ * 人员表单保存
+ * @param {*} id 
+ * @returns 
+ */
+
+export const personSubmit = (id, data) => request(`/room-order/${id}/person`, { method: 'post', data })