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

config/dev.js

     NODE_ENV: '"development"'
   },
   defineConstants: {
-    // HOST: '"http://127.0.0.1:8080"',
+    // HOST: '"http://192.168.89.147:8080"',
     HOST: '"http://sgl-v2-test.njyunzhi.com"',
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
     VERSION: '"2.0.33"',

src/components/SearchBar/index.jsx

 
 
   return (
-    <View className='searchBar'>
+    <View className='searchBar' >
       <mp-searchbar
         placeholder={placeholder}
         onBlur={onBlur}

src/pages/MineUserAll/AllOrder/index.jsx

 import { useState, useEffect, useMemo, } from 'react'
-import {Taro, useRouter } from '@tarojs/taro'
+import { Taro, useRouter } from '@tarojs/taro'
 import { View } from '@tarojs/components'
 import withLayout from '@/layouts'
 import CustomNav from '@/components/CustomNav'

src/pages/RoomOrder/index.jsx

   const [taRoomContent, setTaRoomContent] = useState([])
   const [orderContent, setOrderContent] = useState([])
   const [titleLogo, settitleLogo] = useState('none')
+  const [loading, setLoading] = useState(false)
 
   const { hotelId } = orderContent
   const CarNumber = orderContent?.personNum
   }
 
   const handleSubmit = (e) => {
+    setLoading(true)
 
     // 订阅消息
     withSubscribeMessage([TPL_MESSAGE_HOTEL_CHECK_OUT], () => {
         // Taro.navigateBack({
         //   delta: 1
         // })
+        setLoading(false)
+
         Taro.reLaunch({
           url: `/pages/index/index?tab=1&roomId=${roomId}`
         })
               )
             })
           }
-          <button className='button-OK' onClick={handleSubmit} >确定</button>
+          <button className='button-OK' onClick={handleSubmit} loading={loading} disabled={loading} >确定</button>
         </scroll-view>
       </View>
     </view>

src/pages/details/NoteDetails/index.config.js

+export default {
+  navigationBarTitleText: '笔记详情',
+  disableScroll: true,
+  navigationStyle: 'custom',
+  usingComponents: {
+    // "add-tipsFood": "../../../components/add-tipsFood/index"
+
+  }
+}

src/pages/details/NoteDetails/index.jsx

