fix bugs

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"https://www.newhousehold.cn"',
+    // HOST: '"https://xlk.njyz.tech"',
+    HOST: '"https://www.newhousehold.cn"',
     // HOST: '"http://127.0.0.1:8567"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',

config/prod.js

@@ -10,12 +10,12 @@ module.exports = {
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
-    Version: '"V0.0.58-20210819"'
+    Version: '"V0.0.60-20210823"'
   },
   mini: {},
   h5: {
     /**
-     * 如果h5端编译后体积过大，可以使用webpack-bundle-analyzer插件对打包体积进行分析。
+     * 如果h5端编译后体积过大，可以使用webpack-bundle-analyzer插件对打包体积进行分析。d
      * 参考代码如下：
      * webpackChain (chain) {
      *   chain.plugin('analyzer')

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "miniapp",
 	"description": "",
-	"appid": "wxe44244d1a5ea3364",
+	"appid": "wxc96058d57e77f373",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/app.jsx

@@ -1,11 +1,11 @@
 import { Component } from 'react'
 import { Provider } from 'react-redux'
 import Taro from '@tarojs/taro'
-import { getLocation, getRouterParams } from '@/utils/tools'
+import { getLocation } from '@/utils/tools'
 import login from '@/utils/login'
 import im from '@/utils/im'
-import store from './store'
 import trackUserSource from '@/utils/tracking/userSource'
+import store from './store'
 
 import './app.scss'
 
@@ -49,7 +49,7 @@ class App extends Component {
   onLaunch (options) {
 
     console.log('【onLaunch】:', JSON.stringify(options))
-    const { mode } = options
+    const { mode, query } = options
     Taro.setStorageSync('mode', mode)
 
     // 加载远程字体
@@ -62,52 +62,33 @@ class App extends Component {
       }
     })
 
+    // 获取地址
     getLocation().then((loc) => {
-      getRouterParams(options).then(router => {
-        Taro.setStorageSync('router', router)
-
-        const { query: payload } = router
-
-        payload.path = router.path
-        payload.scene = router.scene
-
-        if (loc) {
-          payload.lon = loc.lon
-          payload.lat = loc.lat
-        }
-
-        const { path, scene, ...params } = payload
-
-        if (mode === 'singlePage') {
-          // 分享朋友圈的单页模式
-          params.singleMode = true
-
-          // login
-          login(params).then(() => {
-            this.logged = true
-          })
-        } else {
-          // 非单页模式
-          Taro.login({
-            success: ({ code }) => {
-              params.code = code
-
-              // login
-              login(params).then((res) => {
-                const { person: { personId } } = res
-                
-                // 初始化 im
-                im.init(personId)
-
-                this.logged = true
-
-                // 埋点
-                trackUserSource(options).then((x) => (this.updateTracking = x))
-              })
-            }
-          })
-        }
-      })
+      const params = {
+        ...query||{},
+        ...loc||{},
+      }
+
+      if (mode === 'singlePage') {
+        // 分享朋友圈的单页模式
+        params.singleMode = true
+  
+        // login
+        login(params).then(() => {
+          this.logged = true
+        })
+      } else {
+        login(params).then((person) => {
+          
+          // 初始化 im
+          im.init(person.personId)
+
+          this.logged = true
+
+          // 埋点
+          trackUserSource(options).then((x) => (this.updateTracking = x))
+        })
+      }
     })
   }
 

src/layout/index.js

@@ -26,7 +26,7 @@ export default (ChildComponent) => (props) => {
   const city = useSelector(s => s.city.curCity)
   const { spinning, userInfo } = useSelector(s => s.user)
   const { person, ...extInfo } = userInfo || {}
-  const router = useFixedRouter()
+  const router = useFixedRouter(person)
   const page = routes.filter((r) => (router.path.indexOf(r.page) > -1))[0]
   const [loading, setLoading] = useState(false)
   const [authPhone, authAvatar, authPage] = useAuth(person, page)

src/layout/useFixedRouter.js

@@ -1,10 +1,10 @@
 
 import { useEffect, useRef, useState } from 'react'
 import { useRouter } from '@tarojs/taro'
-import { parseQueryString } from '@/utils/tools'
+import { parseQueryString, setRecommender } from '@/utils/tools'
 import { getCodeScene } from '@/services/common'
 
-export default () => {
+export default (person) => {
   const router = useRouter()
   const routerRef = useRef()
   routerRef.current = router
@@ -18,23 +18,32 @@ export default () => {
     if (scene) {
       getCodeScene(scene).then((res) => {
         const queryStr = JSON.parse(res).scene
-        const params = parseQueryString(queryStr) || {}
+        const { recommender, ...otherParams } = parseQueryString(queryStr) || {}
+
+        const isSelf = recommender && recommender === person?.personId
         
         routerRef.current.params = {
           ...routerRef.current.params || {},
-          ...params
+          ...otherParams,
+          ...(isSelf || !recommender ? {} : { recommender }),
+        }
+
+        if (!isSelf) {
+          setRecommender(recommender)
         }
 
         setInited(true)
       })
     }
-  }, [scene])
+  }, [scene, person])
 
   const params = {
     ...routerRef.current.params,
     qrInited: inited
   }
 
+  console.log('-------router.params--------->', params)
+
   router.params = params
   return router
 }

src/services/login.js

@@ -9,6 +9,6 @@ import {
  * 获取用户openid等信息
  * @param {*} payload 
  */
-export const wxLogin = (payload, showToast) => {
-  return fetch({ url: `${API_USER_LOGIN}?${Qs.stringify(payload)}`, method: 'POST', showToast })
+export const wxLogin = (payload) => {
+  return fetch({ url: `${API_USER_LOGIN}?${Qs.stringify(payload, { skipNulls: true })}`, method: 'POST', showToast: false })
 }

src/utils/login.js

@@ -1,20 +1,16 @@
 import Taro from '@tarojs/taro';
 import store from "@/store";
 import { dispatchCitySelected } from '@/actions/city'
-import { USER_INFO, ASSIGN_UNREADNUM, ROLE_CODE } from '@/constants/user'
-import { ifNull } from '@/utils/tools'
+import { USER_INFO } from '@/constants/user'
+import { parseQueryString, setRecommender } from '@/utils/tools'
 import { wxLogin } from '@/services/login'
 import { queryUserInfo } from '@/services/user'
-import { API_QUERY_USERINFO_BYID } from '@/constants/api'
-import { fetch } from '@/utils/request'
-
-export default (params) => {
-  return new Promise((resolve, reject) => {  
-    // 转换 undefined 为 ''
-    const loginParams = Object.keys(params).reduce((acc, k) => ({ ...acc, [`${k}`]: ifNull(params[k], '') }), {})
+import { getCodeScene } from '@/services/common'
 
+function loginRemote (params) {
+  return new Promise((resolve, reject) => {
     // 远程登录获取人员
-    wxLogin(loginParams, false).then(data => {
+    wxLogin({...params }).then(data => {
 
       const { extraInfo, miniApp, person, city } = data
       const { token, sessionKey } = miniApp
@@ -32,22 +28,58 @@ export default (params) => {
         }
       }
 
+      // 如果有推荐人信息
+      if (params.recommender && params.recommender !== person.personId) {
+        setRecommender(params.recommender)
+      }
+
       // 获取人员详细信息
       // eslint-disable-next-line no-unused-vars
       queryUserInfo().then(info => {
         resolve(data)
       }).catch(reject)
+    }).catch(reject)
+  
+  })
+}
 
-      // 如果有推荐人信息
-      if (loginParams.recommender && loginParams.recommender !== person.personId) {
-        fetch({ url: `${API_QUERY_USERINFO_BYID}/${loginParams.recommender}` }).then((res) => {
-          dispatch({ type: 'SYNC_RECOMMENDER', payload: res });
-          if (res.personType === ROLE_CODE.CONSULTANT) {
-            dispatch({ type: 'SYNC_CONSULTANT', payload: res });
-          }
+function getCodeAndLogin (params) {
+  return new Promise((resolve, reject) => {
+    Taro.login({
+      success: ({ code }) => {
+        params.code = code
+  
+        // login
+        loginRemote(params).then((res) => {
+          const { person } = res
+          resolve(person)
         })
+      },
+      fail: (err) => {
+        console.error(err)
+        reject(err)
       }
-    }).catch(reject)
-  
+    })
+  })
+}
+
+export default (params) => {
+  return new Promise((resolve, reject) => {
+    // 二维码ID
+    const qrCodeId = params.scene
+    if (qrCodeId) {
+      // 读二维码内容
+      getCodeScene(qrCodeId).then((res) => {
+        const queryStr = JSON.parse(res).scene
+        const qrCodeParams = parseQueryString(queryStr) || {}
+        
+        getCodeAndLogin({
+          ...params,
+          ...qrCodeParams,
+        }).then(resolve).catch(reject)
+      })
+    } else {
+      getCodeAndLogin(params).then(resolve).catch(reject)
+    }
   })
 }

src/utils/tools.js

@@ -1,5 +1,7 @@
-import Taro, { getCurrentInstance } from "@tarojs/taro";
-import { getCodeScene } from '@/services/common';
+import Taro from "@tarojs/taro";
+import { API_QUERY_USERINFO_BYID } from '@/constants/api';
+import { ROLE_CODE } from '@/constants/user'
+import { fetch } from '@/utils/request';
 import store from "@/store";
 
 /**
@@ -329,51 +331,11 @@ export const getLocation = () => {
   })
 }
 
-export const getRouterParams = (options) => {
-  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)
-  //   }
-  // })
-}
+export function setRecommender(recommender) {
+  fetch({ url: `${API_QUERY_USERINFO_BYID}/${recommender}` }).then((res) => {
+    store.dispatch({ type: 'SYNC_RECOMMENDER', payload: res });
+    if (res.personType === ROLE_CODE.CONSULTANT) {
+      store.dispatch({ type: 'SYNC_CONSULTANT', payload: res });
+    }
+  })
+}