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

src/components/BossCard/style.less

@@ -60,15 +60,15 @@
       font-size: 30px;
       font-weight: bold;
       color: #ffffff;
+
     }
   }
+
   .wrapper {
     display: flex;
     position: relative;
-    // margin-top: 600px;
     margin: 30px auto;
     width: 700px;
-
     // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
     // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));
     filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));
@@ -159,9 +159,10 @@
         }
         .title-money-2 {
           font-size: 18px;
-          color: #666;
           padding-left: 10px;
           text-decoration: line-through;
+          color: rgba(102, 102, 102, 0.8);
+
         }
 
         .title-time {

src/components/CollectList/MyCollect/index.jsx

@@ -113,7 +113,6 @@ export default (props) => {
             </view>
           )
         }
-
       </View>
     </View>
 

src/components/CollectList/MyCollect/style.less

@@ -16,7 +16,7 @@
     width: auto;
     height: 44.3px;
     position: absolute;
-    left: 200px;
+    left: 183px;
     top: 28px;
     font-size: 20px;
     color: @whiteColor;
@@ -120,7 +120,8 @@
       }
       .title-money-2 {
         font-size: 18px;
-        color: #666;
+        color: rgba(102, 102, 102, 0.8);
+
         padding-left: 10px;
         text-decoration: line-through;
       }
@@ -184,7 +185,7 @@
   position: relative;
   //右面部分
   .right-content {
-    width: 60px;
+    width: 50%;
     height: 134px;
     position: absolute;
     top: calc(50% - 45px);
@@ -230,7 +231,7 @@
     width: auto;
     height: 44.3px;
     position: absolute;
-    left: 200px;
+    left: 183px;
     top: 28px;
     font-size: 20px;
     color: @whiteColor;
@@ -342,7 +343,8 @@
       }
       .title-money-2 {
         font-size: 18px;
-        color: #666;
+        color: rgba(102, 102, 102, 0.8);
+
         padding-left: 10px;
         text-decoration: line-through;
       }

src/components/Star/Star.jsx

@@ -2,19 +2,19 @@ import hongxin from '@/assets/icons/housemantj/已收藏.png'
 import baixin from '@/assets/icons/housemantj/收藏.png'
 import './Star.less'
 
-const Star = (props) => <image className='star' src={props.star >= props.index ? hongxin : baixin}></image>
+const Star = (props) => <image className='star-image' src={props.star >= props.index ? hongxin : baixin}></image>
 
 const starList = (new Array(5)).fill()
 
 export default (props) => {
-  const {star}=props
+  const { star } = props
 
 
   return (
     <>
-    {
-      starList.map((_, index) => <Star key={index} star={star} index={index + 1} />)
-    }
+      {
+        starList.map((_, index) => <Star key={index} star={star} index={index + 1} />)
+      }
     </>
   )
 }

src/components/Star/Star.less

@@ -1,4 +1,4 @@
-image{
+.star-image{
   width: 24px;
   height: 24px;
   margin-right: 10px;

src/pages/RoomOrder/components/RoomForm/index.jsx

@@ -1,20 +1,16 @@
 import { useState, useEffect } from 'react'
-import Taro from '@tarojs/taro'
-import { Text, Input } from '@tarojs/components'
+import Taro, { useShareTimeline } from '@tarojs/taro'
+import { View, Input } from '@tarojs/components'
 import './style.less'
-import { useShareTimeline } from '@tarojs/taro'
 
 
 
 export default (props) => {
   const { onChange } = props
-
   const [customerName, setCustomerName] = useState()
   const [customerPhone, setCustomerPhone] = useState()
 
 
-
-
   const handeInput = (e, key) => {
     const value = e.detail.value
 
@@ -31,17 +27,17 @@ export default (props) => {
 
 
   return (
-    <view className='from-room'  >
+    <View className='from-room'  >
       <mp-form >
-        <mp-cells title='请填写姓名手机号' footer='  '>
+        <mp-cells title='入住人信息填写' footer='  '>
           <mp-cell prop='customerName' title='姓名：' extClass=''>
-            <input onInput={(e) => handeInput(e, 'customerName')} focus dataField='name' className='weui-input' placeholder='请输入姓名' />
+            <Input onInput={(e) => handeInput(e, 'customerName')} focus dataField='name' className='weui-input' placeholder='请输入姓名' />
           </mp-cell>
           <mp-cell prop='customerPhone' title='手机号：' extClass=''>
-            <input type='number' onInput={(e) => handeInput(e, 'customerPhone')} dataField='mobile' className='weui-input' placeholder='请输入手机号' />
+            <Input type='number' onInput={(e) => handeInput(e, 'customerPhone')} dataField='mobile' className='weui-input' placeholder='请输入手机号' />
           </mp-cell>
         </mp-cells>
       </mp-form>
-    </view>
+    </View>
   )
-}
+}

src/pages/index/tabs/Guide.jsx

@@ -10,7 +10,7 @@ import BlackSpot from '@/assets/icons/GuideCheck/BlackSpot.png'
 import { getRecommendList, getExtendContent } from '@/services/home'
 import sleep from '@/assets/icons/GuideCheck/sleep_logo.png'
 import { getTaRoom, goToRoomForm } from '@/services/taRoom​'
-import  useTrackClick from '@/utils/hooks/useTrackClick'
+import useTrackClick from '@/utils/hooks/useTrackClick'
 import showMore from '../../../assets/icons/housemantj/查看更多.png'
 import './GuideCss/style.less'
 
@@ -27,8 +27,8 @@ export default (props) => {
   const [spackage, setPackage] = useState([])
 
   const cardNavigateTo = undefined
-  
-  const trackClick = useTrackClick(router)
+
+  const trackClick = useTrackClick(router)
 
   // 住宿经纬度
   const Roomlog = useRef('')
@@ -235,6 +235,7 @@ export default (props) => {
                   <view className='MessageCard-name' >名称：{taRoomContent?.wifiName}</view>
                   <view className='MessageCard-info'  ><text className='MessageCard-name'>密码：</text>{taRoomContent?.wifiPassword}</view>
                 </view>
+
                 <view className='MessageCard-button' onClick={() => { wifiCopy() }} style={{ display: wifiButtonStyle }}>
                   <image className='MessageCard-image' src={WiFi} />
                   <text className='MessageCard-text'>复制</text>

src/pages/index/tabs/GuideCss/style.less

@@ -40,6 +40,7 @@
       margin-left: 30px;
 
       .MessageCard-name {
+        width: 400px;
         height: 40px;
         font-size: 32px;
         font-weight: bold;
@@ -251,7 +252,7 @@
       width: auto;
       height: 44.3px;
       position: absolute;
-      left: 200px;
+      left: 183px;
       top: 28px;
       font-size: 20px;
       color: @whiteColor;