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

config/prod.js

@@ -3,7 +3,7 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"https://sgl-v2.njyunzhi.com"',
+    HOST: '"https://sgl-v2-test.njyunzhi.com"',
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
   },
   mini: {},

project.config.json

@@ -2,7 +2,7 @@
   "miniprogramRoot": "./dist",
   "projectname": "miniapp",
   "description": "十公里",
-  "appid": "wx06a7372d48d56843",
+  "appid": "wx835627a9b9b3932a",
   "setting": {
     "urlCheck": true,
     "es6": false,

src/components/SlideView/style.less

@@ -10,6 +10,7 @@
 
   .slideview-content {
     min-width: 100%;
+    width: 100%;
     display: inline-block;
     vertical-align: middle;
   }

src/hotel/pages/landlord/addRoom/addRoom.jsx

@@ -34,7 +34,6 @@ export default withLayout((props) => {
 
   const onRoomMap = () => {
     Taro.chooseLocation().then((res) => {
-      console.log("🚀 ~ file: addRoom.jsx ~ line 37 ~ Taro.chooseLocation ~ res", res)
       setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude, locName: res.name, address: res.address })
     })
   }
@@ -174,8 +173,8 @@ export default withLayout((props) => {
       <view className='index-navbar'>
         <CustomNav title={hotelName} />
       </view>
-      <view className='roomDetail' style={{ height: '100%', overflow: "hidden", }} >
-        <scroll-view scrollY style={{ height: '87%' }}>
+      <view className='roomDetail' style={{ height: '100%', display: 'flex', flexDirection: 'column', overflow: 'hidden' }} >
+        <scroll-view scrollY style={{ height: '100%', position: 'relative', overflow: "hidden", flex: 'auto' }}>
           <View id='det'>
             <Popup show={showCutover} onClose={onClose}>
               <View className='editword'>
@@ -238,17 +237,15 @@ export default withLayout((props) => {
               </mp-cell>
             </mp-cells>
             {roomId ? <>
-              <view>
-                <view className='weui-cells__title'>其他指引</view>
-                {
-                  extend == '' ? null :
-                    <view>
-                      {extend.map((item) => (
-                        <Extend key={item.extId} item={item} setReset={setReset} />
-                      ))}
-                    </view>
-                }
-              </view>
+              <view className='weui-cells__title'>其他指引</view>
+              {
+                extend == '' ? null :
+                  <>
+                    {extend.map((item) => (
+                      <Extend key={item.extId} item={item} setReset={setReset} />
+                    ))}
+                  </>
+              }
             </> : null
             }
           </mp-form>
@@ -263,8 +260,8 @@ export default withLayout((props) => {
             </View>
           </> : null
           }
-          <Button className='button-OK' onClick={sumbit}>确定</Button>
         </scroll-view>
+        <Button className='button-OK' onClick={sumbit}>确定</Button>
       </view>
     </view>
   )

src/hotel/pages/landlord/addRoom/addRoom.less

@@ -23,7 +23,6 @@
   }
 
   .adds {
-    width: 100%;
     background-color: #fff;
     border-radius: 12px;
     font-weight: bold;
@@ -36,7 +35,7 @@
     }
     .add {
       position: absolute;
-      right: 90px;
+      right: 30px;
       height: 60px;
       top: calc(50% - 30px);
       width: 170px;
@@ -55,28 +54,15 @@
       }
     }
   }
+}
   .button-OK {
-    // height: 92px;
-    // background: #274291;
-    // margin: 60px 0 30px 0;
-    // letter-spacing: 5px;
-    // line-height: 92px;
-    // border-radius: 12px;
-    // font-size: 30px;
-    // font-weight: bold;
-    // color: #fff;
-    /* height: 95rpx; */
-
+    flex: none;
     background: #274291;
-    margin: 60rpx 0 30rpx 0;
-    letter-spacing: 5rpx;
-    line-height: 92rpx;
-    border-radius: 12rpx;
-    font-size: 30rpx;
+    margin: 30px 0 20px 0;
+    letter-spacing: 5px;
+    line-height: 92px;
+    border-radius: 12px;
+    font-size: 30px;
     font-weight: bold;
     color: #fff;
-    position: fixed;
-    top: 37em;
-    width: 23em;
   }
-}

src/pages/index/tabs/Guide.jsx

@@ -3,7 +3,7 @@ import Taro, { useDidShow } from '@tarojs/taro'
 import MoreGuide from "@/components/MoreGuide";
 import BossCard from '@/components/BossCard'
 import SpinBox from "@/components/Spin/SpinBox";
-
+import {Image } from "@tarojs/components";
 import GPS from '@/assets/icons/GuideCheck/GPS.png'
 import copy_logo from '@/assets/icons/GuideCheck/copy_logo.png'
 import Cup from '@/assets/icons/GuideCheck/Cup.png'
@@ -145,7 +145,9 @@ export default (props) => {
       }
     })
   }
-
+  const goIndex=()=>{
+    Taro.redirectTo({url:'/pages/index/index'})
+  }
   return (
     <scroll-view scrollY style={{ height: '100%' }}  >
       <view className='Guide-Home-box'>
@@ -256,7 +258,7 @@ export default (props) => {
         <view style={{ marginTop: '10rpx', paddingBottom: '60rpx' }}>
           {(spackage || []).map((item, index) => <BossCard det={item} st={parseFloat(item.score.toFixed(1))} key={(index)} trackClick={trackClick} taRoomContent={taRoomContent} item={item} />)}
         </view>
-        {/* <Image src={} /> */}
+        <Image mode='widthFix' style={{width:'100%'}} src='http://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/hotel_guide_help.png' onClick={goIndex}/>
       </view>
     </scroll-view>
   )