+import CustomNav from '@/components/CustomNav'
+import ax from '@/assets/icons/housemantj/onlove.png'
+import dw from '@/assets/icons/housemantj/loc-o.png'
+import TextMentioned from '@/assets/icons/housemantj/TextMentioned.png'
+import NoteasICO from '@/assets/icons/housemantj/NoteasICO.png'
+import { compressImage } from '@/utils'
+import MoreGuide from "@/components/MoreGuide";//视频
+
+import share from '@/assets/icons/housemantj/touristShare.png'
+import good from '@/assets/icons/housemantj/touristGood.png'
+import baozan from '@/assets/icons/housemantj/bgood.png'
+import weibaozan from '@/assets/icons/housemantj/unLike.png'
+import zhuandao from "@/assets/icons/housemantj/backTop.png";
+import withLayout from '@/layouts'
+import SpinBox from "@/components/Spin/SpinBox";
+import TabIcon from '@/components/HorTabbar/TabIcon'
+import { useState, useEffect } from 'react'
+import { getTouristDetail, getExtendContent, getRecommendList } from '@/services/home'
+import logo from "@/assets/icons/UserCenter/laba.png"
+import { Swiper, SwiperItem, Button, View, Ad } from '@tarojs/components';
+import useSave from "@/utils/hooks/useSave"
+import useLike from "@/utils/hooks/useLike"
+import Cards from '@/components/foodCards/foodCards.jsx'
+import Taro, { useShareAppMessage } from '@tarojs/taro'
+import Extend from '../components/Extend/extend'
+import './index.less'
+
+
+
+export default withLayout((props) => {
+  const { router, person, location } = props
+  const { id } = props.router.params
+  const [detail, setDetail] = useState({})
+  const [isSaved, toggleSave] = useSave(detail.isSaved, 'tourist', id)
+  const [isLike, toggleLike] = useLike(detail.isLike, 'tourist', id)
+  const [loading, setLoading] = useState(false)
+
+  //banner图集数组
+  const [imglist, setimglist] = useState([])
+  const [index, setIndex] = useState(0)
+  const handchange = (e) => {
+    setIndex(e.detail.current)
+  }
+
+  //本店指南
+  const [extend, setExtend] = useState([])
+
+  // 推荐套餐列表
+  const [recommend, setRecommend] = useState([])
+
+  const openMap = () => {
+    const [lng, lat] = detail.locaton.split(',')
+
+    Taro.openLocation({
+      longitude: lng - 0,
+      latitude: lat - 0,
+      name: detail.touristName,
+      address: detail.address,
+      scale: 12,
+    })
+  }
+  //引导显隐
+  const [guidance, setGuidance] = useState('shareOff')
+  useEffect(() => {
+    if (router.params.enterType === "share") {
+      setGuidance('shareOn')
+    }
+  }, [router.params.enterType])
+
+
+  useEffect(() => {
+    if (id) {
+      setLoading(true)
+      getTouristDetail(id, { location }).then((res) => {
+        setDetail(res)
+        setimglist(res.imageList || [])
+        getRecommendList({ location: res.locaton }).then((res2) => {
+          setRecommend(res2 || [])
+        })
+      })
+      getExtendContent('tourist', id, { pageSize: 500 }).then((res) => {
+        setExtend(res.records || [])
+        setLoading(false)
+
+      })
+    } else {
+      getRecommendList({ location }).then((res2) => {
+        setRecommend(res2 || [])
+        setLoading(false)
+      }).catch(e => {
+        setLoading(false)
+      })
+    }
+  }, [id, location])
+  // 分享
+  useShareAppMessage(() => {
+    return {
+      title: detail.touristName,
+      path: `/pages/details/mjDetails/sceneryDetails?id=${id}&enterType=share`,
+      imageUrl: detail.poster,
+    }
+
+  })
+  return (
+    <view className='page-index'>
+      {
+        guidance === 'shareOn' ? <view className='index-navbar'>
+          <add-tipsFood logo={logo} custom duration={-1} />
+          <CustomNav title='十公里' noback />
+        </view> :
+          <view className='index-navbar'>
+            <CustomNav title='十公里' />
+          </view>
+      }
+
+
+      <SpinBox loading={loading} className='index-container' style={{ padding: '0 30rpx', background: '#F8F8F8' }}>
+        <scroll-view scrollY style={{ height: '100%' }}>
+          <view className='storeDetails'>
+            <View className='huadong'>
+              <Swiper
+                className='swiper'
+                circular
+                onChange={handchange}
+              >
+                {
+                  imglist.map((item, key) => (
+                    item.noteType == 'image' ?
+                      <SwiperItem key={key}>
+                        <image src={compressImage(item.url)} mode='aspectFit' className='storeImage' />
+                      </SwiperItem> : <MoreGuide key={key} item={item} />
+                  ))}
+              </Swiper>
+              <view className='tpPage'>
+                <text>
+                  {index + 1}/{imglist.length}
+                </text>
+              </view>
+            </View>
+
+            <view className='storeJs'>
+              <view className='introduce'>
+                <text className='storeName'>{detail.touristName}</text>
+              </view>
+              <view className='bz'>
+                <image src={baozan} style={{ width: '15px', height: '15px', marginRight: '10px', marginBottom: '-2px' }} />
+                <text className='bzRight'>爆赞{detail.likeNum}</text>
+              </view>
+              <view className='wz'>{detail.address}</view>
+              <view className='dpPosition' onClick={openMap}>
+                <image src={dw} className='dwTip' />
+                <view className='distance'>{(detail.distance / 1000).toFixed(2)}公里<image src={zhuandao} className='zhuandao' /></view>
+              </view>
+            </view>
+          </view>
+          <view className='jdjs'>
+            <view>{detail.description}</view>
+            <view className='line'></view>
+            <view className='sc' onClick={toggleSave}>
+              <image className='scTip' src={isSaved > 0 ? ax : good} /><text>{isSaved > 0 ? '已收藏' : '加入收藏'}</text>
+            </view>
+          </view>
+          <view class='adContainer'>
+            <Ad unit-id='adunit-a0f97bb7ec8ec7bb' ad-intervals='30' />
+          </view>
+          <view style={{ position: 'relative', display: extend == '' ? 'none' : '' }}>
+            <view className='title'>
+              <image src={NoteasICO} />笔记详情
+            </view>
+            <View style={{ background: '#FFF' }}>
+              {(extend || []).map((item) => <Extend item={item} />)}
+            </View>
+          </view>
+          <view style={{ display: recommend == '' ? 'none' : '' }}>
+            <view className='title'>
+              <image src={TextMentioned} />文中提及
+            </view>
+            {(recommend || []).map((item) => <Cards item={item} det={item} st={parseFloat(item.score.toFixed(1))} />)}
+          </view>
+          <view className='botton'>这是我的底线</view>
+        </scroll-view>
+      </SpinBox>
+
+      <view className='index-tabber weui-tabbar' style={{ background: '#fff' }}>
+        <view className='weui-tabbar__item'>
+          <Button openType='share' className='purebtn'><TabIcon icon={share} text='分享' /></Button>
+        </view>
+        <view className='weui-tabbar__item' onClick={toggleLike}>
+          <TabIcon icon={isLike > 0 ? baozan : weibaozan} text={isLike > 0 ? "已爆赞" : "爆赞"} />
+        </view>
+        <view className='weui-tabbar__item' onClick={toggleSave}>
+          <TabIcon icon={isSaved > 0 ? ax : good} text={isSaved > 0 ? "已收藏" : "加入收藏"} />
+        </view>
+      </view>
+    </view>
+  )
+})
+
+

