房东端tab

src/app.config.js

@@ -7,9 +7,8 @@ export default {
     'pages/details/foodDetails/foodDetails',
     'pages/details/mjDetails/sceneryDetails',
     'pages/login/login',
-    'pages/shopKeeper/shopKeeper',
-    'pages/spread/spreadMoney',
-    'pages/landlord/AllLandlord/AllLandlord',
+    'pages/spread/spreadIndex',
+    'pages/landlord/landlord',
     'pages/PayOrder/index',
     'pages/MineUserAll/ContactMe/index',
     'pages/MineUserAll/HomeLogo/index',

src/pages/shopKeeper/shopKeeper.jsx → src/components/spreads/ShopKeeper/shopKeeper.jsx

@@ -1,18 +1,12 @@
-import Taro 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 orders from '../../assets/icons/shopKeeper/订单收入按下.png'
-import spread from '../../assets/icons/shopKeeper/推广收入.png'
-import iconsearch from '../../assets/icons/housemantj/search.png'
-import ms from '../../assets/icons/housemantj/ms3.jpg'
+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'
 
 
 export default (props) => {
-  const toSpread=()=>{
-    Taro.redirectTo({url:'/pages/spread/spreadMoney'})
-  }
   return (
     <view>
       <view>
@@ -112,16 +106,7 @@ export default (props) => {
           </view>
           <view className='botton'>已经到底了~</view>
         </scroll-view>        
-      </view>
-      <view className='bottomTab'>
-          <view className='orderstab'>
-            <image className='orders' src={orders} /><text>订单收入</text>
-          </view>
-          <view className='spreadtab' onClick={toSpread}>
-            <image className='spread' src={spread} /><text>推广收入</text>
-          </view>
-        </view>
-    
+      </view>      
       </view>
   )
 }

src/pages/shopKeeper/shopKeeper.less → src/components/spreads/ShopKeeper/shopKeeper.less

@@ -245,32 +245,3 @@
   padding:40px 0 100px 0;
 }
 
-.bottomTab{
-  width: 100%;
-  height: 98px;
-  background: #FFFFFF;
-  box-shadow: 0px -4px 6px 0px rgba(0, 0, 0, 0.08);
-  display: inline-block;
-  position: absolute;
-  bottom: 0;
-  line-height: 98px;
-  font-size: 30px;     
-  font-weight: bold;
-  color: #202020;
-  .orderstab{
-    display: inline-block;
-    margin-left: 17%;
-  }
-  .spreadtab{
-    margin-right:17%;
-    float: right;
-    color: #666;
-  }
-  image{
-    width: 31px;
-    height: 31px;
-    position: relative;
-    top: 7px;
-    margin-right: 12px;
-  }
-}

src/pages/spread/spreadMoney.jsx → src/components/spreads/Sparead/spreadMoney.jsx

@@ -1,16 +1,10 @@
-import Taro from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import './spreadMoney.less'
-import eyes from '../../assets/icons/shopKeeper/小眼睛.png'
-import ceyes from '../../assets/icons/shopKeeper/小眼睛-闭上.png'
-import orders from '../../assets/icons/shopKeeper/订单收入.png'
-import spread from '../../assets/icons/shopKeeper/推广收入按下.png'
+import eyes from '@/assets/icons/shopKeeper/小眼睛.png'
+import ceyes from '@/assets/icons/shopKeeper/小眼睛-闭上.png'
 
 
 export default (props) => {
-  const toOrders=()=>{
-    Taro.redirectTo({url:'/pages/shopKeeper/shopKeeper'})
-  }
   return (
     <view>
       <view>
@@ -58,15 +52,7 @@ export default (props) => {
           <view className='botton'>已经到底了~</view>
         </scroll-view>        
       </view>
-      <view className='bottomTab'>
-          <view className='orderstab' onClick={toOrders}>
-            <image className='orders' src={orders} /><text>订单收入</text>
-          </view>
-          <view className='spreadtab'>
-            <image className='spread' src={spread} /><text>推广收入</text>
-          </view>
-        </view>
-    
+      
       </view>
   )
 }

src/pages/spread/spreadMoney.less → src/components/spreads/Sparead/spreadMoney.less

@@ -115,32 +115,3 @@
   text-align: center;
   padding:40px 0 100px 0;
 }
-.bottomTab{
-  width: 100%;
-  height: 98px;
-  background: #FFFFFF;
-  box-shadow: 0px -4px 6px 0px rgba(0, 0, 0, 0.08);
-  display: inline-block;
-  position: absolute;
-  bottom: 0;
-  line-height: 98px;
-  font-size: 30px;     
-  font-weight: bold;
-  color: #202020;
-  .orderstab{
-    display: inline-block;
-    margin-left: 17%;
-    color: #666;
-  }
-  .spreadtab{
-    margin-right:17%;
-    float: right;
-  }
-  image{
-    width: 31px;
-    height: 31px;
-    position: relative;
-    top: 7px;
-    margin-right: 12px;
-  }
-}

src/pages/landlord/AllLandlord/AllLandlord.jsx → src/pages/landlord/landlord.jsx

@@ -7,7 +7,7 @@ import incomeImg from '@/assets/icons/landlord/我的收入.png'
 import onincomeImg from '@/assets/icons/landlord/我的收入按下.png'
 import houseImg from '@/assets/icons/landlord/房源管理.png'
 import onhouseImg from '@/assets/icons/landlord/房源管理按下.png'
-import './AllLandlord.less'
+import './landlord.less'
 
 export default (props) => {
   const { params } = useRouter()

src/pages/shopKeeper/shopKeeper.config.js → src/pages/spread/spreadIndex.config.js

@@ -1,4 +1,7 @@
 export default {
   navigationBarTitleText: '十公里',
   navigationStyle: 'custom',
+  usingComponents: {
+    "mp-tabbar": "weui-miniprogram/tabbar/tabbar"
+  }
 }

src/pages/spread/spreadIndex.jsx

@@ -0,0 +1,49 @@
+import React, { useState, useEffect } from 'react'
+import { useRouter } from '@tarojs/taro'
+import ShopKeeper from '@/components/spreads/ShopKeeper/shopKeeper'
+import Sparead from '@/components/spreads/Sparead/spreadMoney'
+import TabBar from '@/components/CustTabBar'
+import shopImg from '@/assets/icons/shopKeeper/订单收入.png'
+import onShopImg from '@/assets/icons/shopKeeper/订单收入按下.png'
+import spareadImg from '@/assets/icons/shopKeeper/推广收入.png'
+import onSpareadImg from '@/assets/icons/shopKeeper/推广收入按下.png'
+import './spreadIndex.less'
+
+export default (props) => {
+  const { params } = useRouter()
+  const { tab } = params || {}
+
+  const [currentTab, setCurrentTab] = useState(0)
+
+  const handleTabChange = (e) => {
+    const { index } = e.detail
+    setCurrentTab(index)
+  }
+
+  useEffect(() => {
+    if (tab) {
+      setCurrentTab(tab - 0)
+    }
+  }, [tab])
+
+  return (
+    <view className='page-index'>
+      <view className='index-container'>
+        {currentTab === 0 && <ShopKeeper />}
+        {currentTab === 1 && <Sparead />}
+      </view>
+      <view className='index-tabbar'>
+        <TabBar extClass='custom-tabbar bottomTab' current={currentTab} onChange={handleTabChange}>
+          <view className={`${currentTab === 0 ? 'orderstab' : ''}`}>
+            <image className='incomes' src={currentTab === 0 ? onShopImg : shopImg} /><text>订单收入</text>
+          </view>
+          <view className={`${currentTab === 1 ? 'spreadtab' : ''}`}>
+            <image className='house' src={currentTab === 1 ? onSpareadImg : spareadImg} /><text>推广收入</text>
+          </view>
+        </TabBar>
+      </view>
+    </view>
+
+  )
+
+}

src/pages/spread/spreadIndex.less

@@ -0,0 +1,20 @@
+.bottomTab{
+  height: 98px;
+  line-height: 98px;
+  font-size: 30px;     
+  font-weight: bold;
+  color: #202020;
+  .orderstab{
+    color: #666;
+  }
+  .spreadtab{
+    color: #666;
+  }
+  image{
+    width: 31px;
+    height: 31px;
+    position: relative;
+    top: 7px;
+    margin-right: 12px;
+  }
+}

src/pages/spread/spreadMoney.config.js

@@ -1,4 +0,0 @@
-export default {
-  navigationBarTitleText: '十公里',
-  navigationStyle: 'custom',
-}