bug fix

src/pages/project/index.js

@@ -17,7 +17,6 @@ import { ROLE_CODE, DECREASE_UNREADNUM } from '@constants/user'
 import { getStore, connect } from '@tarojs/redux'
 import * as actions from '@actions/project'
 import { transferImage } from '@utils/tools'
-import QQMapWX from '@lib/qqmap-wx-jssdk.min'
 import Notice from '@components/Notice'
 import Authorize from '@components/authorize'
 
@@ -51,9 +50,6 @@ export default class Index extends Component {
   }
 
   componentWillMount() {
-    this.qqmapsdk = new QQMapWX({
-      key: 'TIIBZ-ZJG33-52T3L-Y3X4Q-NWKLV-KUB3B'
-    })
     ready.queue(() => {
       this.getLocation()
 
@@ -97,6 +93,8 @@ export default class Index extends Component {
   }
 
   getLocation() {
+    debugger
+    console.log('-----this.props-->', this.props)
     const { cityList, userInfo: { person: { org } } } = this.props
     let defaultCity = cityList.filter(item => {
       return item.id == org.defaultCityId

src/reducers/user.js

@@ -1,3 +1,5 @@
+import { mergeNotNull } from '@utils/tools'
+
 import {
   USER_INFO,
   // USER_QUERY_INFO,
@@ -20,10 +22,23 @@ const INITIAL_STATE = {
 export default function user(state = INITIAL_STATE, action) {
   switch (action.type) {
     case USER_INFO: {
-      return {
-        ...state,
-        userInfo: {
-          ...action.payload
+      if (!(state.userInfo || {}).person) {
+        return {
+          ...state,
+          userInfo: {
+            ...action.payload
+          }
+        }
+      } else {
+        const { person } = action.payload || {}
+        const newPerson = mergeNotNull(state.userInfo.person, person)
+        return {
+          ...state,
+          userInfo: {
+            ...state.userInfo,
+            ...action.payload,
+            person: newPerson,
+          }
         }
       }
     }
@@ -41,8 +56,9 @@ export default function user(state = INITIAL_STATE, action) {
     //   }
     // }
     case UPDATE_USER_INFO: {
-      const { person, extraInfo, miniApp = {} } = state.userInfo
       // debugger
+      const { person, extraInfo, miniApp = {} } = state.userInfo
+      
       return {
         ...state,
         userInfo: {

src/utils/login.js

@@ -27,7 +27,6 @@ export default function (payload, callback) {
         const { dispatch } = getStore()
         Taro.setStorageSync('token', token)
         Taro.setStorageSync('sessionKey', sessionKey)
-
         dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp } })
 
         // 用户信息已授权获取成功
@@ -52,6 +51,7 @@ export default function (payload, callback) {
             })
           }
         }
+
         ready.open()
 
         console.info('ready status2', ready)

src/utils/tools.js

@@ -16,6 +16,31 @@ export function times(n) {
   return n > 0 ? '*'.repeat(n - 1).split('*') : []
 }
 
+/**
+ * 将 b 中不为 null 或者 undefined 的值合并到 a 中
+ * @param {*} a 
+ * @param {*} b 
+ */
+export function mergeNotNull(a, b) {
+  const bKeys = Object.keys(b || {})
+  if (!bKeys.length) {
+    return a
+  }
+
+  let res = { ...(a || {}) }
+
+  bKeys.forEach(k => {
+    const v = b[k]
+    if (v === null || v === undefined) {
+      return
+    }
+
+    res[k] = v
+  })
+
+  return res
+}
+
 /**
  * 
  * @param {*} img