src/pages/details/NoteDetails/index.less

+.storeDetails {
+  background-color: #fff;
+  border-radius: 12px;
+  margin-bottom: 20px;
+  .huadong {
+    position: relative;
+    .swiper {
+      height: calc((100vw - 60px) * 0.6);
+      .storeImage {
+        border-radius: 22px;
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .tpPage {
+      position: absolute;
+      right: 20px;
+      bottom: 20px;
+      background: #000000;
+      border-radius: 16px;
+      font-size: 24px;
+      color: #ffffff;
+      padding: 0 7px;
+      opacity: 0.4;
+      line-height: 32px;
+      padding: 7px 8px 8px 7px;
+      text {
+        opacity: 0.64;
+      }
+    }
+  }
+  .storeJs {
+    padding: 22px;
+    .introduce {
+      display: inline-block;
+      .storeName {
+        font-size: 32px;
+        font-weight: bold;
+        color: #020200;
+      }
+    }
+    .bz {
+      float: right;
+      .bzRight {
+        font-size: 24px;
+        color: #202020;
+        line-height: 34px;
+        height: 23px;
+      }
+    }
+    .wz {
+      font-size: 24px;
+      padding: 30rpx 0 32rpx 0;
+      font-weight: bold;
+      color: #404040;
+    }
+    .dpPosition {
+      position: relative;
+      .dwTip {
+        width: 48px;
+        height: 48px;
+        top: -8px;
+        left: -8px;
+        position: absolute;
+      }
+      .distance {
+        padding-left: 38px;
+        font-size: 24px;
+        color: #c0c8d3;
+        .zhuandao {
+          width: 14px;
+          height: 24px;
+          transform: rotate(180deg);
+          position: relative;
+          left: 8px;
+          top: 5px;
+        }
+      }
+    }
+  }
+}
+.jdjs {
+  background: #fff;
+  border-radius: 12px 12px 0px 0px;
+  padding: 30px 20px 43px 20px;
+  text-align: justify;
+  font-size: 24px;
+  font-weight: bold;
+  color: #202020;
+  line-height: 54px;
+  overflow: hidden;
+  margin-bottom: 20px;
+  .line {
+    height: 1px;
+    background: #000;
+    opacity: 0.1;
+    margin: 57px 0 42px 0;
+  }
+  .sc {
+    font-size: 20px;
+    font-weight: bold;
+    color: #333;
+    float: right;
+    line-height: 0;
+    margin-right: 4px;
+    .scTip {
+      width: 20px;
+      height: 20px;
+      margin-right: 8px;
+    }
+  }
+}
+.title {
+  margin: 40px 0 40px 0;
+  font-size: 34px;
+  font-weight: bold;
+  color: #202020;
+  display: flex;
+  align-items: center;
+  image {
+    width: 35px;
+    height: 35px;
+    margin-right: 10px;
+  }
+}
+
+.botton {
+  font-size: 28px;
+  color: #c0c8d3;
+  line-height: 34px;
+  text-align: center;
+  padding: 40px 0;
+  background-color: #f8f8f8;
+}

src/pages/details/foodDetails/foodDetails.jsx

 } from "@/services/home";
 import { getVerifyTargetList } from "@/services/payOrder";
 import { useState, useEffect, useRef } from "react";
-import { Button,View, Ad } from "@tarojs/components";
+import { Button, View, Ad } from "@tarojs/components";
 import Star from "@/components/Star/Star.jsx";
 import NoData from '@/components/NoData'
 import Cards from "@/components/foodCards/foodCards.jsx";
 import good from "@/assets/icons/housemantj/touristGood.png";
 import baozan from "@/assets/icons/housemantj/bgood.png";
 import weibaozan from "@/assets/icons/housemantj/unLike.png";
+import logo from "@/assets/icons/UserCenter/laba.png"
+
 import useSave from "@/utils/hooks/useSave";
 import useLike from "@/utils/hooks/useLike";
 import Extend from "../components/Extend/extend";
 import ImageList from "../components/ImageList";
-import logo from "./laba.png";
 import "./foodDetails.less";
 
 export default withLayout((props) => {
                     <Cards scene={scene} id={id} setScroll={setScroll} subOrderId={subOrderId} key={item.packageId} editable='1' st={star} goshop='1' item={item} det={detail} />
                   ))}
                 </view>
