fix: 修复设置已读数量更新问题

config/env.config.js

 const isProduction = process.env.NODE_ENV === 'production';
 const isPre = process.env.PRE_ENV === 'pre';
-
+const environment = 'sc';
 const envAPi = {
-  api: 'https://security-yxm.liangkebang.net', //'https://security-xyqb.liangkebang.net',
-  kdspOpApi: 'https://sc-merchant-api-yxm.liangkebang.net',
-  kdspApi: 'https://sc-merchant-api-yxm.liangkebang.net',
-  goodsApi: 'https://sc-merchant-api-yxm.liangkebang.net',
+  api: `https://security-${environment}.liangkebang.net`, //'https://security-xyqb.liangkebang.net',
+  kdspOpApi: `https://sc-merchant-api-${environment}.liangkebang.net`,
+  kdspApi: `https://sc-merchant-api-${environment}.liangkebang.net`,
+  goodsApi: `https://sc-merchant-api-${environment}.liangkebang.net`,
   // kdspOpApi: 'https://kdsp-operation-xyqb.liangkebang.net',
   // kdspApi: 'https://sc-op-api-xyqb.liangkebang.net',
   // goodsApi: 'https://sc-op-api-xyqb.liangkebang.net',
-  querysApi: 'https://sc-merchant-api-yxm.liangkebang.net',
+  querysApi: `https://sc-merchant-api-${environment}.liangkebang.net`,
   // goodsApi: '//192.168.188.111:7000',
-  prologueDomain: 'https://mall-yxm.liangkebang.net',
+  prologueDomain: `https://mall-${environment}.liangkebang.net`,
   // qiniuHost: 'https://appsync.lkbang.net',
   qiniuHost: 'https://kdspstatic.q-gp.com/',
-  opapiHost: 'https://opapi-yxm.liangkebang.net',
-  wsApi: 'ws://ws-sc.liangkebang.net',
-  msgApi: 'https://msgapi-yxm.liangkebang.net',
+  opapiHost: `https://opapi-${environment}.liangkebang.net`,
+  wsApi: `ws://ws-${environment}.liangkebang.net`,
+  msgApi: `https://msgapi-${environment}.liangkebang.net`,
 };
 
 const prodApi = {

src/components/MessageReminder/Complex/index.jsx

@@ -42,7 +42,7 @@ const MessageItem = props => {
         <span className={styles['order-number']}> 订单编号：{message.orderNo}</span>
         <span className={styles.time}>订单时间：{message.time}</span>
         {readStatus === 0 ? (
-          <a className={styles['read-status']} onClick={() => onMark([item.id])}>
+          <a className={styles['read-status']} onClick={() => onMark([item.id], item)}>
             标记为已读
           </a>
         ) : (
@@ -139,6 +139,10 @@ const Complex = props => {
     });
   };
 
+  // 过滤参数,获取当前页未读消息数据的id
+  const onFilterMessageParams = msgList =>
+    msgList.filter(message => message.readStatus === 0).map(item => item.id);
+
   const open = () => {
     setVisible(true);
     getMsgReadCount();
@@ -190,20 +194,25 @@ const Complex = props => {
   };
 
   // 标记已读
-  const onMark = idList => {
-    if (!idList.length) {
+  const onMark = (idsList, item) => {
+    if (!idsList.length) {
       return;
     }
     const payload = {
       channelId: CHANNEL_ID,
       bussinessId: userInfo.supplierCode,
-      idList,
+      type: Number(queryParams.type),
+      idsList,
     };
     dispatch({
       type: 'messageReminder/setMarkRead',
       payload,
       options: {
         setLoading,
+        callback: () => {
+          getMsgReadCount();
+          getMsgList();
+        },
       },
     });
   };
@@ -270,13 +279,7 @@ const Complex = props => {
           </Checkbox>
         </div>
         <div className={styles['filter-box__actions']}>
-          <a
-            onClick={() =>
-              onMark(messageData.filter(message => message.readStatus === 0).map(item => item.id))
-            }
-          >
-            全部标记为已读
-          </a>
+          <a onClick={() => onMark(onFilterMessageParams(messageData))}>全部标记为已读</a>
         </div>
       </div>
     );

src/components/MessageReminder/Simple/index.jsx

@@ -167,14 +167,14 @@ const Simple = props => {
   };
 
   // 标记已读信息
-  const onMark = idList => {
-    if (!idList.length) {
+  const onMark = idsList => {
+    if (!idsList.length) {
       return;
     }
     const payload = {
       channelId: CHANNEL_ID,
       bussinessId: userInfo.supplierCode,
-      idList,
+      idsList,
     };
     dispatch({
       type: 'messageReminder/setMarkRead',

src/models/messageReminder.js

@@ -26,6 +26,15 @@ const MessageReminderModel = {
       if (setLoading) {
         setLoading(false);
       }
+      if (res.code !== '0000') {
+        return;
+      }
+      if (
+        Object.hasOwnProperty.call(options, 'callback') &&
+        typeof options.callback === 'function'
+      ) {
+        options.callback(res);
+      }
       yield put({
         type: 'updateUnReadData',
         payload,
@@ -46,9 +55,9 @@ const MessageReminderModel = {
     },
     updateUnReadData(state, { payload, options = {} }) {
       // 删除已读的数据
-      const currentData = state.unReadData.filter(message => !payload.idList.includes(message.id));
+      const currentData = state.unReadData.filter(message => !payload.idsList.includes(message.id));
       // 重置当前未读数量
-      const unReadCount = currentData.length; // state.unReadCount - (options.readCount || payload.idList.length || 1)
+      const unReadCount = currentData.length; // state.unReadCount - (options.readCount || payload.idsList.length || 1)
       return { ...state, unReadCount, unReadData: currentData };
     },
   },

src/pages/AfterSaleManage/data.js

@@ -384,7 +384,7 @@ export const getColumns = props => {
           showRefunded,
         } = record;
         // 是否是服务类商品
-        const isServiceGoods = !['vip', 'self'].includes(supplierType);
+        const isServiceGoods = ['pop'].includes(supplierType);
         // 按钮通用属性
         const btnProps = {
           className: 'mr10 mt10',

src/utils/websocket.js

@@ -113,6 +113,12 @@ class Socket extends EventEmitter {
       this.checkWaitingData();
     }
   }
+
+  hearBeat() {
+    setTimeout(() => {
+      this.sendMessage('HeartBeat');
+    }, 300000);
+  }
 }
 
 export default Socket;