feats

src/app.js

@@ -7,15 +7,14 @@ import './app.less'
 class App extends Component {
 
   onLaunch(options) {
-    const {setPerson, login} = store.getModel('person').getState()
+    console.group('APP Launch')
+    console.debug(options)
+    console.groupEnd()
+
+    const { login} = store.getModel('person').getState()
 
     // 预拉取数据
     preFetchData().then((fetchData) => {
-      setPerson({
-        personId: fetchData.personId,
-        openid: fetchData.openid,
-      })
-
       const { fromType, recommender, scene : qrCodeId } = options.query
 
       // 登录获取人员信息

src/components/AuthPage/index.jsx

@@ -1,5 +1,4 @@
 import React, { useState } from 'react'
-import Taro from '@tarojs/taro'
 import { useModel } from '@/store'
 import { Label, RadioGroup, Radio } from '@tarojs/components'
 import index from '@/assets/icons/login/LOGO.png'
@@ -7,7 +6,7 @@ import './login.less'
 
 
 export default (props) => {
-  const { getPhone } = useModel('person')
+  const { getPhone, sessionKey } = useModel('person')
 
   const [loading, setLoading] = useState(false)
   const [checked, setChecked] = useState(false)
@@ -19,7 +18,6 @@ export default (props) => {
   const handlePhoneNumber = (e) => {
     const { errMsg, ...data } = e.detail || {}
     if (errMsg === 'getPhoneNumber:ok') {
-      const sessionKey = Taro.getStorageSync('sessionKey')
       getPhone({ ...data, sessionKey }).then(() => {
         setLoading(false)
       }).catch(() => setLoading(false))

src/components/CustomNav/index.jsx

@@ -71,7 +71,9 @@ export default (props) => {
   }
 
   useEffect(() => {
-    Taro.setNavigationBarTitle(title)
+    if (title) {
+      Taro.setNavigationBarTitle({title})
+    }
   }, [title])
 
   return (

src/layouts/index.jsx

@@ -33,12 +33,10 @@ export default (Child) => (props) => {
     const isNormalPerson = personRole === 'normal'
 
     const currentPage = getPageBy(router.path)
-    let indexPage = getIndexPageOf(personRole)
+    let indexPage = `pages/index/index`
     if (!isNormalPerson) {
-      indexPage = `${personRole}/${indexPage.page}`
-
-    } else {
-      indexPage = `pages/index/index`
+      const { page } = getIndexPageOf(personRole);
+      indexPage = `${personRole}/${page}`
     }
 
     const isMatched = isNormalPerson ?
@@ -49,7 +47,7 @@ export default (Child) => (props) => {
 
 
     // 如果对应上, 就不跳转
-    return isMatched ? personRole : indexPage
+    return isMatched ? undefined : indexPage
 
   }, [router.path, person?.personRole])
 

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -16,12 +16,9 @@ import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
 import Cards from '@/components/foodCards/foodCards.jsx'
 import Taro, { useShareAppMessage } from '@tarojs/taro'
-import { getTouristDistance } from '@/services/home'
 import Extend from '../components/Extend/extend'
 import './sceneryDetails.less'
 
-
-
 export default withLayout((props) => {
   const { router, person, location } = props
   const { id } = props.router.params
@@ -56,35 +53,37 @@ export default withLayout((props) => {
   const [recommend, setRecommend] = useState([])
 
   const openMap = () => {
+    const [lng, lat] = detail.location.split(',')
+
     Taro.openLocation({
-      longitude: log.current - 0,
-      latitude: lat.current - 0,
+      longitude: lng - 0,
+      latitude: lat - 0,
       name: detail.touristName,
       address: detail.address,
       scale: 12,
     })
   }
-  const log = useRef('')
-  const lat = useRef('')
+
   useEffect(() => {
-    getTouristDetail(id).then((res) => {
-      log.current = (res.locaton).toString().split(',')[0]
-      lat.current = (res.locaton).toString().split(',')[1]
-      setDetail(res)
-      setimglist(res.imageList || [])
-    })
-    getExtendContent('tourist', id).then((res) => {
-      setExtend(res.records || [])
-      setAllextNum(res.total)
-      setNewextNum(res.records.length)
-    })
-    getTouristDistance('tourist', id, { location: location }).then((res) => {
-      setDistance((res.distance / 1000).toFixed(2))
-      getRecommendList({ location: res.lng + ',' + res.lat }).then((res2) => {
+    if (id) {
+      getTouristDetail(id).then((res) => {
+        setDetail(res)
+        setimglist(res.imageList || [])
+        getRecommendList({ location: res.locaton }).then((res2) => {
+          setRecommend(res2 || [])
+        })
+      })
+      getExtendContent('tourist', id).then((res) => {
+        setExtend(res.records || [])
+        setAllextNum(res.total)
+        setNewextNum(res.records.length)
+      })
+    } else {
+      getRecommendList({ location }).then((res2) => {
         setRecommend(res2 || [])
       })
-    })
-  }, [])
+    }
+  }, [id, location])
   // 分享
   useShareAppMessage(() => {
     return {

src/services/home.js

@@ -103,12 +103,6 @@ export const getExtendContent = (type, id, params) => request(`/${type}/${id}/co
  */
 export const getTouristDetail = (id) => request(`/tourist/${id}`)
 
-/**
- * 获取景点距离定位 用于通过景点分享功能进入景点详情页的客户
- * @param {*} id 
- * @returns 
- */
- export const getTouristDistance = (targetType,targetId,params) => request(`/resource/${targetType}/${targetId}`,{params})
 
 /**
  * 获取推荐套餐列表

src/store/models/person.js

@@ -4,22 +4,19 @@ import { signIn, authPhone, authAvatar,toggleRole } from '@/services/person'
 
 export default () => {
   const [person, setPerson] = useState()
+  const [qrCode, setQrCode] = useState()
   const [peronRoles, setPersonRoles] = useState([])
+  const [sessionKey, setSessionKey] = useState()
 
   const login = (params) => {
     signIn(params).then((res) => {
-      const { person: taPerson, personRoleList, sessionKey, qrcode, token } = res;
+      const { person: taPerson, personRoleList, sessionKey : skey, qrcode, token } = res;
       setPerson(taPerson);
       setPersonRoles(personRoleList);
+      setQrCode(qrcode);
+      setSessionKey(skey);
 
-      Taro.setStorage({ key: 'sessionKey', data: sessionKey })
       Taro.setStorage({ key: 'token', data: token })
-      Taro.setStorage({ key: 'personId', data: taPerson.personId })
-      Taro.setStorage({ key: 'openid', data: taPerson.openid })
-
-      if (qrcode) {
-        Taro.setStorage({ key: 'qrcode', data: qrcode })
-      }
     })
   }
 
@@ -45,6 +42,8 @@ export default () => {
   return {
     person,
     peronRoles,
+    qrCode,
+    sessionKey,
     setPerson,
     login,
     getPhone,

src/utils/hooks/useRouter.js

@@ -1,14 +1,15 @@
 import Taro, { useRouter } from '@tarojs/taro'
 import { parseQueryString } from '@/utils'
+import { useModel } from '@/store'
 
 export default () => {
   const router = useRouter()
+  const { qrCode } = useModel('person')
 
   // 扫码进入的
   if (router?.params?.scene) {
-    const qrCodeStr = Taro.getStorageSync('qrcode')
-    if (qrCodeStr && qrCodeStr !== 'undefined') {
-      const qrParams = parseQueryString(qrCodeStr) || {}
+    if (qrCode) {
+      const qrParams = parseQueryString(qrCode) || {}
       router.params = {
         ...router.params || {},
         ...qrParams,

src/utils/preFetchData.js

@@ -2,9 +2,6 @@ import Taro from '@tarojs/taro'
 
 export default () => {
 
-  const personId = Taro.getStorageSync('personId')
-  const openid = Taro.getStorageSync('openid')
-
   return new Promise((resolve, reject) => {
     Taro.getLocation({
       success(res) {
@@ -12,8 +9,6 @@ export default () => {
         Taro.setStorageSync('location', location)
         resolve({
           location,
-          personId,
-          openid
         })
       },
       fail(err) {