commit

config/dev.js

@@ -9,8 +9,13 @@ module.exports = {
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
+<<<<<<< HEAD
     // HOST: '"http://192.168.2.52:8080"',
     // WSS_HOST: '"ws://192.168.2.52:8080"',
+=======
+    HOST: '"http://192.168.2.52:8080"',
+    WSS_HOST: '"ws://192.168.2.52:8080"',
+>>>>>>> 6d2db04a857d72bc8504b0f061c8baf8a3c98aba
   },
   weapp: {},
   h5: {}

src/components/Notice/index.js

@@ -10,8 +10,9 @@ export default class Index extends Component {
   }
 
   handleClick() {
-    const { dispatch } = getStore()
-    dispatch({ type: DECREASE_UNREADNUM })
+    // toFix #5922
+    // const { dispatch } = getStore()
+    // dispatch({ type: DECREASE_UNREADNUM })
     Taro.navigateTo({
       url: '/pages/im/list/index'
     })

src/pages/im/index.js

@@ -183,13 +183,15 @@ export default class Chat extends Component {
       const chattingName = res.name || chatting.nickname
 
       // 发送 卡片 消息
-      socket.sendNotice({
+      const payload = {
         sendPerson: chatting.personId,
         receivePerson: me.personId,
         message: `您好，我是${chattingName},有什么可以帮助您的吗?您可以在这里跟我实时沟通哦~`,
         messageType: MESSAGETYPE.CARD,
         createDate: new Date().valueOf(),
-      }, res => {
+      }
+
+      socket.sendNotice(payload, res => {
         console.log('发送成功')
         this.appendData(payload)
       })

src/pages/im/list/index.js

@@ -6,7 +6,10 @@ import { queryChatFriends } from '@services/chat'
 import EmptyPage from '@components/empty-page'
 import Item from './item'
 import ready from '@utils/ready'
-import { connect } from '@tarojs/redux'
+
+import { DECREASE_UNREADNUM } from '@constants/user'
+import { getStore, connect } from '@tarojs/redux'
+
 @connect(state => state.user)
 export default class Index extends Component {
   config = {
@@ -61,6 +64,15 @@ export default class Index extends Component {
     })
   }
 
+  handleItemClick = ({ unReadNum }) => {
+    if (unReadNum > 0) {
+      const { dispatch } = getStore()
+      dispatch({ type: DECREASE_UNREADNUM, payload: unReadNum })
+    }
+
+    return this.toChat.bind(this);
+  }
+
   render() {
     const { list } = this.state
     return (
@@ -73,7 +85,7 @@ export default class Index extends Component {
           height: getWindowHeight()
         }}>
 
-        {(loaded && list.length === 0) ? <EmptyPage text="暂无好友哦~" /> : list.map(item => <Item key={item.sendPerson} data={item} onClick={this.toChat.bind(this)} />)}
+        {(loaded && list.length === 0) ? <EmptyPage text="暂无好友哦~" /> : list.map(item => <Item key={item.sendPerson} data={item} onClick={this.handleItemClick(item)} />)}
 
         {/* <Loadmore nodata={!list.length} loading={loading} loadend={loadend}></Loadmore> */}
       </ScrollView>

src/reducers/user.js

@@ -87,9 +87,16 @@ export default function user(state = INITIAL_STATE, action) {
       }
     }
     case DECREASE_UNREADNUM: {
+      let { unReadNum } = state
+      unReadNum = unReadNum - action.payload
+
+      if (unReadNum < 0) {
+        unReadNum = 0
+      }
+
       return {
         ...state,
-        unReadNum: 0
+        unReadNum,
       }
     }
     default: