Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

package-lock.json

@@ -609,7 +609,7 @@
     },
     "@tarojs/plugin-sass": {
       "version": "1.3.25",
-      "resolved": "https://registry.npm.taobao.org/@tarojs/plugin-sass/download/@tarojs/plugin-sass-1.3.25.tgz",
+      "resolved": "https://registry.npm.taobao.org/@tarojs/plugin-sass/download/@tarojs/plugin-sass-1.3.25.tgz?cache=0&sync_timestamp=1575429381399&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Fplugin-sass%2Fdownload%2F%40tarojs%2Fplugin-sass-1.3.25.tgz",
       "integrity": "sha1-8eKTL0aBnae56J9KmFvnCz2s0Kk=",
       "dev": true,
       "requires": {

package.json

@@ -30,7 +30,7 @@
     "@tarojs/plugin-babel": "1.3.25",
     "@tarojs/plugin-csso": "1.3.25",
     "@tarojs/plugin-less": "1.3.25",
-    "@tarojs/plugin-sass": "1.3.25",
+    "@tarojs/plugin-sass": "^1.3.25",
     "@tarojs/plugin-uglifyjs": "1.3.25",
     "@tarojs/webpack-runner": "1.3.25",
     "@types/react": "^16.4.6",

src/pages/person/accessRecord.js

@@ -53,12 +53,23 @@ export default class Person extends Component {
   loadList(pageNumber) {
     console.log(this.props, "this.props")
     const { userInfo: { person } } = this.props
-    const payload = {
-      userId: person.userId,
-      pageNumber,
-      pageSize: 10
+
+    let payload
+    if(person.userId){
+      payload = {
+        userId: person.userId,
+        pageNumber,
+        pageSize: 5
+      }
+    }else{
+     payload = {
+       userId: Taro.getStorageSync('userId'),
+       pageNumber,
+       pageSize: 5
+     }
     }
     getConsulantVisitRecord(payload).then(res => {
+
       const { records, list, total, current, pages } = res || {}
       const _list = records || list || []
       const newList = current <= 1 ? _list : this.state.recordList.concat(_list)

src/pages/person/index.js

@@ -94,13 +94,22 @@ export default class Person extends Component {
     }
     else {
       putRegisterConsultant().then(res => {
+        Taro.setStorageSync('userId',res.userId)
+        this.loadUserInfo()
+
+        // this.setState({
+        //   consultant:true,
+        //   user:{
+        //     personType:'CONSULTANT'
+        //   }
+        // },this.loadUserInfo())
 
         // if (res) {
-          Taro.showToast({
-            title: "匹配成功，请退出小程序重新登录即可",
-            icon: "none",
-            duration: 3000
-          })
+          // Taro.showToast({
+          //   title: "匹配成功，请退出小程序重新登录即可",
+          //   icon: "none",
+          //   duration: 3000
+          // })
         // } else {
         //   Taro.showToast({
         //     title: "匹配失败，请联系相关管理人员",

src/pages/project/index.js

@@ -17,7 +17,6 @@ import { SET_SCREEN_SHOWED } from '@constants/project'
 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()
 
@@ -98,6 +94,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