flx

src/components/CustTabBar/index.jsx

@@ -1,39 +0,0 @@
-
-import React from 'react'
-import './style.less'
-
-export default (props) => {
-  const { extClass = '', current, onChange, children } = props
-
-  const handleTabChange = (e, index) => {
-    if (e) {
-      e.detail = {
-        ...e.detail || {},
-        index,
-      }
-      // Object.assign(e.detail, { index })
-    }
-
-    if (onChange) {
-      onChange(e)
-    }
-  }
-
-  const className = `weui-tabbar cust-tabbar ${extClass}`
-
-  return (
-    <view className={className}>
-      {
-        React.Children.toArray(children).map((child, index) => {
-          const itemClass = `weui-tabbar__item cust-tabbar-item`
-
-          return (
-            <view className={itemClass} onClick={(e) => handleTabChange(e, index)}>
-              {child}
-            </view>
-          )
-        })
-      }
-    </view>
-  )
-}

src/components/CustTabBar/style.less

@@ -1,6 +0,0 @@
-.cust-tabbar {
-  &-item {
-    font-size: 1em;
-    padding: 0;
-  }
-}

src/hotel/pages/landlord/Roomtabbar.js

@@ -0,0 +1,18 @@
+
+const Roomtabbar = [
+
+
+  {
+    text: '房源管理',
+    iconPath: require('@/assets/icons/landlord/roomOff.png'),
+    selectedIconPath: require('@/assets/icons/landlord/roomON.png'),
+  },
+  {
+    text: '我的收入',
+    iconPath: require('@/assets/icons/landlord/money.png'),
+    selectedIconPath: require('@/assets/icons/landlord/moneyON.png'),
+  },
+
+]
+
+export default Roomtabbar

src/hotel/pages/landlord/landlord.jsx

@@ -1,17 +1,16 @@
 import React, { useState, useEffect, useRef } from 'react'
 import Taro, { useRouter, useShareAppMessage } from '@tarojs/taro'
-import TabBar from '@/components/CustTabBar'
-import incomeImg from '@/assets/icons/landlord/money.png'
-import onincomeImg from '@/assets/icons/landlord/moneyON.png'
-import houseImg from '@/assets/icons/landlord/roomOff.png'
-import onhouseImg from '@/assets/icons/landlord/roomON.png'
+
 import withLayout from '@/layouts'
+
 import { getHotelManage, getNowHotelManage } from '@/services/landlord'
 import NoData from '@/components/NoData'
 import CustomNav from '@/components/CustomNav'
 import { withSubscribeMessage } from '@/utils/subscribeMessage'
 import HouseManage from '../../components/HouseManage/houseManage'
 import Income from '../../components/Income/income'
