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

src/components/foodCards/foodCards.jsx

     <view className='foodCard'>
       <view className='fCleft'>
         <view className='fCleft_header'>
-          <view>
+          <view style={{flex:"none"}}>
             <view className='backMoney'>
               返现￥{(item.cashback / 100).toFixed(2)}
             </view>

src/components/foodCards/style.less

 
     .appraise {
       display: inline-block;
-
       image{
         width: 21px;
         height: 21px;
         color: #333;
         .rmb{
           font-size: 24px;             
-          margin: 0 8px 0 7px;
+          margin-right:8px;
         }
         .p1{
           font-size: 24px;     

src/pages/details/foodDetails/foodDetails.jsx

         >
           <view className="storeDetails">
             <Swiper
-              className=".swiper"
+              className="swiper"
               circular
               current={index}
               onChange={handchange}
             >
               {imglist.map((item) => (
                 <SwiperItem>
-                  <image src={item.url} className="storeImage">
+                  <image src={item.url} mode='aspectFit' className="storeImage">
                     <view className="tpPage">
                       <text>
                         {index + 1}/{imglist.length}

src/pages/details/foodDetails/foodDetails.less

   color: #202020;
   text-align: center;
   position: absolute;
-  bottom: -40px;
+  bottom: -100px;
   padding-top: 77px;
   padding-bottom: 20px;
   .moreTip{

src/pages/details/mjDetails/sceneryDetails.jsx

         <scroll-view scrollY style={{ height: '100%' }}>
           <view className='storeDetails'>
             <Swiper
-              className='.swiper'
+              className='swiper'
               circular
               current={index}
               onChange={handchange}
               {
                 imglist.map((item) =>
                   <SwiperItem>
-                    <image src={item.url} className='storeImage' >
+                    <image src={item.url}  mode='aspectFit' className='storeImage' >
                       <view className='tpPage'>
                         <text>{index + 1}/{imglist.length}</text>
                       </view>

src/pages/details/mjDetails/sceneryDetails.less

     }
     .wz{
       font-size: 24px;      
-      line-height: 0;
       padding: 30rpx 0 32rpx 0;
       font-weight: bold;
       color: #404040;
   color: #202020;
   text-align: center;
   position: absolute;
-  bottom: -40px;
+  bottom: -100px;
   padding-top: 77px;
   padding-bottom: 20px;
   .moreTip{

src/shop/components/Sparead/spreadMoney.jsx

 
   return (
     <view>
-      <view>
-      </view>
       <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
       <view style={{ padding: '30rpx', height: '100%' }}>
-        <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
           <view className='storexx'>
             <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择商铺" value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
             <view onClick={ShowMoldeOn} className='User-info-cutover'>
             render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
           >
           </List>
-        </scroll-view>
       </view>
-
     </view>
   )
 }