feats

src/hotel/pages/landlord/landlord.jsx

@@ -9,7 +9,7 @@ import withLayout from '@/layouts'
 import { getHotelManage,  getNowHotelManage } from '@/services/landlord'
 import NoData from '@/components/NoData'
 import CustomNav from '@/components/CustomNav'
-import useSubscribeMessage from '@/utils/hooks/useSubscribeMessage'
+import { withSubscribeMessage } from '@/utils/subscribeMessage'
 import HouseManage from '../../components/HouseManage/houseManage'
 import Income from '../../components/Income/income'
 import './landlord.less'
@@ -25,10 +25,6 @@ export default withLayout((props) => {
 
   const houseRef = useRef()
 
-  // 订阅消息
-  useSubscribeMessage('hotel_check_in', true)
-
-
   useEffect(() => {
     getHotelManage().then((res) => {
       const { hotelList: list, account: acc, hotel: current } = res
@@ -51,6 +47,8 @@ export default withLayout((props) => {
   const handleTabChange = (e) => {
     const { index } = e.detail
     setCurrentTab(index)
+
+    withSubscribeMessage('hotel_check_in')
   }
 
   useEffect(() => {

src/pages/RoomOrder/index.jsx

@@ -3,7 +3,7 @@ import { useEffect, useState } from "react"
 import CustomNav from '@/components/CustomNav'
 import withLayout from '@/layouts'
 import { getTaRoom, goToRoomForm, personSubmit } from '@/services/taRoom​'
-import useSubscribeMessage from "@/utils/hooks/useSubscribeMessage"
+import { withSubscribeMessage } from "@/utils/subscribeMessage"
 import RoomForm from './components/RoomForm'
 import './style.less'
 
@@ -23,30 +23,29 @@ export default withLayout((props) => {
   }
 
   const handleSubmit = (e) => {
-    for (let i = 0, len = formData.length; i < len; i++) {
-
-      const item = formData[i];
-
-      if (!item.customerName || !item.customerPhone) {
-        Taro.showToast({
-          title: '手机号或姓名不能为空',
-          icon: 'none',
-        })
-        return;
+    
+    // 订阅消息
+    withSubscribeMessage('hotel_check_out', () => {
+      for (let i = 0, len = formData.length; i < len; i++) {
+        const item = formData[i];
+        if (!item.customerName || !item.customerPhone) {
+          Taro.showToast({
+            title: '手机号或姓名不能为空',
+            icon: 'none',
+          })
+          return;
+        }
       }
-    }
-    personSubmit(roomOrderId, formData).then(a => {
-      Taro.navigateBack({
-        delta: 1
-      })
+  
+      personSubmit(roomOrderId, formData).then(a => {
+        Taro.navigateBack({
+          delta: 1
+        })
+      })      
     })
 
   }
 
-  // 订阅消息
-  useSubscribeMessage('hotel_check_out', true)
-
-
   useEffect(() => {
     getTaRoom(roomId).then((res) => {
       setTaRoomContent(res)

src/pages/index/index.jsx

@@ -1,19 +1,18 @@
 
 
 import React, { useState, useEffect } from 'react'
+import { useDidShow } from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import logo from '@/assets/icons/comm/logo_small.png'
-import { getNowHotelManage, getHotelDetail } from '@/services/landlord'
-import { getTaRoom, goToRoomForm, getWorkerDetail } from '@/services/taRoom​'
-
+import { getHotelDetail } from '@/services/landlord'
+import { getTaRoom } from '@/services/taRoom​'
 import withLayout from '@/layouts'
 import tabList from './tabbar'
 import Guide from './tabs/Guide'
 import Mine from './tabs/Mine'
 import Recommend from './tabs/Recommend'
-
+import { withSubscribeMessage } from '@/utils/subscribeMessage'
 import './index.less'
-import { useDidShow } from '@tarojs/taro'
 
 
 
@@ -39,6 +38,10 @@ export default withLayout((props) => {
   const handleTabChange = (e) => {
     const { index } = e.detail
     setCurrentTab(index)
+
+    if (index === 1) {
+      withSubscribeMessage('hotel_check_out')
+    }
   }
   useEffect(() => {
     if (tab) {

src/pages/index/tabs/Guide.jsx

@@ -12,7 +12,6 @@ import sleep from '@/assets/icons/GuideCheck/sleep_logo.png'
 import { getTaRoom, goToRoomForm } from '@/services/taRoom​'
 import useTrackClick from '@/utils/hooks/useTrackClick'
 import showMore from '@/assets/icons/housemantj/查看更多.png'
-import useSubscribeMessage from "@/utils/hooks/useSubscribeMessage";
 import './GuideCss/style.less'
 
 
@@ -53,9 +52,6 @@ export default (props) => {
     })
   }
 
-  // 订阅消息
-  useSubscribeMessage('hotel_check_out', !roomOrderId)
-
   useEffect(() => {
     if (roomOrderId) {
       goToRoomForm(roomOrderId).then((res) => {

src/utils/hooks/useSubscribeMessage.js

@@ -1,21 +0,0 @@
-import { useEffect } from "react";
-import Taro from '@tarojs/taro';
-import { useModel } from "@/store";
-
-export default function(messageType, dep) {
-  const { messageTpls } = useModel('system')
-
-  useEffect(() => {
-    if (!messageTpls || !messageTpls.length) return;
-
-    if (dep && messageType) {
-      const tpl = messageTpls.filter(x => x.messageType === messageType)[0] || {}
-
-      if (tpl.templateId) {
-        Taro.requestSubscribeMessage({
-          tmplIds: [tpl.templateId]
-        })
-      }
-    }
-  }, [messageTpls, messageType, dep])
-}

src/utils/subscribeMessage.js

@@ -0,0 +1,30 @@
+import Taro from "@tarojs/taro";
+import store from "@/store"
+
+export function subscribeMessage(messageType) {
+  if (!messageType) return Promise.resolve();
+  
+  const { messageTpls } = store.getModel('system').getState()
+  if (!messageTpls || !messageTpls.length) return Promise.resolve();
+
+  return new Promise((resolve, reject) => {
+    const tpl = messageTpls.filter(x => x.messageType === messageType)[0] || {}
+
+    if (tpl.templateId) {
+      Taro.requestSubscribeMessage({
+        tmplIds: [tpl.templateId],
+        complete: () => resolve(),
+      })
+    } else {
+      resolve()
+    }
+  })
+}
+
+export function withSubscribeMessage(type, callback) {
+  subscribeMessage(type).then(() => {
+    if (callback) {
+      callback()
+    }
+  })
+}