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

src/pages/MineUserAll/AllOrder/index.jsx

 
 import { useState, useEffect, } from 'react'
 import { Taro, useRouter } from '@tarojs/taro'
+import withLayout from '@/layouts'
 
 import CustomNav from '@/components/CustomNav'
 import AlreadyExpired from '@/components/CompoentsOrder/AlreadyExpired'
 
 
 
-export default (props) => {
+export default withLayout((props) => {
   const [activeTab, setActiveTab] = useState(0)
   const [swiperHeight, setSwiperHeight] = useState(0)
+  const { router, person } = props
 
 
   const { params } = useRouter()
       {activeTab === 4 && <AlreadyExpired />}
     </view>
   )
-}
+})

src/pages/MineUserAll/Collect/index.jsx

 
 import CustomNav from '@/components/CustomNav'
 import { useState } from "react";
+import withLayout from '@/layouts'
 
 import Taro from '@tarojs/taro'
 import image from '@/assets/icons/ProCard/8kb.jpg'
 const scoreList = new Array(5).fill(0)
 const score = '3.9'
 
-export default (props) => {
+export default withLayout((props) => {
+  const { router, person } = props
 
   const [value, setVaule] = useState('已收藏')
   const [imageSrc, setImageSrc] = useState(starOn)
       </view>
     </view>
   )
-}
+})

src/pages/MineUserAll/ContactMe/index.jsx

 import CustomNav from '@/components/CustomNav'
 // import { Button } from '@tarojs/components'
 import Taro from '@tarojs/taro'
+import withLayout from '@/layouts'
 
 import { Button, Text, Textarea } from '@tarojs/components'
 import './style.less'
 
-export default (props) => {
-  
-  const {location}=props
-  const {person}=location.query
-  console.log(person)
+
+export default withLayout((props) => {
+  const { router, person } = props
+
   const back = () => {
     Taro.navigateBack()
   }
       </view>
     </view>
   )
-}
+})

src/pages/MineUserAll/RefundMoney/CheckRefund/index.jsx

 import { Button, Icon, Text, Textarea } from '@tarojs/components'
 
 import { useState } from 'react'
+import withLayout from '@/layouts'
+
 import image from '@/assets/icons/ProCard/8kb.jpg'
 import food from '@/assets/icons/ProCard/food.png'
 import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
 import CustomNav from '@/components/CustomNav'
 import './style.less'
 
-export default (props) => {
+export default withLayout((props) => {
   const [view, setView] = useState(true)
   const [view2, setView2] = useState(false)
   const [view3, setView3] = useState(false)
   const [view4, setView4] = useState(false)
   const [view5, setView5] = useState(false)
   const [view6, setView6] = useState(false)
+  const { router, person } = props
+
   let value = view
   let list = [
     {
       </view>
     </view>
   )
-}
+})

src/pages/MineUserAll/RefundMoney/index.jsx

 import image from '@/assets/icons/ProCard/8kb.jpg'
 import food from '@/assets/icons/ProCard/food.png'
 import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
+import withLayout from '@/layouts'
 
 import Null from '@/assets/icons/UserCenter/null_logo.png'
 import Refund from '@/assets/icons/UserCenter/Refund.png'
 
 const scoreList = new Array(5).fill(0)
 const score = '3.9'
-export default (props) => {
+export default withLayout((props) => {
+  const { router, person } = props
 
   const handleRefund2 = () => {
     Taro.navigateTo({ url: '/pages/MineUserAll/RefundMoney/CheckRefund/index' })
       </view>
     </view>
   )
-}
+})

src/pages/MineUserAll/Rules/index.jsx

 
+import withLayout from '@/layouts'
 import CustomNav from '@/components/CustomNav'
 import './style.less'
 
-export default (props) => {
+export default withLayout((props) => {
+  const { router, person } = props
+
   return (
     <view className='box-content'>
       <CustomNav title='用户协议须知' />
       </view>
     </view>
   )
-}
+})

src/pages/PayOrder/index.jsx

-
+import withLayout from '@/layouts'
 import image from '@/assets/icons/ProCard/8kb.jpg'
 import { useState, useEffect } from 'react'
 import { Button, Radio, Input } from '@tarojs/components'
 
 import './style.less'
 
-export default () => {
+export default withLayout((props) => {
+  const { router, person } = props
+
   const [showDialog, setShowDialog] = useState(false)
 
+  const [BuyNumber, setBuyNumber] = useState(1)
+  const [DisabledBool, setDisabledBool] = useState(false)
+
   const ShowMoldeOn = () => {
     setShowDialog(true)
   }
 
   }
 
-  const [BuyNumber, setBuyNumber] = useState(1)
-  const [DisabledBool, setDisabledBool] = useState(false)
 
 
   const NumberAdd = () => {
 
 
   )
-}
+})

src/pages/TobeShop/index.jsx

+import withLayout from '@/layouts'
+
 import CustomNav from "@/components/CustomNav"
 import Popup from '@/components/Popup'
 import { useState, useEffect } from 'react'
 import './style.less'
 
 
