flx

src/components/CollectList/MyCollect/style.less

@@ -1,5 +1,5 @@
 .View-box-LR {
-  margin: 30px 0;  
+  margin: 30px 0;
   .cpn-card-text {
     font-size: 24px;
     font-weight: 400;
@@ -31,19 +31,21 @@
     display: flex;
     margin-top: 10px;
     position: relative;
-    .wdscbaozan{
-    .title-on {
-      width: 28px;
-      height: 28px;
-      padding-right: 10px;
+    .wdscbaozan {
       position: relative;
-      top: 0.1em;
-    }
-    .title-on-text {
-      align-items: center;
-      font-size: 22px;
-      color: #333;
+      left: 5vh;
+      .title-on {
+        width: 28px;
+        height: 28px;
+        padding-right: 10px;
+        position: relative;
+        top: 0.1em;
+      }
+      .title-on-text {
+        align-items: center;
+        font-size: 22px;
+        color: #333;
+      }
     }
   }
-  }
-}
+}

src/components/CompoentsOrder/OrderCard/index.jsx

@@ -103,7 +103,7 @@ export default (props) => {
                     <view className={item.isVerified == 1 ? 'title-time' : ''}>
                       {
                         sh == 1 ? '有效期：' + formatTime(item.endTime, "yyyy/MM/dd") :
-                          item.isVerified == 1 ? '核销时间 :' + formatTime(item?.verifiedDate, "yyyy/MM/dd") :
+                          item.isVerified == 1 ? '' + formatTime(item?.verifiedDate, "yyyy/MM/dd hh:mm:ss") :
                             '有效期：' + formatTime(item?.startTime, "yyyy/MM/dd") + '-' +
                             formatTime(item.endTime, "yyyy/MM/dd")
                       }
@@ -115,7 +115,9 @@ export default (props) => {
           </CouponCard>
         </SlideViewOrder>
           :
-          <CouponCard action={PayAction}>
+          <CouponCard onClick={() => {
+            item.status === 1 && item.isVerified == false ? Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` }) : ''
+          }} action={PayAction} >
             <CouponMedia>
               <CouponMedia.Header
                 cashback={item.cashback}
@@ -137,7 +139,7 @@ export default (props) => {
                     <view className={item.isVerified == 1 ? 'title-time' : ''}>
                       {
                         sh == 1 ? '有效期：' + formatTime(item.endTime, "yyyy/MM/dd") :
-                          item.isVerified == 1 ? '核销时间 :' + formatTime(item?.verifiedDate, "yyyy/MM/dd") :
+                          item.isVerified == 1 ? '' + formatTime(item?.verifiedDate, "yyyy/MM/dd hh:mm:ss") :
                             '有效期：' + formatTime(item?.startTime, "yyyy/MM/dd") + '-' +
                             formatTime(item.endTime, "yyyy/MM/dd")
                       }

src/hotel/pages/landlord/landlord.less

@@ -1,20 +1,21 @@
-.bottomTab{
+.bottomTab {
   height: 98px;
   line-height: 98px;
-  font-size: 30px;     
+  font-size: 30px;
   font-weight: bold;
   color: #202020;
-  .incomeTab{
+
+  .incomeTab {
     color: #666;
   }
-  .houseTab{
+  .houseTab {
     color: #666;
   }
-  image{
+  image {
     width: 31px;
     height: 31px;
     position: relative;
     top: 7px;
     margin-right: 12px;
   }
-}
+}

src/pages/details/foodDetails/foodDetails.jsx

@@ -272,7 +272,7 @@ export default withLayout((props) => {
           }
         </scroll-view>
       </SpinBox>
-      <view className='bottomTab custom-tabbar'>
+      <view className='bottomTab'>
         <Button openType='share' className='sharebtn'>
           分享
         </Button>

src/pages/details/foodDetails/foodDetails.less

@@ -187,6 +187,8 @@
   border-radius: 12px;
   column-count: 3;
   text-align: center;
+  height: 6em;
+
   .sharebtn {
     position: absolute;
     width: 260px;

src/pages/details/mjDetails/sceneryDetails.less

@@ -1,126 +1,130 @@
-.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: 22px;
-    .introduce{
+    .introduce {
       display: inline-block;
-      .storeName{
-        font-size: 32px;         
+      .storeName {
+        font-size: 32px;
         font-weight: bold;
         color: #020200;
       }
     }
-    .bz{
+    .bz {
       float: right;
-      .bzRight{
-        font-size: 24px;         
+      .bzRight {
+        font-size: 24px;
         color: #202020;
         line-height: 34px;
         height: 23px;
       }
     }
-    .wz{
-      font-size: 24px;      
+    .wz {
+      font-size: 24px;
       padding: 30rpx 0 32rpx 0;
       font-weight: bold;
       color: #404040;
     }
-    .dpPosition{
+    .dpPosition {
       position: relative;
-      .dwTip{
+      .dwTip {
         width: 28px;
         height: 28px;
         position: absolute;
         top: 4px;
-        left:0;
+        left: 0;
       }
-      .distance{
+      .distance {
         padding-left: 38px;
-        font-size: 24px;         
-        color: #C0C8D3;        
-        .zhuandao{
+        font-size: 24px;
+        color: #c0c8d3;
+        .zhuandao {
           width: 14px;
           height: 24px;
           transform: rotate(180deg);
           position: relative;
           left: 8px;
           top: 5px;
-        }        
+        }
       }
     }
   }
 }
-.jdjs{
-  background: #FFF;
+.jdjs {
+  background: #fff;
   border-radius: 12px 12px 0px 0px;
   padding: 30px 20px 43px 20px;
   text-align: justify;
-  font-size: 24px;   
+  font-size: 24px;
   font-weight: bold;
   color: #202020;
   line-height: 54px;
   overflow: hidden;
-  .line{
+  .line {
     height: 1px;
     background: #000;
     opacity: 0.1;
-    margin:57px 0 42px 0;
+    margin: 57px 0 42px 0;
   }
-  .sc{
-    font-size: 20px;     
+  .sc {
+    font-size: 20px;
     font-weight: bold;
     color: #333;
     float: right;
     line-height: 0;
     margin-right: 4px;
-    .scTip{
+    .scTip {
       width: 20px;
       height: 20px;
       margin-right: 8px;
     }
   }
 }
-.title{
-  margin: 60px 0 40px 0; 
-  font-size: 34px;      
+.title {
+  margin: 60px 0 40px 0;
+  font-size: 34px;
   font-weight: bold;
   color: #202020;
-  image{
+  image {
     width: 30px;
     height: 30px;
     margin-right: 10px;
   }
 }
-.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;
@@ -129,38 +133,40 @@
   bottom: -130px;
   padding-top: 77px;
   padding-bottom: 20px;
-  .moreTip{
+  .moreTip {
     width: 38px;
     height: 19px;
     margin-top: 14px;
   }
 }
 
-.bottom{
-  font-size: 28px;    
-  color: #C0C8D3;
+.bottom {
+  font-size: 28px;
+  color: #c0c8d3;
   line-height: 34px;
   text-align: center;
-  padding:40px 0 60px 0;
-  background-color: #F8F8F8;
+  padding: 40px 0 60px 0;
+  background-color: #f8f8f8;
 }
 
-.bottomTab{
-  background: #FFF;
+.bottomTab {
+  background: #fff;
   border-radius: 12px;
   column-count: 3;
-  text-align: center; 
-  .sharebtn{
+  text-align: center;
+  height: 6em;
+
+  .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;
@@ -168,4 +174,4 @@
       margin-right: 12px;
     }
   }
-}
+}

src/pages/index/index.jsx

@@ -9,19 +9,22 @@ import tips from '@/assets/icons/UserCenter/tips.png'
 import { getHotelDetail } from '@/services/landlord'
 import { getTaRoom } from '@/services/taRoom​'
 import withLayout from '@/layouts'
+import { useModel } from "@/store";
 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 './index.less'
 
 
 
 export default withLayout((props) => {
   const { router, person, location } = props
-  const { roomId, roomOrderId } = router.params
+  let { roomId, roomOrderId } = router.params
+  const { roomId: rid } = useModel('hotel')
 
   const { params, path } = router
   const { tab } = params || {}
@@ -35,6 +38,12 @@ export default withLayout((props) => {
 
   const [isDidShow, setIsDidShow] = useState(0)
 
+  if (!roomId && rid) {
+    roomId = rid
+  }
+
+
+
   useDidShow(() => {
     setIsDidShow(isDidShow + 1)
   })

src/shop/pages/spread/spreadIndex.less

@@ -1,20 +1,20 @@
-.bottomTab{
+.bottomTab {
   height: 98px;
   line-height: 98px;
-  font-size: 30px;     
+  font-size: 30px;
   font-weight: bold;
   color: #202020;
-  .orderstab{
+  .orderstab {
     color: #666;
   }
-  .spreadtab{
+  .spreadtab {
     color: #666;
   }
-  image{
+  image {
     width: 31px;
     height: 31px;
     position: relative;
     top: 7px;
     margin-right: 12px;
   }
-}
+}