。

src/components/BossCard/style.less

@@ -224,76 +224,4 @@
     height: 70%;
     border-left: 1px dashed #595959;
   }
-
-  .view-button {
-
-    position: fixed;
-    bottom: 0px;
-
-    .Card-number-box {
-      .Card-number {
-        width: 100%;
-        height: 96px;
-        background-color: @whiteColor;
-      }
-      .Card-user {
-        width: 100%;
-        height: 96px;
-        background-color: @whiteColor;
-      }
-    }
-    .button-box-button-box {
-      position: relative;
-      .button-text-image {
-        width: 144;
-        height: 45px;
-        position: absolute;
-        top: -35px;
-        left: 267px;
-        right: 305px;
-        z-index: 1;
-        .button-text-money-hot {
-          position: absolute;
-          width: 144px;
-          height: 43px;
-          line-height: 43px;
-          font-size: 24px;
-          font-weight: bold;
-          color: @whiteColor;
-        }
-        .button-image {
-          width: 143px;
-          height: 43px;
-        }
-        .button-text-money {
-          position: absolute;
-          margin-top: -8;
-          width: 157px;
-          font-size: 18px;
-          font-weight: 400;
-          text-decoration: line-through;
-          color: @whiteColor;
-        }
-      }
-      .button-box-one {
-        font-size: 30px;
-        line-height: 92px;
-        margin-top: 3em;
-        background-color: #274190;
-        border-radius: 12px;
-        width: calc(100% - 60px);
-        height: 92px;
-        color: @whiteColor;
-        // position: absolute;
-        bottom: 40px;
-        right: 0;
-        left: 0;
-        .button-text-one {
-          right: 133px;
-          font-size: 30px;
-          padding-left: 220px;
-        }
-      }
-    }
-  }
 }

src/components/CompoentsOrder/complete/style.less

@@ -85,21 +85,21 @@
       }
       //图片
       .title-image {
-        width: 145px;
+        height: 144px;
         margin-left: 20px;
         border-radius: 24px;
         overflow: hidden;
         position: relative;
         .image-1 {
-          width: 100%;
-          height: 145px;
+          width: 144px;
+          height: 144px;
+          margin: 0;
         }
         .image-2 {
           width: 89px;
           height: 34px;
           position: absolute;
           left: 0;
-          top: 0;
         }
       }
       // 商品标题
@@ -194,37 +194,21 @@
     position: relative;
     //右面部分
     .right-content {
-      // width: 100px;
-      height: 120px;
+      width: 60px;
+      height: 134px;
       position: absolute;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%);
-      // border: 1px solid red;
+      top: calc(50% - 45px);
+      left: calc(50% - 30px);
       .right-image-2 {
         width: 76px;
         height: 66px;
         margin-top: 1em;
       }
-      .right-number {
-        // width: 32px;
-        // font-size: 20px;
-        // border-radius: 4px;
-        // border: 2px solid #999;
-        // margin: auto;
-        // text-align: center;
-      }
       .right-image {
-        // float: convert();
         width: 35px;
         height: 34px;
-        margin: 0 auto;
-        align-items: center;
-        margin: auto;
-        padding-left: 8px;
-        // text-align: center;
+        margin-left: calc(50% - 17.5px);
       }
-
       .right-title {
         font-weight: 700;
         font-size: 24px;

src/components/PayOrderCard/index.jsx

@@ -1,7 +1,3 @@
-import withLayout from '@/layouts'
-import useSave from "@/utils/hooks/useSave"
-import image from '@/assets/icons/ProCard/8kb.jpg'
-import AuthPage from '@/components/AuthPage'
 import formatTimes from '@/utils/formatTime'
 import { useState, useEffect } from 'react'
 import { Button, Radio, Input } from '@tarojs/components'

src/components/PayOrderCard/style.less

@@ -225,75 +225,4 @@
     border-left: 1px dashed #595959;
   }
 
