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

src/pages/RoomOrder/index.jsx

@@ -45,8 +45,8 @@ export default withLayout((props) => {
       //   url: `/pages/index/index?tab=1&roomId=${roomId}`
       // })
       personSubmit(roomOrderId, formData).then(a => {
-        Taro.reLaunch({
-          url: `/pages/index/index?tab=1&roomId=${roomId}`
+        Taro.navigateBack({
+          delta: 1
         })
       })
     })

src/pages/details/foodDetails/foodDetails.jsx

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

src/pages/details/foodDetails/foodDetails.less

@@ -89,7 +89,6 @@
         font-size: 24px;
         color: #666666;
         padding-left: 34px;
-        padding-bottom: 40px;
         .zhuandao {
           width: 14px;
           height: 24px;
@@ -103,7 +102,6 @@
   }
 }
 .title {
-  margin: 59px 0 41px 0;
   image {
     width: 30px;
     height: 30px;
@@ -181,4 +179,4 @@
   text-align: center;
   padding: 40px 0 68px 0;
   background-color: #f8f8f8;
-}
+}

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -46,15 +46,11 @@ export default withLayout((props) => {
   //指南当前页数
   const [epage, setepage] = useState(2)
   const extendMore = () => {
-    setLoading(true)
     setepage(epage + 1)
     getExtendContent('tourist', id, { pageNum: epage }).then((res) => {
       setExtend([...extend, ...res.records])
       setNewextNum(newextNum + res.records.length)
       setLoading(false)
-    }).catch(e => {
-      setLoading(false)
-
     })
   }
 
@@ -177,7 +173,7 @@ export default withLayout((props) => {
           <view className='bottom'>这是我的底线</view>
         </scroll-view>
       </SpinBox>
-      
+
       <view className='index-tabber weui-tabbar' style={{ background: '#fff' }}>
         <view className='weui-tabbar__item'>
           <Button openType='share' className='purebtn'><TabIcon icon={share} text='分享' /></Button>

src/pages/details/mjDetails/sceneryDetails.less

@@ -108,7 +108,7 @@
   }
 }
 .title {
-  margin: 60px 0 40px 0;
+  margin: 40px 0 40px 0;
   font-size: 34px;
   font-weight: bold;
   color: #202020;

src/pages/index/tabs/Guide.jsx

@@ -59,7 +59,7 @@ export default (props) => {
     if (roomOrderId) {
       goToRoomForm(roomOrderId).then((res) => {
         if (res.status !== 1 && res.personNum > 0) {
-          Taro.reLaunch({
+          Taro.navigateTo({
             url: `/pages/RoomOrder/index?roomOrderId=${roomOrderId}&status=${res.status}&roomId=${roomId}`,
           })
         }