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

src/components/OrderMolded/style.less

@@ -8,7 +8,7 @@
     padding-bottom: 21px;
     display: flex;
     border-radius: 15px 0px 0px 15px;
-    align-items: center;    
+    align-items: center;
     .left-viewText-payOrder {
       background: url(../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
       background-size: 100% 100%;
@@ -24,8 +24,8 @@
     //图片
     .title-image-cardOrder {
       width: 100%;
-      margin-left: 20px;
       border-radius: 24px;
+      display: flex;
       overflow: hidden;
       position: relative;
       .image-1-cardOrder {

src/components/ShopCommission/index.jsx

@@ -15,7 +15,7 @@ export default (props) => {
     <view className='spreadCard'>
       <view className='spreadDate'>日期：<text>{formatTimes(item.createDate, "yyyy/MM/dd")}</text></view>
       <view className='card'>
-        <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{formatTimes(item.createDate, "yyyy/MM/dd hh:ss")}</text></view>
+        <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{formatTimes(item.createDate, "yyyy/MM/dd hh:mm")}</text></view>
         <view className='spreadMoney'>收入金额：<text>{(item.amount / 100).toFixed(2)}</text>元</view>
       </view>
     </view>

src/components/ShopUnused/index.jsx

@@ -19,7 +19,7 @@ export default (props) => {
     <view className='orderCard'>
       <view style={{ overflow: 'hidden' }}>
         <view className='orderId'>订单编号：{item.orderId}</view>
-        <view className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:ss')}</view>
+        <view className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:mm')}</view>
       </view>
       <view className='order'>
         <image className='orderImg' src={item.poster} mode='aspectFit' />

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/MineUserAll/ContactMe/index.jsx

@@ -24,15 +24,19 @@ export default withLayout((props) => {
         content
       }).then(() => {
 
-        Taro.navigateBack({
-          delta: 1
-        })
         Taro.showToast({
           title: '反馈成功',
           icon: 'success',
           duration: 2000
+
+        }).then(x => {
+
+          Taro.navigateBack({
+            delta: 1
+          })
+          setLoading(false)
+
         })
-        setLoading(false)
       })
     }
     else {

src/pages/MineUserAll/RefundMoney/index.jsx

@@ -29,9 +29,11 @@ export default withLayout((props) => {
         pageNum === 1 ? res.records || [] : list.concat(res.records || [])
       );
       setHasNextPage(res.current < res.pages);
-      Taro.hideLoading();
+      setLoading(false)
 
-    });
+    }).catch(e => {
+      setLoading(false)
+    })
   };
 
 
@@ -62,12 +64,14 @@ export default withLayout((props) => {
         <SpinBox loading={loading} className='index-container' >
 
           <view className='View-box-Card'>
+
             {(list || []).map((item) => {
               return (
                 <OrderCard item={item} key={item.orderId} sh='1' />
               )
             })}
             <view className='foot'>这是我的底线</view>
+
           </view>
         </SpinBox>
 

src/pages/PayOrder/style.less

@@ -98,16 +98,20 @@
           margin-right: 5px;
           width: 10px;
           height: 10px;
-          background: #999999;
+          font-weight: 800;
+
+          background: #000;
           border-radius: 50%;
         }
         .ul-li-textname {
+          font-weight: 800;
+
           font-size: 25px;
-          color: #999999;
+          color: #000;
         }
       }
     }
-    .payorder{
+    .payorder {
       margin: 40px 30px;
       color: #fff;
       background-color: #274190;
@@ -118,12 +122,12 @@
       align-items: center;
       //垂直居中
       justify-content: center;
-      .paytext{
+      .paytext {
         font-size: 30px;
       }
-      .paycontent{
-        margin:0 40px 0 20px;
-        .paybuttontop{
+      .paycontent {
+        margin: 0 40px 0 20px;
+        .paybuttontop {
           background: url(../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
           background-size: 100% 100%;
           padding: 5px 25px 8px 6px;
@@ -134,7 +138,7 @@
           color: @whiteColor;
           font-weight: 600;
         }
-        .paybuttonbottom{          
+        .paybuttonbottom {
           font-size: 18px;
           text-decoration: line-through;
           line-height: 17px;
@@ -142,4 +146,4 @@
       }
     }
   }
-}
+}

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/TobeShop/index.jsx

@@ -3,20 +3,14 @@ import { Button, Icon, ScrollView, Text, Textarea, View } from "@tarojs/componen
 import { useState, useEffect } from "react";
 import withLayout from "@/layouts";
 import CustomNav from "@/components/CustomNav";
-import { getShopDetail, getShopPackage, getExtendContent } from '@/services/home';
+import { getShopDetail } from '@/services/home';
 import { getVerifyTargetList, putVerifyTarget } from "@/services/payOrder";
-import formatTime from '@/utils/formatTime'
 import Popup from "@/components/Popup";
 import SpinBox from "@/components/Spin/SpinBox";
-import formatPrice from "@/utils/formatPrice";
 
 import LocationBig from "@/assets/icons/UserCenter/LocationBig.png";
 import Perfection from "@/assets/icons/UserCenter/Perfection.png";
-import Check_OK from "@/assets/icons/UserCenter/Check_OK.png";
-import Check_NO from "@/assets/icons/UserCenter/Check_NO.png";
 import BlackSpot from "@/assets/icons/GuideCheck/BlackSpot.png";
-import food from "@/assets/icons/ProCard/food.png";
-import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
 import TBCard from './Card'
 
 import "./style.less";
@@ -105,19 +99,16 @@ export default withLayout((props) => {
   };
   const ButtonOK = (e) => {
     if (!submiting) {
-      Taro.showLoading({
-        title: '核销中'
-      })
       setSubmiting(true);
       Promise.all(checked.map(verifyNo => putVerifyTarget(verifyNo)))
         .then(res => {
-          Taro.hideLoading()
+
           setSubmiting(false);
           setShowDialog(false);
           setConsumption(true);
         })
         .catch(e => {
-          Taro.hideLoading()
+
           setShowDialog(false);
           setSubmiting(false);
           getList();  // 刷新数据
@@ -135,7 +126,10 @@ export default withLayout((props) => {
     if (list?.length > 1) {
       getList()
     } else {
-      Taro.navigateBack({ delta: 1 })
+      Taro.redirectTo({
+        url: '/pages/MineUserAll/AllOrder/index?tabJump=3',
+      });
+      // Taro.navigateBack({ delta: 1 })
     }
   };
 

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/pages/index/tabs/GuideCss/style.less

@@ -8,8 +8,8 @@
   .room-box-info-ROOM {
     width: 97%;
     display: flex;
-    margin: 60px auto;
-
+    margin-top: 35px;
+    margin: auto;
     .room-bi-name-ROOM {
       width: 100%;
 
@@ -34,7 +34,8 @@
   .room-box-info-HouLocation {
     width: 97%;
     display: flex;
-    margin: 60px auto;
+    margin-top: 35px;
+    margin: auto;
 
     .room-bi-name-HouLocation {
       width: 100%;
@@ -91,8 +92,8 @@
   .room-box-info-Parking {
     width: 97%;
     display: flex;
-    margin: 60px auto;
-
+    margin-top: 35px;
+    margin: auto;
     .room-bi-name-Parking {
       width: 100%;
 
@@ -148,8 +149,8 @@
   .room-box-info-WIFIContent {
     width: 97%;
     display: flex;
-    margin: 60px auto;
-
+    margin-top: 35px;
+    margin: auto;
     .room-bi-name-WIFIContent {
       width: 100%;
 
@@ -270,6 +271,7 @@
     }
   }
   .Guide-Content-box {
+    margin-top: 2em;
     .title-image {
       display: flex;
       // width: 270px;

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/hooks/useRouter.js

@@ -16,6 +16,13 @@ export default () => {
   const loginScene = Taro.getStorageSync('scene')
 
   useEffect(() => {
+    // 没有 token 说明没有登录
+    const token = Taro.getStorageSync('token')
+    if (!token) {
+      return;
+    }
+
+
     // 扫码进入
     if (scene) {
       if (scene === loginScene && qrCode) {
@@ -26,9 +33,7 @@ export default () => {
           parseQRFinished: true,
         }
         setToggleRefresh(Math.random().toString())
-        console.log('-----------qrCode---------------', qrCode)
       } else {
-        console.log('-----------getQrcode---------------', scene)
         getQrcode(scene).then((res) => {
           const qrParams = parseQueryString(res.scene) || {}
           routerRef.current.params = {
@@ -41,5 +46,6 @@ export default () => {
       }
     }
   }, [qrCode, scene])
+
   return routerRef.current
 }

src/utils/subscribeMessage.js

@@ -1,18 +1,21 @@
 import Taro from "@tarojs/taro";
 import store from "@/store"
 
-export function subscribeMessage(messageType) {
-  if (!messageType) return Promise.resolve();
+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 tpl = messageTpls.filter(x => x.messageType === messageType)[0] || {}
+    const tmplIds = messageTypes.map((messageType) => {
+      const tpl = messageTpls.filter(x => x.messageType === messageType)[0] || {}
+      return tpl.templateId;
+    }).filter(Boolean)
 
-    if (tpl.templateId) {
+    if (tmplIds && tmplIds.length > 0) {
       Taro.requestSubscribeMessage({
-        tmplIds: [tpl.templateId],
+        tmplIds,
         complete: () => resolve(),
       })
     } else {
@@ -21,8 +24,8 @@ export function subscribeMessage(messageType) {
   })
 }
 
-export function withSubscribeMessage(type, callback) {
-  subscribeMessage(type).then(() => {
+export function withSubscribeMessage(types, callback) {
+  subscribeMessage(types).then(() => {
     if (callback) {
       callback()
     }