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

src/components/SearchBar/style.less

@@ -1,41 +1,27 @@
-
 .searchBar{
   margin: 35px 0;
   .weui-search-bar{
     padding: 0px;
     border-radius: 45px;
     background: #F8F8F8;
-
-    .weui-search-bar__label{
-      background: #F8F8F8;
-    }
     .weui-search-bar__form{
       border-radius: 45px;
       background: #F8F8F8;
-      
-
     }
-
     .weui-search-bar__label{
       border-radius: 45px;
       background: #F8F8F8;
-
-
     }
     .weui-search-bar__input{
       text-align: center;
       background: #F8F8F8;
-
-    }
-  
+    }  
     .weui-search-bar__cancel-btn{
       position: relative;
       left: -10px;
       font-size: 31px;
       padding-left: 5px;
       background: #F8F8F8;
-
-
     }
   }
 }

src/components/foodCards/foodCards.jsx

@@ -1,11 +1,13 @@
 import Taro from '@tarojs/taro'
-import { View, Text } from '@tarojs/components'
+import { View, Text, Image, Button, ScrollView } from '@tarojs/components'
 import CouponCard from '@/components/CouponCard'
 import Location from '@/components/Location'
 import { compressImage } from '@/utils'
 import SaveIcon from '@/components/SaveIcon'
 import Pay from '@/assets/icons/housemantj/pay.png'
+import Popup from '@/components/Popup'
 import './style.less'
+import { useState } from 'react'
 
 
 const CouponMedia = CouponCard.Media
@@ -13,26 +15,43 @@ const Action = CouponCard.Action
 
 //套餐卡片
 export default (props) => {
-  const { item, st, det, editable, goshop, scene, subOrderId, id } = props
+  const { item, st, det, editable,setScroll, goshop, scene, subOrderId, id } = props
   const { shopId } = props.item
   const goFood = () => {
     Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${shopId}` })
   }
+  const [showCutover, setShowCutover] = useState(false)
   const goDetail = () => {
-    
+    //打开当前套餐详情弹窗
+    setShowCutover(true)
+    //使父组件禁止滚动
+    setScroll(false)
+  }
+  const onClose = () => {
+    //关闭当前套餐详情弹窗
+    setShowCutover(false)
+    //使父组件恢复滚动
+    setScroll(true)
   }
 
-  // 支付成功--判断---有---问--没有--跳转到全部订单
 
 
   const handlePayClick = () => {
     Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}&scene=${scene || ''}&subOrderId=${subOrderId}&id=${id}` })
-    console.log("🚀 ~ file: foodCards.jsx ~ line 17 ~ scene", item.packageId, scene)
-
   }
   const PayAction = <Action.Icon icon={Pay} text='支付' onClick={handlePayClick} />
   return (
-    <View style={{ margin: '15px 5px' }}>
+    <View style={{ margin: '15px 5px' }} >
+      <View className='packageDetail' style={{display:goshop?'':'none'}}>
+        <Popup show={showCutover} maskClosable={showCutover}  onClose={onClose}>
+          <ScrollView
+            scrollY
+            style={{ maxHeight: '60vh' }}
+          >
+            <Image mode='widthFix' src={item.details ? item.details : item.poster} />
+          </ScrollView>
+        </Popup >
+      </View>
       <CouponCard action={PayAction}>
         <CouponMedia onClick={goshop ? goDetail : goFood}>
           <CouponMedia.Header

src/components/foodCards/style.less

@@ -35,4 +35,13 @@
       flex: 1;
     }
   }
+}
+.packageDetail{
+  Image{
+    width: 100%;
+  }
+  .weui-dialog__bd{
+    padding: 0;
+    margin: 0;
+  }
 }

src/layouts/Loading.jsx

@@ -24,8 +24,7 @@ export default (props) => {
           textAlign: 'center',
           opacity: '0.8',
           animation: ' logo-opacity 2s linear infinite',
-
-          fontSize: '4vw',
+          fontSize: '4.3vw',
         }}
       >
         收集人间美好

src/pages/MineUserAll/AllOrder/index.jsx

@@ -46,16 +46,17 @@ export default withLayout((props) => {
   const handleTabClick = (index) => {
     console.log('------tab-----event--------', index)
     setActiveTab(index)
+
   }
   
   console.log('------setActiveTab--------', activeTab)
 
   return (
     <view className='page-index box-content'>
-      <view className='index-navbar'>
+      <view className='index-navbar'  >
         <CustomNav title='我的订单' />
       </view>
-      <View className='index-container' style={{display:'flex',flexDirection:'column',boxSizing:'border-box'}}>
+      <View className='index-container' style={{ display: 'flex', flexDirection: 'column', boxSizing: 'border-box' }}>
         <view className='index-tabs'>
           <TabBar onClick={handleTabClick} current={activeTab} />
         </view>

src/pages/details/foodDetails/foodDetails.config.js

@@ -2,6 +2,8 @@ export default {
   navigationBarTitleText: '美食详情',
   navigationStyle: 'custom',
   disableScroll: true,
-
-  enableShareAppMessage: true
+  enableShareAppMessage: true,
+  usingComponents: {
+    "mp-dialog": "weui-miniprogram/dialog/dialog",
+  }
 }

src/pages/details/foodDetails/foodDetails.jsx

@@ -126,7 +126,7 @@ export default withLayout((props) => {
       imageUrl: detail.poster,
     };
   });
-
+ const [isScroll,setScroll]=useState(true)
   return (
     <view className='page-index'>
       <view className='index-navbar'>
@@ -134,7 +134,7 @@ export default withLayout((props) => {
       </view>
       <SpinBox loading={loading} className='index-container' style={{ padding: '0 30rpx' }}>
         <scroll-view
-          scrollY
+          scrollY={isScroll}
           style={{ height: '100%' }}
         >
           <view className='storeDetails'>
@@ -217,7 +217,7 @@ export default withLayout((props) => {
                     <text>返现套餐</text>
                   </view>
                   {(spackage || []).map((item) => (
-                    <Cards scene={scene} id={id} subOrderId={subOrderId} key={item.packageId} editable='1' st={star} goshop='1' item={item} det={detail} />
+                    <Cards scene={scene} id={id} setScroll={setScroll} subOrderId={subOrderId} key={item.packageId} editable='1' st={star} goshop='1' item={item} det={detail} />
                   ))}
                 </view>
                 <view

src/pages/index/tabs/Guide.jsx

@@ -253,7 +253,7 @@ export default (props) => {
             <text className='title-title-boss' >老板推荐好吃的</text>
           </view>
         </view>
-        <view style={{ marginTop: '10rpx', marginBottom: '60rpx' }}>
+        <view style={{ marginTop: '10rpx', paddingBottom: '60rpx' }}>
           {(spackage || []).map((item, index) => <BossCard det={item} st={parseFloat(item.score.toFixed(1))} key={(index)} trackClick={trackClick} taRoomContent={taRoomContent} item={item} />)}
         </view>
       </view>

src/pages/index/tabs/Recommend.jsx

@@ -11,6 +11,7 @@ import { getIndexType, getResourceList } from '@/services/home'
 import { random } from '@/utils'
 import Card from '../components/Card'
 import './less/Recommend.less'
+import { OfficialAccount } from '@tarojs/components'
 
 const listStyle = { height: '100%' }
 
@@ -75,6 +76,7 @@ export default (props) => {
 
   return (
     <view style={{ height: '100%', overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
+      <OfficialAccount>s21</OfficialAccount>
       <view className='search' onClick={onSearch} >
         <input className='searchInput' disabled />
         <image className='searchicon' src={iconsearch} />