-                <view class="adContainer">
-                  <Ad unit-id="adunit-a0f97bb7ec8ec7bb" ad-intervals="30" />
+                <view class='adContainer'>
+                  <Ad unit-id='adunit-a0f97bb7ec8ec7bb' ad-intervals='30' />
                 </view>
                 <view
                   style={{

src/pages/details/mjDetails/sceneryDetails.jsx

 import TabIcon from '@/components/HorTabbar/TabIcon'
 import { useState, useEffect } from 'react'
 import { getTouristDetail, getExtendContent, getRecommendList } from '@/services/home'
-import { Button, View, Ad } from '@tarojs/components';
+import logo from "@/assets/icons/UserCenter/laba.png"
+import { Swiper, SwiperItem, Button, View, Ad } from '@tarojs/components';
 import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
 import Cards from '@/components/foodCards/foodCards.jsx'
 import Taro, { useShareAppMessage } from '@tarojs/taro'
 import Extend from '../components/Extend/extend'
+import './sceneryDetails.less'
 import ImageList from "../components/ImageList";
-import logo from "../foodDetails/laba.png";
 
-import './sceneryDetails.less'
+
 
 export default withLayout((props) => {
   const { router, person, location } = props
               <view className='wz'>{detail.address}</view>
               <view className='dpPosition' onClick={openMap}>
                 <image src={dw} className='dwTip' />
-                <view className='distance'>{(detail.distance / 1000).toFixed(2)}公里<image src={zhuandao} className="zhuandao" /></view>
+                <view className='distance'>{(detail.distance / 1000).toFixed(2)}公里<image src={zhuandao} className='zhuandao' /></view>
               </view>
             </view>
           </view>
               <image className='scTip' src={isSaved > 0 ? ax : good} /><text>{isSaved > 0 ? '已收藏' : '加入收藏'}</text>
             </view>
           </view>
-          <view class="adContainer">
-            <Ad unit-id="adunit-a0f97bb7ec8ec7bb" ad-intervals="30" />
+          <view class='adContainer'>
+            <Ad unit-id='adunit-a0f97bb7ec8ec7bb' ad-intervals='30' />
           </view>
           <view style={{ position: 'relative', display: extend == '' ? 'none' : '' }}>
             <view className='title'>

src/pages/index/components/Card/index.jsx

       <view className='contentCard' style={style}>
         <view className='cardTop'>
           <image mode='widthFix' onClick={Detail} src={compressImage(item.poster)} className='cCardimg' />
-          <image className='lefttips' src={item.targetType === 'tourist' ? mjTip : msTip} />
+          {/* <image className='lefttips' src={item.targetType === 'tourist' ? mjTip : msTip} /> */}
           <image onClick={toggleSave} src={isSaved > 0 ? onlove : love} className='loveharde'></image>
         </view>
         <view className='bContent' onClick={Detail}>

src/pages/index/tabs/Recommend.jsx

 import { random } from '@/utils'
 import Card from '../components/Card'
 import './less/Recommend.less'
-import { OfficialAccount } from '@tarojs/components'
+
+
 const listStyle = { height: '100%' }
 
 export default (props) => {
   const [typeList, setTypeList] = useState([])
   const listRef = useRef()
 
-  const [queryParams, setQueryParams] = useState({ location, pageNum: 1, pageSize: 10, typeId: '' })
+  const [queryParams, setQueryParams] = useState({ location, pageNum: 1, pageSize: 10, typeId: '' })//地点
+
+  // const [queryParams, setQueryParams] = useState({ location, pageNum: 1, pageSize: 10, typeId: '' })//笔记
   const rfTimes = useRef(0)
 
   // 获取资源表信息
 
 
   //分类标签
-  const tabs = [{ title: '附近' }].concat(typeList.map(x => ({ ...x, title: x.typeName })))
-  const details = (index, tab) => {
+  const tabs = [{ title: '地点' }, { title: '笔记' }].concat(typeList.map(x => ({ ...x, title: x.typeName })))
+
+  //笔记
+  const penDetails = (index, tab) => {
+    // setActiveTab(index)
+    // setQueryParams({
+    //   ...queryParams,
+    //   typeId: tab
+    // })
+  }
+
+
+  const placeDetails = (index, tab) => {
     setActiveTab(index)
     setQueryParams({
       ...queryParams,
   //切换上面的标签
   const handleTabChange = (e) => {
     const { index } = e.detail
-    details(index, tabs[index].typeId || '')
+    // if (index = 0) {
+
+    // }
+    placeDetails(index, tabs[index].typeId || '')
   }
 
   const handleDataChange = (value, e) => {
     //查询分类标签表
     getIndexType({ pageSize: 20 }).then((res) => {
       setTypeList(res.records || [])
-      details(1, res.records[0].typeId)
+      placeDetails(1, res.records[0]?.typeId)
     })
   }, [])
 

src/pages/search/search.jsx

 import CustomNav from '@/components/CustomNav'
 import Taro from '@tarojs/taro'
+import { View, Picker } from '@tarojs/components'
 import withLayout from '@/layouts'
 import { getIndexSearch } from '@/services/home'
 import { useEffect, useState } from 'react'
       Taro.navigateTo({ url: `/pages/searchResult/searchResult?q=${e.detail.value}` });
     }
   }
+  const [selectValue, setselectValue] = useState('地点')
+  const state = {
+    selector: ['地点', '笔记'],
+    selectorChecked: selectValue,
+    // timeSel: '12:01',
+    // dateSel: '2018-04-22'
+  }
+
+  const onChange = e => {
+    setselectValue(state.selector[e.detail.value])
+  }
   useEffect(() => {
     getIndexSearch().then((res) => {
       setHotList(res || [])
     })
   }, [])
   return (
-    <view className='page-index'>
-      <view className='index-navbar'>
+    <View className='page-index'>
+      <View className='index-navbar'>
         <CustomNav title='搜索' />
-      </view>
-      <SearchBar placeholder='搜索景点/店铺' onBlur={onSearch} />
-      <view className='content'>
-        <view className='hotSearch'>热门搜索</view>
-        <view className='hotSearchtip'>
+      </View>
+      <View className='page-index-box' >
+
+        <Picker className='picker-box' mode='selector' range={state.selector} onChange={onChange}>
+          <View className='picker-text'>
+            {state.selectorChecked} |
+          </View>
+        </Picker>
+        <View className='selector-box'>
+          <SearchBar placeholder='搜索景点/店铺' onBlur={onSearch} />
+        </View>
+
+      </View>
+      <View className='content'>
+        <View className='hotSearch'>热门搜索</View>
+        <View className='hotSearchtip'>
           {
-            (hotList || []).map((item) => <view onClick={() => hotSearch(item.word)}>{item.word}</view>)
+            (hotList || []).map((item) => <View onClick={() => hotSearch(item.word)}>{item.word}</View>)
           }
-        </view>
-      </view>
-    </view>
+        </View>
+      </View>
+    </View>
   )
 })

src/pages/search/search.less

-.content{
-  padding: 60px 30px;
-  .hotSearch{
-    font-size: 34px;     
-    font-weight: bold;
-    color: #202020;
-    margin-bottom:58.4px;
+.page-index {
+  .page-index-box {
+    margin-top: -10vw;
+    .picker-box {
+      width: 20%;
+      display: inline-block;
+      position: relative;
+      top: 10vw;
+
+      .picker-text {
+        line-height: 73px;
+        text-align: center;
+        border-radius: 42px;
+        font-size: 30px;
+        font-weight: 700;
+        background-color: #f8f8f8;
+        position: relative;
+        top: 34px;
+        height: 9.9vw;
+        left: 12px;
+      }
+    }
+    .selector-box {
+      width: 83%;
+      position: relative;
+      right: -15vw;
+    }
   }
-  .hotSearchtip view{
-    border-radius: 30px;
-    font-size: 24px;     
-    font-weight: bold;
-    margin:0 40px 40px 0;
-    padding:18px 23px;
-    float: left;
-    color: #666666;
-    border: 1px solid #999999;
-  }  
-}
+
+  .content {
+    padding: 60px 30px;
+    .hotSearch {
+      font-size: 34px;
+      font-weight: bold;
+      color: #202020;
+      margin-bottom: 58.4px;
+    }
+    .hotSearchtip view {
+      border-radius: 30px;
+      font-size: 24px;
+      font-weight: bold;
+      margin: 0 40px 40px 0;
+      padding: 18px 23px;
+      float: left;
+      color: #666666;
+      border: 1px solid #999999;
+    }
+  }
+}

src/routes.js

     title: '景点详情',
     page: 'pages/details/mjDetails/sceneryDetails',
   },
+  {
+    title: '笔记详情',
+    page: 'pages/details/NoteDetails/index',
+
+  },
   {
     title: '订单',
     page: 'pages/PayOrder/index',
 // 商户管理页面shop/pages/spread/spreadIndex
 const shopPages = [
   {
-    title: '商铺管理',  
+    title: '商铺管理',
     page: 'pages/spread/spreadIndex',
     isIndex: true,
   },