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

src/components/CompoentsOrder/OrderCard/index.jsx

@@ -1,6 +1,9 @@
 import Taro from "@tarojs/taro";
 import { View, Text } from '@tarojs/components'
 import formatTime from "@/utils/formatTime";
+import SlideViewOrder from '@/components/SlideViewOrder';
+import { getOrderSub, deleteOrder } from "@/services/payOrder";
+
 import CouponCard from '@/components/CouponCard'
 import QRcode from "@/assets/icons/UserCenter/QRcode.png";
 import refund from "@/assets/icons/GuideCheck/refund.png";
@@ -17,7 +20,7 @@ const CouponMedia = CouponCard.Media
 const Action = CouponCard.Action
 
 export default (props) => {
-  const { item, setShowCutover, show, sh, kkp } = props
+  const { item, setShowCutover, show, sh, kkp, handeDelete } = props
 
   const handleDetail = () => {
     if (item.status === 0) {
@@ -27,6 +30,8 @@ export default (props) => {
     }
   }
 
+
+
   //核销
   const onWriteOff = (item) => {
     Taro.scanCode({
@@ -70,44 +75,45 @@ export default (props) => {
                   item.isVerified == true && item.isEvaluated > 0 ? <Action.Image image={Evaluated} /> :
                     item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : null
 
-
   return (
     <>
       {
-        sh != '1'|| kkp == '1'? <view className='OrderNumber'>订单编号：{item.orderId}</view> : null
+        sh != '1' || kkp == '1' ? <view className='OrderNumber'>订单编号：{item.orderId}</view> : null
       }
-      <CouponCard action={PayAction}>
-        <CouponMedia>
-          <CouponMedia.Header
-            cashback={item.cashback}
-            image={item.poster}
-            badge='food'
-          />
-          <CouponMedia.Body star={kkp == '1' ? 'ss' : item.score}>
-            <View className='orderCard'>
-              <View className='cpn-card-text'>
-                <View style={{ flex: '1' }}>{(item.packageDescription).toString().length > 25 ? (item.packageDescription).substring(0, 25) + '...' : (item.packageDescription)}</View>
-                <text className={kkp == '1' ? 'shanchu' : 'title-money-2'}>
-                  数量：{item.amount}张
-                </text>
-              </View>
-              <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
-                <Text className='cpn-card-text_mn'>￥{`${(item.unitPrice / 100)?.toFixed(2)}元`}</Text>
-              </View>
-              <View className='cpn-md-act'>
-                <view className={item.isVerified == 1 ? 'title-time' : ''}>
-                  {
-                    sh == 1 ? '有效期：' + formatTime(item.endTime, "yyyy/MM/dd") :
-                      item.isVerified == 1 ? '核销时间 :' + formatTime(item?.verifiedDate, "yyyy/MM/dd") :
-                        '有效期：' + formatTime(item?.startTime, "yyyy/MM/dd") + '-' +
-                        formatTime(item.endTime, "yyyy/MM/dd")
-                  }
-                </view>
+      <SlideViewOrder del onDelete={() => handeDelete(item)} >
+        <CouponCard action={PayAction}>
+          <CouponMedia>
+            <CouponMedia.Header
+              cashback={item.cashback}
+              image={item.poster}
+              badge='food'
+            />
+            <CouponMedia.Body star={kkp == '1' ? 'ss' : item.score}>
+              <View className='orderCard'>
+                <View className='cpn-card-text'>
+                  <View style={{ flex: '1' }}>{(item.packageDescription).toString().length > 25 ? (item.packageDescription).substring(0, 25) + '...' : (item.packageDescription)}</View>
+                  <text className={kkp == '1' ? 'shanchu' : 'title-money-2'}>
+                    数量：{item.amount}张
+                  </text>
+                </View>
+                <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
+                  <Text className='cpn-card-text_mn'>￥{`${(item.unitPrice / 100)?.toFixed(2)}元`}</Text>
+                </View>
+                <View className='cpn-md-act'>
+                  <view className={item.isVerified == 1 ? 'title-time' : ''}>
+                    {
+                      sh == 1 ? '有效期：' + formatTime(item.endTime, "yyyy/MM/dd") :
+                        item.isVerified == 1 ? '核销时间 :' + formatTime(item?.verifiedDate, "yyyy/MM/dd") :
+                          '有效期：' + formatTime(item?.startTime, "yyyy/MM/dd") + '-' +
+                          formatTime(item.endTime, "yyyy/MM/dd")
+                    }
+                  </view>
+                </View>
               </View>
-            </View>
-          </CouponMedia.Body>
-        </CouponMedia>
-      </CouponCard>
+            </CouponMedia.Body>
+          </CouponMedia>
+        </CouponCard>
+      </SlideViewOrder>
     </>
   )
 }

src/components/CompoentsOrder/complete/index.jsx

@@ -7,6 +7,7 @@ import AlreadyUsed from "../AlreadyUsed";
 import OrderCard from '../OrderCard'
 import "./style.less";
 import { View } from "@tarojs/components";
+import SlideViewOrder from '@/components/SlideViewOrder';
 
 
 const dict = {
@@ -117,11 +118,11 @@ export default (props) => {
                 /* 待支付 */
                 if (item.status === 0) {
                   return (
-                    <mp-slideview buttons={button} onButtontap={() => slideButtonTap(item)} icon >
-                      <view key={`${type}-${item.orderId}`}  >
-                        <OrderCard item={item} />
-                      </view>
-                    </mp-slideview>
+                    // <SlideViewOrder del onDelete={() => slideButtonTap(item)}>
+                    <view key={`${type}-${item.orderId}`}  >
+                      <OrderCard item={item} handeDelete={slideButtonTap} />
+                    </view>
+                    // </SlideViewOrder>
                   );
                 }
                 /* 已使用 */

src/components/SlideViewOrder/index.jsx

@@ -0,0 +1,97 @@
+
+import React, { useEffect, useMemo, useRef, useState } from 'react'
+import Taro from '@tarojs/taro';
+import { ScrollView, View, Image, Text } from '@tarojs/components';
+import deleteIcon from '@/assets/icons/landlord/delete.png';
+import './style.less'
+
+export default (props) => {
+  const { className, action, del, onDelete } = props;
+
+  const contextRef = useRef()
+  const contentHeightRef = useRef(0)
+  const [actStyle, setActStyle]= useState()
+
+  const uqClass = useMemo(() => `f-${Math.random().toString(36).substring(2)}`, [])
+  const classes = [className, 'slideview-wrapper', uqClass].filter(Boolean).join(' ');
+
+  const handleScrollLeft = () => {
+    if (contextRef.current) {
+      contextRef.current.scrollIntoView('.slideview-content')
+    }
+  }
+
+  const handleScrollRight = () => {
+    if (contextRef.current) {
+      contextRef.current.scrollIntoView('.slideview-actions')
+    }
+  }
+
+  const handleDelete = (e) => {
+    if (onDelete) {
+      onDelete(e)
+    }
+  }
+
+  useEffect(() => {
+    Taro.nextTick(() => {
+      Taro.createSelectorQuery()
+      .select(`.${uqClass}`)
+      .node()
+      .exec((res) => {
+        contextRef.current = res[0].node;
+      })
+    })
+  }, [])
+
+  useEffect(() => {
+    Taro.nextTick(() => {
+      // 不清楚为什么, 此处获取高度一直不准确
+      const t = setTimeout(() => {
+        Taro.createSelectorQuery()
+        .select(`.${uqClass}`)
+        .boundingClientRect()
+        .exec((res) => {
+          if (res && res[0]) {
+            const { height } = res[0]
+            if (height && height !== contentHeightRef.current) {
+              setActStyle({
+                height: `${height}px`,
+              })
+              contentHeightRef.current = height
+            }
+          }
+        })
+        clearTimeout(t)
+      }, 500)
+    })
+  })
+
+  return (
+    <ScrollView
+      className={classes}
+      upperThreshold={20}
+      lowerThreshold={20}
+      scrollX
+      scrollWithAnimation
+      enhanced
+      onScrollToUpper={handleScrollLeft}
+      onScrollToLower={handleScrollRight}
+    >
+      <View className='slideview-content'>{props.children}</View>
+      <View className='slideview-actions' style={actStyle}>
+        <View className='slideview-action'>
+          {
+            del && (
+              <View className='slideview-action_delete' onClick={handleDelete}>
+                <Image src={deleteIcon} />
+                <View>删除</View>
+              </View>
+            )
+          }
+          {action}
+        </View>
+      </View>
+    </ScrollView>
+  )
+}

src/components/SlideViewOrder/style.less

@@ -0,0 +1,52 @@
+.slideview-wrapper {
+  box-sizing: border-box;
+  white-space: nowrap;
+
+  &::-webkit-scrollbar{
+    width: 0;
+    height: 0;
+    color: transparent;
+  }
+
+  .slideview-content {
+    min-width: 100%;
+    display: inline-block;
+    vertical-align: middle;
+  }
+
+  .slideview-actions {
+    display: inline-block;
+    vertical-align: middle;
+    margin: 0 20px;
+    background: #FFFFFF;
+    box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
+    border-radius: 12px;
+
+    .slideview-action {
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      
+      &_delete {
+        display: block;
+        flex: none;
+        height: 74px;
+        width: 67px;
+        text-align: center;
+        padding: 10px;
+        font-size: 24px;
+        font-weight: bold;
+        color: #FF3434;
+
+        & > image {
+          width: 28px;
+          height: 30px;
+          display: block;
+          margin: 0 auto 20px;
+        }
+      }
+    }
+
+  }
+}

src/components/Spin/SpinBox.jsx

@@ -0,0 +1,24 @@
+
+import React, { useMemo } from 'react'
+import { View } from '@tarojs/components'
+import Spin from '.'
+import './style.less'
+
+export default (props) => {
+  const { className, style, loading, size = '64rpx', ...leftProps } = props
+
+  const cls = useMemo(() => [className, 'loading-wrapper'].filter(Boolean).join(' '), [className])
+
+  return (
+    <View className={cls} style={style}>
+      {
+        loading && (
+          <View className='loading-box'>
+            <Spin size={size} {...leftProps} />
+          </View>
+        )
+      }
+      {props.children}
+    </View>
+  )
+}

src/components/Spin/style.less

@@ -130,3 +130,22 @@
     transform: translate(-50%, -50%);
   }
 }
+
+
+.loading-wrapper {
+  position: relative;
+
+  .loading-box {
+    position: absolute;
+    z-index: 10;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    min-height: 72px;
+    padding-top: 60%;
+    padding-left: 50%;
+    background: rgba(255, 255, 255, .95);
+    box-sizing: border-box;
+  }
+}

src/components/add-tips/index.js

@@ -0,0 +1,69 @@
+
+const STORAGE_KEY = 'PLUG-ADD-MYAPP-KEY'
+Component({
+  properties: {
+    name: {
+      type: String,
+      value: '测试'
+    },
+    duration: {
+      type: Number,
+      value: 10
+    },
+    delay: {
+      type: Number,
+      value: 2
+    },
+    logo: {
+      type: String,
+      value: 'https://cdn.blog.makergyt.com/mini/assets/component-add_tips.png'
+    },
+    custom: {
+      type: Boolean,
+      value: false
+    }
+  },
+  lifetimes: {
+    attached: function () {
+      if (wx.getStorageSync(STORAGE_KEY)) return;
+      let rect = wx.getMenuButtonBoundingClientRect ? wx.getMenuButtonBoundingClientRect() : null
+      let { screenWidth } = wx.getSystemInfoSync()
+      this.setData({
+        navbarHeight: rect.bottom,
+        arrowR: screenWidth - rect.right + rect.width * 3 / 4 - 5,
+        bodyR: screenWidth - rect.right
+      })
+      this.startTimer = setTimeout(() => {
+        this.setData({
+          SHOW_TOP: true
+        })
+      }, this.data.delay * 1000)
+      this.duraTimer = setTimeout(() => {
+        this.shrink();
+      }, (this.data.duration + this.data.delay) * 1000)
+    },
+    detached: function () {
+      if (this.startTimer) clearTimeout(this.startTimer)
+      if (this.duraTimer) clearTimeout(this.duraTimer)
+    },
+  },
+  data: {
+    SHOW_TOP: false
+  },
+  methods: {
+    hidden: function () {
+      wx.setStorageSync(STORAGE_KEY, true)
+      this.shrink()
+    },
+    shrink: function () {
+      this.animate('#add-tips', [
+        { scale: [1, 1] },
+        { scale: [0, 0], ease: 'ease', transformOrigin: `calc(600rpx - ${this.data.arrowR}px) 1%` }
+      ], 500, function () {
+        this.setData({
+          SHOW_TOP: false
+        })
+      }.bind(this))
+    }
+  }
+})

src/components/add-tips/index.json

@@ -0,0 +1,3 @@
+{
+  "component": true
+}

src/components/add-tips/index.wxml

@@ -0,0 +1,7 @@
+<view class="box" wx:if="{{SHOW_TOP}}" style="top:{{custom?navbarHeight:0}}px;" id="add-tips">
+  <view class='arrow' style="margin-right:{{arrowR}}px;"></view>
+  <view class='body' bindtap='hidden' style="margin-right:{{bodyR}}px;">
+    <image src="{{logo}}" class="logo"></image>
+    <view class="tips"></view>
+  </view>
+</view>

src/components/add-tips/index.wxss

@@ -0,0 +1,49 @@
+.box {
+  position: fixed;
+  right: 0;
+  z-index: 999;
+  display: flex;
+  justify-content: flex-end;
+  align-items: flex-end;
+  flex-direction: column;
+  width: 600px;
+}
+.arrow {
+  width: 0;
+  height: 0;
+  border-width: 5px;
+  border-style: solid;
+  border-color: transparent transparent rgba(0, 0, 0, 0.75) transparent;
+}
+.body {
+  background-color: rgba(0, 0, 0, 0.75);
+  border-radius: 15px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 42px;
+  padding: 10px;
+  zoom: 1.5;
+}
+.tips {
+  height: 200px;
+  width: 200px;
+  flex: 1;
+  color: #fff;
+  font-size: 20px;
+  font-weight: 700;
+}
+.logo {
+  height: 200px;
+  width: 200px;
+  border-radius: 8px;
+  margin-right: 10px;
+}
+
+.button-view {
+  color: #04b040;
+  text-align: center;
+  font-size: 20px;
+  /* line-height: 22px; */
+  display: initial;
+}

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/layouts/Loading.jsx

@@ -22,7 +22,9 @@ export default (props) => {
           position: 'absolute',
           left: '-4vh',
           textAlign: 'center',
-          opacity: '0.8'
+          opacity: '0.8',
+          animation: ' logo-opacity 2s linear infinite',
+
         }}
       >
         收集人间美好

src/pages/MineUserAll/RefundMoney/CheckRefund/style.less

@@ -18,7 +18,6 @@
       .title-title-boss {
         font-size: 32px;
         font-weight: 800;
-
       }
     }
   }
@@ -66,7 +65,7 @@
       color: #ff3434;
     }
   }