-export default (props) => {
+export default withLayout((props) => {
+  const { router, person } = props
 
   const [showDialog, setShowDialog] = useState(false)
   //核销
 
     </view>
   )
-}
+})

src/pages/index/tabs/Guide.jsx

 import { useState } from "react";
+import withLayout from '@/layouts'
 import Taro from '@tarojs/taro'
 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'
 import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
-import sleep from '@/assets/icons/GuideCheck/sleep_logo.png'
 import Taxi from '@/assets/icons/GuideCheck/taxi.png'
 import WiFi from '@/assets/icons/GuideCheck/WiFi.png'
 import GoHere from '@/assets/icons/GuideCheck/GoHere.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 AAAAAAAA from '@/assets/icons/GuideCheck/RaidersImage.jpg'
-
+import articleCardImage from '@/assets/icons/GuideCheck/articleCardImage.png'
 import './GuideCss/style.less'
 
 
 const score = '3.9'
 
 
-export default (props) => {
+export default withLayout((props) => {
+  const { router, person } = props
   const [value, setVaule] = useState('已收藏')
   const [imageSrc, setImageSrc] = useState(starOn)
 
             <text className='articleCard-right'>--------</text>
           </view>
           <view className='articleCard-content'>
-            <image className='articleCard-image' src={AAAAAAAA} />
+            <image className='articleCard-image' src={articleCardImage} />
           </view>
           <view className='articleCard-textarea'>
             <view className='articleCard-textarea-title' >位置：<text className='articleCard-textarea-content'>地处繁华街区，餐饮、娱乐选择丰富
     </scroll-view>
 
   )
-}
+})

src/pages/index/tabs/Mine.jsx

 import React from 'react'
 import Taro from '@tarojs/taro'
+import withLayout from '@/layouts'
 
 import AuthPage from '@/components/AuthPage'
 import boy from '@/assets/icons/UserCenter/boy.png'
 
 
 
-export default (props) => {
-  const { person } = props
+export default withLayout((props) => {
+  const { router, person } = props
 
   // // 我的行程 
   // const HomeLogo = () => {
             <text className='Badge-list-titme'> 我的行程</text>
             <text className='Badge-list-gt'>&gt;</text>
           </view> */}
+
+
           <view className='Badge-list' onClick={handleCollect}>
             <image className='Badge-list-logo' src={collect} />
             <text className='Badge-list-titme'> 我的收藏</text>
       </view>
     </scroll-view>
   )
-}
+})

src/pages/index/tabs/Recommend.jsx

 import { React, useState, useEffect, } from 'react'
-// .就是当前路径
+
 import iconsearch from '@/assets/icons/housemantj/search.png'
 import icontip from '@/assets/icons/housemantj/tip.png'
 import location from '@/assets/icons/housemantj/location.png'
 import onlove from '@/assets/icons/housemantj/onlove.png'
 import Taro,{useRouter } from '@tarojs/taro'
 import withLayout from '@/layouts'
+
 import { getIndexType, getIndexRecommender } from '@/services/home'
 
 import './less/Recommend.less'
     const tab = tabs[index].typeId
     // getIndexRecommender().then()
   }
+
   useEffect(() => {
     getIndexType({ pageSize: 20 }).then((res) => {
       setTypeList(res.records || [])
       <view className='search' onClick={onSearch}>
         <input className='searchInput' disabled />
         <image className='searchicon' src={iconsearch} />
-        <view className="searchword">搜索</view>
+        <view className='searchword'>搜索</view>
       </view>
       <view className='tip' onclick={onLogin}>
         <image className='tipicon' src={icontip} />
       </view>
       <view className='index-tabs'>
         <view className='position'>
-            <image className='location' src={location} />
-            <view className='city'>南京</view>
+          <image className='location' src={location} />
+          <view className='city'>南京</view>
           <view className='line' />
         </view>
-          <scroll-view scroll-x="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
 
-        <mp-tabs
-          tabClass='tabs-Unselected'
-          swiperClass='tabs-swiper'
-          activeClass='tabs-Selected'
-          tabs={tabs}
-          current={activeTab}
-          onChange={handleTabChange}
-          activeTab={activeTab}
-        >
-        </mp-tabs>
+        <scroll-view scroll-x='true' scroll-view='true' bindscrolltoupper='upper' bindscrolltolower='lower' bindscroll='scroll'>
+
+          <mp-tabs
+            tabClass='tabs-Unselected'
+            swiperClass='tabs-swiper'
+            activeClass='tabs-Selected'
+            tabs={tabs}
+            current={activeTab}
+            onChange={handleTabChange}
+            activeTab={activeTab}
+          >
+          </mp-tabs>
         </scroll-view>
       </view>
-      <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
-        <view className="waterfall">
+      <scroll-view scroll-y='true' scroll-view='true' bindscrolltoupper='upper' bindscrolltolower='lower' bindscroll='scroll'>
+        <view className='waterfall'>
           {/* {
             list.map()