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

src/components/AuthPage/login.less

@@ -30,20 +30,16 @@
   bottom: 80px;
   width: 100%;
   vertical-align: middle;
-
   radio-group {
     display: inline-block;
     vertical-align: middle;
   }
-
   radio {
     transform: scale(.8);
   }
-
   view {
     display: inline-block;
     vertical-align: middle;
-
     text{
       color: #274190;
       text-decoration: underline;

src/hotel/pages/components/Extend/style.less

@@ -1,28 +1,28 @@
-#det{
-  .editword{
+#det {
+  .editword {
     padding-top: 60px;
-    .srl{
+    .srl {
       font-size: 30px;
       font-weight: bold;
       color: #202020;
-    }  
-    .mg{
+    }
+    .mg {
       font-size: 38px;
       margin: 0 20px 50px 20px;
     }
-    .rzline{
+    .rzline {
       border-top: 2px #999 dashed;
       height: 2px;
       width: 160px;
       display: inline-block;
       margin-bottom: 8px;
-    } 
-    .cancel{
+    }
+    .cancel {
       color: #274290;
       display: inline-block;
       margin-right: 44px;
-      width: 240px;      
-      font-size: 30px;      
+      width: 240px;
+      font-size: 30px;
       font-weight: bold;
       height: 78px;
       line-height: 78px;
@@ -34,30 +34,42 @@
       letter-spacing: 3px;
       width: 240px;
       height: 78px;
-      font-size: 30px;      
+      font-size: 30px;
       line-height: 78px;
       background: #274290;
       font-weight: bold;
       border-radius: 12px;
       display: inline-block;
       color: #fff;
-    }  
+    }
   }
-  .storezn{
+  .storezn {
+    // color: #202020;
+    // line-height: 64px;
+    // margin-bottom: 60px;
+    // overflow: hidden;
+    // text-align: justify;
+    // white-space: pre-wrap;
+
     color: #202020;
-    line-height: 64px;
-    margin-bottom: 60px;
+    line-height: 64rpx;
+    margin-bottom: 60rpx;
+    overflow: hidden;
     text-align: justify;
+    width: 23em;
+    padding: 0 21px 0 11px;
+    /* padding-right: -12px; */
     white-space: pre-wrap;
+    overflow-wrap: break-word;
   }
-  Textarea{
+  Textarea {
     height: 300px;
     width: 100%;
     padding: 30px;
-    background: #F8F8F8;
+    background: #f8f8f8;
     border-radius: 8px;
     box-sizing: border-box;
     height: 254px;
     font-size: 26px;
   }
-}
+}

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

@@ -34,13 +34,14 @@ export default withLayout((props) => {
 
   const onRoomMap = () => {
     Taro.chooseLocation().then((res) => {
-      setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude, locName: res.name })
+      console.log("🚀 ~ file: addRoom.jsx ~ line 37 ~ Taro.chooseLocation ~ res", res)
+      setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude, locName: res.name, address: res.address })
     })
   }
-  
+
   const onParkMap = () => {
     Taro.chooseLocation().then((res) => {
-      setRoomModel({ ...roomModel, parkingLocation: res.longitude + ',' + res.latitude, pkLocName: res.name })
+      setRoomModel({ ...roomModel, parkingLocation: res.longitude + ',' + res.latitude, pkLocName: res.name, address: res.address })
     })
   }
   const sumbit = () => {
@@ -174,7 +175,7 @@ export default withLayout((props) => {
         <CustomNav title={hotelName} />
       </view>
       <view className='roomDetail' style={{ height: '100%', overflow: "hidden", }} >
-        <scroll-view scrollY style={{ height: '100%' }}>
+        <scroll-view scrollY style={{ height: '87%' }}>
           <View id='det'>
             <Popup show={showCutover} onClose={onClose}>
               <View className='editword'>

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

@@ -56,14 +56,27 @@
     }
   }
   .button-OK {
-    height: 92px;
+    // 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; */
+
     background: #274291;
-    margin: 60px 0 30px 0;
-    letter-spacing: 5px;
-    line-height: 92px;
-    border-radius: 12px;
-    font-size: 30px;
+    margin: 60rpx 0 30rpx 0;
+    letter-spacing: 5rpx;
+    line-height: 92rpx;
+    border-radius: 12rpx;
+    font-size: 30rpx;
     font-weight: bold;
     color: #fff;
+    position: fixed;
+    top: 37em;
+    width: 23em;
   }
 }

src/pages/MineUserAll/AllOrder/index.jsx

@@ -6,7 +6,7 @@ import CustomNav from '@/components/CustomNav'
 import Complete from '@/components/CompoentsOrder/complete'
 import './style.less'
 
-const tabs = ['全部', '待支付', '待核销', '已使用','已过期'].map(x => ({ title: x }))
+const tabs = ['全部', '待支付', '待核销', '已使用', '已过期'].map(x => ({ title: x }))
 
 const TabBar = (props) => {
   const handleClick = (e) => {
@@ -47,7 +47,7 @@ export default withLayout((props) => {
     setActiveTab(index)
 
   }
-  
+
   console.log('------setActiveTab--------', activeTab)
 
   return (

src/pages/index/components/Card/style.less

@@ -6,11 +6,9 @@
   margin-bottom: 30px;
   break-inside: avoid;
   position: relative;
-
   width: calc(100% - 30px);
   box-sizing: border-box;
   margin-left: 15px;
-
   .cardTop{
     border-radius: 24px 24px 0px 0px;
     .cCardimg{
@@ -40,10 +38,8 @@
       color: #404040;
       text-align: justify;
     }
-
     .cCBottom {
-      display: flex;
-    
+      display: flex;    
       .cCleft{
         flex: 3;
         position: relative;

src/pages/index/tabs/Guide.jsx

@@ -256,6 +256,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={} /> */}
       </view>
     </scroll-view>
   )

src/pages/index/tabs/Recommend.jsx

@@ -33,17 +33,18 @@ export default (props) => {
 
   //分类标签
   const tabs = [{ title: '附近' }].concat(typeList.map(x => ({ ...x, title: x.typeName })))
-  //切换上面的标签
-  const handleTabChange = (e) => {
-    const { index } = e.detail
+  const details=(index,tab)=>{
     setActiveTab(index)
-    const tab = tabs[index].typeId || ''
-
     setQueryParams({
       ...queryParams,
       typeId: tab
     })
   }
+  //切换上面的标签
+  const handleTabChange = (e) => {
+    const { index } = e.detail
+    details(index,tabs[index].typeId||'')
+  }
 
   const handleDataChange = (value, e) => {
     if (e.paramsChanged) {
@@ -62,6 +63,8 @@ export default (props) => {
     //查询分类标签表
     getIndexType({ pageSize: 20 }).then((res) => {
       setTypeList(res.records || [])
+      details(1,res.records[1].typeId)
+
     })
   }, [])