flx

src/components/Popup/index.jsx

@@ -3,11 +3,11 @@ import './style.less'
 
 export default (props) => {
   const { show, mask = true, onClose, maskClosable } = props
-  const onClose3=()=>{
+  const onClose3 = () => {
     console.log('3333333333333333333333')
   }
   return (
-    <mp-dialog extClass='x-popup' buttons={[]} show={show} mask={mask} maskClosable={maskClosable} onClose={onClose3}>
+    <mp-dialog extClass='x-popup' buttons={[]} show={show} mask={mask} maskClosable={maskClosable} onClose={onClose}>
       {props.children}
     </mp-dialog>
   )

src/components/toggleRole/ToggleRole.jsx

@@ -13,7 +13,7 @@ import { useModel } from '@/store'
 
 
 export default (props) => {
-  const { showCutover, onClose, role } = props
+  const { showCutover, onClose, maskClosable, role } = props
   const { getRole } = useModel('person')
   const goToPerson = () => {
     getRole('normal')
@@ -29,7 +29,7 @@ export default (props) => {
     // console.log('2222222222222222222')
   }
   return (
-    <Popup show={showCutover} onClose={onClose2}>
+    <Popup show={showCutover} maskClosable={maskClosable} onClose={onClose}>
       <view className='User-box-sths' >
         <view className='User-box-selectUser'>请选择身份：</view>
         <view className='User-box-tourist' onClick={goToPerson}>

src/pages/MineUserAll/Collect/index.jsx

@@ -15,7 +15,6 @@ import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
 import position from '@/assets/icons/GuideCheck/position_logo.png'
 import starOn from '@/assets/icons/GuideCheck/starOn.png'
 import starOff from '@/assets/icons/GuideCheck/starOff.png'
-import AttractionsCollect from '@/components/CollectList/AttractionsCollect'
 import FoodCollect from '@/components/CollectList/FoodCollect'
 
 
@@ -57,12 +56,7 @@ export default withLayout((props) => {
 
 
       </view>
-      {/* {
-        collectContent.map((item, index) => {
-          return <AttractionsCollect key={(index)} item={item} />
-        })
 
-      } */}
       <view className='foot'>
         已经到底了~
       </view>

src/pages/index/tabs/Mine.jsx

@@ -113,7 +113,7 @@ export default (props) => {
 
       <view className='User-box'>
         {/* 身份切换 */}
-        <ToggleRole showCutover={showCutover} onClose={onClose} role='normal' />
+        <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' />