Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

src/hotel/pages/landlord/landlord.jsx

@@ -5,6 +5,7 @@ import { getHotelManage, getNowHotelManage } from '@/services/landlord'
 import NoData from '@/components/NoData'
 import CustomNav from '@/components/CustomNav'
 import { withSubscribeMessage } from '@/utils/subscribeMessage'
+import { TPL_MESSAGE_HOTEL_CHECK_IN } from '@/utils/constants'
 import HouseManage from '../../components/HouseManage/houseManage'
 import Income from '../../components/Income/income'
 import tabList from './Roomtabbar'
@@ -45,7 +46,7 @@ export default withLayout((props) => {
   const handleTabChange = (e) => {
     const { index } = e.detail
     setCurrentTab(index)
-    withSubscribeMessage('hotel_check_in')
+    withSubscribeMessage(TPL_MESSAGE_HOTEL_CHECK_IN)
   }
 
   useEffect(() => {

src/pages/RoomOrder/index.jsx

@@ -4,6 +4,7 @@ import CustomNav from '@/components/CustomNav'
 import withLayout from '@/layouts'
 import { getTaRoom, goToRoomForm, personSubmit } from '@/services/taRoom​'
 import { withSubscribeMessage } from "@/utils/subscribeMessage"
+import { TPL_MESSAGE_HOTEL_CHECK_OUT } from '@/utils/constants'
 import RoomForm from './components/RoomForm'
 import './style.less'
 
@@ -25,7 +26,7 @@ export default withLayout((props) => {
   const handleSubmit = (e) => {
 
     // 订阅消息
-    withSubscribeMessage('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

@@ -7,11 +7,12 @@ import logo from '@/assets/icons/comm/logo_small.png'
 import { getHotelDetail } from '@/services/landlord'
 import { getTaRoom } from '@/services/taRoom​'
 import withLayout from '@/layouts'
+import { withSubscribeMessage } from '@/utils/subscribeMessage'
+import { TPL_MESSAGE_HOTEL_CHECK_OUT } from '@/utils/constants'
 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'
 
 
@@ -40,7 +41,7 @@ export default withLayout((props) => {
     setCurrentTab(index)
 
     if (index === 1) {
-      withSubscribeMessage('hotel_check_out')
+      withSubscribeMessage(TPL_MESSAGE_HOTEL_CHECK_OUT)
     }
   }
   useEffect(() => {

src/shop/pages/spread/spreadIndex.jsx

@@ -2,9 +2,9 @@ import React, { useState, useEffect, useRef } from 'react'
 import CustomNav from '@/components/CustomNav'
 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 tabList from './Shoptabbar'
 import ShopKeeper from '../../components/ShopKeeper/shopKeeper'
 import Sparead from '../../components/Sparead/spreadMoney'
@@ -36,8 +36,9 @@ export default withLayout((props) => {
     //如果context有的话代表他滚动了   那么切换tab页就置顶
     if (listRef.current?.context) {
       listRef.current.context.scrollTo({ top: 0 })
-
     }
+
+    withSubscribeMessage(TPL_MESSAGE_SHOP_PAY_SUCCESS)
   }
   const handelTypeOrder = () => {
 

src/utils/constants.js

@@ -0,0 +1,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";   // 商铺下单成功通知