.

src/components/ToggleRole/index.jsx

@@ -0,0 +1,70 @@
+import { useState, useEffect } from 'react'
+import binded from '@/assets/icons/UserCenter/binding.png'
+import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
+import './style.less'
+
+import SpinBox from "@/components/Spin/SpinBox";
+
+import touristON from '@/assets/icons/UserCenter/touristON.png'
+import touristOFF from '@/assets/icons/UserCenter/touristOFF.png'
+import hotelBossON from '@/assets/icons/UserCenter/hotelBossON.png'
+import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
+import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
+import shopBossOFF from '@/assets/icons/UserCenter/shopBossOFF.png'
+
+import Popup from '@/components/Popup'
+import { useModel } from '@/store'
+
+export default (props) => {
+  const { role, isBind } = props
+  const [showCutover, setShowCutover] = useState(false)
+
+  const ShowMoldeOn = () => {
+    setShowCutover(true)
+  }
+  const onClose = () => {
+    setShowCutover(false)
+  }
+  const { getRole, loading } = useModel('person')
+
+  const goToPerson = () => {
+    getRole('normal')
+    onClose()
+  }
+  const goToHotel = () => {
+    getRole('hotel')
+    onClose()
+  }
+  const goToShop = () => {
+    getRole('shop')
+    onClose()
+  }
+  return (
+    <>
+      <Popup show={showCutover} maskClosable={showCutover} onClose={onClose}>
+        <SpinBox loading={loading}>
+          <view className='User-box-sths' >
+            <view className='User-box-selectUser'>请选择身份：</view>
+            <view className='User-box-tourist' onClick={goToPerson}>
+              <image className='Ubs-tourist-image' src={role === 'normal' ? touristON : touristOFF} />
+              <text className='Ubs-tourist-text'>我是用户</text>
+            </view>
+            <view className='User-box-hotelBoss' onClick={goToHotel}>
+              <image className='Ubs-hotelBoss-image' src={role === 'hotel' ? hotelBossON : hotelBossOFF} />
+              <text className='Ubs-hotelBoss-text'>我是房东</text>
+            </view>
+            <view className='User-box-shopBoss' onClick={goToShop}>
+              <image className='Ubs-shopBoss-image' src={role === 'shop' ? shopBossON : shopBossOFF} />
+              <text className='Ubs-shopBoss-text'>我是商铺</text>
+            </view>
+          </view>
+        </SpinBox>
+      </Popup >
+
+      <view onClick={ShowMoldeOn} className='User-info-cutover'>
+        <image className='User-info-cutover-image' src={cutoverUser} />
+        <image src={binded} className='User-info-cutover-image2' style={{ display: isBind ? '' : 'none' }} />
+      </view>
+    </>
+  )
+}

src/components/toggleRole/ToggleRole.less → src/components/ToggleRole/style.less

@@ -1,3 +1,19 @@
+.User-info-cutover {
+  width:36px;
+  height: 36px;
+  position: relative;
+  .User-info-cutover-image {
+    width: 36px;
+    height: 36px;
+  }
+  .User-info-cutover-image2 {
+    width: 21px;
+    height: 14px;
+    position: absolute;
+    right: -10px;
+    bottom: -14px;
+  }
+}
 .User-box-sths {
   display: flex;
   margin: 40px 0 60px 0;
@@ -51,4 +67,4 @@
       color: #202020;
     }
   }
-}
+}

src/components/toggleRole/ToggleRole.jsx