-  
+
   .ul-li-text {
     .ul-li-view {
       display: inline-block;
@@ -89,7 +88,7 @@
       margin-top: 60px;
       height: 92px;
       line-height: 92px;
-      background: #1A3B83;      
+      background: #1a3b83;
       border-radius: 12px;
       color: @whiteColor;
       font-size: 30px;

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

@@ -7,6 +7,7 @@ import { getShopDetail, getShopPackage, getExtendContent } 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";
@@ -22,13 +23,15 @@ import "./style.less";
 export default withLayout((props) => {
   const { router, person, location } = props;
   const { id, subOrderId } = props.router.params;
+  const [submiting, setSubmiting] = useState(false)
   const [showDialog, setShowDialog] = useState(false);
   //核销
   const [Consumption, setConsumption] = useState(false);
 
-  const [checked, setChecked] = useState();
+  const [checked, setChecked] = useState([]);
   const [shopContent, setShopContent] = useState([])
 
+  const [loading, setLoading] = useState(false)
   const [list, setList] = useState([]);
 
 
@@ -40,6 +43,7 @@ export default withLayout((props) => {
   }
 
   const getList = (params) => {
+    setLoading(true)
     getVerifyTargetList({
       shopId: id,
       isMine: true,
@@ -50,39 +54,73 @@ export default withLayout((props) => {
       if (res) {
         setList(res.records)
 
-        setChecked(res?.records.filter(x => x.subOrderId == subOrderId)[0]?.verifyNo)
-
-        // if(item.verifyNo==checked)
+        if (res.records && res.records.length > 0) {
+          if (res.records.length === 1) {
+            setChecked([res.records[0].verifyNo])
+          } else {
+            setChecked([res?.records.filter(x => x.subOrderId == subOrderId)[0]?.verifyNo].filter(Boolean))
+          }
+        } else {
+          Taro.navigateBack({ delta: 1 })
+        }
       }
 
-    });
+      setLoading(false)
+    }).catch(() => setLoading(false));
   };
 
   useEffect(() => {
-    getList();
-    getShop();
-  }, []);
+    if (id) {
+      getList();
+      getShop();
+    }
+  }, [id]);
+
+  const handleCheck = (verifyNo) => {
+    const inx = checked.indexOf(verifyNo)
+    if (inx === -1) {
+      setChecked([...checked, verifyNo])
+    } else {
+      const p1 = checked.slice(0, inx)
+      const p2 = checked.slice(inx + 1)
+      setChecked(p1.concat(p2))
+    }
+  }
+
+  const handleVerifyClick = () => {
+    if (!checked || !checked.length) {
+      Taro.showToast({
+        title: '请选择待核销套餐',
+        icon: 'none',
+      })
+
+      return;
+    }
 
-  const ShowMoldeOn = () => {
     setShowDialog(true);
   };
   const ButtonCancel = () => {
     setShowDialog(false);
   };
   const ButtonOK = (e) => {
-    if (!checked) return
-    if (showDialog === true) {
+    if (!submiting) {
       Taro.showLoading({
         title: '核销中'
       })
 
-      putVerifyTarget(checked).then(res => {
+      setSubmiting(true);
+      Promise.all(checked.map(verifyNo => putVerifyTarget(verifyNo)))
+      .then(res => {
         Taro.hideLoading()
+        setSubmiting(false);
         setShowDialog(false);
         setConsumption(true);
-      }).catch(e => {
+      })
+      .catch(e => {
         Taro.hideLoading()
         setShowDialog(false);
+        setSubmiting(false);
+        getList();  // 刷新数据
         Taro.showToast({
           title: '核销失败',
           icon: 'none',
@@ -101,6 +139,8 @@ export default withLayout((props) => {
     }
   };
 
+  const btnText = ['确认核销', checked && checked.length > 0  ? `(${checked.length})` : undefined].filter(Boolean).join(' ')
+
   return (
     <view className='shop-Eat'>      
       <view className='index-navbar'>
@@ -114,7 +154,7 @@ export default withLayout((props) => {
           <button className='button-Cancel' onClick={ButtonCancel}>
             取消
           </button>
-          <button className='button-OK' onClick={ButtonOK}>
+          <button className='button-OK' onClick={ButtonOK} loading={submiting}>
             确定
           </button>
         </view>
@@ -147,10 +187,10 @@ export default withLayout((props) => {
           />
           <text className='shop-title-title'>请选择你要核销的套餐</text>
         </view>
-        <view>
+        <SpinBox loading={loading}>
           {(list || []).map((item) => {
             return (
-              <view class='wrapper' key={item.verifyNo} onClick={() => setChecked(item.verifyNo)}>
+              <view class='wrapper' key={item.verifyNo} onClick={() => handleCheck(item.verifyNo)}>
                 <view class='left-complete-one'>
                   <image className='left-image-1' src={ProCard_hot}></image>
                   <view className='left-viewText'>返现￥{(item.cashback / 100).toFixed(2)}</view>
@@ -182,18 +222,18 @@ export default withLayout((props) => {
                 <view class='right-complete-two'>
                   <view className='right-content'>
                     <view className='Check_OK-box'>
-                      <image className='Check_OK-image' src={item.verifyNo == checked ? Check_OK : Check_NO} />
+                      <image className='Check_OK-image' src={checked.indexOf(item.verifyNo) > -1 ? Check_OK : Check_NO} />
                     </view>
                   </view>
                 </view>
               </view>
             );
           })}
-        </view>
+        </SpinBox>
 
         <view className='button-info'>
-          <Button className='button-box' disabled={!checked} onClick={ShowMoldeOn}>
-            确定核销
+          <Button className='button-box' onClick={handleVerifyClick}>
+            {btnText}
           </Button>
         </view>
       </view>

src/pages/details/foodDetails/foodDetails.jsx

@@ -12,6 +12,7 @@ import { Button, Swiper, SwiperItem } from "@tarojs/components";
 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 ax from "@/assets/icons/housemantj/onlove.png";
 import yysj from "@/assets/icons/housemantj/openTime.png";
 import dw from "@/assets/icons/housemantj/loc.png";
@@ -48,6 +49,7 @@ export default withLayout((props) => {
   }, [id, scene, subOrderId]);
 
   //商铺基础信息
+  const [loading, setLoading] = useState(false)
   const [detail, setDetail] = useState({});
   //商铺套餐
   const [spackage, setPackage] = useState([]);
@@ -104,12 +106,14 @@ export default withLayout((props) => {
 
   useEffect(() => {
     if (id) {
+      setLoading(true)
       getShopDetail(id, { location }).then((res) => {
         setDetail(res);
         log.current = res.locaton.toString().split(",")[0];
         lat.current = res.locaton.toString().split(",")[1];
         setimglist(res.imageList || []);
-      });
+        setLoading(false)
+      }).catch(() => setLoading(false));
       getShopPackage(id).then((res) => {
         setPackage(res.records || []);
         setNewpgNum(res.records.length);
@@ -142,9 +146,7 @@ export default withLayout((props) => {
       <view className='index-navbar'>
         <CustomNav title='十公里' />
       </view>
-      <view
-        style={{ overflow: "hidden", padding: "0 30rpx", height: '100%', background: "#F8F8F8" }}
-      >
+      <SpinBox loading={loading} className='index-container' style={{ padding: '0 30rpx' }}>
         <scroll-view
           scrollY
           style={{ height: '100%' }}
@@ -156,8 +158,8 @@ export default withLayout((props) => {
               current={index}
               onChange={handchange}
             >
-              {imglist.map((item) => (
-                <SwiperItem>
+              {imglist.map((item, inx) => (
+                <SwiperItem key={inx}>
                   <image src={item.url} mode='aspectFit' className='storeImage'>
                     <view className='tpPage'>
                       <text>
@@ -269,8 +271,8 @@ export default withLayout((props) => {
               </>
           }
         </scroll-view>
-      </view>
-      <view className='bottomTab'>
+      </SpinBox>
+      <view className='bottomTab custom-tabbar'>
         <Button openType='share' className='sharebtn'>
           分享
         </Button>

src/pages/details/foodDetails/foodDetails.less

@@ -1,73 +1,73 @@
-.storeDetails{
-  background-color: #fff;  
+.storeDetails {
+  background-color: #fff;
   border-radius: 12px;
   margin-bottom: 20px;
 
-  .swiper{
+  .swiper {
     height: calc((100vw - 60px) * 0.6);
   }
-  .storeImage{
+  .storeImage {
     position: relative;
     border-radius: 22px;
     width: 100%;
     height: 100%;
-    .tpPage{
+    .tpPage {
       position: absolute;
       right: 20px;
       bottom: 20px;
       background: #000000;
-      border-radius: 16px;  
-      font-size: 24px;       
-      color: #FFFFFF;
-      padding:0 7px;
-      opacity: 0.4;  
+      border-radius: 16px;
+      font-size: 24px;
+      color: #ffffff;
+      padding: 0 7px;
+      opacity: 0.4;
       line-height: 32px;
       padding: 7px 8px 8px 7px;
-      text{
+      text {
         opacity: 0.64;
       }
     }
-  }  
-  .storeJs{
+  }
+  .storeJs {
     padding: 20px;
-    .storeName{      
-      font-size: 32px;         
+    .storeName {
+      font-size: 32px;
       font-weight: bold;
       color: #202020;
     }
-    .sprice{
+    .sprice {
       color: #202020;
-      font-size: 32px;         
+      font-size: 32px;
       font-weight: bold;
-      .t1{        
+      .t1 {
         font-size: 24px;
         padding-right: 10px;
       }
-      .bzRight{        
+      .bzRight {
         font-weight: 400;
         font-size: 24px;
         float: right;
       }
     }
-    .appraise{
+    .appraise {
       line-height: 0;
       margin-top: 28px;
       margin-bottom: 37px;
-      font-size: 24px;         
+      font-size: 24px;
       font-weight: bold;
       color: #020200;
-      .t1{
+      .t1 {
         margin-left: 10px;
       }
-      .comment{
+      .comment {
         color: #666;
       }
     }
-    .yysj{
+    .yysj {
       line-height: 0;
       font-size: 24px;
       color: #666;
-      .yysjImg{
+      .yysjImg {
         width: 26px;
         height: 26px;
         position: relative;
@@ -75,50 +75,49 @@
         padding-right: 10px;
       }
     }
-    .dpPosition{
+    .dpPosition {
       margin-top: 40px;
       position: relative;
-      .dwTip{
+      .dwTip {
         width: 28px;
         height: 28px;
         position: absolute;
         top: 4px;
-        left:0;
+        left: 0;
       }
-      view{
-        font-size: 24px;         
+      view {
+        font-size: 24px;
         color: #666666;
         padding-left: 34px;
         padding-bottom: 40px;
-        .zhuandao{
+        .zhuandao {
           width: 14px;
           height: 24px;
           transform: rotate(180deg);
           position: relative;
           left: 8px;
           top: 5px;
-        }        
+        }
       }
-      
     }
   }
 }
-.title{
+.title {
   margin: 59px 0 41px 0;
-  image{
+  image {
     width: 30px;
     height: 30px;
     position: relative;
     top: 5px;
   }
-  text{
-    font-size: 34px;       
+  text {
+    font-size: 34px;
     font-weight: bold;
     color: #202020;
     margin-left: 10px;
   }
 }
-.cs{
+.cs {
   height: 500px;
   // background: rgb(240, 142, 142);
   // background: radial-gradient(circle at top left, transparent 15px, rgb(240, 142, 142) 0) top left,
@@ -126,66 +125,79 @@
   //           radial-gradient(circle at bottom left, transparent 15px, #58a 0) bottom left,
   //           radial-gradient(circle at bottom right, transparent 15px, #58a 0) bottom right;
 
+  background: radial-gradient(
+        circle at 82% top,
+        transparent 15px,
+        rgb(240, 140, 140) 0
+      )
+      top,
+    radial-gradient(
+        circle at 82% bottom,
+        transparent 15px,
+        rgb(230, 120, 120) 0
+      )
+      bottom;
 
-  background: radial-gradient(circle at 82% top,transparent 15px,rgb(240,140,140) 0) top,
-              radial-gradient(circle at 82% bottom,transparent 15px,rgb(230,120,120) 0) bottom;
-
-background-repeat: no-repeat;
-background-size: auto 50%;
+  background-repeat: no-repeat;
+  background-size: auto 50%;
 }
 
-.showMore{
+.showMore {
   width: 100%;
-  background: linear-gradient(0deg, rgba(248, 248, 248, 0.58) 42%, rgba(248, 248, 248, 0) 100%);
+  background: linear-gradient(
+    0deg,
+    rgba(248, 248, 248, 0.58) 42%,
+    rgba(248, 248, 248, 0) 100%
+  );
   font-size: 28px;
   font-weight: bold;
   color: #202020;
   text-align: center;
   position: absolute;
-  bottom: -100px;
+  bottom: -140px;
   padding-top: 77px;
   padding-bottom: 20px;
-  .moreTip{
+  .moreTip {
     width: 38px;
     height: 19px;
     margin-top: 14px;
   }
 }
-.storezn{
-  font-size: 28px;    
+.storezn {
+  font-size: 28px;
   color: #202020;
   line-height: 54px;
   margin-bottom: 44px;
 }
-.storezn+image{
+.storezn + image {
   width: 100%;
   margin-bottom: 40px;
 }
 
-.botton{
-  font-size: 28px;   
-  color: #C0C8D3;
+.botton {
+  font-size: 28px;
+  color: #c0c8d3;
   line-height: 34px;
   text-align: center;
-  padding:40px 0 68px 0;
-  background-color: #F8F8F8;
+  padding: 40px 0 68px 0;
+  background-color: #f8f8f8;
 }
-.bottomTab{
-  background: #FFF;
+.bottomTab {
+  background: #fff;
   border-radius: 12px;
   column-count: 3;
-  text-align: center;  
-  .sharebtn{
+  text-align: center;
+  .sharebtn {
     position: absolute;
     width: 260px;
     opacity: 0;
   }
-  .tab{
+  .tab {
     line-height: 96px;
-    font-size: 28px;     
+    font-size: 28px;
     font-weight: bold;
     color: #202020;
-    image{
+    image {
       width: 31px;
       height: 31px;
       position: relative;
@@ -193,4 +205,4 @@ background-size: auto 50%;
       margin-right: 12px;
     }
   }
-}
+}

src/pages/index/index.config.js

@@ -11,5 +11,6 @@ export default {
     "mp-cells": "weui-miniprogram/cells/cells",
     "mp-dialog": "weui-miniprogram/dialog/dialog",
     "mp-slideview": "weui-miniprogram/slideview/slideview",
+    "add-tips": "../../components/add-tips/index"
   }
 }

src/pages/index/index.jsx

@@ -1,17 +1,18 @@
 
 
 import React, { useState, useEffect } from 'react'
-import { useDidShow } from '@tarojs/taro'
+import Taro, { useDidShow } from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 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(() => {
@@ -49,9 +50,7 @@ export default withLayout((props) => {
     }
   }, [tab])
 
-  useEffect(() => {
 
-  }, [])
 
   useEffect(() => {
     if (roomId) {
@@ -72,9 +71,12 @@ export default withLayout((props) => {
 
   }, [roomId, hotelId])
 
-
   return (
     <view className='page-index'>
+      <add-tips
+        logo={logo}
+        custom
+        duration={-1} />
       <view className='index-navbar'>
         <CustomNav logo={titleLogo} title={titleRoom} />
       </view>

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";   // 商铺下单成功通知

src/utils/copyTxt.js

@@ -1,38 +0,0 @@
-
-export default function copyTxt(text, fn) { // 复制功能
-  if (typeof document.execCommand !== 'function') {
-    console.log('复制失败，请长按复制')
-    return
-  }
-  var dom = document.createElement('textarea')
-  dom.value = text
-  dom.setAttribute('style', 'display: block;width: 1px;height: 1px;')
-  document.body.appendChild(dom)
-  dom.select()
-  var result = document.execCommand('copy')
-  document.body.removeChild(dom)
-  if (result) {
-    console.log('复制成功')
-    typeof fn === 'function' && fn()
-    return
-  }
-  if (typeof document.createRange !== 'function') {
-    console.log('复制失败，请长按复制')
-    return
-  }
-  var range = document.createRange()
-  var div = document.createElement('div')
-  div.innerhtml = text
-  div.setAttribute('style', 'height: 1px;fontSize: 1px;overflow: hidden;')
-  document.body.appendChild(div)
-  range.selectNode(div)
-  var selection = window.getSelection()
-  console.log(selection)
-  if (selection.rangeCount > 0) {
-    selection.removeAllRanges()
-  }
-  selection.addRange(range)
-  document.execCommand('copy')
-  typeof fn === 'function' && fn()
-  console.log('复制成功')
-}