feats

config/dev.js

@@ -4,12 +4,12 @@ module.exports = {
   },
   defineConstants: {
     HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"http://127.0.0.1:8081"',
+    // HOST: '"http://127.0.0.1:8567"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
-    Version: '"V3.5.29-20201112"'
+    Version: '"V0.0.20"'
   },
   mini: {},
   h5: {}

config/index.js

@@ -1,4 +1,5 @@
 const path = require('path')
+const { routes } = require('../src/routes')
 
 const config = {
   projectName: 'miniapp',
@@ -26,16 +27,43 @@ const config = {
     '@/utils': path.resolve(__dirname, '..', 'src/utils'),
     '@/native': path.resolve(__dirname, '..', 'src/native'),
     '@/pages': path.resolve(__dirname, '..', 'src/pages'),
+    '@/subpackages': path.resolve(__dirname, '..', 'src/subpackages'),
   },
   copy: {
     patterns: [
       // { from: 'src/native/', to: 'dist/native/' },
+      // { from: 'src/subpackages/native/', to: 'dist/subpackages/native/' },
     ],
     options: {
     }
   },
   framework: 'react',
   mini: {
+    // addChunkPages (pages) {
+    //   // pages.set('subpackages/bar/index', ['subpackages/common'])
+    //   routes.filter(r => r.pkg === 'subpackages').forEach((r) => {
+    //     pages.set(r.pkg + '/' + r.page, ['subpackages/common'])
+    //   })
+    // },
+    // webpackChain (chain) {
+    //   chain.merge({
+    //     optimization: {
+    //       splitChunks: {
+    //         cacheGroups: {
+    //           subpackagesCommon: {
+    //             name: 'subpackages/common',
+    //             minChunks: 2,
+    //             test: (module, chunks) => {
+    //               const isNoOnlySubpackRequired = chunks.find(chunk => !(/\bsubpackages\b/.test(chunk.name)))
+    //               return !isNoOnlySubpackRequired
+    //             },
+    //             priority: 200
+    //           }
+    //         }
+    //       }
+    //     }
+    //   })
+    // },
     compile: {
       // exclude: [
       //   path.resolve(__dirname, '..', 'src/native/')

config/prod.js

@@ -10,7 +10,7 @@ module.exports = {
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
-    Version: '"V3.5.29-20201112"'
+    Version: '"V0.0.22-20210805"'
   },
   mini: {},
   h5: {

jsconfig.json

@@ -13,6 +13,7 @@
       "@/styles/*": ["./src/styles/*"],
       "@/utils/*": ["./src/utils/*"],
       "@/services/*": ["./src/services/*"],
+      "@/subpackages/*": ["./src/subpackages/*"],
     }
   }
 }

src/app.config.js

@@ -1,9 +1,10 @@
 import { getPages } from './routes'
 
-const { pages } = getPages()
+const { pages, subPackages } = getPages()
 
 export default {
   pages,
+  subPackages,
   window: {
     backgroundTextStyle: 'light',
     navigationBarBackgroundColor: '#fff',

src/components/Poster/index.jsx

@@ -1,6 +1,6 @@
 import React, { useRef, useState } from 'react'
 import Taro from '@tarojs/taro'
-import Modal from '@/components/Modal'
+// import PageModal from '@/components/PageModal'
 import { authorize } from '@/utils/wxAuth'
 import { View, Image, Button } from '@tarojs/components'
 import Spin2 from '@/components/Spin/Spin2'
@@ -91,7 +91,7 @@ export default (props) => {
   return (
     // <Modal title={title} visible={show} onClose={onClose}>
     // eslint-disable-next-line react/jsx-no-undef
-    <page-modal show={show} position='bottom' onClickOverlay={onClose} height='70vh'>
+    <page-modal show={show} position='bottom' onClose={onClose} height='70vh'>
       <View className='modal-poster'>
         <View className='modal-poster-img-box'>
           <view>

src/layout/index.js

@@ -114,7 +114,7 @@ export default (ChildComponent) => (props) => {
       }
       <FirstScreen
         info={screenInfo}
-        visible={false}
+        visible={screenVisible}
         onClick={handleScreen}
         onClose={toggleShowScreen}
       />

src/native/PageContainer/index.js

@@ -57,10 +57,12 @@ Component({
     onEnter(e) {},
     onAfterEnter(e) {},
     onBeforeLeave(e) {},
-    onLeave(e) {},
+    onLeave(e) {
+      this.triggerEvent('close', e)
+    },
     onAfterLeave(e) {},
     onClickOverlay(e) {
-      this.triggerEvent('clickOverlay', e)
+      this.triggerEvent('close', e)
     }
   }
 })

src/native/PageContainer/index.json

@@ -1,3 +1,4 @@
 {
+  "component": true,
   "usingComponents": {}
 }

src/pages/index/buildingDetail/components/PropertyConsultant/index.jsx

@@ -33,7 +33,7 @@ export default function PropertyConsultant (props) {
   
   const gotoDetail = (item) => {
     Taro.navigateTo({
-      url: `/pages/mine/myHomepage/index?id=${item.id}`
+      url: `/subpackages/pages/consultant/myHomepage/index?id=${item.id}`
     })
   }
 

src/pages/index/buildingPropertyConsultant/index.jsx

@@ -30,7 +30,7 @@ export default withLayout((props) => {
 
   const gotoDetail = (item) => {
     Taro.navigateTo({
-      url: `/pages/mine/myHomepage/index?id=${item.id}`
+      url: `/subpackages/pages/consultant/myHomepage/index?id=${item.id}`
     })
   }
 

src/pages/index/components/Menu/index.jsx

@@ -23,7 +23,7 @@ export default function Menu () {
     { name: '文旅商办', id: 11, icon: require('@/assets/index-icon13.png'), router: `/pages/index/buildingList/index?isCommerce=1` },
     { name: '新闻资讯', id: 12, icon: require('@/assets/index-icon15.png'), router: '/pages/index/newsList/index' },
     { name: '购房百科', id: 13, icon: require('@/assets/index-icon4.png'), router: '/pages/index/encyclopediasOfBuyHouse/index' },
-    { name: '房贷计算', id: 14, icon: require('@/assets/index-icon3.png'), router: '/pages/index/mortgageCalculation/index' }
+    { name: '房贷计算', id: 14, icon: require('@/assets/index-icon3.png'), router: '/pages/mine/mortgageCalc/index' }
   ]
 
   let Arr = []

src/pages/index/encyclopediasOfBuyHouse/index.jsx

@@ -123,7 +123,7 @@ export default withLayout((props) => {
           name: "贷款查征信",
           id: 10,
           tips: "",
-          icon: require("../../../assets/ency-icon1.png"),
+          icon: require("@/assets/ency-icon1.png"),
         },
       ],
     },

src/pages/index/mortgageCalculation/components/ShangYe/index.jsx

@@ -1,82 +0,0 @@
-import { useState, useEffect } from 'react'
-import { Input } from '@tarojs/components'
-import './index.scss'
-
-export default function ShangYe () {
-
-  // 商贷年限
-  const [Years, setYears] = useState([])
-  const [CurrentYears, setCurrentYears] = useState({})
-  
-  // 利率方式
-  const [InterestTypes] = useState([
-    { name: '按LPR', id: 1 },
-    { name: '按旧版基准利率', id: 2 }
-  ])
-  const [CurrentInterestTypes, setCurrentInterestTypes] = useState(InterestTypes[0])
-
-  let BusinessInterestTypes1 = [ // 按照LPR
-    {name: '', id: 1}
-  ]
-  const BusinessInterestTypes2 = [ // 按照旧版基准利率
-  ]
-  const [BusinessInterestTypes] = useState(BusinessInterestTypes1)
-  const [CurrentBusinessInterest, setCurrentBusinessInterest] = useState(BusinessInterestTypes[0])
-
-  useEffect(() => {
-    if (!Years.length) {
-      let Arr = []
-      for (let n = 30; n > 0; n--) {
-        Arr.push({ name: `${n}年`, id: n })
-      }
-      setYears(Arr)
-    } else {
-      setCurrentYears(Years[0])
-    }
-  }, [Years])
-
-  return (
-    <view className='components ShangYe'>
-
-      <view className='flex-h'>
-        <text>计算方式</text>
-        <view className='flex-item'>
-
-        </view>
-      </view>
-
-      <view className='flex-h'>
-        <text>商贷金额</text>
-        <view className='flex-item'>
-          <Input></Input>
-        </view>
-        <text>万</text>
-      </view>
-
-      <view className='flex-h'>
-        <text>商贷年限</text>
-        <view className='flex-item'>
-          <picker value={0} range-key='name' range={Years}>{CurrentYears.name}</picker>
-        </view>
-        <text className='iconfont icon-jiantouright'></text>
-      </view>
-
-      <view className='flex-h'>
-        <text>利率方式</text>
-        <view className='flex-item'>
-          <picker value={0} range-key='name' range={InterestTypes}>{CurrentInterestTypes.name}</picker>
-        </view>
-        <text className='iconfont icon-jiantouright'></text>
-      </view>
-
-      <view className='flex-h'>
-        <text>商贷利率</text>
-        <view className='flex-item'>
-          <picker value={0} range-key='name' range={BusinessInterestTypes}>{CurrentBusinessInterest.name}</picker>
-        </view>
-        <text className='iconfont icon-jiantouright'></text>
-      </view>
-
-    </view>
-  )
-}

src/pages/index/mortgageCalculation/components/ShangYe/index.scss

@@ -1,4 +0,0 @@
-.components.ShangYe {
-  position: relative;
-  overflow: hidden;
-}

src/pages/index/mortgageCalculation/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '房贷计算'
-}

src/pages/index/mortgageCalculation/index.jsx

@@ -1,53 +0,0 @@
-import { useState, useEffect } from 'react'
-import withLayout from '@/layout'
-import { ScrollView } from '@tarojs/components'
-import '@/assets/css/iconfont.css'
-import ShangYe from './components/ShangYe/index'
-import './index.scss'
-
-export default withLayout(() => {
-
-  const [MenuList] = useState([
-    { name: '商业贷款', id: 1 },
-    { name: '组合贷款', id: 2 },
-    { name: '公积金贷款', id: 3 }
-  ])
-  const [CurrnetMenuId, setCurrnetMenuId] = useState(1)
-
-  const CutMenu = (id) => {
-    return () => {
-      setCurrnetMenuId(id)
-    }
-  }
-
-  return (
-    <view className='Page mortgageCalculation flex-v'>
-
-      <view className='MenuList flex-h'>
-        {
-          MenuList.map((item, index) => (
-            <view key={`ListItem${index}`} className='flex-item'>
-              <text onClick={CutMenu(item.id)} className={CurrnetMenuId === item.id ? 'active' : ''}>{item.name}</text>
-            </view>
-          ))
-        }
-      </view>
-
-      <view className='flex-item'>
-        <view>
-          <ScrollView scroll-y>
-            <view className='PageContent'>
-
-              {
-                CurrnetMenuId === 1 &&
-                <ShangYe></ShangYe>
-              }
-
-            </view>
-          </ScrollView>
-        </view>
-      </view>
-
-    </view>
-  )
-})

src/pages/index/mortgageCalculation/index.scss

@@ -1,58 +0,0 @@
-.Page.mortgageCalculation {
-  background: #fff;
-  >.MenuList {
-    position: relative;
-    overflow: hidden;
-    border-bottom: 2px solid rgba(0, 0, 0, 0.08);
-    padding: 0 30px;
-    >view {
-      text-align: center;
-      font-size: 0;
-      >text {
-        display: inline-block;
-        font-size: 30px;
-        font-weight: bold;
-        line-height: 40px;
-        padding: 20px 0 30px;
-        position: relative;
-        &.active {
-          color: #193C83;
-          &::after {
-            content: '';
-            width: 30px;
-            height: 4px;
-            border-radius: 4px;
-            background: #193C83;
-            display: block;
-            position: absolute;
-            left: 50%;
-            bottom: 4px;
-            transform: translateX(-50%);
-            -webkit-transform: translateX(-50%);
-          }
-        }
-      }
-    }
-  }
-  >.flex-item {
-    position: relative;
-    overflow: hidden;
-    >view {
-      width: 100%;
-      position: absolute;
-      left: 0;
-      top: 0;
-      bottom: 0;
-      overflow: hidden;
-      > scroll-view {
-        width: 100%;
-        height: 100%;
-        .PageContent {
-          position: relative;
-          overflow: hidden;
-          min-height: 100vh;
-        }
-      }
-    }
-  }
-}

src/pages/index/newsDetail/index.jsx

@@ -91,7 +91,7 @@ export default withLayout((props) => {
           <view>
             <Image
               mode="heightFix"
-              src={require("../../../assets/buildingDetail-icon3.png")}
+              src={require("@/assets/buildingDetail-icon3.png")}
             ></Image>
             <text>生成海报</text>
           </view>

src/pages/mine/components/NeedLogin/index.jsx

@@ -7,7 +7,7 @@ export default function Banner (props) {
   return (
     <view className='components NeedLogin flex-v'>
       <view className='Logo'>
-        <Image mode='aspectFit' className='centerLabel' src={require('../../../../assets/logo.png')} />
+        <Image mode='aspectFit' className='centerLabel' src={require('@/assets/logo.png')} />
       </view>
       <view className='LoginBtn'>
         <text>微信登录</text>

src/pages/mine/index.jsx

@@ -15,6 +15,9 @@ import MineMenuList from './tabData'
 
 const defaultRuleImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon18.jpg'
 
+const version = `版本: ${Version}`
+const copyRight = `云致科技 @ ${(new Date()).getFullYear()}`
+
 export default withLayout(() => {
 
   const user = useSelector(state => state.user)
@@ -125,7 +128,11 @@ export default withLayout(() => {
 
             </view>
           }
+        </view>
 
+        <view className='copyright'>
+          <view>{version}</view>
+          <view>{copyRight}</view>
         </view>
       </ScrollView>
 

src/pages/mine/index.scss

@@ -1,5 +1,15 @@
 .Page.Mine {
   background: #fff;
+
+  .copyright {
+    padding: 2em;
+    background: #f8f8f8;
+    text-align: center;
+    font-size: 20px;
+    color: rgba(0,0,0, 0.5);
+    line-height: 1.6em;
+  }
+
   > scroll-view {
     width: 100%;
     height: 100%;

src/pages/mine/mortgageCalc/index.jsx

@@ -105,7 +105,7 @@ export default withLayout(() => {
           <button loading={loading} onClick={handleCalc}>开始计算</button>
         </view>
       </ScrollView>
-      <page-modal show={visible} position='bottom'>
+      <page-modal show={visible} position='bottom' onClose={() => setVisible(false)} >
         <Result dataSource={result} isMixed={current === 3} onClose={() => setVisible(false)} />
       </page-modal>
     </view>

src/pages/mine/myCustomerDetail/index.jsx

@@ -190,7 +190,7 @@ export default withLayout((props) => {
             <view className='Title flex-h'>
               <text>跟进记录</text>
               <view className='Edit' onClick={() => setShowFollowModal(true)}>
-                <Image mode='heightFix' src={require('../../../assets/mine-icon26.png')}></Image>
+                <Image mode='heightFix' src={require('@/assets/mine-icon26.png')}></Image>
                 <text>新增</text>
               </view>
               <view className='flex-item'></view>
@@ -224,7 +224,7 @@ export default withLayout((props) => {
           <button loading={followSubmitting} style={{ background: '#193c83', color: '#fff', borderRadius: 0 }} onClick={handleAddFollow}>确定</button>
         </view>
       </Modal>
-      <page-modal show={showUserEditor} position='bottom' onClickOverlay={() => setShowUserEditor(false)} height='90vh'>
+      <page-modal show={showUserEditor} position='bottom' onClose={() => setShowUserEditor(false)} height='90vh'>
         <EditUserDetailBasicInfo Data={custMoreInfo} CustomerId={id} close={() => setShowUserEditor(false)} />
       </page-modal>
     </view>

src/pages/mine/recommendUser/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '推荐客户'
-}

src/pages/mine/recommendUser/index.jsx

@@ -1,73 +0,0 @@
-import React, { useState, useEffect } from 'react'
-import withLayout from '@/layout'
-import './index.scss'
-import { ScrollView, Input, Image } from '@tarojs/components'
-import '@/assets/css/iconfont.css'
-
-const defaultSpecialImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg'
-
-export default withLayout((props) => {
-
-  // const [PageProps] = useState(props)
-
-  return (
-    <view className='Page recommendUser'>
-
-      <ScrollView scroll-y={true} refresher-enabled={false} refresher-background='#fff'>
-        <view className='PageContent'>
-
-          <text>客户姓名</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入客户真实姓名'></Input>
-            </view>
-          </view>
-
-          <text>客户电话</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入手机号码'></Input>
-            </view>
-          </view>
-
-          <text>客户性别</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <text>请选择</text>
-            </view>
-            <text className='iconfont icon-jiantoudown'></text>
-          </view>
-
-          <text>意向楼盘</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入意向楼盘'></Input>
-            </view>
-          </view>
-
-          <text>置业顾问（选填）</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <text>请选择</text>
-            </view>
-            <Image mode='heightFix' src={defaultSpecialImage}></Image>
-            <text>选择</text>
-          </view>
-
-          <text>备注</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='补充说明（选填）'></Input>
-            </view>
-          </view>
-
-          <view className='Btn'>
-            <text>提交</text>
-          </view>
-
-        </view>
-      </ScrollView>
-
-    </view>
-  )
-})

src/pages/mine/recommendUser/index.scss

@@ -1,71 +0,0 @@
-.Page.recommendUser {
-  background: #fff;
-  height: 100vh;
-  width: 100%;
-  > scroll-view {
-    width: 100%;
-    height: 100%;
-    .PageContent {
-      position: relative;
-      overflow: hidden;
-      min-height: 100vh;
-      > text {
-        font-size: 34px;
-        font-weight: bold;
-        color: #333;
-        display: block;
-        text-indent: 40px;
-        margin-top: 30px;
-      }
-      > .flex-h {
-        padding: 20px 40px;
-        border-bottom: 2px solid rgba(0, 0, 0, 0.12);
-        margin-top: 10px;
-        align-items: center;
-        > view {
-          > input {
-            display: block;
-            width: 100%;
-            background: none;
-            font-size: 26px;
-            line-height: 40px;
-            height: 40px;
-          }
-          > text {
-            display: block;
-            width: 100%;
-            background: none;
-            font-size: 26px;
-            line-height: 40px;
-            height: 40px;
-          }
-        }
-        > text {
-          font-size: 26px;
-          &.iconfont {
-            font-size: 30px;
-          }
-        }
-        >image {
-          height: 30px;
-          margin-right: 10px;
-        }
-      }
-      .Btn {
-        padding: 40px;
-        position: relative;
-        overflow: hidden;
-        > text {
-          display: block;
-          text-align: center;
-          font-size: 32px;
-          line-height: 92px;
-          background: #193c83;
-          color: #fff;
-          font-weight: bold;
-          border-radius: 92px;
-        }
-      }
-    }
-  }
-}

src/pages/mine/reportUser/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '报备客户'
-}

src/pages/mine/reportUser/index.jsx

@@ -1,73 +0,0 @@
-import React, { useState, useEffect } from 'react'
-import withLayout from '@/layout'
-import './index.scss'
-import { ScrollView, Input, Image } from '@tarojs/components'
-import '@/assets/css/iconfont.css'
-
-const defaultSpecialImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg'
-
-export default withLayout((props) => {
-
-  // const [PageProps] = useState(props)
-
-  return (
-    <view className='Page reportUser'>
-
-      <ScrollView scroll-y={true} refresher-enabled={false} refresher-background='#fff'>
-        <view className='PageContent'>
-
-          <text>客户姓名</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入客户真实姓名'></Input>
-            </view>
-          </view>
-
-          <text>客户电话</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入手机号码'></Input>
-            </view>
-          </view>
-
-          <text>客户性别</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <text>请选择</text>
-            </view>
-            <text className='iconfont icon-jiantoudown'></text>
-          </view>
-
-          <text>意向楼盘</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入意向楼盘'></Input>
-            </view>
-          </view>
-
-          <text>置业顾问（选填）</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <text>请选择</text>
-            </view>
-            <Image mode='heightFix' src={defaultSpecialImage}></Image>
-            <text>选择</text>
-          </view>
-
-          <text>备注</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='补充说明（选填）'></Input>
-            </view>
-          </view>
-
-          <view className='Btn'>
-            <text>提交</text>
-          </view>
-
-        </view>
-      </ScrollView>
-
-    </view>
-  )
-})

src/pages/mine/reportUser/index.scss

@@ -1,71 +0,0 @@
-.Page.reportUser {
-  background: #fff;
-  height: 100vh;
-  width: 100%;
-  > scroll-view {
-    width: 100%;
-    height: 100%;
-    .PageContent {
-      position: relative;
-      overflow: hidden;
-      min-height: 100vh;
-      > text {
-        font-size: 34px;
-        font-weight: bold;
-        color: #333;
-        display: block;
-        text-indent: 40px;
-        margin-top: 30px;
-      }
-      > .flex-h {
-        padding: 20px 40px;
-        border-bottom: 2px solid rgba(0, 0, 0, 0.12);
-        margin-top: 10px;
-        align-items: center;
-        > view {
-          > input {
-            display: block;
-            width: 100%;
-            background: none;
-            font-size: 26px;
-            line-height: 40px;
-            height: 40px;
-          }
-          > text {
-            display: block;
-            width: 100%;
-            background: none;
-            font-size: 26px;
-            line-height: 40px;
-            height: 40px;
-          }
-        }
-        > text {
-          font-size: 26px;
-          &.iconfont {
-            font-size: 30px;
-          }
-        }
-        >image {
-          height: 30px;
-          margin-right: 10px;
-        }
-      }
-      .Btn {
-        padding: 40px;
-        position: relative;
-        overflow: hidden;
-        > text {
-          display: block;
-          text-align: center;
-          font-size: 32px;
-          line-height: 92px;
-          background: #193c83;
-          color: #fff;
-          font-weight: bold;
-          border-radius: 92px;
-        }
-      }
-    }
-  }
-}

src/pages/mine/tabData.js

@@ -1,79 +1,79 @@
 const MineMenuList = {
   User: [ // 普通用户
     [
-      { name: '推荐客户', icon: require('../../assets/mine-icon8.png'), router: '/pages/mine/addCustomer/index?type=customer' },
+      { name: '推荐客户', icon: require('@/assets/mine-icon8.png'), router: '/pages/mine/addCustomer/index?type=customer' },
     ],
     [
-      { name: '我的分享', icon: require('../../assets/mine-icon9.png'), router: '/pages/mine/myShare/index' },
-      { name: '我的活动', icon: require('../../assets/mine-icon10.png'), router: '/pages/mine/myActivity/index' },
-      { name: '我的收藏', icon: require('../../assets/mine-icon13.png'), router: '/pages/mine/myCollect/index' }
+      { name: '我的分享', icon: require('@/assets/mine-icon9.png'), router: '/pages/mine/myShare/index' },
+      { name: '我的活动', icon: require('@/assets/mine-icon10.png'), router: '/pages/mine/myActivity/index' },
+      { name: '我的收藏', icon: require('@/assets/mine-icon13.png'), router: '/pages/mine/myCollect/index' }
     ],
     [
-      { name: '房贷计算器', icon: require('../../assets/mine-icon4.png'), router: '/pages/mine/mortgageCalc/index' },
-      { name: '购房百科', icon: require('../../assets/mine-icon2.png'), router: '/pages/index/encyclopediasOfBuyHouse/index' },
-      { name: '意见反馈', icon: require('../../assets/mine-icon16.png'), router: '/pages/mine/feedBack/index' }
+      { name: '房贷计算器', icon: require('@/assets/mine-icon4.png'), router: '/pages/mine/mortgageCalc/index' },
+      { name: '购房百科', icon: require('@/assets/mine-icon2.png'), router: '/pages/index/encyclopediasOfBuyHouse/index' },
+      { name: '意见反馈', icon: require('@/assets/mine-icon16.png'), router: '/pages/mine/feedBack/index' }
     ],
     [
-      { name: '成为驻场管理', icon: require('../../assets/mine-icon8.png'), router: '/pages/mine/toBeManager/index' },
-      { name: '成为置业顾问', icon: require('../../assets/mine-icon4.png'), router: 'propertyConsultant' },
-      { name: '成为专业经纪人', icon: require('../../assets/mine-icon2.png'), router: '/pages/mine/toBeAgent/index' }
+      { name: '成为驻场管理', icon: require('@/assets/mine-icon8.png'), router: '/pages/mine/toBeManager/index' },
+      { name: '成为置业顾问', icon: require('@/assets/mine-icon4.png'), router: 'propertyConsultant' },
+      { name: '成为专业经纪人', icon: require('@/assets/mine-icon2.png'), router: '/pages/mine/toBeAgent/index' }
     ]
   ],
   Broker: [ // 经纪人
     [
-      { name: '报备客户', icon: require('../../assets/mine-icon1.png'), router: '/pages/mine/addCustomer/index?type=estateAgent' },
-      { name: '合作渠道', icon: require('../../assets/mine-icon3.png'), router: '/pages/mine/partnerChannel/index' }
+      { name: '报备客户', icon: require('@/assets/mine-icon1.png'), router: '/pages/mine/addCustomer/index?type=estateAgent' },
+      { name: '合作渠道', icon: require('@/assets/mine-icon3.png'), router: '/subpackages/pages/channel/partnerChannel/index' }
     ],
     [
-      { name: '我的客户', icon: require('../../assets/mine-icon15.png'), router: '/pages/mine/myCustomer/index' },
-      { name: '我的分享', icon: require('../../assets/mine-icon9.png'), router: '/pages/mine/myShare/index' },
-      { name: '我的活动', icon: require('../../assets/mine-icon10.png'), router: '/pages/mine/myActivity/index' },
-      { name: '我的课堂', icon: require('../../assets/mine-icon12.png'), router: '/pages/mine/myCourse/index' },
-      { name: '我的收藏', icon: require('../../assets/mine-icon13.png'), router: '/pages/mine/myCollect/index' }
+      { name: '我的客户', icon: require('@/assets/mine-icon15.png'), router: '/pages/mine/myCustomer/index' },
+      { name: '我的分享', icon: require('@/assets/mine-icon9.png'), router: '/pages/mine/myShare/index' },
+      { name: '我的活动', icon: require('@/assets/mine-icon10.png'), router: '/pages/mine/myActivity/index' },
+      { name: '我的课堂', icon: require('@/assets/mine-icon12.png'), router: '/pages/mine/myCourse/index' },
+      { name: '我的收藏', icon: require('@/assets/mine-icon13.png'), router: '/pages/mine/myCollect/index' }
     ],
     [
-      { name: '成为驻场管理', icon: require('../../assets/mine-icon8.png'), router: '/pages/mine/toBeManager/index' },
-      { name: '房贷计算器', icon: require('../../assets/mine-icon4.png'), router: '/pages/mine/mortgageCalc/index' },
-      { name: '购房百科', icon: require('../../assets/mine-icon2.png'), router: '/pages/index/encyclopediasOfBuyHouse/index' },
-      { name: '意见反馈', icon: require('../../assets/mine-icon16.png'), router: '/pages/mine/feedBack/index' }
+      { name: '成为驻场管理', icon: require('@/assets/mine-icon8.png'), router: '/pages/mine/toBeManager/index' },
+      { name: '房贷计算器', icon: require('@/assets/mine-icon4.png'), router: '/pages/mine/mortgageCalc/index' },
+      { name: '购房百科', icon: require('@/assets/mine-icon2.png'), router: '/pages/index/encyclopediasOfBuyHouse/index' },
+      { name: '意见反馈', icon: require('@/assets/mine-icon16.png'), router: '/pages/mine/feedBack/index' }
     ]
   ],
   Adviser: [ // 置业顾问
     [
-      { name: '添加客户', icon: require('../../assets/mine-icon7.png'), router: '/pages/mine/addCustomer/index?type=consultant' },
-      { name: '成为驻场管理', icon: require('../../assets/mine-icon8.png'), router: '/pages/mine/toBeManager/index' },
-      { name: '我的主页', icon: require('../../assets/mine-icon15.png'), router: '/pages/mine/myHomepage/index' },
-      { name: '我的推广码', icon: require('../../assets/mine-icon14.png'), router: '' },
-      { name: '客户分析', icon: require('../../assets/mine-icon5.png'), router: '/pages/mine/customerAnalyse/index' },
-      { name: '盘客工具', icon: require('../../assets/mine-icon6.png'), router: '/pages/mine/statCustomer/index' }
+      { name: '添加客户', icon: require('@/assets/mine-icon7.png'), router: '/pages/mine/addCustomer/index?type=consultant' },
+      { name: '成为驻场管理', icon: require('@/assets/mine-icon8.png'), router: '/pages/mine/toBeManager/index' },
+      { name: '我的主页', icon: require('@/assets/mine-icon15.png'), router: '/subpackages/pages/consultant/myHomepage/index' },
+      { name: '我的推广码', icon: require('@/assets/mine-icon14.png'), router: '' },
+      { name: '客户分析', icon: require('@/assets/mine-icon5.png'), router: '/subpackages/pages/consultant/customerAnalyse/index' },
+      { name: '盘客工具', icon: require('@/assets/mine-icon6.png'), router: '/subpackages/pages/consultant/statCustomer/index' }
     ],
     [
-      { name: '我的分享', icon: require('../../assets/mine-icon9.png'), router: '/pages/mine/myShare/index' },
-      { name: '我的活动', icon: require('../../assets/mine-icon10.png'), router: '/pages/mine/myActivity/index' },
-      { name: '我的课堂', icon: require('../../assets/mine-icon12.png'), router: '/pages/mine/myCourse/index' },
-      { name: '我的收藏', icon: require('../../assets/mine-icon13.png'), router: '/pages/mine/myCollect/index' }
+      { name: '我的分享', icon: require('@/assets/mine-icon9.png'), router: '/pages/mine/myShare/index' },
+      { name: '我的活动', icon: require('@/assets/mine-icon10.png'), router: '/pages/mine/myActivity/index' },
+      { name: '我的课堂', icon: require('@/assets/mine-icon12.png'), router: '/pages/mine/myCourse/index' },
+      { name: '我的收藏', icon: require('@/assets/mine-icon13.png'), router: '/pages/mine/myCollect/index' }
     ],
     [
-      { name: '房贷计算器', icon: require('../../assets/mine-icon4.png'), router: '/pages/mine/mortgageCalc/index' },
-      { name: '购房百科', icon: require('../../assets/mine-icon2.png'), router: '/pages/index/encyclopediasOfBuyHouse/index' },
-      { name: '意见反馈', icon: require('../../assets/mine-icon16.png'), router: '/pages/mine/feedBack/index' }
+      { name: '房贷计算器', icon: require('@/assets/mine-icon4.png'), router: '/pages/mine/mortgageCalc/index' },
+      { name: '购房百科', icon: require('@/assets/mine-icon2.png'), router: '/pages/index/encyclopediasOfBuyHouse/index' },
+      { name: '意见反馈', icon: require('@/assets/mine-icon16.png'), router: '/pages/mine/feedBack/index' }
     ]
   ],
   Resident: [ // 驻场管理
     [
-      { name: '绑定楼盘码', icon: require('../../assets/mine-icon8.png'), router: '/pages/mine/toBeManager/index' },
-      { name: '驻场管理', icon: require('../../assets/mine-icon17.png'), router: '/pages/mine/residentManager/index' }
+      { name: '绑定楼盘码', icon: require('@/assets/mine-icon8.png'), router: '/pages/mine/toBeManager/index' },
+      { name: '驻场管理', icon: require('@/assets/mine-icon17.png'), router: '/subpackages/pages/marketing/residentManager/index' }
     ],
     [
-      // { name: '我的客户', icon: require('../../assets/mine-icon11.png'), router: '/pages/mine/myCustomer/index' },
-      { name: '我的分享', icon: require('../../assets/mine-icon9.png'), router: '/pages/mine/myShare/index' },
-      { name: '我的活动', icon: require('../../assets/mine-icon10.png'), router: '/pages/mine/myActivity/index' },
-      { name: '我的收藏', icon: require('../../assets/mine-icon13.png'), router: '/pages/mine/myCollect/index' }
+      // { name: '我的客户', icon: require('@/assets/mine-icon11.png'), router: '/pages/mine/myCustomer/index' },
+      { name: '我的分享', icon: require('@/assets/mine-icon9.png'), router: '/pages/mine/myShare/index' },
+      { name: '我的活动', icon: require('@/assets/mine-icon10.png'), router: '/pages/mine/myActivity/index' },
+      { name: '我的收藏', icon: require('@/assets/mine-icon13.png'), router: '/pages/mine/myCollect/index' }
     ],
     [
-      { name: '房贷计算器', icon: require('../../assets/mine-icon4.png'), router: '/pages/mine/mortgageCalc/index' },
-      { name: '购房百科', icon: require('../../assets/mine-icon2.png'), router: '/pages/index/encyclopediasOfBuyHouse/index' },
-      { name: '意见反馈', icon: require('../../assets/mine-icon16.png'), router: '/pages/mine/feedBack/index' }
+      { name: '房贷计算器', icon: require('@/assets/mine-icon4.png'), router: '/pages/mine/mortgageCalc/index' },
+      { name: '购房百科', icon: require('@/assets/mine-icon2.png'), router: '/pages/index/encyclopediasOfBuyHouse/index' },
+      { name: '意见反馈', icon: require('@/assets/mine-icon16.png'), router: '/pages/mine/feedBack/index' }
     ]
   ]
 }

src/routes.js

@@ -21,21 +21,21 @@ const routes = [
     page: 'pages/video/index',
     pkg: 'main',
     isTab: true,
-    type: 'other',
+    type: 'video',
   },
   {
     name: '消息',
     page: 'pages/chat/index',
     pkg: 'main',
     isTab: true,
-    type: 'other',
+    type: 'chat',
   },
   {
     name: '我是',
     page: 'pages/mine/index',
     pkg: 'main',
     isTab: true,
-    type: 'center',
+    type: 'mine',
   },
 
   // 聊天
@@ -43,19 +43,13 @@ const routes = [
     name: '聊天',
     page: 'pages/chat/chatDetail/index',
     pkg: 'main',
-    type: 'other',
+    type: 'chat',
     auth: ['phone', 'avatar'],
   },
 
   // /********************************
   //  * 项目相关
   //  *******************************/
-  {
-    name: '房贷计算',
-    page: 'pages/index/mortgageCalculation/index',
-    pkg: 'main',
-    type: 'building',
-  },
   {
     name: '定位',
     page: 'pages/index/location/index',
@@ -91,7 +85,7 @@ const routes = [
     page: 'pages/index/buildingDetail/index',
     pkg: 'main',
     type: 'building',
-    auth: ['phone', 'avatar'],
+    // auth: ['phone', 'avatar'],
     shortcut: {
       chat: false,
       consultant: true,
@@ -175,6 +169,7 @@ const routes = [
     page: 'pages/index/activityList/index',
     pkg: 'main',
     type: 'activity',
+    auth: ['phone', 'avatar'],
   },
   {
     name: '活动详情',
@@ -188,6 +183,7 @@ const routes = [
     page: 'pages/index/specialPriceHouse/index',
     pkg: 'main',
     type: 'building',
+    auth: ['phone', 'avatar'],
   },
   {
     name: '免责声明',
@@ -199,7 +195,7 @@ const routes = [
     name: '康养',
     page: 'pages/index/recovered/index',
     pkg: 'main',
-    type: 'building',
+    type: 'other',
   },
   {
     name: '文旅商办',
@@ -263,7 +259,7 @@ const routes = [
     name: '房贷计算器',
     page: 'pages/mine/mortgageCalc/index',
     pkg: 'main',
-    type: 'mine',
+    type: 'other',
   },
   {
     name: '基本信息',
@@ -283,18 +279,6 @@ const routes = [
     pkg: 'main',
     type: 'mine',
   },
-  {
-    name: '推荐客户',
-    page: 'pages/mine/recommendUser/index',
-    pkg: 'main',
-    type: 'mine',
-  },
-  {
-    name: '报备客户',
-    page: 'pages/mine/reportUser/index',
-    pkg: 'main',
-    type: 'mine',
-  },
   {
     name: '我的分享',
     page: 'pages/mine/myShare/index',
@@ -311,7 +295,7 @@ const routes = [
     name: '我的活动',
     page: 'pages/mine/myActivity/index',
     pkg: 'main',
-    type: 'mine',
+    type: 'activity',
   },
   {
     name: '我的客户',
@@ -333,8 +317,8 @@ const routes = [
   },
   {
     name: '合作渠道',
-    page: 'pages/mine/partnerChannel/index',
-    pkg: 'main',
+    page: 'pages/channel/partnerChannel/index',
+    pkg: 'subpackages',
     type: 'mine',
   },
   {
@@ -345,26 +329,26 @@ const routes = [
   },
   {
     name: '驻场管理',
-    page: 'pages/mine/residentManager/index',
-    pkg: 'main',
+    page: 'pages/marketing/residentManager/index',
+    pkg: 'subpackages',
     type: 'mine',
   },
   {
     name: '确认到访',
-    page: 'pages/mine/sureVisit/index',
-    pkg: 'main',
+    page: 'pages/marketing/sureVisit/index',
+    pkg: 'subpackages',
     type: 'mine',
   },
   {
     name: '变更交易节点',
-    page: 'pages/mine/changeVisit/index',
-    pkg: 'main',
+    page: 'pages/marketing/changeVisit/index',
+    pkg: 'subpackages',
     type: 'mine',
   },
   {
     name: '盘客工具',
-    page: 'pages/mine/statCustomer/index',
-    pkg: 'main',
+    page: 'pages/consultant/statCustomer/index',
+    pkg: 'subpackages',
     type: 'mine',
   },
   {
@@ -375,14 +359,14 @@ const routes = [
   },
   {
     name: '客户分析',
-    page: 'pages/mine/customerAnalyse/index',
-    pkg: 'main',
+    page: 'pages/consultant/customerAnalyse/index',
+    pkg: 'subpackages',
     type: 'mine',
   },
   {
     name: '个人主页',
-    page: 'pages/mine/myHomepage/index',
-    pkg: 'main',
+    page: 'pages/consultant/myHomepage/index',
+    pkg: 'subpackages',
     type: 'mine',
   },
   {

src/components/Chart/index.jsx → src/subpackages/components/Chart/index.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState, useMemo } from 'react'
-import * as echarts from '@/native/ec-canvas/echarts';
+import * as echarts from '@/subpackages/native/ec-canvas/echarts';
 
 function initChart(canvas, width, height, dpr) {
   const chart = echarts.init(canvas, null, {

src/pages/mine/partnerChannel/components/LineChat.jsx → src/subpackages/pages/channel/partnerChannel/components/LineChat.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import Chart from '@/components/Chart'
+import Chart from '@/subpackages/components/Chart'
 
 export default (props) => {
   const { dataSource, xAxisDataRef } = props

src/pages/mine/partnerChannel/index.config.js → src/subpackages/pages/channel/partnerChannel/index.config.js

@@ -1,6 +1,6 @@
 export default {
   navigationBarTitleText: '合作渠道',
   usingComponents: {
-    'ec-canvas': '@/native/ec-canvas/ec-canvas'
+    'ec-canvas': '@/subpackages/native/ec-canvas/ec-canvas'
   }
 }

src/pages/mine/partnerChannel/index.jsx → src/subpackages/pages/channel/partnerChannel/index.jsx

@@ -132,7 +132,7 @@ export default withLayout((props) => {
           <view className='SaleNews'>
             <view className='Top flex-h'>
               <text>销售简报</text>
-              <Image mode='heightFix' src={require('../../../assets/mine-icon23.png')} onClick={handleReportDate}></Image>
+              <Image mode='heightFix' src={require('@/assets/mine-icon23.png')} onClick={handleReportDate}></Image>
               <view className='flex-item'></view>
               <text onClick={handleMore}>更多</text>
               <text className='iconfont icon-jiantouright'></text>

src/pages/mine/customerAnalyse/components/LineChart.jsx → src/subpackages/pages/consultant/customerAnalyse/components/LineChart.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import Chart from '@/components/Chart'
+import Chart from '@/subpackages/components/Chart'
 
 export default (props) => {
   const { dimensions, source } = props

src/pages/mine/customerAnalyse/index.config.js → src/subpackages/pages/consultant/customerAnalyse/index.config.js

@@ -1,6 +1,6 @@
 export default {
   navigationBarTitleText: '客户分析',
   usingComponents: {
-    'ec-canvas': '@/native/ec-canvas/ec-canvas'
+    'ec-canvas': '@/subpackages/native/ec-canvas/ec-canvas'
   }
 }

src/pages/mine/myHomepage/index.jsx → src/subpackages/pages/consultant/myHomepage/index.jsx

@@ -2,13 +2,13 @@ import { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import withLayout from '@/layout'
 import { ScrollView, Image } from '@tarojs/components'
-import '@/assets/css/iconfont.css'
+import ProjectListItem from '@/components/ProjectListItem/index'
 import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
 import { API_AGENT_CURRENT, API_ITEMS_DETAIL } from '@/constants/api'
 import { getImgURL } from '@/utils/image'
+import '@/assets/css/iconfont.css'
 import './index.scss'
-import ProjectListItem from '../../../components/ProjectListItem/index'
 
 export default withLayout(() => {
   
@@ -85,7 +85,7 @@ export default withLayout(() => {
                 </view>
                 <view className='Tag'>
                   <view>
-                    <Image mode='heightFix' src={require('../../../assets/mine-icon28.png')}></Image>
+                    <Image mode='heightFix' src={require('@/assets/mine-icon28.png')}></Image>
                     <text>金牌置业顾问</text>
                   </view>
                 </view>

src/pages/mine/components/ResidentListItem/index.jsx → src/subpackages/pages/marketing/components/ResidentListItem/index.jsx

@@ -27,7 +27,7 @@ export default function ResidentListItem (props) {
         } */}
         {
           data.customerStatus - 0 === 1 &&
-          <text className='Status' onClick={() => { Taro.navigateTo({ url: `/pages/mine/sureVisit/index?id=${data.id}` }) }}>到访确认</text>
+          <text className='Status' onClick={() => { Taro.navigateTo({ url: `/subpackages/pages/marketing/sureVisit/index?id=${data.id}` }) }}>到访确认</text>
         }
       </view>
       <view className='flex-h'>
@@ -87,7 +87,7 @@ export default function ResidentListItem (props) {
       <view className='Opt'>
         {
           !(data.type === 'report' && data.channelStatus - 0 === 3) &&
-          <text className='active' onClick={() => { Taro.navigateTo({ url: `/pages/mine/changeVisit/index?id=${data.id}&name=${data.name}&buildingId=${data.buildingId}&type=${data.type}&channelId=${data.channelId}` }) }}>更新交易</text>
+          <text className='active' onClick={() => { Taro.navigateTo({ url: `/subpackages/pages/marketing/changeVisit/index?id=${data.id}&name=${data.name}&buildingId=${data.buildingId}&type=${data.type}&channelId=${data.channelId}` }) }}>更新交易</text>
         }
         {
           data.type === 'report' && data.channelStatus - 0 === 1 &&