+import tabList from './Roomtabbar'
+
 import './landlord.less'
 
 export default withLayout((props) => {
@@ -64,7 +63,7 @@ export default withLayout((props) => {
 
   return (
     <view className='page-index'>
-      <view className="index-navbar">
+      <view className='index-navbar'>
         <CustomNav title={hotel?.hotelName} logo={hotel?.logo} />
       </view>
       <view className='index-container'>
@@ -72,14 +71,17 @@ export default withLayout((props) => {
         {hotel?.hotelId ? currentTab === 0 && <HouseManage hotel={hotel} ref={houseRef} disabled={!hotel.hotelId} /> : <NoData />}
       </view>
       <view className='index-tabbar'>
-        <TabBar extClass='custom-tabbar bottomTab' current={currentTab} onChange={handleTabChange}>
+        {/* <TabBar extClass='custom-tabbar bottomTab' current={currentTab} onChange={handleTabChange}>
           <view className={`${currentTab === 0 ? 'houseTab' : ''}`}>
             <image className='house' src={currentTab === 0 ? onhouseImg : houseImg} /><text>房源管理</text>
           </view>
           <view className={`${currentTab === 1 ? 'incomeTab' : ''}`}>
             <image className='incomes' src={currentTab === 1 ? onincomeImg : incomeImg} /><text>我的收入</text>
           </view>
-        </TabBar>
+        </TabBar> */}
+      </view>
+      <view className='index-tabbar'>
+        <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>
       </view>
     </view>
 

src/pages/details/foodDetails/foodDetails.jsx

@@ -138,9 +138,9 @@ export default withLayout((props) => {
   });
 
   return (
-    <view className="page-index">
-      <view className="index-navbar">
-        <CustomNav title="十公里" />
+    <view className='page-index'>
+      <view className='index-navbar'>
+        <CustomNav title='十公里' />
       </view>
       <view
         style={{ overflow: "hidden", padding: "0 30rpx", height: '100%', background: "#F8F8F8" }}
@@ -149,17 +149,17 @@ export default withLayout((props) => {
           scrollY
           style={{ height: '100%' }}
         >
-          <view className="storeDetails">
+          <view className='storeDetails'>
             <Swiper
-              className="swiper"
+              className='swiper'
               circular
               current={index}
               onChange={handchange}
             >
               {imglist.map((item) => (
                 <SwiperItem>
-                  <image src={item.url} mode='aspectFit' className="storeImage">
-                    <view className="tpPage">
+                  <image src={item.url} mode='aspectFit' className='storeImage'>
+                    <view className='tpPage'>
                       <text>
                         {index + 1}/{imglist.length}
                       </text>
@@ -168,13 +168,13 @@ export default withLayout((props) => {
                 </SwiperItem>
               ))}
             </Swiper>
-            <view className="storeJs">
+            <view className='storeJs'>
               <view style={{ overflow: "hidden" }}>
-                <view className="storeName">{detail.shopName}</view>
-                <view className="sprice">
-                  <text className="t1">￥</text>
+                <view className='storeName'>{detail.shopName}</view>
+                <view className='sprice'>
+                  <text className='t1'>￥</text>
                   {detail.averagePrice / 100}/人
-                  <view className="bzRight">
+                  <view className='bzRight'>
                     <image
                       src={baozan}
                       style={{
@@ -188,25 +188,25 @@ export default withLayout((props) => {
                   </view>
                 </view>
               </view>
-              <view className="appraise">
+              <view className='appraise'>
                 <Star star={star} />
                 {star}
                 <view style={{ float: "right", marginTop: "5px" }}>
-                  <text className="comment">点评：</text>
-                  <text className="t1">口味：{detail.sweetScore}</text>
-                  <text className="t1">环境：{detail.environmentScore}</text>
-                  <text className="t1">服务：{detail.serviceScore}</text>
+                  <text className='comment'>点评：</text>
+                  <text className='t1'>口味：{detail.sweetScore}</text>
+                  <text className='t1'>环境：{detail.environmentScore}</text>
+                  <text className='t1'>服务：{detail.serviceScore}</text>
                 </view>
               </view>
-              <view className="yysj">
-                <image src={yysj} className="yysjImg" />
+              <view className='yysj'>
+                <image src={yysj} className='yysjImg' />
                 营业时间：{detail.businessHours}
               </view>
-              <view className="dpPosition" onClick={openMap}>
-                <image src={dw} className="dwTip" />
+              <view className='dpPosition' onClick={openMap}>
+                <image src={dw} className='dwTip' />
                 <view>
                   {detail.address}
-                  <image src={zhuandao} className="zhuandao" />
+                  <image src={zhuandao} className='zhuandao' />
                 </view>
               </view>
             </view>
@@ -221,7 +221,7 @@ export default withLayout((props) => {
                     display: spackage == "" ? "none" : "",
                   }}
                 >
-                  <view className="title">
+                  <view className='title'>
                     <image src={titlezs} />
                     <text>返现套餐</text>
                   </view>
@@ -229,12 +229,12 @@ export default withLayout((props) => {
                     <Cards key={item.packageId} st={star} item={item} det={detail} />
                   ))}
                   <view
-                    className="showMore"
+                    className='showMore'
                     style={{ display: newpgNum == AllpgNum ? "none" : "" }}
                     onClick={pgMore}
                   >
                     <view>查看更多</view>
-                    <image src={showMore} className="moreTip" />
+                    <image src={showMore} className='moreTip' />
                   </view>
                 </view>
                 <view
@@ -244,7 +244,7 @@ export default withLayout((props) => {
                     display: extend == "" ? "none" : "",
                   }}
                 >
-                  <view className="title">
+                  <view className='title'>
                     <image src={titlezs} />
                     <text>本店指南</text>
                   </view>
@@ -252,16 +252,16 @@ export default withLayout((props) => {
                     <Extend key={item.extId} item={item} />
                   ))}
                   <view
-                    className="showMore"
+                    className='showMore'
                     style={{ display: newextNum == AllextNum ? "none" : "" }}
                     onClick={extendMore}
                   >
                     <view>查看更多</view>
-                    <image src={showMore} className="moreTip" />
+                    <image src={showMore} className='moreTip' />
                   </view>
                 </view>
                 <view
-                  className="botton"
+                  className='botton'
                   style={{ display: newextNum == AllextNum ? "" : "none" }}
                 >
                   这是我的底线
@@ -270,20 +270,20 @@ export default withLayout((props) => {
           }
         </scroll-view>
       </view>
-      <view className="bottomTab">
-        <Button openType="share" className="sharebtn">
+      <view className='bottomTab'>
+        <Button openType='share' className='sharebtn'>
           分享
         </Button>
-        <view className="tab">
-          <image className="share" src={share} />
+        <view className='tab'>
+          <image className='share' src={share} />
           分享
         </view>
-        <view className="tab" onClick={toggleLike}>
-          <image className="good" style={{ top: '1px' }} src={isLike > 0 ? baozan : weibaozan} />
+        <view className='tab' onClick={toggleLike}>
+          <image className='good' style={{ top: '1px' }} src={isLike > 0 ? baozan : weibaozan} />
           {isLike > 0 ? "已爆赞" : "爆赞"}
         </view>
-        <view className="tab" onClick={toggleSave}>
-          <image className="collection" src={isSaved > 0 ? ax : good} />
+        <view className='tab' onClick={toggleSave}>
+          <image className='collection' src={isSaved > 0 ? ax : good} />
           {isSaved > 0 ? "已收藏" : "加入收藏"}
         </view>
       </view>

src/shop/pages/spread/Shoptabbar.js

@@ -0,0 +1,17 @@
+
+const Shoptabbar = [
+
+  {
+    text: '订单收入',
+    iconPath: require('@/assets/icons/shopKeeper/orderOFF.png'),
+    selectedIconPath: require('@/assets/icons/shopKeeper/orderON.png'),
+  },
+  {
+    text: '推广收入',
+    iconPath: require('@/assets/icons/shopKeeper/spreadOFF.png'),
+    selectedIconPath: require('@/assets/icons/shopKeeper/spreadON.png'),
+  },
+
+]
+
+export default Shoptabbar

src/shop/pages/spread/spreadIndex.jsx

@@ -3,12 +3,9 @@ import CustomNav from '@/components/CustomNav'
 import { useRouter } from '@tarojs/taro'
 import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
 
-import TabBar from '@/components/CustTabBar'
-import shopImg from '@/assets/icons/shopKeeper/orderOFF.png'
-import onShopImg from '@/assets/icons/shopKeeper/orderON.png'
-import spareadImg from '@/assets/icons/shopKeeper/spreadOFF.png'
-import onSpareadImg from '@/assets/icons/shopKeeper/spreadON.png'
+
 import withLayout from '@/layouts'
+import tabList from './Shoptabbar'
 import ShopKeeper from '../../components/ShopKeeper/shopKeeper'
 import Sparead from '../../components/Sparead/spreadMoney'
 
@@ -43,6 +40,7 @@ export default withLayout((props) => {
     }
   }
   const handelTypeOrder = () => {
+
     setAmountType('order')
 
   }
@@ -116,7 +114,7 @@ export default withLayout((props) => {
 
   return (
     <view className='page-index'>
-      <view className="index-navbar">
+      <view className='index-navbar'>
         <CustomNav title={shop?.shopName} />
       </view>
       <view className='index-container'>
@@ -125,14 +123,10 @@ export default withLayout((props) => {
         {currentTab === 1 && <Sparead shopList={shopList} shop={shop} verifiedOrder={verifiedOrder} onHotelChange={handleHotelChange} shopMoney={shopMoney} />}
       </view>
       <view className='index-tabbar'>
-        <TabBar extClass='custom-tabbar bottomTab' current={currentTab} onChange={handleTabChange}>
-          <view className={`${currentTab === 0 ? 'orderstab' : ''}`} onClick={() => { handelTypeOrder() }}>
-            <image className='incomes' src={currentTab === 0 ? onShopImg : shopImg} /><text>订单收入</text>
-          </view>
-          <view className={`${currentTab === 1 ? 'spreadtab' : ''}`} onClick={() => { handelType() }} >
-            <image className='house' src={currentTab === 1 ? onSpareadImg : spareadImg} /><text>推广收入</text>
-          </view>
-        </TabBar>
+
+      </view>
+      <view className='index-tabbar'>
+        <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>
       </view>
     </view>