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

src/components/foodCards/foodCards.jsx

@@ -63,7 +63,7 @@ export default (props) => {
             <image src={msTip} className='mstip'></image>
           </view>
           <view className='neirong'>
-            <view className='textword'>{(item.description).toString().length > 25 ? (item.description).substring(0, 25) + '...' : (item.description)}</view>
+            <view className='textword'  onClick={() => { goFood() }} >{(item.description).toString().length > 25 ? (item.description).substring(0, 25) + '...' : (item.description)}</view>
             <view className='jiage' onClick={() => { goFood() }} >
               <text className='rmb' >￥&nbsp;&nbsp;</text>
               <text className='p1'><text className='price' >{item.actualPrice / 100}</text>元&nbsp;&nbsp;</text>

src/components/foodCards/style.less

@@ -3,6 +3,7 @@
   box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
   border-radius: 12px;
   position: relative;
+  margin: 15px 5px;
   margin-bottom: 30px;
   overflow: hidden;
   background: radial-gradient(circle at 82% top,transparent 20px,#fff 0) top,

src/hotel/components/HouseManage/houseManage.jsx

@@ -3,13 +3,12 @@ import see from '@/assets/icons/landlord/查看入住人.png'
 import share from '@/assets/icons/landlord/分享链接.png'
 import del from '@/assets/icons/landlord/删除.png'
 import addImg from '@/assets/icons/landlord/添加.png'
-import iconsearch from '@/assets/icons/housemantj/search.png'
 import React, { useState, useEffect, useRef, useImperativeHandle } from 'react'
 import { getRoomList, deleteRoom } from '@/services/landlord'
+import SearchBar from '@/components/SearchBar'
 import ShareRoom from '../shareRoom/ShareRoom.jsx'
 import ShareCard from '../shareCard/shareCard'
 import './houseManage.less'
-import SearchBar from '@/components/SearchBar'
 
 
 export default React.forwardRef((props, ref) => {
@@ -24,16 +23,25 @@ export default React.forwardRef((props, ref) => {
   const handelClick = () => {
     Taro.navigateTo({ url: `/hotel/pages/landlord/addRoom/addRoom?hotelId=${hotel.hotelId}&hotelName=${hotel.hotelName}` });
   }
-  const handelDelete = (roomId) => {
-    deleteRoom(roomId).then(() => {
-      Taro.showToast({
-        title: '删除房源成功',
-        icon: 'none',
-      })
-      getRoomList({ hotelId: hotel.hotelId }).then((res) => {
-        setDetail(res.records || [])
-      })
+  const handelDelete = (val) => {
+    Taro.showModal({
+      title: '提示',
+      content: `确认删除${val.roomName}?`,
+      success: function (res) {
+        if (res.confirm) {
+          deleteRoom(val.roomId).then(() => {
+            Taro.showToast({
+              title: '删除房源成功',
+              icon: 'none',
+            })
+            getRoomList({ hotelId: hotel.hotelId }).then((res) => {
+              setDetail(res.records || [])
+            })
+          })       
+        } 
+      }
     })
+   
   }
 
   const [showCutover, setShowCutover] = useState(false)
@@ -97,16 +105,15 @@ export default React.forwardRef((props, ref) => {
       getRoomList({ hotelId: hotel.hotelId,roomName:e.detail.value }).then((res) => {
       setDetail(res.records || [])
     })
-    }
-    
+    }    
   }
   return (
     <view>
       <view style={{ padding: '0 30rpx', height: '100%' }}>
-        <SearchBar placeholder='请输入房源名搜索' onBlur={onSearch} />
+        <SearchBar placeholder='请输入房源名搜索' onBlur={onSearch}/>
         <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
         <ShareCard showCutover={showCard} onClose={onClose} />
-        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 255px)' }}>
+        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 244px)' }}>
           {
             detail?.map((item) =>
               <view className='houseCard'>
@@ -114,7 +121,7 @@ export default React.forwardRef((props, ref) => {
                 <view className='operation'>
                   <view onClick={() => handelOrder(item)}><image src={see} />查看入住人</view>
                   <view onClick={() => ShowMoldeOn(item)}><image src={share} />分享链接</view>
-                  <view onClick={() => handelDelete(item.roomId)}><image src={del} />删除房源</view>
+                  <view onClick={() => handelDelete(item)}><image src={del} />删除房源</view>
                 </view>
               </view>
             )

src/hotel/components/HouseManage/houseManage.less

@@ -6,7 +6,7 @@
   border-radius: 12px;
   padding: 40px 30px 41px 30px;
   text-align: center;
-  margin: 30px 0;
+  margin: 30px 10px;
   .houseName{
     height: 122px;
     font-size: 32px;
@@ -39,7 +39,7 @@
   text-align: center;
   line-height: 88px;
   position: absolute;
-  bottom: 30px;
+  bottom: 18px;
   image{
     width: 32px;
     height: 32px;

src/hotel/components/Income/income.less

@@ -62,6 +62,7 @@
   border-radius: 24px;
   padding: 50px 30px 64px 40px;
   box-sizing: border-box;
+  margin: 0 10px;
   .storeName{
     height: 26px;
     font-size: 28px;
@@ -145,7 +146,7 @@
   margin: 62px 0 10px 1px;
 }
 .spreadCard{
-  margin-bottom: 60px;  
+  margin:0 10px 60px 10px;  
   .card{
     height: 166px;
     background: #FFF;

src/hotel/components/shareRoom/ShareRoom.jsx

@@ -31,6 +31,37 @@ export default (props) => {
   return (
     <Popup show={showCutover} onClose={onClose}>
       <View className='from-room'>
+      <mp-form  >
+        <Label style={{color:'black'}}>请输入入住人信息</Label>
+        <mp-cells    footer='  ' >
+          <mp-cell title='入住人数：' extClass='font'>
+            <Input focus dataField='nm' onInput={(e) => setRoomNum(e.detail.value)} value={roomNum} type='number' placeholder='请输入入住人数' />
+          </mp-cell>
+          <mp-cell title='入住开始时间：' extClass='font'>
+            <Picker mode='date' onChange={handelStartDate}>
+              {startDate == '' ? '请选择入住开始时间' : startDate}
+            </Picker>
+          </mp-cell>
+          <mp-cell title='入住结束时间：' extClass='font'>
+            <Picker  mode='date' onChange={handelEndDate}>
+            {endDate == '' ? '请选择入住结束时间' : endDate}
+          </Picker>
+          </mp-cell>
+          <mp-cell>
+            <Button className='cancel' onClick={onClose}>取消</Button><Button className='btn' onClick={handelShare}>分享</Button>
+            {/* <button className='button-OK' onClick={sumbit}>确定</button> */}
+          </mp-cell>
+        </mp-cells>
+      </mp-form>
+      </View>
+
+
+
+
+
+
+
+      {/* <View className='from-room'>
         <Label style={{ color: 'black' }}>请输入入住人信息</Label>
         <View className='flex'>
           <Label>入住人数：</Label><Input focus dataField='nm' onInput={(e) => setRoomNum(e.detail.value)} value={roomNum} type='number' placeholder='请输入入住人数' /></View>
@@ -47,7 +78,7 @@ export default (props) => {
           </Picker>
         </View>
         <View><Button className='cancel' onClick={onClose}>取消</Button><Button className='btn' onClick={handelShare}>分享</Button></View>
-      </View>
+      </View> */}
     </Popup>
   )
 }

src/hotel/components/shareRoom/ShareRoom.less

@@ -1,38 +1,28 @@
-  .from-room{
-    font-size: 34px;
-    padding-top: 30px;
-    .flex{
-      display: flex;
-      margin: 10px 0;
-      Input{
-        width: 345px;
-        border-radius: 15px;
-        border: solid 1px rgb(121, 116, 116);
-        margin-left: 70px;
-      }
-      .picker{
-        width: 345px;
-        border-radius: 15px;
-        border: solid 1px rgb(121, 116, 116);
-      }
-    }
+.from-room{
+  padding-top: 30px;
+  .font{
+    font-size: 28px;
+    color: #202020;
   }
   .cancel{
-      width: 150px;
-      height: 70px;
-      display: inline-block;
-      line-height: 70px;
-      border-radius: 12px;
-      font-size: 36px;
-      margin-right: 20px;
+    width: 150px;
+    height: 70px;
+    display: inline-block;
+    line-height: 70px;
+    border-radius: 12px;
+    font-size: 36px;
+    margin-right: 20px;
   }
   .btn {
-      width: 150px;
-      height: 70px;
-      background: #1A3B83;
-      display: inline-block;
-      line-height: 70px;
-      border-radius: 12px;
-      font-size: 36px;
-      color: #fff;
+    width: 150px;
+    height: 70px;
+    background: #1A3B83;
+    display: inline-block;
+    line-height: 70px;
+    border-radius: 12px;
+    font-size: 36px;
+    color: #fff;
   }
+}
+  
+  

src/hotel/pages/landlord/landlord.config.js

@@ -5,7 +5,10 @@ export default {
   usingComponents: {
     "mp-tabbar": "weui-miniprogram/tabbar/tabbar",
     "mp-dialog": "weui-miniprogram/dialog/dialog",
-    "mp-searchbar": "weui-miniprogram/searchbar/searchbar"
+    "mp-searchbar": "weui-miniprogram/searchbar/searchbar",    
+    "mp-cells": "weui-miniprogram/cells/cells",
+    "mp-cell": "weui-miniprogram/cell/cell",
+    "mp-form": "weui-miniprogram/form/form"
   },
   enableShareAppMessage: true
 }

src/pages/details/foodDetails/foodDetails.config.js

@@ -1,4 +1,5 @@
 export default {
     navigationBarTitleText: '美食详情',
     navigationStyle: 'custom',
+    enableShareAppMessage: true
   }

src/pages/details/foodDetails/foodDetails.jsx

@@ -2,7 +2,7 @@ import CustomNav from '@/components/CustomNav'
 import withLayout from '@/layouts'
 import { getShopDetail, getShopPackage, getExtendContent } from '@/services/home'
 import { useState, useEffect, useRef } from 'react'
-import { Swiper, SwiperItem } from '@tarojs/components';
+import { Button, Swiper, SwiperItem } from '@tarojs/components';
 import Star from '@/components/Star/Star.jsx'
 import Cards from '@/components/foodCards/foodCards.jsx'
 import ax from '@/assets/icons/housemantj/onlove.png'
@@ -15,7 +15,7 @@ import share from '@/assets/icons/housemantj/景点分享.png'
 import good from '@/assets/icons/housemantj/景点爆赞.png'
 import baozan from '@/assets/icons/housemantj/爆赞.png'
 import weibaozan from '@/assets/icons/housemantj/未赞.png'
-import Taro from '@tarojs/taro'
+import Taro,{ useShareAppMessage } from '@tarojs/taro'
 import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
 import Extend from '../components/Extend/extend'
@@ -77,10 +77,6 @@ export default withLayout((props) => {
       setNewextNum(newextNum + res.records.length)
     })
   }
-  const toShare = () => {
-    console.log(222222222222)
-    onShareAppMessage()
-  }
   const openMap = () => {
     Taro.openLocation({
       longitude: log.current - 0,
@@ -112,6 +108,17 @@ export default withLayout((props) => {
     })
   }, [])
   const star = parseFloat(((detail.sweetScore + detail.environmentScore + detail.serviceScore) / 3).toFixed(1));
+  
+  // 分享
+  useShareAppMessage(()=>{
+      return {
+        title: detail.shopName,
+        path: `/pages/details/foodDetails/foodDetails?id=${id}`,
+        imageUrl: detail.poster,
+      }
+    
+  })
+
   return (
     <view className='page-index'>
       <view className='index-navbar'>
@@ -194,7 +201,8 @@ export default withLayout((props) => {
         </scroll-view>
       </view>
       <view className='bottomTab'>
-        <view className='tab' onClick={toShare}>
+        <Button openType='share' className='sharebtn'>分享</Button>
+        <view className='tab'>
           <image className='share' src={share} />分享
         </view>
         <view className='tab' onClick={toggleLike}>

src/pages/details/foodDetails/foodDetails.less

@@ -175,6 +175,11 @@ background-size: auto 50%;
   border-radius: 12px;
   column-count: 3;
   text-align: center;  
+  .sharebtn{
+    position: absolute;
+    width: 260px;
+    opacity: 0;
+  }
   .tab{
     line-height: 96px;
     font-size: 28px;     

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -1,22 +1,22 @@
 import CustomNav from '@/components/CustomNav'
-import ax from '../../../assets/icons/housemantj/onlove.png'
-import dw from '../../../assets/icons/housemantj/地址.png'
-import titlejd from '../../../assets/icons/housemantj/推荐景点.png'
-import titlems from '../../../assets/icons/housemantj/推荐美食.png'
-import showMore from '../../../assets/icons/housemantj/查看更多.png'
-import share from '../../../assets/icons/housemantj/景点分享.png'
-import good from '../../../assets/icons/housemantj/景点爆赞.png'
-import baozan from '../../../assets/icons/housemantj/爆赞.png'
-import weibaozan from '../../../assets/icons/housemantj/未赞.png'
+import ax from '@/assets/icons/housemantj/onlove.png'
+import dw from '@/assets/icons/housemantj/地址.png'
+import titlejd from '@/assets/icons/housemantj/推荐景点.png'
+import titlems from '@/assets/icons/housemantj/推荐美食.png'
+import showMore from '@/assets/icons/housemantj/查看更多.png'
+import share from '@/assets/icons/housemantj/景点分享.png'
+import good from '@/assets/icons/housemantj/景点爆赞.png'
+import baozan from '@/assets/icons/housemantj/爆赞.png'
+import weibaozan from '@/assets/icons/housemantj/未赞.png'
 import withLayout from '@/layouts'
 import { useState, useEffect, useRef } from 'react'
 import { getTouristDetail, getExtendContent, getRecommendList } from '@/services/home'
-import { Swiper, SwiperItem } from '@tarojs/components';
+import { Swiper, SwiperItem,Button } from '@tarojs/components';
 import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
-import Extend from '../components/Extend/extend'
 import Cards from '@/components/foodCards/foodCards.jsx'
-import Taro from '@tarojs/taro'
+import Taro,{ useShareAppMessage } from '@tarojs/taro'
+import Extend from '../components/Extend/extend'
 import './sceneryDetails.less'
 
 
@@ -84,6 +84,16 @@ export default withLayout((props) => {
       setRecommend(res || [])
     })
   }, [])
+  
+  // 分享
+  useShareAppMessage(()=>{
+    return {
+      title: detail.touristName,
+      path: `/pages/details/mjDetails/sceneryDetails?id=${id}`,
+      imageUrl: detail.poster,
+    }
+  
+})
   return (
     <view className='page-index'>
       <view className='index-navbar'>
@@ -153,6 +163,7 @@ export default withLayout((props) => {
         </scroll-view>
       </view>
       <view className='bottomTab'>
+      <Button openType='share' className='sharebtn'>分享</Button>
         <view className='tab'>
           <image className='share' src={share} />分享
         </view>

src/pages/details/mjDetails/sceneryDetails.less

@@ -276,7 +276,12 @@
   background: #FFF;
   border-radius: 12px;
   column-count: 3;
-  text-align: center;  
+  text-align: center; 
+  .sharebtn{
+    position: absolute;
+    width: 260px;
+    opacity: 0;
+  }
   .tab{
     line-height: 96px;
     font-size: 28px;     

src/pages/index/index.jsx

@@ -1,7 +1,6 @@
 
 
-import React, { useState, useEffect, useRef } from 'react'
-import Taro from '@tarojs/taro'
+import React, { useState, useEffect } from 'react'
 import CustomNav from '@/components/CustomNav'
 import logo from '@/assets/icons/comm/logo_small.png'
 import withLayout from '@/layouts'
@@ -10,8 +9,6 @@ import Guide from './tabs/Guide'
 import Mine from './tabs/Mine'
 import Recommend from './tabs/Recommend'
 import './index.less'
-import { getLocation } from '@/utils/location'
-import { getIndexType, getResourceList } from '@/services/home'
 
 
 

src/pages/index/tabs/Recommend.jsx

@@ -1,20 +1,16 @@
-import Taro, { useRouter } from '@tarojs/taro'
-import { React, useState, useEffect, useRef } from 'react'
+import Taro from '@tarojs/taro'
+import { React, useState, useEffect } from 'react'
 import iconsearch from '@/assets/icons/housemantj/search.png'
 import locationimg from '@/assets/icons/housemantj/location.png'
 import Tip from '@/components/tip'
 import { getIndexType,  getResourceList } from '@/services/home'
 import Card from '../components/Card'
-import { getLocation } from '@/utils/location'
-
 import './less/Recommend.less'
 
 
 export default (props) => {
   const { router, person, location } = props
   const [activeTab, setActiveTab] = useState(0)
-  const { params } = useRouter()
-  const { tabJump } = params || {}
   const [typeList, setTypeList] = useState([])
   
   
@@ -56,9 +52,6 @@ export default (props) => {
     Taro.navigateTo({ url: '/pages/search/search' });
   }
 
-
-
-  
   return (
     <view style={{ height: '100%', overflow: 'auto' }}>
       <view className='search' onClick={onSearch}>

src/pages/search/search.config.js

@@ -1,4 +1,7 @@
 export default {
     navigationBarTitleText: '搜索',
     navigationStyle: 'custom',
+    usingComponents: {
+      "mp-searchbar": "weui-miniprogram/searchbar/searchbar", 
+    },
   }

src/pages/search/search.jsx

@@ -1,33 +1,43 @@
-import React from 'react'
-import iconsearch from '../../assets/icons/housemantj/search.png'
-import './search.less'
 import CustomNav from '@/components/CustomNav'
-import '../index/index.less'
 import Taro from '@tarojs/taro'
 import withLayout from '@/layouts'
+import { getIndexSearch } from '@/services/home'
+import { useEffect, useState } from 'react'
+import SearchBar from '@/components/SearchBar'
+import './search.less'
+
 
 export default withLayout((props) => {
-    const { router, person } = props
-    const goLook=()=>{
-        Taro.navigateTo({ url:'/pages/searchResult/searchResult'});
+    const { router, person } = props    
+    const [hotList, setHotList] = useState([])
+    const hotSearch = (val) => {
+        Taro.navigateTo({ url: `/pages/searchResult/searchResult?q=${val}` });
     }
-    
-return (
+    const onSearch = (e) => {
+        if (e.detail.value !== '') {
+            Taro.navigateTo({ url: `/pages/searchResult/searchResult?q=${e.detail.value}` });
+        }
+    }
+    useEffect(() => {
+        getIndexSearch().then((res) => {
+            setHotList(res || [])
+        })
+    }, [])
+    return (
         <view className='page-index'>
             <view className='index-navbar'>
-                <CustomNav title='搜索' />                 
-            </view>
-            
-            <view className='search'>
-                <input className='searchInput' placeholder='请输入景区/城市搜索'/>
-                <image className='searchicon' src={iconsearch} />
-                <view className='lineSearch'></view>
+                <CustomNav title='搜索' />
             </view>
+
+            <SearchBar placeholder='请输入景区/城市搜索' onBlur={onSearch} />
+
             <view className='content'>
                 <view className='hotSearch'>热门搜索</view>
                 <view className='hotSearchtip'>
-                    <view onClick={goLook}>小龙虾</view>
-                    <view>小笼包</view>
+                    {
+                        hotList?.map((item) => <view onClick={()=>hotSearch(item.word)}>{item.word}</view>)
+                    }
+                    {/* <view onClick={goLook}>小龙虾</view>
                     <view>小笼包</view>
                     <view>小笼包</view>
                     <view>小笼包</view>
@@ -41,8 +51,9 @@ return (
                     <view>小笼包</view>
                     <view>小笼包</view>
                     <view>小笼包</view>
+                    <view>小笼包</view> */}
                 </view>
-            </view>  
+            </view>
 
         </view>
     )

src/pages/search/search.less

@@ -1,31 +1,3 @@
-.search{
-  padding: 10px 30px 0 30px;
-  position: relative;
-  .searchInput{    
-      height: 68px;
-      background: #F8F8F8;
-      border-radius: 34px;
-      padding-left: 86px;
-      box-sizing: border-box;
-      font-size: 24px;
-  }
-  .searchicon{
-    width: 25px;
-    height: 25px;
-    position: absolute;
-    bottom: 21px;
-    left: 50px;
-  }
-  .lineSearch{      
-    position: absolute;
-    bottom: 19px;
-    left: 95px;
-    width: 1px;
-    height: 28px;
-    background: #000;
-    opacity: 0.2;
-  }    
-}
 .content{
   padding: 60px 30px;
   .hotSearch{

src/pages/searchResult/searchResult.jsx

@@ -1,7 +1,6 @@
 import { React, useState, useEffect, } from 'react'
 // .就是当前路径
 import iconsearch from '../../assets/icons/housemantj/search.png'
-import location from '../../assets/icons/housemantj/location.png'
 import msImage from '../../assets/icons/housemantj/ms.jpg'
 import mjImage from '../../assets/icons/housemantj/mj.jpg'
 import glImage from '../../assets/icons/housemantj/gl.jpg'
@@ -10,45 +9,44 @@ import mjTip from '../../assets/icons/housemantj/mjtip.png'
 import glTip from '../../assets/icons/housemantj/gltip.png'
 import onlove from '../../assets/icons/housemantj/onlove.png'
 import CustomNav from '@/components/CustomNav'
-import Taro, { useRouter } from '@tarojs/taro'
+import Taro from '@tarojs/taro'
+import Card from '../index/components/Card'
+
 import './searchResult.less'
 import withLayout from '@/layouts'
 
 
 
 export default withLayout((props) => {
-  const { router, person } = props
+  const { router, person,location } = props
+  const { q} = props.router.params
 
+console.log(location,q)
   // 横向tab
   const [activeTab, setActiveTab] = useState(0)
-  const { params } = useRouter()
-  const { tabJump } = params || {}
-  useEffect(() => {
-    if (tabJump) {
-      setActiveTab(tabJump - 0)
-    }
-  }, [tabJump])
+  const [queryParams, setQueryParams] = useState({q:q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
 
+  // 获取资源表信息
+  const [alllist, setAllList] = useState([])
   const tabs = [
     {
       title: '全部',
     },
     {
       title: '美食',
-
     },
     {
       title: '景点',
-
-    },
-    {
-      title: '攻略',
-
     },
   ]
   const handleTabChange = (e) => {
     const { index } = e.detail
     setActiveTab(index)
+    if (index == 0) {
+      setQueryParams({q:q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
+    }
+    // else if(index==1){}
+    // else{}
   }
 
 
@@ -58,7 +56,11 @@ export default withLayout((props) => {
     Taro.navigateTo({ url: '/pages/search/search' });
   }
 
-
+  useEffect(() => {
+    getResourceList(queryParams).then((res) => {
+      setAllList(res.records || [])
+    })
+  }, [queryParams])
 
 
 
@@ -87,221 +89,9 @@ export default withLayout((props) => {
 
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" >
           <view className="waterfall">
-
-            {activeTab === 0 && <>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={msImage} className='cCardimg' />
-                  <image className='lefttips' src={msTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={mjImage} className='cCardimg' />
-                  <image className='lefttips' src={mjTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={glImage} className='cCardimg' />
-                  <image className='lefttips' src={glTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={mjImage} className='cCardimg' />
-                  <image className='lefttips' src={mjTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-
-            </>}
-            {activeTab === 1 && <>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={msImage} className='cCardimg' />
-                  <image className='lefttips' src={msTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-
-            </>}
-            {activeTab === 2 && <>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={mjImage} className='cCardimg' />
-                  <image className='lefttips' src={mjTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={msImage} className='cCardimg' />
-                  <image className='lefttips' src={msTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-
-            </>}
-            {activeTab === 3 && <>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={mjImage} className='cCardimg' />
-                  <image className='lefttips' src={mjTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={msImage} className='cCardimg' />
-                  <image className='lefttips' src={msTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={mjImage} className='cCardimg' />
-                  <image className='lefttips' src={mjTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-
-            </>}
-
-
+            {
+              alllist?.map((item) => <Card key={item.resourceNo} item={item} />)
+            }
           </view>
           <view className='botton'>已经到底了~</view>
         </scroll-view>

src/services/home.js

@@ -127,7 +127,6 @@ export const saveLike = (targetType, targetId) => request(`/${targetType}/like/$
  */
 export const removeLike = (targetType, targetId) => request(`/${targetType}/like/${targetId}`, { method: 'delete' })
 
-//缺少套餐订单生成
 
 
 
@@ -135,4 +134,4 @@ export const removeLike = (targetType, targetId) => request(`/${targetType}/like
  * 获取搜索列表
  * @returns 
  */
-export const getIndexSearch = (params) => request('/taSearch', { params })
+export const getIndexSearch = (params) => request('/hot-word', { params })

src/utils/location.js

@@ -1,26 +0,0 @@
-
-import Taro from '@tarojs/taro'
-
-export function getLocation() {
-  return new Promise((resolve, reject) => {
-    Taro.authorize({
-      scope: 'scope.userLocation',
-      success: () => {
-        Taro.getLocation({
-          type: 'wgs84',
-          success: (res) => {
-            resolve(res)
-          },
-          fail: (err) => {
-            console.error(err)
-            reject(err)
-          }
-        })
-      },
-      fail: (err) => {
-        console.error(err)
-        reject(err)
-      }
-    })
-  })
-}