feats

config/dev.js

@@ -4,8 +4,8 @@ module.exports = {
   },
   defineConstants: {
     // HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"https://xlj.newlandsh.com"',
-    HOST: '"http://127.0.0.1:8567"',
+    HOST: '"https://xlj.newlandsh.com"',
+    // 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/"',

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: '"V0.0.46-20210813"'
+    Version: '"V0.0.51-20210813"'
   },
   mini: {},
   h5: {

src/app.jsx

@@ -61,7 +61,7 @@ class App extends Component {
         Taro.setStorage({ key: 'systemInfo', data })
       }
     })
-  
+
     getLocation().then((loc) => {
       getRouterParams(options).then(router => {
         Taro.setStorageSync('router', router)

src/constants/api.js

@@ -322,3 +322,5 @@ export const API_CHANNEL_STAT_REPORT = resolvePath('briefing')
 
 // 渠道客户基本状态
 export const API_CHANNEL_CUSTOMER_STATUS = resolvePath('channelCustomer/status')
+
+export const API_SUBSCRIBE_MESSAGE = resolvePath('miniapp-message')

src/layout/index.js

@@ -16,6 +16,7 @@ import nav2Target from '@/utils/nav2Target'
 import { ROLE_CODE } from '@/constants/user'
 import useAuth from './useAuth'
 import useScreen from './useScreen'
+import useFixedRouter from './useFixedRouter'
 import { routes } from '../routes'
 
 import './style.scss'
@@ -28,13 +29,14 @@ export default (ChildComponent) => (props) => {
   const city = useSelector(s => s.city.curCity)
   const { spinning, userInfo } = useSelector(s => s.user)
   const { person, ...extInfo } = userInfo || {}
-  const router = useRouter()
+  const router = useFixedRouter()
   const page = routes.filter((r) => (router.path.indexOf(r.page) > -1))[0]
   const [loading, setLoading] = useState(false)
   const [authPhone, authAvatar, authPage] = useAuth(person, page)
   const [shareTimelineVisible, setShareTimelineVisible] = useState(false)
 
-  const { id } = router.params
+  const { id, scene, qrInited } = router.params
+
   const showConsultant = page.shortcut && page.shortcut.consultant
 
   // 页面分享
@@ -98,9 +100,9 @@ export default (ChildComponent) => (props) => {
   }, [page])
 
   useEffect(() => {
-    setLoading(!person || !person.personId)
+    setLoading((!person || !person.personId) || (scene && !qrInited))
   // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [person])
+  }, [person, scene, qrInited])
 
   return (
     <>

src/layout/useFixedRouter.js

@@ -0,0 +1,40 @@
+
+import { useEffect, useRef, useState } from 'react'
+import { useRouter } from '@tarojs/taro'
+import { parseQueryString } from '@/utils/tools'
+import { getCodeScene } from '@/services/common'
+
+export default () => {
+  const router = useRouter()
+  const routerRef = useRef()
+  routerRef.current = router
+
+  const { scene } = router.params
+
+  // 标记是否已经远程读取二维码参数
+  const [inited, setInited] = useState(scene ? false : true)
+
+  useEffect(() => {
+    if (scene) {
+      getCodeScene(scene).then((res) => {
+        const queryStr = JSON.parse(res).scene
+        const params = parseQueryString(queryStr) || {}
+        
+        routerRef.current.params = {
+          ...routerRef.current.params || {},
+          ...params
+        }
+
+        setInited(true)
+      })
+    }
+  }, [scene])
+
+  const params = {
+    ...routerRef.current.params,
+    qrInited: inited
+  }
+
+  router.params = params
+  return router
+}

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

@@ -6,6 +6,9 @@ import { ROLE_CODE } from '@/constants/user'
 import classNames from 'classnames'
 import useFavor from '@/utils/hooks/useFavor'
 import { formatDate } from '@/utils/chatDate'
+import { showSubscribeMessage, MESSAGE_TYPE } from '@/utils/subscribeMessage'
+import { fetch } from '@/utils/request'
+import { API_SUBSCRIBE_MESSAGE } from '@/constants/api'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
@@ -19,9 +22,9 @@ export default function BasicInfo (props) {
   const goto = (url) => Taro.navigateTo({ url })
 
   const handleSubscribeMessage = () => {
-    Taro.showToast({
-      title: '该功能即将上线！',
-      icon: 'none',
+    const messageType = MESSAGE_TYPE.ACTIVITY 
+    showSubscribeMessage(messageType).then(() => {
+      fetch({ url: `${API_SUBSCRIBE_MESSAGE}`, payload: { messageType }, showToast: false })
     })
   }
 

src/utils/subscribeMessage.js

@@ -3,6 +3,7 @@ import store from '../store'
 
 export const MESSAGE_TYPE = {
   NOTICE: 'notice',
+  ACTIVITY: 'activity',
 }
 
 export function showSubscribeMessage (messageType) {
@@ -11,8 +12,8 @@ export function showSubscribeMessage (messageType) {
 
   const tmplIds = (miniApp.tpls || []).filter(x => x.tplType === messageType).map(x => x.tplId)
   if (tmplIds.length > 0) {
-    return new Promise((resolve) => {
-      Taro.requestSubscribeMessage({ tmplIds, fail: (e) => { console.error(e) }, complete: resolve })
+    return new Promise((resolve, reject) => {
+      Taro.requestSubscribeMessage({ tmplIds, fail: (e) => { console.error(e); reject(e) }, success: resolve })
     })
   } else {
     return Promise.resolve()

src/utils/tools.js

@@ -330,49 +330,50 @@ export const getLocation = () => {
 }
 
 export const getRouterParams = (options) => {
-  return new Promise(resolve => {
-    const router = options || getCurrentInstance().router
-    const originQuery = { ...router.query };
-    let { query: { scene: paramsId }, scene } = router
-
-    // query 里面如果跟同级场景一样, 说明是小程序原生场景值
-    if (paramsId === scene) {
-      paramsId = undefined
-    }
-
-    if (paramsId) {
-      // 扫码进入
-      getCodeScene(paramsId).then(res => {
-        let params = JSON.parse(res).scene
-
-        let { from: _from, recommender: _recommender, consultant, id, ...left } = parseQueryString(params) || {}
-
-        router.query = Object.assign(router.query, {
-          originQuery,
-          id,
-          paramsId,
-          from: _from,
-          recommender: _recommender,
-          consultant,
-          params,
-          targetId: id,
-          ...left,
-        })
-        Taro.setStorageSync('recommender', router.query.recommender)
-        Taro.setStorageSync('consultantId', router.query.consultant)
-        resolve(router)
-      })
-    } else {
-      router.query = Object.assign(router.query, {
-        originQuery,
-        paramsId: router.query.id || '',
-        from: router.query.from || 'search',
-        recommender: router.query.recommender || '',
-        targetId: router.query.id || '',
-        consultant: router.query.consultant || '',
-      })
-
-      resolve(router)
-    }
-  })
+  return Promise.resolve(options)
+  // return new Promise(resolve => {
+  //   const router = options || getCurrentInstance().router
+  //   const originQuery = { ...router.query };
+  //   let { query: { scene: paramsId }, scene } = router
+
+  //   // query 里面如果跟同级场景一样, 说明是小程序原生场景值
+  //   if (paramsId === scene) {
+  //     paramsId = undefined
+  //   }
+
+  //   if (paramsId) {
+  //     // 扫码进入
+  //     getCodeScene(paramsId).then(res => {
+  //       let params = JSON.parse(res).scene
+
+  //       let { from: _from, recommender: _recommender, consultant, id, ...left } = parseQueryString(params) || {}
+
+  //       router.query = Object.assign(router.query, {
+  //         originQuery,
+  //         id,
+  //         paramsId,
+  //         from: _from,
+  //         recommender: _recommender,
+  //         consultant,
+  //         params,
+  //         targetId: id,
+  //         ...left,
+  //       })
+  //       Taro.setStorageSync('recommender', router.query.recommender)
+  //       Taro.setStorageSync('consultantId', router.query.consultant)
+  //       resolve(router)
+  //     })
+  //   } else {
+  //     router.query = Object.assign(router.query, {
+  //       originQuery,
+  //       paramsId: router.query.id || '',
+  //       from: router.query.from || 'search',
+  //       recommender: router.query.recommender || '',
+  //       targetId: router.query.id || '',
+  //       consultant: router.query.consultant || '',
+  //     })
+
+  //     resolve(router)
+  //   }
+  // })
 }