@@ -1,57 +0,0 @@
-import { useState, useEffect } from 'react';
-import SpinBox from "@/components/Spin/SpinBox";
-
-import touristON from '@/assets/icons/UserCenter/touristON.png'
-import touristOFF from '@/assets/icons/UserCenter/touristOFF.png'
-import hotelBossON from '@/assets/icons/UserCenter/hotelBossON.png'
-import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
-import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
-import shopBossOFF from '@/assets/icons/UserCenter/shopBossOFF.png'
-
-import Popup from '@/components/Popup'
-import './ToggleRole.less'
-import { useModel } from '@/store'
-
-
-export default (props) => {
-  const { showCutover, onClose, maskClosable, role } = props
-  const { getRole, loading } = useModel('person')
-  // const [loading, setLoading] = useState(false)
-
-  const goToPerson = () => {
-    getRole('normal')
-  }
-  const goToHotel = () => {
-    getRole('hotel')
-
-  }
-  const goToShop = () => {
-    getRole('shop')
-  }
-  return (
-
-    <Popup show={showCutover} maskClosable={maskClosable} onClose={onClose}>
-      <SpinBox loading={loading}>
-        <view className='User-box-sths' >
-          <view className='User-box-selectUser'>请选择身份：</view>
-          <view className='User-box-tourist' onClick={goToPerson}>
-            <image className='Ubs-tourist-image' src={role === 'normal' ? touristON : touristOFF} />
-            <text className='Ubs-tourist-text'>我是用户</text>
-          </view>
-          <view className='User-box-hotelBoss' onClick={goToHotel}>
-            <image className='Ubs-hotelBoss-image' src={role === 'hotel' ? hotelBossON : hotelBossOFF} />
-            <text className='Ubs-hotelBoss-text'>我是房东</text>
-          </view>
-          <view className='User-box-shopBoss' onClick={goToShop}>
-            <image className='Ubs-shopBoss-image' src={role === 'shop' ? shopBossON : shopBossOFF} />
-            <text className='Ubs-shopBoss-text'>我是商铺</text>
-          </view>
-        </view>
-      </SpinBox>
-
-
-    </Popup >
-
-
-  )
-}

src/hotel/components/HouseManage/houseManage.jsx

@@ -8,18 +8,17 @@ import copyRoomImg from '@/assets/icons/landlord/copyroom.png'
 import React, { useState, useEffect, useRef, useImperativeHandle, useMemo } from 'react'
 import { getRoomList,deleteRoom,copyRoom } from '@/services/landlord'
 import Spin3 from '@/components/Spin/Spin3';
-import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
-import ToggleRole from '@/components/toggleRole/ToggleRole'
 import List from '@/components/List';
 import Picker from '@/components/Picker'
 import SearchBar from '@/components/SearchBar'
 import ShareRoom from '../shareRoom/ShareRoom.jsx'
 import ShareCard from '../shareCard/shareCard'
+import ToggleRole from '@/components/ToggleRole'
 import './houseManage.less'
 
 
 export default React.forwardRef((props, ref) => {
-  const { hotel, hotelList, onHotelChange } = props
+  const { hotel, hotelList, onHotelChange,isBind } = props
   const [detail, setDetail] = useState([])
   const [search, setSearch] = useState()
 
@@ -155,23 +154,15 @@ export default React.forwardRef((props, ref) => {
       setDetail([...detail.slice(0, copy), res, ...detail.slice(copy)])
     })
   }
-  const [showCutover3, setShowCutover3] = useState(false)
-  const ShowMoldeOn3 = () => {
-    setShowCutover3(true)
-  }
-  const onClose3 = () => {
-    setShowCutover3(false)
-  }
   return (
     <View style={{ padding: '0 30rpx', height: '100%', display: 'flex', flexDirection: 'column' }}>
       <View style={{ flex: 'none' }}>
         <Spin3 show={loading} />
-        <ToggleRole role='hotel' showCutover={showCutover3} maskClosable={showCutover3} onClose={onClose3} />
       </View>
       <View style={{ flex: 'none' }}>
         <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择民宿" value={hotel?.hotelId} kv={['hotelName', 'hotelId']} dicts={hotelList} onChange={handleHotelChange} /></view>
-        <view onClick={ShowMoldeOn3} className='User-info-cutover'>
-          <image className='User-info-cutover-image' src={cutoverUser} />
+        <view className='User-info-cutover-normal'>
+            <ToggleRole role='hotel' isBind={isBind}/>
         </view>
       </View>
       <View style={{ flex: 'none' }}>

src/hotel/components/HouseManage/houseManage.less

@@ -4,15 +4,11 @@
   color: #202020;
   text-align: center;
 }
-
-.User-info-cutover{
+.User-info-cutover-normal
+{
   position: absolute;
-  top: 0;
   right: 60px;
-  .User-info-cutover-image{
-    width: 36px;
-    height: 36px;
-  }
+  top: 0;
 }
 
 .houseCard{

src/hotel/pages/landlord/landlord.jsx

@@ -16,6 +16,8 @@ export default withLayout((props) => {
   const { router, person } = props
   const { params } = useRouter()
   const { tab } = params || {}
+  const isBind=person.mpOpenid
+
 
   const [hotelList, setHotelList] = useState([])
   const {hotel, setHotel} = useModel('hotel')
@@ -69,7 +71,7 @@ export default withLayout((props) => {
       </view>
       <view className='index-container'>
         {currentTab === 1 && <Income hotel={hotel} account={account} />}
-        {hotel?.hotelId ? currentTab === 0 && <HouseManage hotelList={hotelList} hotel={hotel} onHotelChange={handleHotelChange} ref={houseRef} disabled={!hotel.hotelId} /> : <NoData />}
+        {hotel?.hotelId ? currentTab === 0 && <HouseManage isBind={isBind} hotelList={hotelList} hotel={hotel} onHotelChange={handleHotelChange} ref={houseRef} disabled={!hotel.hotelId} /> : <NoData />}
       </view>
       <view className='index-tabbar'>
         <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>

src/pages/index/tabs/Mine.jsx

@@ -12,9 +12,8 @@ import ContactMe from '@/assets/icons/UserCenter/ContactMe.png'
 import collect from '@/assets/icons/UserCenter/collect.png'
 import Rules from '@/assets/icons/UserCenter/Rules.png'
 import DefaultImage from '@/assets/icons/UserCenter/DefaultImage.png'
-import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import { getMineOrder } from '@/services/payOrder' //创建订单
-import ToggleRole from '@/components/toggleRole/ToggleRole'
+import ToggleRole from '@/components/ToggleRole'
 import { useModel } from '@/store'
 import './MineCss/style.less'
 
@@ -24,17 +23,9 @@ import './MineCss/style.less'
 export default (props) => {
   const { person, isDidShow, router } = props
   const { getAvatar, sessionKey } = useModel('person')
-  const [showCutover, setShowCutover] = useState(false)
   const hasAvatar = !!person.avatar
   const [orderNum, setOrderNum] = useState([])
-
-
-  const ShowMoldeOn = () => {
-    setShowCutover(true)
-  }
-  const onClose = () => {
-    setShowCutover(false)
-  }
+  const isBind=person.mpOpenid
 
   useEffect(() => {
     getMineOrder().then(res => setOrderNum(res))
@@ -105,8 +96,6 @@ export default (props) => {
   return !person.phone ? <AuthPage /> : (
     <scroll-view scrollY style='height: 100%;' >
       <view className='User-box'>
-        {/* 身份切换 */}
-        <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='normal' />
         <view className='User-info'>
           <view className='User-photos-box'>
             <image src={person.avatar || DefaultImage} className='User-photos' />
@@ -117,8 +106,8 @@ export default (props) => {
             <image className='User-sex' src={person.sex === 1 ? boy : girl} />
           </view>
           {/* 切换身份 */}
-          <view onClick={ShowMoldeOn} className='User-info-cutover'>
-            <image className='User-info-cutover-image' src={cutoverUser} />
+          <view className='User-info-cutover-normal'>
+            <ToggleRole role='normal' isBind={isBind}/>
           </view>
         </view>
         <view>

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

@@ -95,25 +95,16 @@
         top: -100px;
       }
       .User-phone {
-        // height: 20px;
         font-size: 30px;
         font-weight: 400;
         color: #202020;
         line-height: 48px;
       }
     }
-    .User-info-cutover {
-      width: 62px;
-      height: 62px;
-      align-items: center;
-      display: flex;
-      position: relative;
-      left: 8em;
-      .User-info-cutover-image {
-        width: 36px;
-        height: 36px;
-        margin: 0 auto;
-      }
+    .User-info-cutover-normal
+    {
+      position: absolute;
+      right: 60px;      
     }
   }
 

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -9,13 +9,12 @@ import List from '@/components/List';
 import NoData from '@/components/NoData'
 import eyes from '@/assets/icons/shopKeeper/eyesON.png'
 import ceyes from '@/assets/icons/shopKeeper/eyesOFF.png'
-import ToggleRole from '@/components/toggleRole/ToggleRole'
-import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
+import ToggleRole from '@/components/ToggleRole'
 import './shopKeeper.less'
 
 
 export default (props) => {
-  const { shopList, shop, onHotelChange, verifiedOrder, shopMoney, onVarified } = props
+  const { shopList, shop, onHotelChange, verifiedOrder, shopMoney, isBind } = props
   const { params } = useRouter()
   const { tabJump } = params || {}
 
@@ -28,10 +27,6 @@ export default (props) => {
     phone: phonea || '',
   }), [phonea, shop?.shopId, isVerifieda])
 
-
-  // 获取资源表信息
-  const [alllist, setAllList] = useState([])
-
   const [isyear, setYear] = useState(true)
   const [isMomth, setMonth] = useState(false)
   const [refres, setRefres] = useState(true)
@@ -75,11 +70,6 @@ export default (props) => {
     }
   }, [tabJump])
 
-
-
-
-
-
   const handleTabChange = (e) => {
     const { index } = e.detail
     setActiveTab(index)
@@ -97,27 +87,13 @@ export default (props) => {
       title: '已核销订单',
     },
   ]
-
-  //给父组件传val
-  const handleVarified = () => {
-    onVarified()
-  }
-
-  const [showCutover, setShowCutover] = useState(false)
-  const ShowMoldeOn = () => {
-    setShowCutover(true)
-  }
-  const onClose = () => {
-    setShowCutover(false)
-  }
   return (
     <view style={{height:'100%'}}>
-      <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
       <view style={{ padding: '0 15px 0 15px', height: '100%',display:'flex' ,flexDirection:'column' }}>
         <view className='storexx' style={{flex:'none'}}>
-          <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder='请选择商铺' value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
-          <view onClick={ShowMoldeOn} className='User-info-cutover'>
-            <image className='User-info-cutover-image' src={cutoverUser} />
+          <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder='请选择商铺' value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>          
+          <view className='User-info-cutover-normal'>
+            <ToggleRole role='shop' isBind={isBind}/>
           </view>
           <view className='tip'>（计算收入以核销为准）</view>
           <view className='money'>
@@ -160,7 +136,6 @@ export default (props) => {
                 style={{ height: '100%' }}
                 request={getVerifiedOrder}
                 params={queryParams}
-                onDataChange={setAllList}
                 refresherEnabled={refres}
                 refresOff={refresOff}
                 noData={<NoData />}
@@ -177,7 +152,6 @@ export default (props) => {
                 request={getVerifiedOrder}
                 params={queryParams}
                 refresherEnabled={refres}
-                onDataChange={setAllList}
                 refresOff={refresOff}
                 render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
               >

src/shop/components/Sparead/spreadMoney.jsx

@@ -6,28 +6,19 @@ import { getAccount } from '@/services/shopBoss'
 import ShopCommission from '@/components/ShopCommission'
 import eyes from '@/assets/icons/shopKeeper/eyesON.png'
 import ceyes from '@/assets/icons/shopKeeper/eyesOFF.png'
-import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import NoData from '@/components/NoData'
-import ToggleRole from '@/components/toggleRole/ToggleRole'
+import ToggleRole from '@/components/ToggleRole'
 import './spreadMoney.less'
-import { View } from '@tarojs/components';
 
 const getList = (id) => (params) => getAccount(id, params)
 
 export default (props) => {
-  const { shopList, shop, onHotelChange, shopMoney } = props
-  const [showCutover, setShowCutover] = useState(false)
+  const { shopList, shop, onHotelChange, shopMoney, isBind } = props
   const [isyear, setYear] = useState(true)
   const [isMomth, setMonth] = useState(false)
-
   const queryParams = useMemo(() => ({}), [onHotelChange])
-
-
   const reqestAPI = getList(shopMoney?.acc?.accountId)
 
-
-
-
   //小眼睛开关
   const handleYear = () => {
     isyear ? setYear(false) : setYear(true)
@@ -40,25 +31,12 @@ export default (props) => {
   const handleHotelChange = (shopId, current) => {
     onHotelChange(current)
   }
-
-
-
-  const ShowMoldeOn = () => {
-    setShowCutover(true)
-  }
-  const onClose = () => {
-    setShowCutover(false)
-  }
-
   return (
     <view style={{ padding: '0 15px 0 15px', height: '100%', display: 'flex', flexDirection: 'column' }}>
-      <View style={{ flex: 'none' }}>
-        <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
-      </View>
       <view className='storexx' style={{ flex: 'none' }}>
         <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择商铺" value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
-        <view onClick={ShowMoldeOn} className='User-info-cutover'>
-          <image className='User-info-cutover-image' src={cutoverUser} />
+        <view className='User-info-cutover-normal'>
+          <ToggleRole role='shop' isBind={isBind} />
         </view>
         <view className='tip'>（计算收入以核销为准）</view>
         <view className='money'>

src/shop/components/Sparead/spreadMoney.less

@@ -68,14 +68,10 @@
     color: #202020;
     margin-bottom: 27px;
   }
-  .User-info-cutover {
+  .User-info-cutover-normal{
     position: absolute;
     top: 60px;
     right: 60px;
-    .User-info-cutover-image {
-      width: 36px;
-      height: 36px;
-    }
   }
   .tip {
     height: 23px;

src/shop/pages/spread/spreadIndex.jsx

@@ -28,6 +28,8 @@ export default withLayout((props) => {
   const [shop, setShop] = useState()
   // const shopOrderId='1a8deba868489b0be19cba941e6f577e'
   const shopId = shop?.shopId
+  const isBind=person.mpOpenid
+
 
 
   const [amountType, setAmountType] = useState('order')
@@ -66,12 +68,6 @@ export default withLayout((props) => {
     setVerifiedOrder(e.records)
   }
 
-
-  const onVarified = () => {
-    setisVerified(1)
-  }
-
-
   const onVarifiedTwo = () => {
     setisVerified(0)
   }
@@ -112,9 +108,9 @@ export default withLayout((props) => {
         <CustomNav logo='none' title={shop?.shopName} />
       </view>
       <view className='index-container'>
-        {currentTab === 0 && <ShopKeeper isVerified={isVerified} shopId={shopId} amountType={amountType} setVer={setVer} onVarifiedTwo={onVarifiedTwo} onVarified={onVarified} verifiedOrder={verifiedOrder} shopList={shopList} shop={shop} onHotelChange={handleHotelChange} shopMoney={shopMoney} />
+        {currentTab === 0 && <ShopKeeper isBind={isBind} isVerified={isVerified} shopId={shopId} amountType={amountType} setVer={setVer} onVarifiedTwo={onVarifiedTwo} verifiedOrder={verifiedOrder} shopList={shopList} shop={shop} onHotelChange={handleHotelChange} shopMoney={shopMoney} />
         }
-        {currentTab === 1 && <Sparead shopList={shopList} shop={shop} verifiedOrder={verifiedOrder} onHotelChange={handleHotelChange} shopMoney={shopMoney} />}
+        {currentTab === 1 && <Sparead isBind={isBind} shopList={shopList} shop={shop} verifiedOrder={verifiedOrder} onHotelChange={handleHotelChange} shopMoney={shopMoney} />}
       </view>
       <view className='index-tabbar'>
         <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>