.

src/components/Landlord/Income/income.jsx

@@ -13,6 +13,7 @@ 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  ToggleRoul  from  '@/components/toggleRoul/ToggleRoul'
 
 
 export default (props) => {
@@ -20,38 +21,15 @@ export default (props) => {
   const ShowMoldeOn = () => {
     setShowCutover(true)
   }
-  const ok = () => {
+  const onClose = () => {
     setShowCutover(false)
   }
-  const gotoShop = () => {
-    Taro.redirectTo({ url: '/shop/pages/spread/spreadIndex' })
-  }
-  const gotoPerson = () => {
-    Taro.redirectTo({ url: '/pages/index/index' })
-  }
   return (
     <view>
       <view>
         <CustomNav title='十公里' />
       </view>
-      <Popup show={showCutover} maskClosable={false}>
-          <view className='User-box-sths' >
-            <view className='User-box-selectUser'>请选择身份：</view>
-            <view className='User-box-tourist' onClick={gotoPerson}>
-              <image className='Ubs-tourist-image' src={touristOFF} />
-              <text className='Ubs-tourist-text'>游客</text>
-            </view>
-            <view className='User-box-hotelBoss' onClick={ok}>
-              <image className='Ubs-hotelBoss-image' src={hotelBossON} />
-              <text className='Ubs-hotelBoss-text'>民宿老板</text>
-
-            </view>
-            <view className='User-box-shopBoss' onClick={gotoShop}>
-              <image className='Ubs-shopBoss-image' src={shopBossOFF} />
-              <text className='Ubs-shopBoss-text'>店铺老板</text>
-            </view>
-          </view>
-        </Popup>     
+      <ToggleRoul showCutover={showCutover} onClose={onClose} />
       <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'>

src/components/spreads/ShopKeeper/shopKeeper.jsx

@@ -14,6 +14,7 @@ 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 './shopKeeper.less'
+import  ToggleRoul  from  '@/components/toggleRoul/ToggleRoul'
 
 
 export default (props) => {
@@ -44,41 +45,16 @@ export default (props) => {
   const ShowMoldeOn = () => {
     setShowCutover(true)
   }
-  const ok = () => {
+  const onClose = () => {
     setShowCutover(false)
   }
-  const goToHotel = () => {
-    Taro.redirectTo({ url: '/hotel/pages/landlord/landlord' })
-  }
-  const gotoPerson = () => {
-    Taro.redirectTo({ url: '/pages/index/index' })
-  }
   return (
     <view>
       <view>
         <CustomNav title='十公里' />
       </view>
-      <Popup show={showCutover} maskClosable={false}>
-          <view className='User-box-sths' >
-            <view className='User-box-selectUser'>请选择身份：</view>
-            <view className='User-box-tourist' onClick={gotoPerson}>
-              <image className='Ubs-tourist-image' src={touristOFF} />
-              <text className='Ubs-tourist-text'>游客</text>
-            </view>
-            <view className='User-box-hotelBoss' onClick={goToHotel}>
-              <image className='Ubs-hotelBoss-image' src={hotelBossOFF} />
-              <text className='Ubs-hotelBoss-text'>民宿老板</text>
-
-            </view>
-            <view className='User-box-shopBoss' onClick={ok}>
-              <image className='Ubs-shopBoss-image' src={shopBossON} />
-              <text className='Ubs-shopBoss-text'>店铺老板</text>
-
-            </view>
-          </view>
-
-        </Popup>
-        
+      <ToggleRoul showCutover={showCutover} onClose={onClose} />
+  
       <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'>

src/layouts/index.jsx

@@ -18,12 +18,12 @@ export default (Child) => (props) => {
     const personRole = person?.personRole;
     if (!personRole) return;
 
-    const isNormalPerson = personRole === 'person'
+    const isNormalPerson = personRole === 'normal'
 
     const currentPage = getPageBy(router.path)
     let indexPage = getIndexPageOf(personRole)
     if (!isNormalPerson) {
-      indexPage = `${personRole}/${indexPage}`
+      indexPage = `${personRole}/${indexPage.page}`
     }
 
     const isMatched = isNormalPerson ?

src/pages/index/tabs/Mine.jsx

@@ -18,6 +18,8 @@ import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import SwitchSelect from '@/components/SwitchSelect'
 import { useModel } from '@/store'
 import './MineCss/style.less'
+import  ToggleRoul  from  '@/components/toggleRoul/ToggleRoul'
+
 
 
 
@@ -32,7 +34,10 @@ export default (props) => {
   // console.log("🚀 ~ file: Mine.jsx ~ line 31 ~ hidePhone", hidePhone)
 
   const ShowMoldeOn = () => {
-    setShowCutover(!showCutover)
+    setShowCutover(true)
+  }
+  const onClose = () => {
+    setShowCutover(false)
   }
 
   // 通过getUserProfile获取微信用户信息
@@ -103,7 +108,7 @@ export default (props) => {
 
       <view className='User-box'>
         {/* 身份切换 */}
-        <SwitchSelect show={showCutover} maskClosable />
+        <ToggleRoul showCutover={showCutover} onClose={onClose} />
         <view className='User-info'>
           <view className='User-photos-box'>
             <image src={person.avatar || { DefaultImage }} className='User-photos' />