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

src/components/MoreGuide/style.less

@@ -1,11 +1,11 @@
-
-.image-content{
-  border-radius: 10px
+.image-content {
+  border-radius: 10px;
+}
+.storezn {
+  font-size: 28px;
+  font-weight: 400;
+  color: #202020;
+  line-height: 64px;
+  padding-bottom: 10px;
+  overflow-wrap: break-word;
 }
-  .storezn{
-    font-size: 28px;
-    font-weight: 400;
-    color: #202020;
-    line-height: 64px;
-    padding-bottom: 10px;
-  }

src/pages/details/foodDetails/foodDetails.jsx

@@ -247,12 +247,10 @@ export default withLayout((props) => {
                 </view>
                 <view
                   style={{
-                    position: "relative",
-                    marginTop: '1em',
                     display: extend == "" ? "none" : "",
                   }}
                 >
-                  <view className='title' style={{ margin: '50px 0 40px 0' }} >
+                  <view className='title'>
                     <image src={titlezs} />
                     <text>本店指南</text>
                   </view>

src/pages/details/foodDetails/foodDetails.less

@@ -103,6 +103,7 @@
   }
 }
 .title {
+  margin: 40px 0;
   image {
     width: 30px;
     height: 30px;

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -167,7 +167,7 @@ export default withLayout((props) => {
               {(extend || []).map((item) => <Extend item={item} />)}
             </View>
           </view>
-          <view style={{ position: 'relative', marginTop: '6em', display: recommend == '' ? 'none' : '' }}>
+          <view style={{ display: recommend == '' ? 'none' : '' }}>
             <view className='title'>
               <image src={titlems} />老板推荐好吃的
             </view>

src/pages/details/mjDetails/sceneryDetails.less

@@ -89,6 +89,7 @@
   color: #202020;
   line-height: 54px;
   overflow: hidden;
+  margin-bottom: 20px;
   .line {
     height: 1px;
     background: #000;

src/pages/index/index.jsx

@@ -83,7 +83,6 @@ export default withLayout((props) => {
     if (roomId) {
       getTaRoom(roomId).then((res) => {
         setExtend(res)
-
         getHotelDetail(hotelId).then((e) => {
           setTitleRoom(e?.hotelName || '十公里')
           settitleLogo(e?.logo || logo)

src/pages/index/tabs/Mine.jsx

@@ -1,5 +1,6 @@
 import { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
+import { Ad } from '@tarojs/components'
 import AuthPage from '@/components/AuthPage'
 import boy from '@/assets/icons/UserCenter/boy.png'
 import girl from '@/assets/icons/UserCenter/girl.png'
@@ -156,7 +157,7 @@ export default (props) => {
           </view>
         </view>
         <view class='adContainer'>
-          <ad unit-id='adunit-e6c9885420df0aff' ad-type='video' ad-theme='white'></ad>
+          <Ad unit-id='adunit-e6c9885420df0aff' ad-type='video' ad-theme='white' />
         </view>
         <view className='Version-box'  >
           <view className='Version-box-number'>

src/utils/request.js

@@ -45,7 +45,6 @@ export default (url, options) => {
               icon: 'none',
             })
           }
-
           reject(message?.indexOf('java') > -1 ? '系统内部错误' : message)
         }
       },