Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

src/components/ChatIcon/index.jsx

@@ -1,24 +1,33 @@
 import { useEffect, useState } from 'react'
+import classNames from 'classnames'
 import Taro from '@tarojs/taro'
 import { MovableArea, MovableView } from '@tarojs/components'
 import { showSubscribeMessage, MESSAGE_TYPE } from '@/utils/subscribeMessage'
+import { API_CHAT_UNREADED } from '@/constants/api'
+import { fetch } from '@/utils/request'
+import useInterval from '@/utils/hooks/useInterval'
 import './style.scss'
 
 export default function ChatIcon(props) {
 
+  const [unReadNum, setUnReadNum] = useState(0)
   const [PageX] = useState(Taro.getSystemInfoSync().windowWidth - 60)
-  const [PageY] = useState(Taro.getSystemInfoSync().windowHeight - 60)
+  const [PageY] = useState(Taro.getSystemInfoSync().windowHeight - 160)
 
   const handleClick = () => {
-    showSubscribeMessage(MESSAGE_TYPE.NOTICE).then((res) => {
-      //
+    showSubscribeMessage(MESSAGE_TYPE.NOTICE).then(() => {
+      Taro.switchTab({ url: '/pages/chat/index' })
     })
   }
 
+  useInterval(() =>{
+    fetch({url: API_CHAT_UNREADED, showToast: false}).then(x => setUnReadNum(x || 0))
+  }, 30000, true)
+
   return (
-    <MovableArea className='components ChatIcon'>
+    <MovableArea className='components ChatIcon' onClick={handleClick}>
       <MovableView className='MoveItem' x={PageX} y={PageY} direction='all'>
-        <text className='iconfont icon-xiaoxi centerLabel active'></text>
+        <text className={classNames('iconfont icon-xiaoxi centerLabel', { active: unReadNum > 0 })}></text>
       </MovableView>
     </MovableArea>
   )

src/constants/api.js

@@ -72,6 +72,8 @@ export const API_CHAT_SEND = wss_host + '/wx/chat'
 export const API_CHAT_FRIENDS = resolvePath('chat/with')
 export const API_UPLOAD_IMAGE = resolvePath('image')
 export const API_CHAT_READED = resolvePath('chat/message')
+export const API_CHAT_UNREADED = resolvePath('chat/unReaded')
+
 
 // card
 export const API_CARDS_LIST = resolvePath('cards')

src/pages/index/index.jsx

@@ -65,8 +65,8 @@ export default withLayout((props) => {
 
   return (
     <view className='Page Index'>
-      <ChatIcon></ChatIcon>
-      {/* <ShareToCircle visible></ShareToCircle> */}
+      <ChatIcon />
+
       <ScrollView scroll-y>
         <view className='PageContent'>
 

src/utils/login.js

@@ -35,10 +35,6 @@ export default (params) => {
       // 获取人员详细信息
       // eslint-disable-next-line no-unused-vars
       queryUserInfo().then(info => {
-        // const { unReadNum } = info
-
-        // 默认红点开始就有
-        dispatch({ type: ASSIGN_UNREADNUM, payload: true });
         resolve(data)
       }).catch(reject)
 
@@ -51,9 +47,6 @@ export default (params) => {
           }
         })
       }
-
-      // 如果通过扫码进入
-
     }).catch(reject)
   
   })