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

src/components/AlreadyUsedMolded/index.jsx

@@ -1,12 +1,9 @@
 
-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 Evaluation from '@/assets/icons/UserCenter/Evaluation.png'
-import starOn from '@/assets/icons/GuideCheck/starOn.png'
-import starOff from '@/assets/icons/GuideCheck/starOff.png'
 import formatTime from '@/utils/formatTime'
-import Star from '@/components/Star/Star.jsx'
+
 import { useState } from 'react'
 import './style.less'
 
@@ -35,7 +32,7 @@ export default (props) => {
                   返现￥{(item.cashback / 100)?.toFixed(2)}
                 </view>
                 <view className='title-image' >
-                  <image className='image-1' mode='scaleToFill' src={item.poster || image}></image>
+                  <image className='image-1' mode='scaleToFill' src={item.poster || []}></image>
                   <image className='image-2' src={food}></image>
                 </view>
                 <view className='title-content'>

src/components/BadgeTag/index.jsx

@@ -1,13 +1,15 @@
 
 import React from 'react'
-import { View, Image, Text } from '@tarojs/components'
+import { View, Image } from '@tarojs/components'
 import food from '@/assets/icons/ProCard/food.png'
+import glTip from '@/assets/icons/housemantj/gltip.png'
+
 import './style.less'
 
 export default (props) => {
   const { type, top = '0px', left = '0px' } = props
 
-  const icon = type === 'food' ? food : undefined;
+  const icon = type === 'food' ? food : glTip;
 
   const style = {
     top,

src/components/CompoentsOrder/TobeWritten/index.jsx

@@ -1,6 +1,5 @@
 
 import formatTime from "@/utils/formatTime";
-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 QRcode from "@/assets/icons/UserCenter/QRcode.png";
@@ -23,7 +22,7 @@ export default (props) => {
           <image
             className='image-1'
             mode='scaleToFill'
-            src={item.poster || image}
+            src={item.poster || []}
           ></image>
           <image className='image-2' src={food}></image>
         </view>

src/components/CompoentsOrder/complete/index.jsx

@@ -3,7 +3,6 @@ import React, { useState, useEffect } from "react";
 import Taro, { useDidShow, AtSwipeAction } from "@tarojs/taro";
 import { getOrderSub, deleteOrder } from "@/services/payOrder";
 import formatTime from "@/utils/formatTime";
-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 refund from "@/assets/icons/GuideCheck/refund.png";
@@ -181,7 +180,7 @@ export default (props) => {
                             <image
                               className='image-1'
                               mode='scaleToFill'
-                              src={item.poster || image}
+                              src={item.poster || []}
                             ></image>
                             <image className='image-2' src={food}></image>
                           </view>
@@ -240,7 +239,7 @@ export default (props) => {
                           <image
                             className='image-1'
                             mode='scaleToFill'
-                            src={item.poster || image}
+                            src={item.poster || []}
                           ></image>
                           <image className='image-2' src={food}></image>
                         </view>
@@ -290,7 +289,7 @@ export default (props) => {
                           <image
                             className='image-1'
                             mode='scaleToFill'
-                            src={item.poster || image}
+                            src={item.poster || []}
                           ></image>
                           <image className='image-2' src={food}></image>
                         </view>
@@ -350,7 +349,7 @@ export default (props) => {
                           <image
                             className='image-1'
                             mode='scaleToFill'
-                            src={item.poster || image}
+                            src={item.poster || []}
                           ></image>
                           <image className='image-2' src={food}></image>
                         </view>
@@ -410,7 +409,7 @@ export default (props) => {
                           <image
                             className='image-1'
                             mode='scaleToFill'
-                            src={item.poster || image}
+                            src={item.poster || []}
                           ></image>
                           <image className='image-2' src={food}></image>
                         </view>

src/components/CouponCard/Action/IconAction.jsx

@@ -1,12 +1,12 @@
 
 import React from 'react'
 import { View, Image, Text } from '@tarojs/components'
-
 import './style.less'
 
 export default (props) => {
   const { icon, text, onClick } = props
 
+
   const handleClick = (e) => {
     if (onClick) {
       e.stopPropagation()

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/components/OrderMolded/index.jsx

@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import image from '@/assets/icons/ProCard/8kb.jpg'
+
 import { Button, Radio } from '@tarojs/components'
 import PayOrderCard from '@/components/PayOrderCard'
 import formatTimes from '@/utils/formatTime'

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/MineUserAll/ContactMe/index.jsx

@@ -1,5 +1,4 @@
 import { saveFeedback } from '@/services/mine'
-import QCRsgl from '@/assets/icons/ProCard/QCRsgl.png'
 import CustomNav from '@/components/CustomNav'
 import Taro from '@tarojs/taro'
 import { Image, Button } from '@tarojs/components'
@@ -20,17 +19,6 @@ export default withLayout((props) => {
         personId,
         content
       }).then(() => {
-        // 成功返回一个模态框提醒用户
-        // Taro.showModal({
-        //   title: '提示',
-        //   content: '反馈成功，感谢提交；\r\n如有需要平台将在24小时内添加您的微信，请留意您的手机信息。',
-        //   showCancel: false,
-        //   success(res) {
-        //     if (res.confirm) {
-        //       back()
-        //     }
-        //   }
-        // })
       })
     }
     else {

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

@@ -1,12 +1,11 @@
 import BlackSpot from "@/assets/icons/GuideCheck/BlackSpot.png";
 import Taro from "@tarojs/taro";
-import { Button, Icon, Text, Textarea } from "@tarojs/components";
+import { Button, Textarea } from "@tarojs/components";
 import formatPrice from "@/utils/formatPrice";
 import formatTime from "@/utils/formatTime";
 import { useState, useEffect } from "react";
 import withLayout from "@/layouts";
 import { getOrderSub, refund } from "@/services/payOrder";
-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";

src/pages/MineUserAll/RefundMoney/index.jsx

@@ -1,6 +1,5 @@
 import { useState, useEffect } from "react";
 import Taro, { useDidShow } from "@tarojs/taro";
-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";

src/pages/PayOrder/index.jsx

@@ -1,6 +1,10 @@
 import withLayout from "@/layouts";
-import image from "@/assets/icons/ProCard/8kb.jpg";
+import Taro, { useDidShow } from "@tarojs/taro";
+import { getPackageDetail } from "@/services/home";
+import { saveOrder, getOrderSub, payOrder } from "@/services/payOrder";
 import { useState, useEffect } from "react";
+import formatPrice from "@/utils/formatPrice";
+
 import { Button, Checkbox, Input, RadioGroup, Radio } from "@tarojs/components";
 import AuthPage from '@/components/AuthPage'
 import food from "@/assets/icons/ProCard/food.png";
@@ -9,11 +13,7 @@ import CustomNav from "@/components/CustomNav";
 import OrderMolded from "@/components/OrderMolded";
 import Popup from "@/components/Popup";
 import "./style.less";
-import Taro, { useDidShow } from "@tarojs/taro";
-import { getPackageDetail } from "@/services/home";
-import { saveOrder, getOrderSub, payOrder } from "@/services/payOrder";
-import formatTime from "@/utils/formatTime";
-import formatPrice from "@/utils/formatPrice";
+
 import Card from "./Card";
 
 export default withLayout((props) => {

src/pages/TobeShop/index.jsx

@@ -2,7 +2,7 @@ import Taro from "@tarojs/taro";
 import { useState, useEffect } from "react";
 import withLayout from "@/layouts";
 import CustomNav from "@/components/CustomNav";
-import { getShopDetail, getShopPackage, getExtendContent } from '@/services/home'
+import { getShopDetail, getShopPackage, getExtendContent } from '@/services/home';
 import Popup from "@/components/Popup";
 import formatPrice from "@/utils/formatPrice";
 
@@ -11,7 +11,6 @@ import Perfection from "@/assets/icons/UserCenter/Perfection.png";
 import Check_OK from "@/assets/icons/UserCenter/Check_OK.png";
 import Check_NO from "@/assets/icons/UserCenter/Check_NO.png";
 import BlackSpot from "@/assets/icons/GuideCheck/BlackSpot.png";
-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 { Button, Icon, Text, Textarea } from "@tarojs/components";
@@ -148,13 +147,9 @@ export default withLayout((props) => {
         </view>
         <view>
           {(list || []).map((item) => {
-
             return (
               <view class='wrapper' key={item.verifyNo} onClick={() => setChecked(item.verifyNo)}>
                 <view class='left-complete-one'>
-                  <view className='Check_OK-box'>
-                    <image className='Check_OK-image' src={item.verifyNo == checked ? Check_OK : Check_NO} />
-                  </view>
                   <image className='left-image-1' src={ProCard_hot}></image>
                   <view className='left-viewText'>返现￥{(item.cashback / 100).toFixed(2)}</view>
                   <view className='title-image'>
@@ -181,8 +176,13 @@ export default withLayout((props) => {
                     </view>
                   </view>
                 </view>
+
                 <view class='right-complete-two'>
-                  <view className='right-content'></view>
+                  <view className='right-content'>
+                    <view className='Check_OK-box'>
+                      <image className='Check_OK-image' src={item.verifyNo == checked ? Check_OK : Check_NO} />
+                    </view>
+                  </view>
                 </view>
               </view>
             );

src/pages/TobeShop/style.less

@@ -125,18 +125,11 @@
 
       align-items: center;
 
-      .Check_OK-box {
-        padding-left: 20px;
-        .Check_OK-image {
-          width: 34px;
-          height: 34px;
-        }
-      }
       .left-image-1 {
         width: 145px;
         height: 44px;
         position: absolute;
-        margin-left: 85px;
+        // margin-left: 85px;
         top: 22px;
       }
       .left-viewText {
@@ -145,7 +138,7 @@
         width: auto;
         height: 44.3px;
         position: absolute;
-        left: 85px;
+        // left: 85px;
         top: 28px;
         font-size: 20px;
         color: @whiteColor;
@@ -262,7 +255,15 @@
       left: 50%;
       transform: translate(-50%, -50%);
       // border: 1px solid red;
-
+      .Check_OK-box {
+        position: relative;
+        left: 37vw;
+        top: 6vw;
+        .Check_OK-image {
+          width: 34px;
+          height: 34px;
+        }
+      }
       .right-number {
         // width: 32px;
         // font-size: 20px;

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/pages/index/components/Card/index.jsx

@@ -3,7 +3,6 @@ import Taro from '@tarojs/taro'
 import useSave from "@/utils/hooks/useSave"
 import msTip from '@/assets/icons/housemantj/foodtip.png'
 import mjTip from '@/assets/icons/housemantj/mjtip.png'
-import glTip from '@/assets/icons/housemantj/gltip.png'
 import location from '@/assets/icons/housemantj/location.png'
 import onlove from '@/assets/icons/housemantj/onlove.png'
 import love from '@/assets/icons/housemantj/bheart.png'

src/pages/index/tabs/Guide.jsx

@@ -1,12 +1,9 @@
 import { useState, useEffect, useRef } from "react";
-import Taro, { useDidShow } from '@tarojs/taro'
+import Taro from '@tarojs/taro'
 import MoreGuide from "@/components/MoreGuide";
 import BossCard from '@/components/BossCard'
-import Taxi from '@/assets/icons/GuideCheck/taxi.png'
-import WiFi from '@/assets/icons/GuideCheck/WiFi.png'
 import GPS from '@/assets/icons/GuideCheck/GPS.png'
 import copy_logo from '@/assets/icons/GuideCheck/copy_logo.png'
-import GoHere from '@/assets/icons/GuideCheck/GoHere.png'
 import Cup from '@/assets/icons/GuideCheck/Cup.png'
 import BlackSpot from '@/assets/icons/GuideCheck/BlackSpot.png'
 import { getRecommendList, getExtendContent } from '@/services/home'
@@ -309,10 +306,10 @@ export default (props) => {
             <text className='title-title-boss' >老板推荐好吃的</text>
           </view>
         </view>
-        <view style={{marginTop: '10rpx', marginBottom: '60rpx'}}>
+        <view style={{ marginTop: '10rpx', marginBottom: '60rpx' }}>
           {(spackage || []).map((item, index) => <BossCard det={item} st={parseFloat(item.score.toFixed(1))} key={(index)} trackClick={trackClick} taRoomContent={taRoomContent} item={item} />)}
         </view>
-        
+
       </view>
     </scroll-view>
   )

src/pages/index/tabs/GuideCss/style.less

@@ -200,405 +200,6 @@
     }
   }
 
-  //   .MessageCard {
-  //     width: calc(100% - 60px);
-  //     height: 175px;
-  //     background: @whiteColor;
-  //     border-radius: 12px;
-  //     margin: 30px auto;
-  //     box-shadow: 0px 4px 24px 0px rgba(0, 0, 0, 0.08);
-  //     .MessageCard-title1 {
-  //       height: 26px;
-  //       font-size: 28px;
-  //       font-weight: bold;
-  //       color: #666666;
-  //       line-height: 44px;
-  //       text-align: center;
-  //       .MessageCard-left {
-  //         width: 530px;
-  //         height: 2px;
-  //         padding-right: 50px;
-  //         // opacity: 0.5;
-  //       }
-  //       .MessageCard-right {
-  //         width: 530px;
-  //         height: 2px;
-  //         padding-left: 50px;
-  //       }
-  //     }
-  //     .MessageCard-content {
-  //       // background: @whiteColor;
-  //       width: 13em;
-  //       height: 2.5em;
-  //       margin-top: 45px;
-  //       display: inline-block;
-  //       margin-left: 30px;
-
-  //       .MessageCard-name {
-  //         height: 40px;
-  //         font-size: 32px;
-  //         font-weight: bold;
-  //         color: #202020;
-  //         line-height: 44px;
-  //         overflow: hidden;
-  //         text-overflow: ellipsis;
-  //         white-space: nowrap;
-  //       }
-  //       .MessageCard-info {
-  //         display: flex;
-  //         width: 998em;
-  //         height: 23px;
-  //         font-size: 24px;
-  //         font-weight: 400;
-  //         color: #666666;
-  //         line-height: 44px;
-  //         padding-top: 19px;
-  //       }
-  //     }
-  //     .MessageCard-button-RoomName{
-  //       width: 168px;
-  //       height: 60px;
-  //       border: 2px solid #000000;
-  //       border-radius: 12px;
-  //       position: relative;
-  //       text-align: center;
-  //       display: inline-block;
-  //       left: 1.5em;
-  //       .MessageCard-image {
-  //         width: 30px;
-  //         height: 30px;
-  //         padding-top: 12px;
-  //         padding-right: 5px;
-  //       }
-  //       .MessageCard-text {
-  //         line-height: 30px;
-  //         width: 87px;
-  //         height: 28px;
-  //         font-size: 30px;
-  //         font-weight: bold;
-  //         color: #202020;
-  //       }
-  //     }
-  //     .MessageCard-button-Park{
-  //       width: 168px;
-  //       height: 60px;
-  //       border: 2px solid #000000;
-  //       border-radius: 12px;
-  //       position: relative;
-  //       text-align: center;
-  //       display: inline-block;
-  //       left: 1.5em;
-  //       .MessageCard-image {
-  //         width: 30px;
-  //         height: 30px;
-  //         padding-top: 12px;
-  //         padding-right: 5px;
-  //       }
-  //       .MessageCard-text {
-  //         line-height: 30px;
-  //         width: 87px;
-  //         height: 28px;
-  //         font-size: 30px;
-  //         font-weight: bold;
-  //         color: #202020;
-  //       }
-  //     }
-  //     .MessageCard-button {
-  //       width: 168px;
-  //       height: 60px;
-  //       border: 2px solid #000000;
-  //       border-radius: 12px;
-  //       position: relative;
-  //       text-align: center;
-  //       display: inline-block;
-  //       bottom: 40px;
-  //       left: 1.5em;
-  //       .MessageCard-image {
-  //         width: 30px;
-  //         height: 30px;
-  //         padding-top: 12px;
-  //         padding-right: 5px;
-  //       }
-  //       .MessageCard-text {
-  //         line-height: 30px;
-  //         width: 87px;
-  //         height: 28px;
-  //         font-size: 30px;
-  //         font-weight: bold;
-  //         color: #202020;
-  //       }
-  //     }
-
-  //   }
-
-  //   // --------------------------
-  //   .MessageCard-hotle {
-  //     width: calc(100% - 60px);
-  //     height: 175px;
-  //     background: @whiteColor;
-  //     border-radius: 12px;
-  //     margin: 30px auto;
-  //     box-shadow: 0px 4px 24px 0px rgba(0, 0, 0, 0.08);
-  //     .MessageCard-title1-hotle {
-  //       height: 26px;
-  //       font-size: 28px;
-  //       font-weight: bold;
-  //       color: #666666;
-  //       line-height: 44px;
-  //       text-align: center;
-  //       .MessageCard-left-hotle {
-  //         width: 530px;
-  //         height: 2px;
-  //         padding-right: 50px;
-  //         // opacity: 0.5;
-  //       }
-  //       .MessageCard-right-hotle {
-  //         width: 530px;
-  //         height: 2px;
-  //         padding-left: 50px;
-  //       }
-  //     }
-  //     .MessageCard-content-hotle {
-  //       // background: @whiteColor;
-  //       width: 13em;
-  //       height: 2.5em;
-  //       margin-top: 45px;
-  //       display: inline-block;
-  //       margin-left: 30px;
-
-  //       .MessageCard-name-hotle {
-  //         // width: 100%;
-  //         // font-size: 32px;
-  //         // font-weight: bold;
-  //         // color: #202020;
-  //         // line-height: 44px;
-  //         // display: flex;
-  //         width: 95%;
-  //         font-size: 32px;
-  //         font-weight: bold;
-  //         color: #202020;
-  //         line-height: 44px;
-  //         display: flex;
-  //         overflow: hidden;
-  //         -webkit-line-clamp: 2;
-  //         text-overflow: ellipsis;
-  //         -webkit-box-orient: vertical;
-  //         display: -webkit-box;
-
-  //       }
-  //       .MessageCard-info-hotle {
-  //         height: 23px;
-  //         font-size: 24px;
-  //         font-weight: 400;
-  //         color: #666666;
-  //         line-height: 44px;
-  //         padding-top: 19px;
-  //       }
-  //     }
-  //     .MessageCard-button-RoomName-hotle{
-  //       width: 168px;
-  //       height: 60px;
-  //       border: 2px solid #000000;
-  //       border-radius: 12px;
-  //       position: relative;
-  //       text-align: center;
-  //       display: inline-block;
-  //       left: 1.5em;
-  //       top: -45px;
-  //       .MessageCard-image-hotle {
-  //         width: 30px;
-  //         height: 30px;
-  //         padding-top: 12px;
-  //         padding-right: 5px;
-  //       }
-  //       .MessageCard-text-hotle {
-  //         line-height: 30px;
-  //         width: 87px;
-  //         height: 28px;
-  //         font-size: 30px;
-  //         font-weight: bold;
-  //         color: #202020;
-  //       }
-  //     }
-  //     .MessageCard-button-Park-hotle{
-  //       width: 168px;
-  //       height: 60px;
-  //       border: 2px solid #000000;
-  //       border-radius: 12px;
-  //       position: relative;
-  //       text-align: center;
-  //       display: inline-block;
-  //       left: 1.5em;
-  //       .MessageCard-image-hotle {
-  //         width: 30px;
-  //         height: 30px;
-  //         padding-top: 12px;
-  //         padding-right: 5px;
-  //       }
-  //       .MessageCard-text-hotle {
-  //         line-height: 30px;
-  //         width: 87px;
-  //         height: 28px;
-  //         font-size: 30px;
-  //         font-weight: bold;
-  //         color: #202020;
-  //       }
-  //     }
-  //     .MessageCard-button-hotle {
-  //       width: 168px;
-  //       height: 60px;
-  //       border: 2px solid #000000;
-  //       border-radius: 12px;
-  //       position: relative;
-  //       text-align: center;
-  //       display: inline-block;
-  //       bottom: 40px;
-  //       left: 1.5em;
-  //       .MessageCard-image-hotle {
-  //         width: 30px;
-  //         height: 30px;
-  //         padding-top: 12px;
-  //         padding-right: 5px;
-  //       }
-  //       .MessageCard-text-hotle {
-  //         line-height: 30px;
-  //         width: 87px;
-  //         height: 28px;
-  //         font-size: 30px;
-  //         font-weight: bold;
-  //         color: #202020;
-  //       }
-  //     }
-  //   }
-  // // -------------------------------
-  // .MessageCard-parkView {
-  //   width: calc(100% - 60px);
-  //   height: 175px;
-  //   background: @whiteColor;
-  //   border-radius: 12px;
-  //   margin: 30px auto;
-  //   box-shadow: 0px 4px 24px 0px rgba(0, 0, 0, 0.08);
-  //   .MessageCard-title1-parkView {
-  //     height: 26px;
-  //     font-size: 28px;
-  //     font-weight: bold;
-  //     color: #666666;
-  //     line-height: 44px;
-  //     text-align: center;
-  //     .MessageCard-left-parkView {
-  //       width: 530px;
-  //       height: 2px;
-  //       padding-right: 50px;
-  //       // opacity: 0.5;
-  //     }
-  //     .MessageCard-right-parkView {
-  //       width: 530px;
-  //       height: 2px;
-  //       padding-left: 50px;
-  //     }
-  //   }
-  //   .MessageCard-content-parkView {
-  //     // background: @whiteColor;
-  //     width: 13em;
-  //     height: 2.5em;
-  //     margin-top: 45px;
-  //     display: inline-block;
-  //     margin-left: 30px;
-
-  //     .MessageCard-name-parkView {
-
-  //       width: 100%;
-  //       font-size: 32px;
-  //       font-weight: bold;
-  //       color: #202020;
-  //       line-height: 44px;
-  //       text-overflow: ellipsis;
-  //       display: flex;
-  //     }
-  //     .MessageCard-info-parkView {
-  //       height: 23px;
-  //       font-size: 24px;
-  //       font-weight: 400;
-  //       color: #666666;
-  //       line-height: 44px;
-  //       padding-top: 19px;
-  //     }
-  //   }
-  //   .MessageCard-button-RoomName-parkView{
-  //     width: 168px;
-  //     height: 60px;
-  //     border: 2px solid #000000;
-  //     border-radius: 12px;
-  //     position: relative;
-  //     text-align: center;
-  //     display: inline-block;
-  //     left: 1.5em;
-  //     .MessageCard-image-parkView {
-  //       width: 30px;
-  //       height: 30px;
-  //       padding-top: 12px;
-  //       padding-right: 5px;
-  //     }
-  //     .MessageCard-text-parkView {
-  //       line-height: 30px;
-  //       width: 87px;
-  //       height: 28px;
-  //       font-size: 30px;
-  //       font-weight: bold;
-  //       color: #202020;
-  //     }
-  //   }
-  //   .MessageCard-button-Park-parkView{
-  //     width: 168px;
-  //     height: 60px;
-  //     border: 2px solid #000000;
-  //     border-radius: 12px;
-  //     position: relative;
-  //     text-align: center;
-  //     display: inline-block;
-  //     left: 1.5em;
-  //     .MessageCard-image-parkView {
-  //       width: 30px;
-  //       height: 30px;
-  //       padding-top: 12px;
-  //       padding-right: 5px;
-  //     }
-  //     .MessageCard-text-parkView {
-  //       line-height: 30px;
-  //       width: 87px;
-  //       height: 28px;
-  //       font-size: 30px;
-  //       font-weight: bold;
-  //       color: #202020;
-  //     }
-  //   }
-  //   .MessageCard-button-parkView {
-  //     width: 168px;
-  //     height: 60px;
-  //     border: 2px solid #000000;
-  //     border-radius: 12px;
-  //     position: relative;
-  //     text-align: center;
-  //     display: inline-block;
-  //     bottom: 40px;
-  //     left: 1.5em;
-  //     .MessageCard-image-parkView {
-  //       width: 30px;
-  //       height: 30px;
-  //       padding-top: 12px;
-  //       padding-right: 5px;
-  //     }
-  //     .MessageCard-text-parkView {
-  //       line-height: 30px;
-  //       width: 87px;
-  //       height: 28px;
-  //       font-size: 30px;
-  //       font-weight: bold;
-  //       color: #202020;
-  //     }
-  //   }
-  // }
-
   // ---------------------------------
   .articleCard {
     margin-top: 60px;
@@ -842,21 +443,14 @@
       }
     }
     .Raiders-box {
-      // display: inline;
-      // border: 1px solid RED;
       width: 330px;
-      // height: 649px;
       background: #ffffff;
       box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
       border-radius: 24px;
-      // flex-grow: 1;
-      // padding-right: 30px;
-      // display: flex;
-      // flex-flow: row nowrap;
+
       justify-content: space-between;
       .Raiders-image {
         width: 330px;
-        // width: 100%;
         height: 439px !important;
         border-radius: 24px 24px 0px 0px;
       }

src/pages/index/tabs/MineCss/style.less

@@ -1,62 +1,58 @@
-
-
 .User-box {
   width: 100%;
-  .User-box-sths{
+  .User-box-sths {
     display: flex;
-    margin: 40px 0  60px 0;
+    margin: 40px 0 60px 0;
     justify-content: space-around;
     flex-wrap: wrap;
-    .User-box-selectUser{
+    .User-box-selectUser {
       width: 100%;
       font-size: 32px;
       font-weight: bold;
       color: #202020;
       line-height: 32px;
-      margin: 60px 0 70px  0;
+      margin: 60px 0 70px 0;
       text-align: left;
     }
-    .User-box-tourist{
+    .User-box-tourist {
       display: inline-block;
 
-       .Ubs-tourist-image{
+      .Ubs-tourist-image {
         width: 86px;
         height: 86px;
-  
       }
-      .Ubs-tourist-text{
+      .Ubs-tourist-text {
         display: block;
         font-size: 30px;
         font-weight: bold;
-        color:#202020;
+        color: #202020;
       }
     }
-    .User-box-hotelBoss{
+    .User-box-hotelBoss {
       display: inline-block;
-      .Ubs-hotelBoss-image{
+      .Ubs-hotelBoss-image {
         width: 86px;
         height: 86px;
       }
-      .Ubs-hotelBoss-text{
+      .Ubs-hotelBoss-text {
         display: block;
         font-size: 30px;
         font-weight: bold;
         color: #999999;
       }
     }
-    .User-box-shopBoss{
-      .Ubs-shopBoss-image{
+    .User-box-shopBoss {
+      .Ubs-shopBoss-image {
         width: 86px;
         height: 86px;
       }
-      .Ubs-shopBoss-text{
+      .Ubs-shopBoss-text {
         display: block;
         font-size: 30px;
         font-weight: bold;
         color: #999999;
       }
     }
-
   }
 
   .User-info {
@@ -86,18 +82,17 @@
         font-weight: bold;
         color: #202020;
         padding-top: 20px;
-
       }
       .User-sex {
         // padding-left: 10px;
         // width: 33px;
         // height: 32px;
         width: 33px;
-    height: 32px;
-    display: inline-block;
-    position: relative;
-    left: 200px;
-    top: -3em;
+        height: 32px;
+        display: inline-block;
+        position: relative;
+        left: 200px;
+        top: -3em;
       }
       .User-phone {
         // height: 20px;
@@ -107,18 +102,17 @@
         line-height: 48px;
       }
     }
-    .User-info-cutover{
+    .User-info-cutover {
       width: 62px;
       height: 62px;
       align-items: center;
       display: flex;
       position: relative;
       left: 8em;
-      .User-info-cutover-image{
+      .User-info-cutover-image {
         width: 36px;
         height: 36px;
         margin: 0 auto;
-
       }
     }
   }
@@ -200,12 +194,5 @@
         color: #999;
       }
     }
-    // .Badge-list:nth-child(3) {
-    //   margin-top: 20px;
-    //   border-radius: 24px 24px 0px 0px;
-    // }
-    // .Badge-list:nth-child(4) {
-    //   border-radius: 0px 0px 24px 24px;
-    // }
   }
 }

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>