flx

src/components/MoreGuide/index.jsx

@@ -4,20 +4,27 @@ 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>
-
-    }
+
+    <>
+
+      {
+
+        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/pages/RoomOrder/components/RoomForm/index.jsx

@@ -11,6 +11,9 @@ export default (props) => {
   const [customerName, setCustomerName] = useState()
   const [customerPhone, setCustomerPhone] = useState()
 
+
+
+
   const handeInput = (e, key) => {
     const value = e.detail.value
 
@@ -25,6 +28,7 @@ export default (props) => {
     onChange({ customerName, customerPhone })
   }, [customerName, customerPhone])
 
+
   return (
     <view className='from-room'  >
       <mp-form >

src/pages/RoomOrder/index.jsx

@@ -25,45 +25,29 @@ export default withLayout((props) => {
   }
 
   const handleSubmit = (e) => {
-    console.log('原数组', formData)
+    for (let i = 0, len = formData.length; i < len; i++) {
 
-    var arrr = [...formData]
-    let Phone = /^[1][3,4,5,7,8,9][0-9]{9}$/;
+      const item = formData[i];
 
-    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;
-        }
+      if (!item.customerName || !item.customerPhone) {
+        Taro.showToast({
+          title: '手机号或姓名不能为空',
+          icon: 'none',
+        })
+        return;
       }
-
-
-
-
-
-      //   personSubmit(roomId, { ...formData }).then((res) => {
-      //     console.log('----------------------', res);
-      //   })
-
     }
+    personSubmit(roomOrderId, formData).then(a => {
+      Taro.navigateBack({
+        delta: 1
+      })
+    })
+
   }
 
 
 
+
   useEffect(() => {
     getTaRoom(roomId).then((res) => {
       setTaRoomContent(res)

src/pages/RoomOrder/style.less

@@ -7,4 +7,5 @@ button {
   border-radius: 12px;
   font-size: 40px;
   color: #ffffff;
+  margin-top: 2em;
 }

src/pages/details/foodDetails/foodDetails.jsx

@@ -1,7 +1,7 @@
 import CustomNav from '@/components/CustomNav'
 import withLayout from '@/layouts'
 import { getShopDetail, getShopPackage, getExtendContent } from '@/services/home'
-import { useState, useEffect,useRef } from 'react'
+import { useState, useEffect, useRef } from 'react'
 import { Swiper, SwiperItem } from '@tarojs/components';
 import Star from '@/components/Star/Star.jsx'
 import Cards from '@/components/foodCards/foodCards.jsx'
@@ -96,7 +96,6 @@ 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/index/index.jsx

@@ -27,7 +27,6 @@ export default withLayout((props) => {
       setCurrentTab(tab - 0)
     }
   }, [tab])
-
   return (
     <view className='page-index'>
       <view className='index-navbar'>

src/pages/index/tabs/Guide.jsx

@@ -1,6 +1,8 @@
 import { useState, useEffect, useRef } from "react";
-import withLayout from '@/layouts'
 import Taro from '@tarojs/taro'
+import MoreGuide from "@/components/MoreGuide";
+import Cards from '@/components/foodCards/foodCards.jsx'
+
 import image from '@/assets/icons/ProCard/8kb.jpg'
 import Pay from '@/assets/icons/GuideCheck/Pay_logo.png'
 import food from '@/assets/icons/ProCard/food.png'
@@ -13,11 +15,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 { getTouristDetail, getExtendContent, getRecommendList } from '@/services/home'
+import { getRecommendList, getExtendContent, getShopPackage } from '@/services/home'
 import sleep from '@/assets/icons/GuideCheck/sleep_logo.png'
 import { getTaRoom, goToRoomForm } from '@/services/taRoom​'
+import showMore from '../../../assets/icons/housemantj/查看更多.png'
 
-import MoreGuide from "@/components/MoreGuide";
 import './GuideCss/style.less'
 
 
@@ -28,20 +30,37 @@ const score = '3.9'
 
 export default (props) => {
   const { router, person } = props
+  console.log("🚀 ~ file: Guide.jsx ~ line 34 ~ props", 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 [spackage, setPackage] = useState([])
+
   // 住宿经纬度
   const Roomlog = useRef('')
   const Roomlat = useRef('')
   // 停车场经纬度
   const Parklog = useRef('')
   const Parklat = useRef('')
-
   const [taRoomContent, setTaRoomContent] = useState([])
 
+
+  //当前指南总数
+  const [newextNum, setNewextNum] = useState(0)
+  //全部指南个数
+  const [AllextNum, setAllextNum] = useState(0)
+  //指南当前页数
+  const [epage, setepage] = useState(2)
+  const extendMore = () => {
+    setepage(epage + 1)
+    getExtendContent('room', roomId, { pageNum: epage }).then((res) => {
+      setExtend([...extend, ...res.records])
+      setNewextNum(newextNum + res.records.length)
+    })
+  }
+
   useEffect(() => {
     if (roomOrderId) {
       goToRoomForm(roomOrderId).then((res) => {
@@ -55,9 +74,17 @@ export default (props) => {
     }
   }, [roomOrderId])
 
+
+
+
   useEffect(() => {
+    // 老板推荐的套餐
+    getRecommendList({ location: location }).then((res) => {
+      setPackage(res || [])
+    })
 
     if (roomId) {
+      // 点击’去这里‘跳转导航
       getTaRoom(roomId).then((res) => {
         Roomlog.current = (res.location).toString().split(',')[0]
         Roomlat.current = (res.location).toString().split(',')[1]
@@ -66,18 +93,20 @@ export default (props) => {
         setTaRoomContent(res || [])
         console.log(res);
       })
+      //更多指引
       getExtendContent('room', roomId).then((res) => {
         setExtend(res.records || [])
         setIfroomId('reality')
+        setAllextNum(res.total)
+        setNewextNum(res.records.length)
       })
 
 
     } else {
       console.log('房源没有ID');
+      return
     }
-    // getRecommendList({ location: location }).then((res) => {
-    //   setRecommend(res || [])
-    // })
+
   }, [roomId])
 
 
@@ -121,14 +150,12 @@ export default (props) => {
 
 
 
+
   const AddCollect = () => {
     setImageSrc(starOff)
     setVaule('加入收藏')
 
   }
-  const handleClick = () => {
-    Taro.navigateTo({ url: '/pages/test/index' })
-  }
   // onClick={handleClick}
   return (
     <scroll-view scroll-y style='height: 77vh;' >
@@ -200,114 +227,30 @@ export default (props) => {
                   <text className='MessageCard-text' onClick={() => { wifiCopy() }}>复制</text>
                 </view>
               </view>
-            </view>
 
+              <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>
+                {extend?.map((item, index) => <MoreGuide key={(index)} item={item} />)}
+
+                <view className='showMore' style={{ display: newextNum == AllextNum ? 'none' : '' }} onClick={extendMore}>
+                  <view>点击查看更多</view>
+                  <image src={showMore} className='moreTip' />
+                </view>
+              </view>
+            </view>
           )
         }
-
-
-        {/* 更多指引开始 */}
-        <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 className='Guide-Content-box'>
           <view className='title-image'>
             <image mode='scaleToFill' className='title-image-cup' src={Cup} />
             <text className='title-title-boss' >老板推荐好吃的</text>
           </view>
         </view>
-        {/* 小标题结束 */}
-        <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'>
-              <image className='right-image' src={Pay} />
-              <view className='right-title'>支付</view>
-            </view>
-          </view>
-        </view>
-        {/* 卡片----------------- */}
-        <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>
+        {spackage?.map((item, index) => <Cards key={(index)} item={item} />)}
+
         {/* 卡片------------- */}
         {/* <view className='Guide-Content-box-two'>
           <view className='title-image-two'>

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

@@ -203,11 +203,13 @@
     }
   }
   .Guide-Content-box {
-    margin: 2em 0;
+
     .title-image {
       display: flex;
       // width: 270px;
       height: 40px;
+    padding-bottom: 1em;
+
       .title-image-cup {
         width: 32px;
         height: 32px;
@@ -224,11 +226,69 @@
         color: #202020;
       }
     }
+    .showMore{
+      width: 100%;
+      background: linear-gradient(0deg, rgba(248, 248, 248, 0.58) 42%, rgba(248, 248, 248, 0) 100%);
+      font-size: 28px;
+      font-weight: bold;
+      color: #202020;
+      text-align: center;
+      position: relative;
+      bottom: 7em;
+      padding-top: 77px;
+      padding-bottom: 20px;
+      .moreTip{
+        width: 38px;
+        height: 19px;
+        margin-top: 14px;
+      }
+    }
   }
+  // .Guide-Content-box-boss {
+
+  //   .title-image {
+  //     display: flex;
+  //     // width: 270px;
+  //     height: 40px;
+  //   padding-bottom: 1em;
+
+  //     .title-image-cup {
+  //       width: 32px;
+  //       height: 32px;
+  //       margin-top: 10px;
+  //       padding-right: 10px;
+  //       align-items: center;
+  //     }
+
+  //     .title-title-boss {
+  //       align-items: center;
+
+  //       font-size: 32px;
+  //       font-weight: 800;
+  //       color: #202020;
+  //     }
+  //   }
+  //   .showMore{
+  //     width: 100%;
+  //     background: linear-gradient(0deg, rgba(248, 248, 248, 0.58) 42%, rgba(248, 248, 248, 0) 100%);
+  //     font-size: 28px;
+  //     font-weight: bold;
+  //     color: #202020;
+  //     text-align: center;
+  //     position: relative;
+  //     bottom: 7em;
+  //     padding-top: 77px;
+  //     padding-bottom: 20px;
+  //     .moreTip{
+  //       width: 38px;
+  //       height: 19px;
+  //       margin-top: 14px;
+  //     }
+  //   }
+  // }
   //卡片---------------
 
   .wrapper {
-    margin-top: 40px;
     display: flex;
     position: relative;
     // margin-top: 600px;
@@ -452,10 +512,10 @@
   .Guide-Content-box-two {
     margin-top: 61px;
     margin-bottom: 31px;
+    
     .title-image-two {
       display: flex;
       width: 270px;
-      height: 40px;
       .title-image-cup-two {
         width: 32px;
         height: 32px;
@@ -472,8 +532,13 @@
         color: #202020;
       }
     }
+
+
   }
 
+
+
+
   //攻略卡片.
   .Raiders-box-one {
     // width: 100%;

src/services/payOrder.js

@@ -3,31 +3,38 @@ import request from '@/utils/request'
 //套餐订单列表用哪个接口
 //订单详情，订单修改数量
 
-  /**
- * 生成订单
- * @param {*} data 
- * @returns 
- */
-   export const saveOrder = (data) => request('/order', { method: 'post', data })
+/**
+* 生成订单
+* @param {*} data 
+* @returns 
+*/
+export const saveOrder = (data) => request('/order', { method: 'post', data })
 
-   /**
- * 获取子订单列表
- * @param {*} data
- * @returns 
- */
- export const getOrderSub = (data) => request('/orderSub', { data })
+/**
+* 获取子订单列表
+* @param {*} data
+* @returns 
+*/
+export const getOrderSub = (data) => request('/orderSub', { data })
 
-   /**
- * 订单项目发起支付
- * @param {*} id 
- * @returns 
- */
-    export const payOrder = (id) => request(`/order/${id}/pay`, { method: 'post' })
+/**
+* 订单项目发起支付
+* @param {*} id 
+* @returns 
+*/
+export const payOrder = (id) => request(`/order/${id}/pay`, { method: 'post' })
+
+/**
+* 获取子订单列表
+* @param {*} id
+* @returns 
+*/
+export const getQrcode = (id) => request(`/qrcode/${id}`)
+
+/**
+* 获取待支付/待核销/退款数量
+* @param {*} id
+* @returns 
+*/
+export const getMineOrder = () => request(`/orderSub/summary/mine`)
 
-   /**
- * 获取子订单列表
- * @param {*} id
- * @returns 
- */
-    export const getQrcode = (id) => request(`/qrcode/${id}`)
-