feats

src/hotel/pages/landlord/landlord.jsx

@@ -46,7 +46,7 @@ export default withLayout((props) => {
   const handleTabChange = (e) => {
     const { index } = e.detail
     setCurrentTab(index)
-    withSubscribeMessage(TPL_MESSAGE_HOTEL_CHECK_IN)
+    withSubscribeMessage([TPL_MESSAGE_HOTEL_CHECK_IN])
   }
 
   useEffect(() => {

src/pages/RoomOrder/index.jsx

@@ -26,7 +26,7 @@ export default withLayout((props) => {
   const handleSubmit = (e) => {
 
     // 订阅消息
-    withSubscribeMessage(TPL_MESSAGE_HOTEL_CHECK_OUT, () => {
+    withSubscribeMessage([TPL_MESSAGE_HOTEL_CHECK_OUT], () => {
       for (let i = 0, len = formData.length; i < len; i++) {
         const item = formData[i];
         if (!item.customerName || !item.customerPhone) {

src/pages/index/index.jsx

@@ -43,7 +43,7 @@ export default withLayout((props) => {
     setCurrentTab(index)
 
     if (index === 1) {
-      withSubscribeMessage(TPL_MESSAGE_HOTEL_CHECK_OUT)
+      withSubscribeMessage([TPL_MESSAGE_HOTEL_CHECK_OUT])
     }
   }
   useEffect(() => {

src/shop/pages/spread/spreadIndex.jsx

@@ -4,7 +4,10 @@ import { useRouter } from '@tarojs/taro'
 import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
 import { withSubscribeMessage } from '@/utils/subscribeMessage'
 import withLayout from '@/layouts'
-import { TPL_MESSAGE_SHOP_PAY_SUCCESS } from '@/utils/constants'
+import {
+  TPL_MESSAGE_SHOP_PAY_SUCCESS,
+  TPL_MESSAGE_SHOP_VERIFY_RESULT,
+} from '@/utils/constants'
 import tabList from './Shoptabbar'
 import ShopKeeper from '../../components/ShopKeeper/shopKeeper'
 import Sparead from '../../components/Sparead/spreadMoney'
@@ -38,18 +41,17 @@ export default withLayout((props) => {
       listRef.current.context.scrollTo({ top: 0 })
     }
 
-    withSubscribeMessage(TPL_MESSAGE_SHOP_PAY_SUCCESS)
+    withSubscribeMessage([TPL_MESSAGE_SHOP_PAY_SUCCESS, TPL_MESSAGE_SHOP_VERIFY_RESULT])
   }
-  const handelTypeOrder = () => {
 
+  const handelTypeOrder = () => {
     setAmountType('order')
-
   }
 
   const handelType = () => {
     setAmountType('commission')
-
   }
+
   //商铺列表
   useEffect(() => {
     getShopList().then((res) => {

src/utils/constants.js

@@ -2,3 +2,4 @@
 export const TPL_MESSAGE_HOTEL_CHECK_IN = "hotel_check_in";       // 民宿入住消息
 export const TPL_MESSAGE_HOTEL_CHECK_OUT = "hotel_check_out";     // 民宿离店消息
 export const TPL_MESSAGE_SHOP_PAY_SUCCESS = "shop_pay_success";   // 商铺下单成功通知
+export const TPL_MESSAGE_SHOP_VERIFY_RESULT = "shop_verify_result";   // 商铺下单成功通知

src/utils/subscribeMessage.js

@@ -1,19 +1,18 @@
 import Taro from "@tarojs/taro";
 import store from "@/store"
 
-export function subscribeMessage(...messageTypes) {
+export function subscribeMessage(messageTypes) {
   if (!messageTypes || messageTypes.length < 1) return Promise.resolve();
   
   const { messageTpls } = store.getModel('system').getState()
   if (!messageTpls || !messageTpls.length) return Promise.resolve();
-
+  
   return new Promise((resolve, reject) => {
     const tmplIds = messageTypes.map((messageType) => {
       const tpl = messageTpls.filter(x => x.messageType === messageType)[0] || {}
       return tpl.templateId;
     }).filter(Boolean)
 
-
     if (tmplIds && tmplIds.length > 0) {
       Taro.requestSubscribeMessage({
         tmplIds,
@@ -25,8 +24,8 @@ export function subscribeMessage(...messageTypes) {
   })
 }
 
-export function withSubscribeMessage(type, callback) {
-  subscribeMessage(type).then(() => {
+export function withSubscribeMessage(types, callback) {
+  subscribeMessage(types).then(() => {
     if (callback) {
       callback()
     }