-  .view-button {
-
-    position: fixed;
-    bottom: 0px;
-
-    .Card-number-box {
-      .Card-number {
-        width: 100%;
-        height: 96px;
-        background-color: @whiteColor;
-      }
-      .Card-user {
-        width: 100%;
-        height: 96px;
-        background-color: @whiteColor;
-      }
-    }
-    .button-box-button-box {
-      position: relative;
-      .button-text-image {
-        width: 144;
-        height: 45px;
-        position: absolute;
-        top: -35px;
-        left: 267px;
-        right: 305px;
-        z-index: 1;
-        .button-text-money-hot {
-          position: absolute;
-          width: 144px;
-          height: 43px;
-          line-height: 43px;
-          font-size: 24px;
-          font-weight: bold;
-          color: @whiteColor;
-        }
-        .button-image {
-          width: 143px;
-          height: 43px;
-        }
-        .button-text-money {
-          position: absolute;
-          margin-top: -8;
-          width: 157px;
-          font-size: 18px;
-          font-weight: 400;
-          text-decoration: line-through;
-          color: @whiteColor;
-        }
-      }
-      .button-box-one {
-        font-size: 30px;
-        line-height: 92px;
-        margin-top: 3em;
-        background-color: #274190;
-        border-radius: 12px;
-        width: calc(100% - 60px);
-        height: 92px;
-        color: @whiteColor;
-        // position: absolute;
-        bottom: 40px;
-        right: 0;
-        left: 0;
-        .button-text-one {
-          right: 133px;
-          font-size: 30px;
-          padding-left: 220px;
-        }
-      }
-    }
-  }
 }

src/components/ShopUsed/index.jsx

@@ -1,10 +1,7 @@
 import Taro from '@tarojs/taro'
