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

src/app.less

@@ -35,3 +35,15 @@
     }
   }
 }
+
+.purebtn {
+  margin: 0;
+  padding: 0;
+  background: transparent;
+  border: none;
+  outline: none;
+
+  &::after {
+    border: none;
+  }
+}

src/components/CompoentsOrder/complete/index.jsx

@@ -84,7 +84,6 @@ export default (props) => {
     // 触发页面刷新
     setNumber({ pageNum: 1 })
     setShowCutover(false)
-    console.log('------------------handleFinishEvaluate------------------------------');
   }
 
   return (

src/components/HorTabbar/TabIcon.jsx

@@ -0,0 +1,14 @@
+import React from 'react'
+import { View, Image, Text } from '@tarojs/components'
+import './style.less'
+
+export default (props) => {
+  const { icon, text, onClick } = props
+
+  return (
+    <View className='htab-icon' onClick={onClick}>
+      <Image src={icon} />
+      <Text>{text}</Text>
+    </View>
+  )
+}

src/components/HorTabbar/style.less

@@ -0,0 +1,20 @@
+
+.htab-icon {
+  height: 88px;
+
+  & > image {
+    width: 32px;
+    height: 32px;
+    display: inline-block;
+    vertical-align: middle;
+    margin-right: 12px;
+  }
+
+  & > text {
+    font-size: 28px;
+    font-weight: bold;
+    color: #202020;
+    line-height: 88px;
+    vertical-align: middle;
+  }
+}

src/components/MasonryLayout/hooks.js

@@ -0,0 +1,9 @@
+import { useRef, useState } from "react";
+
+export function useList() {
+  const [lst, setList] = useState([])
+  const lstRef = useRef(lst)
+  lstRef.current = lst
+
+  return [lst, lstRef, setList]
+}

src/components/MasonryLayout/index.jsx

@@ -0,0 +1,101 @@
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { useList } from './hooks';
+import { classNames, getRect } from './utils';
+
+export default (props) => {
+  const { className, itemClassName, style, gutter = 0, list = [], render, ...leftProps } = props
+
+  const leftBottom = useRef(0)
+  const rightBottom = useRef(0)
+  const [leftList, leftRef, setLeftList] = useList()
+  const [rightList, rightRef, setRightList] = useList()
+  const vidRef = useRef()
+  const [cursor, setCursor] = useState(-1)
+
+  const listRef = useRef([])
+  listRef.current = list
+    
+  useEffect(() => {
+    if (list && list.length) {
+      setCursor(0)
+      setLeftList([])
+      setRightList([])
+      console.log('----------useEffect--------')
+    } else {
+      setCursor(-1)
+    }
+  }, [list])
+
+  useEffect(() => {
+    const len = !listRef.current ? 0 : listRef.current.length;
+
+    if (!len || cursor >= len) return;
+
+    const item = listRef.current[cursor] || {}
+    item.__vid = `f-${Math.random().toString(36).substring(2)}`
+    vidRef.current = item.__vid
+
+    console.log('----------leftRef.current--------', leftRef.current, rightRef.current)
+
+    if (leftBottom.current <= rightBottom.current) {
+      setLeftList([...leftRef.current, item])
+    } else {
+      setRightList([...rightRef.current, item])
+    }
+  }, [cursor])
+
+  
+  console.log('---------dddddddd------', vidRef.current, leftRef.current.length, leftList)
+
+  useEffect(() => {
+    const setHeight = (rect) => {
+      console.log('---------rect------', rect)
+      const { bottom } = rect
+      if (cursor % 2 === 0) {
+        leftBottom.current = bottom
+      } else {
+        rightBottom.current = bottom
+      }
+      setCursor(cursor + 1)
+    }
+
+    const calcHeight = () => {
+      getRect(`.${vidRef.current}`).then((res) => {
+        if (!res || !res.length) {
+          const t = setTimeout(() => {
+            clearTimeout(t)
+            calcHeight()
+          }, 300)
+        } else {
+          setHeight(res[0])
+        }
+      })
+    }
+
+    calcHeight()
+  })
+
+  return (
+    <View
+      className={classNames(className, 'masonry-layout')}
+      style={style}
+    >
+      <View className='masonry-column'>
+        {
+          leftList.map((item) => (
+            <View key={item.__vid} className={classNames(itemClassName, 'masonry-item', item.__vid)}>{render(item)}</View>
+          ))
+        }
+      </View>
+      <View className='masonry-column'>
+        {
+          rightList.map((item) => (
+            <View key={item.__vid} className={classNames(itemClassName, 'masonry-item', item.__vid)}>{render(item)}</View>
+          ))
+        }
+      </View>
+    </View>
+  )
+}

src/components/MasonryLayout/style.less

@@ -0,0 +1,15 @@
+
+.masonry-layout {
+  box-sizing: border-box;
+  width: 100%;
+  display: flex;
+
+  .masonry-column {
+    flex: 1;
+  }
+
+  .masonry-item {
+    width: 100%;
+    overflow-x: hidden;
+  }
+}

src/components/MasonryLayout/utils.js

@@ -0,0 +1,13 @@
+import Taro from '@tarojs/taro';
+
+export function classNames(...args) {
+  return args.filter(Boolean).join(' ')
+}
+
+export function getRect(selector) {
+  return new Promise((resolve) => {
+    Taro.nextTick(() => {
+      Taro.createSelectorQuery().select(selector).boundingClientRect(rect => resolve(rect)).exec()
+    })
+  })
+}

src/pages/PayOrder/index.jsx

@@ -27,8 +27,6 @@ export default withLayout((props) => {
   const [BuyNumber, setBuyNumber] = useState(1);
   const [detail, setDetail] = useState({});
   const [showDialog, setShowDialog] = useState(false);
-  // 监控金额变化
-  const preActPrice = usePrevious(totalPrice?.actualPrice || 0)
 
   const ShowMoldeOn = (e) => {
     if (packageId) {
@@ -81,19 +79,21 @@ export default withLayout((props) => {
           icon: "none",
           duration: 2000,
         });
+        // 跳转到待支付
+        Taro.navigateTo({
+          url: `/pages/MineUserAll/AllOrder/index?tabJump=1`
+        })
       },
     });
   };
 
   const onShowPay = (e) => {
     if (agreement) {
-      const actPrice = totalPrice?.actualPrice || 0
-      const isOrderChanged = actPrice !== preActPrice
-
-      if (payInfo && !isOrderChanged) {
+      if (payInfo) {
         requestPayment(payInfo);
         return;
       }
+
       Taro.showLoading({
         title: '支付中',
       })

src/pages/details/foodDetails/foodDetails.jsx

@@ -13,6 +13,7 @@ import Star from "@/components/Star/Star.jsx";
 import NoData from '@/components/NoData'
 import Cards from "@/components/foodCards/foodCards.jsx";
 import SpinBox from "@/components/Spin/SpinBox";
+import TabIcon from "@/components/HorTabbar/TabIcon";
 import ax from "@/assets/icons/housemantj/onlove.png";
 import yysj from "@/assets/icons/housemantj/openTime.png";
 import dw from "@/assets/icons/housemantj/loc.png";
@@ -272,21 +273,15 @@ export default withLayout((props) => {
           }
         </scroll-view>
       </SpinBox>
-      <view className='index-tabber bottomTab'>
-        <Button openType='share' className='sharebtn'>
-          分享
-        </Button>
-        <view className='tab'>
-          <image className='share' src={share} />
-          分享
+      <view className='index-tabber weui-tabbar' style={{ background: '#fff' }}>
+        <view className='weui-tabbar__item'>
+          <Button openType='share' className='purebtn'><TabIcon icon={share} text='分享' /></Button>
         </view>
-        <view className='tab' onClick={toggleLike}>
-          <image className='good' style={{ top: '1px' }} src={isLike > 0 ? baozan : weibaozan} />
-          {isLike > 0 ? "已爆赞" : "爆赞"}
+        <view className='weui-tabbar__item' onClick={toggleLike}>
+          <TabIcon icon={isLike > 0 ? baozan : weibaozan} text={isLike > 0 ? "已爆赞" : "爆赞"} />
         </view>
-        <view className='tab' onClick={toggleSave}>
-          <image className='collection' src={isSaved > 0 ? ax : good} />
-          {isSaved > 0 ? "已收藏" : "加入收藏"}
+        <view className='weui-tabbar__item' onClick={toggleSave}>
+          <TabIcon icon={isSaved > 0 ? ax : good} text={isSaved > 0 ? "已收藏" : "加入收藏"} />
         </view>
       </view>
     </view>

src/pages/details/foodDetails/foodDetails.less

@@ -181,33 +181,4 @@
   text-align: center;
   padding: 40px 0 68px 0;
   background-color: #f8f8f8;
-}
-.bottomTab {
-  background: #fff;
-  border-radius: 12px;
-  column-count: 3;
-  text-align: center;
-  height: 23vw;
-
-  .sharebtn {
-    position: absolute;
-    width: 260px;
-    opacity: 0;
-    bottom: 15px;
-  }
-  .tab {
-    line-height: 96px;
-    font-size: 28px;
-    font-weight: bold;
-    color: #202020;
-    position: relative;
-    top: 15px;
-    image {
-      width: 31px;
-      height: 31px;
-      position: relative;
-      top: 7px;
-      margin-right: 12px;
-    }
-  }
-}
+}

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -11,6 +11,7 @@ import weibaozan from '@/assets/icons/housemantj/unLike.png'
 import zhuandao from "@/assets/icons/housemantj/backTop.png";
 import withLayout from '@/layouts'
 import SpinBox from "@/components/Spin/SpinBox";
+import TabIcon from '@/components/HorTabbar/TabIcon'
 import { useState, useEffect } from 'react'
 import { getTouristDetail, getExtendContent, getRecommendList } from '@/services/home'
 import { Swiper, SwiperItem, Button } from '@tarojs/components';
@@ -176,16 +177,16 @@ export default withLayout((props) => {
           <view className='bottom'>这是我的底线</view>
         </scroll-view>
       </SpinBox>
-      <view className='index-tabber bottomTab'>
-        <Button openType='share' className='sharebtn'>分享</Button>
-        <view className='tab'>
-          <image className='share' src={share} />分享
+      
+      <view className='index-tabber weui-tabbar' style={{ background: '#fff' }}>
+        <view className='weui-tabbar__item'>
+          <Button openType='share' className='purebtn'><TabIcon icon={share} text='分享' /></Button>
         </view>
-        <view className='tab' onClick={toggleLike}>
-          <image className='good' style={{ top: '1px' }} src={isLike > 0 ? baozan : weibaozan} />{isLike > 0 ? '已爆赞' : '爆赞'}
+        <view className='weui-tabbar__item' onClick={toggleLike}>
+          <TabIcon icon={isLike > 0 ? baozan : weibaozan} text={isLike > 0 ? "已爆赞" : "爆赞"} />
         </view>
-        <view className='tab' onClick={toggleSave}>
-          <image className='collection' src={isSaved > 0 ? ax : good} />{isSaved > 0 ? '已收藏' : '加入收藏'}
+        <view className='weui-tabbar__item' onClick={toggleSave}>
+          <TabIcon icon={isSaved > 0 ? ax : good} text={isSaved > 0 ? "已收藏" : "加入收藏"} />
         </view>
       </view>
     </view>

src/pages/details/mjDetails/sceneryDetails.less

@@ -148,33 +148,3 @@
   padding: 40px 0 60px 0;
   background-color: #f8f8f8;
 }
-
-.bottomTab {
-  background: #fff;
-  border-radius: 12px;
-  column-count: 3;
-  text-align: center;
-  height: 23vw;
-
-  .sharebtn {
-    position: absolute;
-    width: 260px;
-    opacity: 0;
-    bottom: 15px;
-  }
-  .tab {
-    line-height: 96px;
-    font-size: 28px;
-    font-weight: bold;
-    color: #202020;
-    position: relative;
-    top: 15px;
-    image {
-      width: 31px;
-      height: 31px;
-      position: relative;
-      top: 7px;
-      margin-right: 12px;
-    }
-  }
-}

src/pages/index/tabs/Guide.jsx

@@ -107,7 +107,8 @@ export default (props) => {
     }
   })
 
-
+  const parkingGps = taRoomContent?.parkingLocation
+  const roomGps = taRoomContent?.location
   useEffect(() => {
 
     if (roomId) {
@@ -208,33 +209,44 @@ export default (props) => {
                 </view>
               </view>
               {/* --------房屋位置-------- */}
-
-              <view className='room-box-info-HouLocation'>
-                <view className='room-bi-name-HouLocation' >
-                  <view className='room-bin-title-HouLocation'>房屋位置</view>
-                  <view className='room-bint-nameInfo-HouLocation'>
-                    <view className='room-bint-nameInfo-bool-HouLocation' >{taRoomContent?.address}</view>
-                    <view className='room-bintn-button-HouLocation' onClick={() => { goRoomMap() }} style={{ display: wifiButtonStyle }}>
-                      <image className='room-bintn-image-HouLocation' src={GPS} />
-                      <text className='room-bintn-text-HouLocation'>去这里</text>
+              {
+                !roomGps ? <view></view>
+                  :
+                  <view className='room-box-info-HouLocation'>
+                    <view className='room-bi-name-HouLocation' >
+                      <view className='room-bin-title-HouLocation'>房屋位置</view>
+                      <view className='room-bint-nameInfo-HouLocation'>
+                        <view className='room-bint-nameInfo-bool-HouLocation' >{taRoomContent?.address}</view>
+                        <view className='room-bintn-button-HouLocation' onClick={() => { goRoomMap() }} style={{ display: wifiButtonStyle }}>
+                          <image className='room-bintn-image-HouLocation' src={GPS} />
+                          <text className='room-bintn-text-HouLocation'>去这里</text>
+                        </view>
+                      </view>
                     </view>
                   </view>
-                </view>
-              </view>
-              {/* --------停车场-------- */}
 
-              <view className='room-box-info-Parking'>
-                <view className='room-bi-name-Parking' >
-                  <view className='room-bin-title-Parking'>停车位置</view>
-                  <view className='room-bint-nameInfo-Parking'>
-                    <view className='room-bint-nameInfo-bool-Parking' >{taRoomContent?.parkingAddress}</view>
-                    <view className='room-bintn-button-Parking' onClick={() => { goParkMap() }} style={{ display: wifiButtonStyle }}>
-                      <image className='room-bintn-image-Parking' src={GPS} />
-                      <text className='room-bintn-text-Parking'>去这里</text>
+              }
+
+
+              {/* --------停车场-------- */}
+              {
+                !parkingGps ? <view></view>
+                  :
+                  <view className='room-box-info-Parking'>
+                    <view className='room-bi-name-Parking' >
+                      <view className='room-bin-title-Parking'>停车位置</view>
+                      <view className='room-bint-nameInfo-Parking'>
+                        <view className='room-bint-nameInfo-bool-Parking' >{taRoomContent?.parkingAddress}</view>
+                        <view className='room-bintn-button-Parking' onClick={() => { goParkMap() }} style={{ display: wifiButtonStyle }}>
+                          <image className='room-bintn-image-Parking' src={GPS} />
+                          <text className='room-bintn-text-Parking'>去这里</text>
+                        </view>
+                      </view>
                     </view>
                   </view>
-                </view>
-              </view>
+
+              }
+
 
               {/* --------无线网-------- */}
               <view className='room-box-info-WIFIContent'>

src/pages/index/tabs/Recommend.jsx

@@ -1,13 +1,14 @@
 import Taro, { useDidShow } from '@tarojs/taro'
 import { React, useState, useEffect, useRef } from 'react'
+import { View } from '@tarojs/components';
 import iconsearch from '@/assets/icons/housemantj/search.png'
 import locationimg from '@/assets/icons/housemantj/location.png'
 import Tip from '@/components/tip'
 import List from '@/components/List';
+import NoData from '@/components/NoData'
+import MasonryLayout from '@/components/MasonryLayout';
 import { getIndexType, getResourceList } from '@/services/home'
-import { View } from '@tarojs/components';
 import Card from '../components/Card'
-import NoData from '@/components/NoData'
 import './less/Recommend.less'
 
 
@@ -107,6 +108,11 @@ export default (props) => {
         params={queryParams}
         onDataChange={setAllList}
       >
+        {/* <MasonryLayout
+          list={alllist}
+          render={item => <Card item={item} />}
+        /> */}
+
         {
           alllist.length == 0 ?
             <NoData /> :