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

src/components/foodCards/foodCards.jsx

 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
 
 //套餐卡片
 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

       flex: 1;
     }
   }
+}
+.packageDetail{
+  Image{
+    width: 100%;
+  }
+  .weui-dialog__bd{
+    padding: 0;
+    margin: 0;
+  }
 }

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

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

src/pages/details/foodDetails/foodDetails.jsx

       imageUrl: detail.poster,
     };
   });
-
+ const [isScroll,setScroll]=useState(true)
   return (
     <view className='page-index'>
       <view className='index-navbar'>
       </view>
       <SpinBox loading={loading} className='index-container' style={{ padding: '0 30rpx' }}>
         <scroll-view
-          scrollY
+          scrollY={isScroll}
           style={{ height: '100%' }}
         >
           <view className='storeDetails'>
                     <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