-import { getShopList, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
-import { View, Button, Text, Image } from '@tarojs/components'
-import { useState, useEffect } from 'react'
-import iconsearch from '@/assets/icons/housemantj/search.png'
-import ms from '@/assets/icons/housemantj/ms3.jpg'
-import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
+import {  setGetVerifiedOrder } from '@/services/shopBoss'
+import { View,  Text, Image } from '@tarojs/components'
+import { useState } from 'react'
 import formatTimes from '@/utils/formatTime'
 import './style.less'
 

src/components/foodCards/foodCards.jsx

@@ -63,7 +63,7 @@ export default (props) => {
             <image src={msTip} className='mstip'></image>
           </view>
           <view className='neirong'>
-            <view className='textword'  onClick={() => { goFood() }} >{(item.description).toString().length > 25 ? (item.description).substring(0, 25) + '...' : (item.description)}</view>
+            <view className='textword'  onClick={() => { goFood() }} >{(item.description).toString().length > 22 ? (item.description).substring(0, 22) + '...' : (item.description)}</view>
             <view className='jiage' onClick={() => { goFood() }} >
               <text className='rmb' >￥&nbsp;&nbsp;</text>
               <text className='p1'><text className='price' >{(item.actualPrice / 100).toFixed(2)}</text>元&nbsp;&nbsp;</text>

src/components/foodCards/style.less

@@ -1,11 +1,12 @@
 .foodCard{
   background: #FFF;
-  box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
+  // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
   border-radius: 12px;
   position: relative;
-  margin: 15px 5px;
+  margin: 15px 15px;
   margin-bottom: 30px;
   overflow: hidden;
+  filter: drop-shadow(0px 6px 13px rgba(0, 0, 0, 0.12));
   background: radial-gradient(circle at 82% top,transparent 20px,#fff 0) top,
               radial-gradient(circle at 82% bottom,transparent 20px,#fff 0) bottom;
   background-repeat: no-repeat;
@@ -54,7 +55,7 @@
     }
     .neirong{
       display: inline-block;
-      width: 65%;
+      width: 57%;
       .textword{
         font-size: 24px;           
         color: #333;

src/hotel/pages/landlord/landlord.jsx

@@ -68,7 +68,7 @@ export default withLayout((props) => {
       <CustomNav title={hotel?.hotelName} logo={hotel?.logo} />
       <view className='index-container'>
         {currentTab === 0 && <Income hotelList={hotelList} hotel={hotel}  account={account} onHotelChange={handleHotelChange} />}
-        {currentTab === 1 && <HouseManage hotel={hotel} ref={houseRef} />}
+        {hotel?.hotelId?currentTab === 1 && <HouseManage hotel={hotel} ref={houseRef} disabled={!hotel.hotelId}/>:''}
       </view>
       <view className='index-tabbar'>
         <TabBar extClass='custom-tabbar bottomTab' current={currentTab} onChange={handleTabChange}>

src/pages/MineUserAll/ContactMe/index.jsx

@@ -22,7 +22,7 @@ export default withLayout((props) => {
         // 成功返回一个模态框提醒用户
         wx.showModal({
           title: '提示',
-          content: '反馈成功',
+          content: '反馈成功，感谢提交；\r\n如有需要平台将在24小时内添加您的微信，请留意您的手机信息。',
           showCancel:false,
           success (res) {
             if (res.confirm) {

src/pages/PayOrder/style.less

@@ -115,21 +115,21 @@
       }
       //图片
       .title-image {
-        width: 145px;
+        height: 144px;
         margin-left: 20px;
         border-radius: 24px;
         overflow: hidden;
         position: relative;
         .image-1 {
-          width: 100%;
-          height: 145px;
+          width: 144px;
+          height: 144px;
+          margin: 0;
         }
         .image-2 {
           width: 89px;
           height: 34px;
           position: absolute;
           left: 0;
-          top: 0;
         }
       }
       // 商品标题
@@ -228,8 +228,9 @@
   .view-button {
 
     position: fixed;
-    bottom: 0px;
-
+    bottom: 0;
+    left: 0;
+    right: 0;
     .Card-number-box {
       .Card-number {
         width: 100%;
@@ -245,12 +246,11 @@
     .button-box-button-box {
       position: relative;
       .button-text-image {
-        width: 144;
+        width: 144px;
         height: 45px;
         position: absolute;
         top: -35px;
-        left: 267px;
-        right: 305px;
+        left: calc(50% - 72px);
         z-index: 1;
         .button-text-money-hot {
           position: absolute;
@@ -284,10 +284,7 @@
         width: calc(100% - 60px);
         height: 92px;
         color: @whiteColor;
-        // position: absolute;
         bottom: 40px;
-        right: 0;
-        left: 0;
         .button-text-one {
           right: 133px;
           font-size: 30px;

src/pages/details/mjDetails/sceneryDetails.less

@@ -127,141 +127,6 @@
     margin-top: 14px;
   }
 }
-.foodCard{
-  background: #FFF;
-  box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
-  border-radius: 12px;
-  position: relative;
-  margin-bottom: 30px;
-  overflow: hidden;
-  background: radial-gradient(circle at 82% top,transparent 20px,#fff 0) top,
-              radial-gradient(circle at 82% bottom,transparent 20px,#fff 0) bottom;
-  background-repeat: no-repeat;
-  background-size: auto 50%;
-  .fCleft{
-    float: left;
-    width: 82%;
-    .backMoney{
-      font-size: 24px;
-      font-weight: bold;
-      color: #FFF;
-      margin: 22px 40px 20px 0;        
-      padding: 12px 17px 9px 6px;
-      background:url('../../../assets/icons/housemantj/fximg.png') no-repeat;    
-      display: inline-block;
-      background-size: 100% 100%;
-    }
-    .appraise{
-      display: inline-block;
-      image{
-        width: 21px;
-        height: 21px;
-        margin-right: 10px;
-      }
-      text{
-        font-size: 24px;           
-        font-weight: bold;
-        color: #020200;
-      }
-    }
-    .contentImg{
-      margin: 0 20px 43px 20px;
-      position: relative;
-      display: inline-block;
-      .img1{
-        width: 144px;
-        height: 144px;
-        border-radius: 24px;
-      }
-      .mstip{
-          width:99px;
-          height:37px;
-          position: absolute;
-          left: 0;          
-      }
-    }
-    .neirong{
-      display: inline-block;
-      width: 65%;
-      .textword{
-        font-size: 24px;           
-        color: #333;
-        margin: 0 21px 0 0;
-        height: 84px;
-      }
-      .jiage{
-        line-height: 20px;
-        font-weight: bold;
-        color: #333;
-        .rmb{
-          font-size: 20px;             
-          margin: 0 8px 0 7px;
-        }
-        .p1{
-          font-size: 24px;     
-        }
-        .p2{
-          font-size: 18px;             
-          text-decoration: line-through;
-          color: #666;
-        }
-      }
-      .address{
-        line-height: 0;
-        margin-top: 18px;
-        .dw{
-          width: 16px;
-          height: 20px;
-          position: relative;
-          top:3px;
-          margin-right: 10px;
-        }
-        .wz{
-          font-size: 20px;             
-          color: #333;
-        }
-        .star{
-          width: 21px;
-          height: 21px;
-          margin: 0 10px 0 40px;
-          position: relative;
-          top: 3px;
-        }
-        .collection{
-          font-size: 20px;             
-          color: #333333;
-        }
-      }
-    }
-  }
-  .fCright{
-    float: right;
-    width: 18%;
-    line-height: 0;
-    image{
-      width:35px;
-      height:32px;
-      margin-top: 120%;
-      margin-left:calc(50% - 15px)
-    }
-    view{
-      font-size: 24px;
-      line-height: 23px;
-      font-weight: bold;
-      color: #202020;
-      margin-top: 19px;
-      text-align: center;
-    }
-  }
-  .columnLine{
-    height: 50%;
-    border-right: 2px dashed #595959;
-    opacity: 0.12;
-    position: absolute;
-    right: 18%;
-    bottom:15%;
-  }
-}
 
 .bottom{
   font-size: 28px;    

src/pages/index/index.config.js

@@ -2,6 +2,7 @@ export default {
   navigationBarTitleText: '十公里',
   navigationStyle: 'custom',
   styleIsolation: 'shared',
+  enableShareAppMessage: true,
   usingComponents: {
     "mp-tabbar": "weui-miniprogram/tabbar/tabbar",
     "mp-tabs": "../../../components/tabs/index",

src/pages/index/tabs/Recommend.jsx

@@ -40,8 +40,7 @@ export default (props) => {
       setTypeList(res.records || [])
     })
   }, [])
-
-
+  
   const onSearch = () => {
     // 用绝对路径
     Taro.navigateTo({ url: '/pages/search/search' });

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -1,20 +1,15 @@
 import { React, useState, useEffect, useMemo } from 'react'
 import Taro, { useRouter } from '@tarojs/taro'
-import CustomNav from '@/components/CustomNav'
 import Picker from '@/components/Picker'
-import Popup from '@/components/Popup'
 import ShopUsed from '@/components/ShopUsed' //已核销
 import ShopUnused from '@/components/ShopUnused' //未核销
 import SearchBar from '@/components/SearchBar'
-import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
+import { getVerifiedOrder } from '@/services/shopBoss'
 import List from '@/components/List';
 
 import eyes from '@/assets/icons/shopKeeper/小眼睛.png'
 import ceyes from '@/assets/icons/shopKeeper/小眼睛-闭上.png'
-import iconsearch from '@/assets/icons/housemantj/search.png'
-import ms from '@/assets/icons/housemantj/ms3.jpg'
 import ToggleRole from '@/components/toggleRole/ToggleRole'
-
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import './shopKeeper.less'