feats

src/app.config.js

@@ -1,24 +1,7 @@
+import { pages } from './routes'
+
 export default {
-  pages: [
-    'pages/index/index',
-    'pages/test/index',
-    'pages/search/search',
-    'pages/searchResult/searchResult',
-    'pages/details/foodDetails/foodDetails',
-    'pages/details/mjDetails/sceneryDetails',
-    'pages/login/login',
-    'pages/spread/spreadIndex',
-    'pages/landlord/landlord',
-    'pages/PayOrder/index',
-    'pages/MineUserAll/ContactMe/index',
-    'pages/MineUserAll/HomeLogo/index',
-    'pages/MineUserAll/Collect/index',
-    'pages/MineUserAll/Rules/index',
-    'pages/MineUserAll/RefundMoney/index',
-    'pages/MineUserAll/RefundMoney/CheckRefund/index',
-    'pages/MineUserAll/AllOrder/index',//我的订单
-    'pages/TobeShop/index',
-  ],
+  pages,
   window: {
     backgroundTextStyle: 'light',
     navigationBarBackgroundColor: '#fff',

src/app.js

@@ -11,6 +11,8 @@ class App extends Component {
 
     // 预拉取数据
     preFetchData().then((fetchData) => {
+      console.log('----fetchData--->', new Date())
+
       setPerson({
         personId: fetchData.personId,
         openid: fetchData.openid,

src/layouts/Demo1.jsx

@@ -1,7 +0,0 @@
-import React from 'react'
-
-export default (props) => {
-  return (
-    <view>demo1</view>
-  )
-}

src/layouts/Demo2.jsx

@@ -1,7 +0,0 @@
-import React from 'react'
-
-export default (props) => {
-  return (
-    <view>demo2</view>
-  )
-}

src/layouts/index.jsx

@@ -1,31 +1,9 @@
-import React, { Suspense, useState } from 'react'
-import tabList from './tabbar'
-import './style.less'
+import { useModel } from '@/store'
+import useRouter from '@/utils/hooks/useRouter'
 
-const Demo1 = React.lazy(() => import('./Demo1'))
-const Demo2 = React.lazy(() => import('./Demo2'))
+export default (Child) => (props) => {
+  const [person] = useModel('person')
+  const router = useRouter()
 
-export default (props) => {
-  const [currentTab, setCurrentTab] = useState(1)
-
-  const handleTabChange = (e) => {
-    const { item } = e.detail
-    setCurrentTab(item.id)
-  }
-
-  const Comp = currentTab === 1 ? Demo1 : Demo2
-
-  return (
-    <Suspense fallback='loading...'>
-      <view className='main-layout'>
-        <view className='main-navbar'></view>
-        <view className='main-container'>
-          <Comp />  
-        </view>
-        <view className='main-tabbar'>
-          <mp-tabbar list={tabList} onChange={handleTabChange}></mp-tabbar>
-        </view>
-      </view>
-    </Suspense>
-  )
+  return <Child {...props} person={person} router={router} />
 }

src/pages/MineUserAll/HomeLogo/index.config.js

@@ -1,4 +0,0 @@
-export default {
-  navigationBarTitleText: '入住指引',
-  navigationStyle: 'custom',
-}

src/pages/MineUserAll/HomeLogo/index.jsx

@@ -1,11 +0,0 @@
-
-import CustomNav from '@/components/CustomNav'
-import './style.less'
-
-export default (props) => {
-  return (
-    <view className='box-content'>
-      <CustomNav title='入住指引' />
-    </view>
-  )
-}

src/pages/MineUserAll/HomeLogo/style.less

@@ -1,2 +0,0 @@
-.box-content {
-}

src/pages/index/index.jsx

@@ -3,6 +3,7 @@ import { useRouter } from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import { useModel } from '@/store'
 import logo from '@/assets/icons/comm/logo_small.png'
+import withLayout from '@/layouts'
 import tabList from './tabbar'
 import './index.less'
 import Guide from './tabs/Guide'
@@ -16,7 +17,7 @@ import Recommend from './tabs/Recommend'
 // const Mine =  import'./tabs/Mine'
 
 
-export default (props) => {
+export default withLayout((props) => {
   const { params } = useRouter()
   const { tab } = params || {}
 
@@ -53,4 +54,4 @@ export default (props) => {
 
   )
 
-}
+})

src/routes.js

@@ -0,0 +1,91 @@
+
+const routes = [
+  {
+    title: '首页',
+    roles: ['person'],
+    page: 'pages/index/index',
+  },
+  {
+    title: '搜索',
+    roles: ['person'],
+    page: 'pages/search/search',
+  },
+  {
+    title: '搜索结果',
+    roles: ['person'],
+    page: 'pages/searchResult/searchResult',
+  },
+  {
+    title: '商铺详情',
+    roles: ['person'],
+    page: 'pages/details/foodDetails/foodDetails',
+  },
+  {
+    title: '景点详情',
+    roles: ['person'],
+    page: 'pages/details/mjDetails/sceneryDetails',
+  },
+  {
+    title: '民宿管理',
+    roles: ['hotel'],
+    page: 'pages/landlord/landlord',
+  },
+  {
+    title: '商铺管理',
+    roles: ['shop'],
+    page: 'pages/spread/spreadIndex',
+  },
+  {
+    title: '订单',
+    roles: ['person'],
+    page: 'pages/PayOrder/index',
+  },
+  {
+    title: '联系我们',
+    roles: ['person'],
+    page: 'pages/MineUserAll/ContactMe/index',
+  },
+  {
+    title: '我的收藏',
+    roles: ['person'],
+    page: 'pages/MineUserAll/Collect/index',
+  },
+  {
+    title: '协议声明',
+    roles: ['person'],
+    page: 'pages/MineUserAll/Rules/index',
+  },
+  {
+    title: '退款申请',
+    roles: ['person'],
+    page: 'pages/MineUserAll/RefundMoney/index',
+  },
+  {
+    title: '确认退款',
+    roles: ['person'],
+    page: 'pages/MineUserAll/RefundMoney/CheckRefund/index',
+  },
+  {
+    title: '我的订单',
+    roles: ['person'],
+    page: 'pages/MineUserAll/AllOrder/index',
+  },
+  {
+    title: '套餐核销',
+    roles: ['person'],
+    page: 'pages/TobeShop/index',
+  },
+];
+
+const pages = routes.map(x => x.page);
+
+function getPage(role) {
+  return routes.filter(x => x.roles.includes(role))
+                .map(x => x.page);
+}
+
+module.exports = {
+  routes,
+  pages,
+  getPage
+}