小程序增加withLayout

src/components/spreads/ShopKeeper/shopKeeper.jsx

@@ -1,19 +1,43 @@
+import { React, useState, useEffect, } from 'react'
+import{ Taro,useRouter } from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
-import './shopKeeper.less'
 import eyes from '@/assets/icons/shopKeeper/小眼睛.png'
 import ceyes from '@/assets/icons/shopKeeper/小眼睛-闭上.png'
 import iconsearch from '@/assets/icons/housemantj/search.png'
 import ms from '@/assets/icons/housemantj/ms3.jpg'
+import './shopKeeper.less'
 
 
 export default (props) => {
+
+  const [activeTab, setActiveTab] = useState(0)
+  const { params } = useRouter()
+  const { tabJump } = params || {}
+  useEffect(() => {
+    if (tabJump) {
+      setActiveTab(tabJump - 0)
+    }
+  }, [tabJump])
+  
+  const handleTabChange = (e) => {
+    const { index } = e.detail
+    setActiveTab(index)
+  }
+  const tabs = [
+      {
+        title: '未核销订单',
+      },
+      {
+        title: '已核销订单',  
+      },   
+    ]
+
+
   return (
     <view>
       <view>
         <CustomNav title='十公里' />
       </view>
-
-
       <view style={{ padding: '30rpx', height: '100%' }}>
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 120px)' }}>
           <view className='storexx'>
@@ -37,36 +61,46 @@ export default (props) => {
             </view>
           </view>
           <view className='search'>
-            <input className='searchInput' disabled />
+            <input className='searchInput'  />
             <image className='searchicon' src={iconsearch} />
             <view className="searchword">搜索订单(输入客户手机号码)</view>
           </view>
-          <view className='orderTab'>
-            <view className='unCheck'>未核销订单</view>
-            <view className='lClickLine'></view>
-            <view className='line' />
-            <view className='check'>已核销订单</view>
-            <view className='rClickLine'></view>
-          </view>
+          <view className='index-tabs'>
+          <mp-tabs
+              tabClass='tabs-Unselected'
+              swiperClass='tabs-swiper'
+              activeClass='tabs-Selected'
+              tabs={tabs}
+              current={activeTab}
+              onChange={handleTabChange}
+              activeTab={activeTab}
+            >
+            </mp-tabs>
+            </view>
+            
           <view>
-            <view className='orderCard'>
-              <view style={{ overflow: 'hidden' }}>
-                <view className='orderId'>订单编号：<text>ABC123456789</text></view>
-                <view className='orderTime'>下单日期：<text>2021-06-22 12:35</text></view>
-              </view>
-              <view className='order'>
-                <image className='orderImg' src={ms} mode='aspectFit' />
-                <view className='orderRight'>
-                  <view className='foodName'>【SEOUL.创意韩国料理】火爆全南京，
-                    新街口又开新店啦...</view>
-                  <view className='price'>合计金额：￥<text style={{ fontSize: '24rpx' }}>88</text>元 <text className='pnum'>数量：<text>1</text>张</text> </view>
-                  <view>已下单：等待客户上门就餐</view>
+            {activeTab === 0&&
+              <view className='orderCard'>
+                <view style={{ overflow: 'hidden' }}>
+                  <view className='orderId'>订单编号：<text>ABC123456789</text></view>
+                  <view className='orderTime'>下单日期：<text>2021-06-22 12:35</text></view>
                 </view>
-                <view className='line' />
-                <view className='phone'>客户手机：<text>136****9434</text></view>
-                <view className='tripTime'>客户行程日期：预计在<text>2021-06-21中下午10:30-16:30</text></view>
-              </view>
-            </view>
+                <view className='order'>
+                  <image className='orderImg' src={ms} mode='aspectFit' />
+                  <view className='orderRight'>
+                    <view className='foodName'>【SEOUL.创意韩国料理】火爆全南京，
+                      新街口又开新店啦...</view>
+                    <view className='price'>合计金额：￥<text style={{ fontSize: '24rpx' }}>88</text>元 <text className='pnum'>数量：<text>1</text>张</text> </view>
+                    <view>已下单：等待客户上门就餐</view>
+                  </view>
+                  <view className='line' />
+                  <view className='phone'>客户手机：<text>136****9434</text></view>
+                  <view className='tripTime'>客户行程日期：预计在<text>2021-06-21中下午10:30-16:30</text></view>
+                </view>
+              </view>              
+            }
+            {activeTab === 1&&
+            <>
             <view className='orderCard'>
               <view style={{ overflow: 'hidden' }}>
                 <view className='orderId'>订单编号：<text>ABC123456789</text></view>
@@ -103,7 +137,9 @@ export default (props) => {
                 <view className='tripTime'>客户行程日期：预计在<text>2021-06-21中下午10:30-16:30</text></view>
               </view>
             </view>
-          </view>
+          </>
+            }
+            </view>
           <view className='botton'>已经到底了~</view>
         </scroll-view>        
       </view>      

src/components/spreads/ShopKeeper/shopKeeper.less

@@ -107,55 +107,28 @@
     bottom: 60px;
   }
 }
-.orderTab{
-  background: #FFFFFF;
-  box-shadow: 0px 2px 18px 0px rgba(0, 0, 0, 0.08);
-  border-radius: 24px;
-  font-size: 28px;
-  font-weight: bold;
-  color: #C0C8D3;
-  line-height: 60px;
-  position: relative;
-  .unCheck{    
-    font-size: 32px;
-    color: #404040;
-    display: inline-block;
-    margin: 29px 0 33px 101px;
-    line-height: 35px;
-    height: 30px;
-  }
-  .lClickLine{
-    position: absolute;
-    width: 60px;
-    height: 6px;
-    background: #000;
-    left: 20%;
-    bottom: 0;
+.index-tabs {
+  width: 100%;
+  height: 91px;
+  .tabs-Unselected {
+    width: 50vw;
+    text-align: center;
+    height: 26px;
+    font-size: 28px;
+    font-weight: bold;
+    color: #c0c8d3;
   }
-  .line{
-    width: 2px;
-    height: 56px;
-    background: #000;
-    opacity: 0.1;
-    position: absolute;
-    left: 50%;
-    bottom: 20px;
+  .tabs-swiper {
+    max-height: 0px;
   }
-  .check{
-    display:inline-block;
-    line-height: 35px;
-    height: 27px;
+  .tabs-Selected {
+    height: 30px;
+    font-size: 32px;
     font-weight: bold;
-    font-size: 28px;
-    float: right;
-    margin: 33px 105px 32px 0;
-  }
-  .rClickLine{
-    position: absolute;
-    width: 60px;
-    height: 6px;
-    right: 20%;
-    bottom: 0;
+    color: #4c4c4c;
+    padding-top: 33px;
+    padding-bottom: 28px;
+    border-bottom: 5px solid black;
   }
 }
 .orderCard{
@@ -236,6 +209,7 @@
       margin-bottom: 30px;
     }
   }
+  
 }
 .botton{
   font-size: 28px;   

src/hotel/pages/landlord/landlord.jsx

@@ -8,8 +8,11 @@ import onincomeImg from '@/assets/icons/landlord/我的收入按下.png'
 import houseImg from '@/assets/icons/landlord/房源管理.png'
 import onhouseImg from '@/assets/icons/landlord/房源管理按下.png'
 import './landlord.less'
+import withLayout from '@/layouts'
 
-export default (props) => {
+
+export default withLayout((props) => {
+  const { router, person } = props
   const { params } = useRouter()
   const { tab } = params || {}
 
@@ -46,4 +49,4 @@ export default (props) => {
 
   )
 
-}
+})

src/pages/MineUserAll/ContactMe/index.jsx

@@ -7,6 +7,10 @@ import { Button, Text, Textarea } from '@tarojs/components'
 import './style.less'
 
 export default (props) => {
+  
+  const {location}=props
+  const {person}=location.query
+  console.log(person)
   const back = () => {
     Taro.navigateBack()
   }

src/pages/details/foodDetails/foodDetails.jsx

@@ -22,9 +22,12 @@ import glImage from '../../../assets/icons/housemantj/gl.jpg'
 import glTip from '../../../assets/icons/housemantj/gltip.png'
 import onlove from '../../../assets/icons/housemantj/爱心.png'
 import './foodDetails.less'
+import withLayout from '@/layouts'
 
 
-export default (props) => {
+export default withLayout((props) => {
+  const { router, person } = props
+
   return (
     <view className='page-index'>
       <view className='index-navbar'>
@@ -301,4 +304,4 @@ export default (props) => {
       </view>
     </view>
   )
-}
+})

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -22,9 +22,11 @@ import share from '../../../assets/icons/housemantj/景点分享.png'
 import good from '../../../assets/icons/housemantj/景点爆赞.png'
 import collection from '../../../assets/icons/housemantj/景点收藏.png'
 import './sceneryDetails.less'
+import withLayout from '@/layouts'
 
 
-export default (props) => {
+export default withLayout((props) => {
+  const { router, person } = props
   return (
     <view className='page-index'>
       <view className='index-navbar'>
@@ -244,4 +246,4 @@ export default (props) => {
       
     </view>
   )
-}
+})

src/pages/index/tabs/Recommend.jsx

@@ -11,12 +11,14 @@ 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 Taro,{useRouter } from '@tarojs/taro'
+import withLayout from '@/layouts'
 import { getIndexType, getIndexRecommender } from '@/services/home'
 
 import './less/Recommend.less'
 
 
-export default (props) => {
+export default withLayout((props) => {
+  const { router, person } = props
   const [activeTab, setActiveTab] = useState(0)
   const { params } = useRouter()
   const { tabJump } = params || {}
@@ -25,13 +27,16 @@ export default (props) => {
 
   const tabs = [{ title: '附近' }].concat(typeList.map(x => ({...x, title: x.typeName })))
   
+  const handleTabChange = (e) => {
+    const { index } = e.detail
+    setActiveTab(index)
+    const tab = tabs[index].typeId
+    // getIndexRecommender().then()
+  }
   useEffect(() => {
-    console.log('----------11111111111-------->')
     getIndexType({ pageSize: 20 }).then((res) => {
-      console.log('----------2222222------->')
       setTypeList(res.records || [])
     })
-
     getIndexRecommender().then((res) => {
       setList(res.records || [])
     })
@@ -39,35 +44,6 @@ export default (props) => {
       setActiveTab(tabJump - 0)
     }
   }, [tabJump])
-
-  // const tabs = [
-  //   {
-  //     title: '附近',
-  //   },
-  //   {
-  //     title: '全城',
-
-  //   },
-  //   {
-  //     title: '夫子庙',
-
-  //   },
-  //   {
-  //     title: '新街口',
-
-  //   },    
-  // ]
-  const handleTabChange = (e) => {
-    const { index } = e.detail
-    setActiveTab(index)
-
-    const tab = tabs[index].typeId
-    // getIndexRecommender().then()
-  }
-
-
-
-
   const onSearch = () => {
     // 用绝对路径
     Taro.navigateTo({ url: '/pages/search/search' });
@@ -82,15 +58,10 @@ export default (props) => {
   }
   const onLogin = () => {
     // 用绝对路径
-    Taro.navigateTo({ url: '/pages/login/login' });
+    Taro.navigateTo({ url: '/components/AuthPage/index' });
   }
   return (
     <view style={{ height: '100%', overflow: 'auto' }}>
-
-
-
-
-
       <view className='search' onClick={onSearch}>
         <input className='searchInput' disabled />
         <image className='searchicon' src={iconsearch} />
@@ -106,8 +77,7 @@ export default (props) => {
             <view className='city'>南京</view>
           <view className='line' />
         </view>
-        
-        <scroll-view scroll-x="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
+          <scroll-view scroll-x="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
 
         <mp-tabs
           tabClass='tabs-Unselected'
@@ -410,4 +380,4 @@ export default (props) => {
       </scroll-view>
     </view>
   )
-}
+})

src/pages/search/search.jsx

@@ -4,12 +4,10 @@ import './search.less'
 import CustomNav from '@/components/CustomNav'
 import '../index/index.less'
 import Taro from '@tarojs/taro'
+import withLayout from '@/layouts'
 
-
-
-
-
-export default (props) => {
+export default withLayout((props) => {
+    const { router, person } = props
     const goLook=()=>{
         Taro.navigateTo({ url:'/pages/searchResult/searchResult'});
     }
@@ -48,4 +46,4 @@ return (
 
         </view>
     )
-}
+})

src/pages/searchResult/searchResult.jsx

@@ -12,9 +12,13 @@ import onlove from '../../assets/icons/housemantj/onlove.png'
 import CustomNav from '@/components/CustomNav'
 import Taro, { useRouter } from '@tarojs/taro'
 import './searchResult.less'
+import withLayout from '@/layouts'
 
 
-export default (props) => {
+
+export default withLayout((props) => {
+  const { router, person } = props
+
   // 横向tab
   const [activeTab, setActiveTab] = useState(0)
   const { params } = useRouter()
@@ -23,8 +27,6 @@ export default (props) => {
     if (tabJump) {
       setActiveTab(tabJump - 0)
     }
-    console.log('---------------------', tabJump);
-
   }, [tabJump])
 
   const tabs = [
@@ -306,4 +308,4 @@ export default (props) => {
       </view>
     </view>
   )
-}
+})

src/routes.js

@@ -56,7 +56,7 @@ const mainPages = [
   },
 ];
 
-// 商户管理页面
+// 商户管理页面shop/pages/spread/spreadIndex
 const shopPages = [
   {
     title: '商铺管理',
@@ -65,7 +65,7 @@ const shopPages = [
   },
 ];
 
-// 民宿管理页面
+// 民宿管理页面hotel/pages/landlord/landlord
 const hotelPages = [
   {
     title: '民宿管理',

src/shop/pages/spread/spreadIndex.config.js

@@ -2,6 +2,7 @@ export default {
   navigationBarTitleText: '十公里',
   navigationStyle: 'custom',
   usingComponents: {
-    "mp-tabbar": "weui-miniprogram/tabbar/tabbar"
+    "mp-tabbar": "weui-miniprogram/tabbar/tabbar",
+    "mp-tabs": "../../../components/tabs/index"
   }
 }

src/shop/pages/spread/spreadIndex.jsx

@@ -8,8 +8,11 @@ import onShopImg from '@/assets/icons/shopKeeper/订单收入按下.png'
 import spareadImg from '@/assets/icons/shopKeeper/推广收入.png'
 import onSpareadImg from '@/assets/icons/shopKeeper/推广收入按下.png'
 import './spreadIndex.less'
+import withLayout from '@/layouts'
+
+export default withLayout((props) => {
+  const { router, person } = props
 
-export default (props) => {
   const { params } = useRouter()
   const { tab } = params || {}
 
@@ -46,4 +49,4 @@ export default (props) => {
 
   )
 
-}
+})