李志伟 3 年之前
父節點
當前提交
90fba8a17c

+ 3
- 25
src/components/Landlord/Income/income.jsx 查看文件

13
 import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
13
 import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
14
 import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
14
 import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
15
 import shopBossOFF from '@/assets/icons/UserCenter/shopBossOFF.png'
15
 import shopBossOFF from '@/assets/icons/UserCenter/shopBossOFF.png'
16
+import  ToggleRoul  from  '@/components/toggleRoul/ToggleRoul'
16
 
17
 
17
 
18
 
18
 export default (props) => {
19
 export default (props) => {
20
   const ShowMoldeOn = () => {
21
   const ShowMoldeOn = () => {
21
     setShowCutover(true)
22
     setShowCutover(true)
22
   }
23
   }
23
-  const ok = () => {
24
+  const onClose = () => {
24
     setShowCutover(false)
25
     setShowCutover(false)
25
   }
26
   }
26
-  const gotoShop = () => {
27
-    Taro.redirectTo({ url: '/shop/pages/spread/spreadIndex' })
28
-  }
29
-  const gotoPerson = () => {
30
-    Taro.redirectTo({ url: '/pages/index/index' })
31
-  }
32
   return (
27
   return (
33
     <view>
28
     <view>
34
       <view>
29
       <view>
35
         <CustomNav title='十公里' />
30
         <CustomNav title='十公里' />
36
       </view>
31
       </view>
37
-      <Popup show={showCutover} maskClosable={false}>
38
-          <view className='User-box-sths' >
39
-            <view className='User-box-selectUser'>请选择身份:</view>
40
-            <view className='User-box-tourist' onClick={gotoPerson}>
41
-              <image className='Ubs-tourist-image' src={touristOFF} />
42
-              <text className='Ubs-tourist-text'>游客</text>
43
-            </view>
44
-            <view className='User-box-hotelBoss' onClick={ok}>
45
-              <image className='Ubs-hotelBoss-image' src={hotelBossON} />
46
-              <text className='Ubs-hotelBoss-text'>民宿老板</text>
47
-
48
-            </view>
49
-            <view className='User-box-shopBoss' onClick={gotoShop}>
50
-              <image className='Ubs-shopBoss-image' src={shopBossOFF} />
51
-              <text className='Ubs-shopBoss-text'>店铺老板</text>
52
-            </view>
53
-          </view>
54
-        </Popup>     
32
+      <ToggleRoul showCutover={showCutover} onClose={onClose} />
55
       <view style={{ padding: '30rpx', height: '100%' }}>
33
       <view style={{ padding: '30rpx', height: '100%' }}>
56
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 120px)' }}>
34
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 120px)' }}>
57
           <view className='storexx'>
35
           <view className='storexx'>

+ 4
- 28
src/components/spreads/ShopKeeper/shopKeeper.jsx 查看文件

14
 import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
14
 import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
15
 import shopBossOFF from '@/assets/icons/UserCenter/shopBossOFF.png'
15
 import shopBossOFF from '@/assets/icons/UserCenter/shopBossOFF.png'
16
 import './shopKeeper.less'
16
 import './shopKeeper.less'
17
+import  ToggleRoul  from  '@/components/toggleRoul/ToggleRoul'
17
 
18
 
18
 
19
 
19
 export default (props) => {
20
 export default (props) => {
44
   const ShowMoldeOn = () => {
45
   const ShowMoldeOn = () => {
45
     setShowCutover(true)
46
     setShowCutover(true)
46
   }
47
   }
47
-  const ok = () => {
48
+  const onClose = () => {
48
     setShowCutover(false)
49
     setShowCutover(false)
49
   }
50
   }
50
-  const goToHotel = () => {
51
-    Taro.redirectTo({ url: '/hotel/pages/landlord/landlord' })
52
-  }
53
-  const gotoPerson = () => {
54
-    Taro.redirectTo({ url: '/pages/index/index' })
55
-  }
56
   return (
51
   return (
57
     <view>
52
     <view>
58
       <view>
53
       <view>
59
         <CustomNav title='十公里' />
54
         <CustomNav title='十公里' />
60
       </view>
55
       </view>
61
-      <Popup show={showCutover} maskClosable={false}>
62
-          <view className='User-box-sths' >
63
-            <view className='User-box-selectUser'>请选择身份:</view>
64
-            <view className='User-box-tourist' onClick={gotoPerson}>
65
-              <image className='Ubs-tourist-image' src={touristOFF} />
66
-              <text className='Ubs-tourist-text'>游客</text>
67
-            </view>
68
-            <view className='User-box-hotelBoss' onClick={goToHotel}>
69
-              <image className='Ubs-hotelBoss-image' src={hotelBossOFF} />
70
-              <text className='Ubs-hotelBoss-text'>民宿老板</text>
71
-
72
-            </view>
73
-            <view className='User-box-shopBoss' onClick={ok}>
74
-              <image className='Ubs-shopBoss-image' src={shopBossON} />
75
-              <text className='Ubs-shopBoss-text'>店铺老板</text>
76
-
77
-            </view>
78
-          </view>
79
-
80
-        </Popup>
81
-        
56
+      <ToggleRoul showCutover={showCutover} onClose={onClose} />
57
+  
82
       <view style={{ padding: '30rpx', height: '100%' }}>
58
       <view style={{ padding: '30rpx', height: '100%' }}>
83
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 120px)' }}>
59
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 120px)' }}>
84
           <view className='storexx'>
60
           <view className='storexx'>

+ 2
- 2
src/layouts/index.jsx 查看文件

18
     const personRole = person?.personRole;
18
     const personRole = person?.personRole;
19
     if (!personRole) return;
19
     if (!personRole) return;
20
 
20
 
21
-    const isNormalPerson = personRole === 'person'
21
+    const isNormalPerson = personRole === 'normal'
22
 
22
 
23
     const currentPage = getPageBy(router.path)
23
     const currentPage = getPageBy(router.path)
24
     let indexPage = getIndexPageOf(personRole)
24
     let indexPage = getIndexPageOf(personRole)
25
     if (!isNormalPerson) {
25
     if (!isNormalPerson) {
26
-      indexPage = `${personRole}/${indexPage}`
26
+      indexPage = `${personRole}/${indexPage.page}`
27
     }
27
     }
28
 
28
 
29
     const isMatched = isNormalPerson ?
29
     const isMatched = isNormalPerson ?

+ 7
- 2
src/pages/index/tabs/Mine.jsx 查看文件

18
 import SwitchSelect from '@/components/SwitchSelect'
18
 import SwitchSelect from '@/components/SwitchSelect'
19
 import { useModel } from '@/store'
19
 import { useModel } from '@/store'
20
 import './MineCss/style.less'
20
 import './MineCss/style.less'
21
+import  ToggleRoul  from  '@/components/toggleRoul/ToggleRoul'
22
+
21
 
23
 
22
 
24
 
23
 
25
 
32
   // console.log("🚀 ~ file: Mine.jsx ~ line 31 ~ hidePhone", hidePhone)
34
   // console.log("🚀 ~ file: Mine.jsx ~ line 31 ~ hidePhone", hidePhone)
33
 
35
 
34
   const ShowMoldeOn = () => {
36
   const ShowMoldeOn = () => {
35
-    setShowCutover(!showCutover)
37
+    setShowCutover(true)
38
+  }
39
+  const onClose = () => {
40
+    setShowCutover(false)
36
   }
41
   }
37
 
42
 
38
   // 通过getUserProfile获取微信用户信息
43
   // 通过getUserProfile获取微信用户信息
103
 
108
 
104
       <view className='User-box'>
109
       <view className='User-box'>
105
         {/* 身份切换 */}
110
         {/* 身份切换 */}
106
-        <SwitchSelect show={showCutover} maskClosable />
111
+        <ToggleRoul showCutover={showCutover} onClose={onClose} />
107
         <view className='User-info'>
112
         <view className='User-info'>
108
           <view className='User-photos-box'>
113
           <view className='User-photos-box'>
109
             <image src={person.avatar || { DefaultImage }} className='User-photos' />
114
             <image src={person.avatar || { DefaultImage }} className='User-photos' />