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

src/pages/im/list/index.js

@@ -47,6 +47,14 @@ export default class Index extends Component {
           pageSize: size,
           pageNumber: current,
         }
+      }, () => {
+        const totalUnRead = (records || []).reduce((acc, item) => (acc + item.unReadNum), 0)
+        if (!totalUnRead) {
+          // 如果未读为 0, 那么更新 提示组件也为 0
+          
+          const { dispatch } = getStore()
+          dispatch({ type: DECREASE_UNREADNUM })
+        }
       })
     })
   }

src/reducers/user.js

@@ -88,10 +88,14 @@ export default function user(state = INITIAL_STATE, action) {
     }
     case DECREASE_UNREADNUM: {
       let { unReadNum } = state
-      unReadNum = unReadNum - action.payload
 
-      if (unReadNum < 0) {
+      if (action.payload === undefined) {
         unReadNum = 0
+      } else {
+        unReadNum = unReadNum - action.payload
+        if (unReadNum < 0) {
+          unReadNum = 0
+        }
       }
 
       return {