f

src/components/SearchBar/index.jsx

@@ -4,7 +4,7 @@ import './style.less'
 
 export default (props) => {
 
-  const { placeholder, onBlur } = props
+  const { placeholder, onBlur, searchValue } = props
 
 
 
@@ -14,6 +14,7 @@ export default (props) => {
       <mp-searchbar
         placeholder={placeholder}
         onBlur={onBlur}
+        value={searchValue}
       >
       </mp-searchbar>
     </View>

src/components/ShopUnused/index.jsx

@@ -25,7 +25,7 @@ export default (props) => {
         <image className='orderImg' src={item.poster} mode='aspectFit' />
         <view className='orderRight'>
           <view className='foodName'>{item.description}</view>
-          <view className='price'>合计金额：￥<text style={{ fontSize: '24rpx' }}>{(item.actualPrice / 100).toFixed(2)}</text>元 <text className='pnum'>数量：<text>1</text>张</text> </view>
+          <view className='price'>合计金额：￥<text style={{ fontSize: '24rpx' }}>{(item.commissionCharge / 100).toFixed(2)}</text>元 <text className='pnum'>数量：<text>1</text>张</text> </view>
           <view>已下单：等待客户上门就餐</view>
         </view>
         <view className='line' />

src/components/ShopUsed/index.jsx

@@ -39,7 +39,7 @@ export default (props) => {
         <Image className='orderImg' src={item.poster} mode='aspectFit' />
         <View className='orderRight'>
           <View className='foodName'>{item.description}</View>
-          <View className='price'>合计金额：￥<Text style={{ fontSize: '24rpx' }}>{item.actualPrice / 100}</Text>元 <Text className='pnum'>数量：<Text>1</Text>张</Text> </View>
+          <View className='price'>合计金额：￥<Text style={{ fontSize: '24rpx' }}>{(item.commissionCharge / 100).toFixed(2)}</Text>元 <Text className='pnum'>数量：<Text>1</Text>张</Text> </View>
         </View>
 
         <View className='veri_Date' > 核销时间：{formatTimes(item.verifiedDate, 'yyyy-MM-dd hh:mm')}</View>

src/hotel/components/HouseManage/houseManage.jsx

@@ -1,5 +1,5 @@
 import Taro, { useDidShow } from '@tarojs/taro'
-import { View, Image} from '@tarojs/components';
+import { View, Image } from '@tarojs/components';
 import see from '@/assets/icons/landlord/lookPerson.png'
 import share from '@/assets/icons/landlord/shareLink.png'
 import del from '@/assets/icons/landlord/delete.png'
@@ -22,13 +22,13 @@ export default React.forwardRef((props, ref) => {
   const [detail, setDetail] = useState([])
 
   const fetchAPI = useMemo(() => hotel.hotelId ? () => getRoomList({ hotelId: hotel.hotelId }) : undefined, [hotel?.hotelId])
-  const queryParams = useMemo(() => ({}), [])
+  const queryParams = useMemo(() => ({ pageNum: 1, pageSize: 0, }), [])
 
   const shareDataRef = useRef()
 
   // 判断是否首次加载
-  const mounted = useRef(false)
 
+  const mounted = useRef(false)
   const handelClick = () => {
     Taro.navigateTo({ url: `/hotel/pages/landlord/addRoom/addRoom?hotelId=${hotel.hotelId}&hotelName=${hotel.hotelName}` });
   }
@@ -122,12 +122,13 @@ export default React.forwardRef((props, ref) => {
       })
     }
     else {
+      // setVal('')
       getRoomList({ hotelId: hotel.hotelId, roomName: e.detail.value }).then((res) => {
         setDetail(res.records || [])
       })
     }
   }
-  const handelCopy = (e, val) => {
+  const handelCopy = (e, val, index) => {
     //阻止冒泡不允许执行父元素的点击事件
     e.stopPropagation()
     saveRoom({ ...val, roomId: null, roomName: val.roomName + '复制' }).then(() => {
@@ -135,6 +136,8 @@ export default React.forwardRef((props, ref) => {
         setDetail(res.records || [])
       })
     })
+
+
   }
   const [showCutover3, setShowCutover3] = useState(false)
   const ShowMoldeOn3 = () => {
@@ -143,18 +146,19 @@ export default React.forwardRef((props, ref) => {
   const onClose3 = () => {
     setShowCutover3(false)
   }
+  const [val, setVal] = useState()
   return (
     <view>
       <view style={{ padding: '0 30rpx', height: '100%' }}>
-      <ToggleRole role='hotel' showCutover={showCutover3} maskClosable={showCutover3} onClose={onClose3} />
+        <ToggleRole role='hotel' showCutover={showCutover3} maskClosable={showCutover3} onClose={onClose3} />
 
         <View>
-        <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择民宿" value={hotel?.hotelId} kv={['hotelName', 'hotelId']} dicts={hotelList} onChange={handleHotelChange} /></view>
-        <view onClick={ShowMoldeOn3} className='User-info-cutover'>
+          <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择民宿" value={hotel?.hotelId} kv={['hotelName', 'hotelId']} dicts={hotelList} onChange={handleHotelChange} /></view>
+          <view onClick={ShowMoldeOn3} className='User-info-cutover'>
             <image className='User-info-cutover-image' src={cutoverUser} />
           </view>
         </View>
-        <SearchBar placeholder='请输入房源名搜索' onBlur={onSearch} />
+        <SearchBar placeholder='请输入房源名搜索' onBlur={onSearch} searchValue={val} />
         <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
         <ShareCard showCutover={showCard} onClose={onClose2} />
         <List
@@ -168,7 +172,8 @@ export default React.forwardRef((props, ref) => {
             {
               detail.map((item, index) =>
                 <view className='houseCard' key={index}>
-                  <View className='houseName' onClick={() => handelDetail(item)}>{item.roomName || ''}<Image src={copyRoom} onClick={(e) => handelCopy(e, item)} /></View>
+                  <View className='houseName' onClick={() => handelDetail(item)}>{item.roomName || ''}<Image src={copyRoom} onClick={(e) => handelCopy(e, item, index)} /></View>
+
                   <view className='operation'>
                     <view onClick={() => handelOrder(item)}><image src={see} />查看入住人</view>
                     <view onClick={() => ShowMoldeOn(item)}><image src={share} />分享链接</view>

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

@@ -1,7 +1,7 @@
 import withLayout from '@/layouts'
-import Taro from '@tarojs/taro'
+import Taro, { useDidShow } from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
-import { View, Input, Button, Label, Textarea, Text,Image } from '@tarojs/components';
+import { View, Input, Button, Label, Textarea, Text, Image } from '@tarojs/components';
 import { useEffect, useState } from "react"
 import { saveRoom, getRoomDetail, updateRoom } from '@/services/landlord'
 import GPS from '@/assets/icons/GuideCheck/GPS.png'
@@ -29,15 +29,29 @@ export default withLayout((props) => {
   })
   const [paddress, setpAddress] = useState()
   const [wifiName, setwifiName] = useState()
+
+  const tipsMap = () => {
+    Taro.showToast({
+      title: '位置信息添加成功',
+      icon: 'success',
+      duration: 2000
+    })
+  }
+
+
   const onRoomMap = () => {
     Taro.chooseLocation().then((res) => {
       setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude })
-
+      tipsMap()
     })
   }
+
+
+
   const onParkMap = () => {
     Taro.chooseLocation().then((res) => {
       setRoomModel({ ...roomModel, parkingLocation: res.longitude + ',' + res.latitude })
+      tipsMap()
 
     })
   }
@@ -190,9 +204,9 @@ export default withLayout((props) => {
             <mp-cells title='房屋位置'>
               <mp-cell>
                 <View className='roomloc'>
-                <Input style={{ color: '#000', fontWeight: 'bold'}} onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address} placeholder='请输入房屋位置（必填）' />
-                <Label style={{display:'none' }} onClick={onRoomMap}>{isError(roomModel.location) ? '房间定位（必填）' : roomModel.location}</Label>
-                <Image className='location' src={GPS} onClick={onRoomMap} />
+                  <Input style={{ color: '#000', fontWeight: 'bold', paddingRight: '3em' }} onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address} placeholder='请输入房屋位置（必填）' />
+                  <Label style={{ display: 'none' }} onClick={onRoomMap}>{isError(roomModel.location) ? '房间定位（必填）' : roomModel.location}</Label>
+                  <Image className='location' src={GPS} onClick={onRoomMap} />
                 </View>
               </mp-cell>
             </mp-cells>
@@ -200,10 +214,10 @@ export default withLayout((props) => {
               paddress != '' ?
                 <mp-cells title='停车场位置'>
                   <mp-cell>
-                  <View className='roomloc'>
-                    <Input onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress} placeholder='请输入停车场位置' />
-                    <Label style={{ color: '#666', lineHeight: '30px',display:'none' }} onClick={onParkMap}>{isError(roomModel.parkingLocation) ? '停车场定位' : roomModel.parkingLocation}</Label>
-                    <Image className='location' src={GPS} onClick={onParkMap} />
+                    <View className='roomloc'>
+                      <Input style={{ paddingRight: '3em' }} onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress} placeholder='请输入停车场位置' />
+                      <Label style={{ color: '#666', lineHeight: '30px', display: 'none' }} onClick={onParkMap}>{isError(roomModel.parkingLocation) ? '停车场定位' : roomModel.parkingLocation}</Label>
+                      <Image className='location' src={GPS} onClick={onParkMap} />
                     </View>
                   </mp-cell>
                 </mp-cells> : null

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

@@ -2,25 +2,26 @@
   padding: 30px;
   background-color: #f8f8f8;
   .weui-cells__title {
-    font-size: 34px;
+    font-size: 26px;
   }
   .weui-cells_after-title {
     border-radius: 50px;
     font-size: 30px;
     margin-top: 40px;
   }
-  .roomloc{
+  .roomloc {
     position: relative;
-    .location{
+    font-size: 26px;
+    .location {
       width: 50px;
       height: 50px;
-      position:absolute;
+      position: absolute;
       right: 0;
       top: -2px;
       z-index: 999;
     }
   }
-  
+
   .adds {
     width: 100%;
     background-color: #fff;

src/pages/details/foodDetails/foodDetails.less

@@ -187,7 +187,6 @@
   border-radius: 12px;
   column-count: 3;
   text-align: center;
-  height: 6em;
 
   .sharebtn {
     position: absolute;

src/pages/details/mjDetails/sceneryDetails.less

@@ -154,7 +154,6 @@
   border-radius: 12px;
   column-count: 3;
   text-align: center;
-  height: 6em;
 
   .sharebtn {
     position: absolute;

src/pages/index/components/Card/index.jsx

@@ -1,5 +1,5 @@
 
-import Taro from '@tarojs/taro'
+import Taro, { useDidShow } from '@tarojs/taro'
 import useSave from "@/utils/hooks/useSave"
 import msTip from '@/assets/icons/housemantj/foodtip.png'
 import mjTip from '@/assets/icons/housemantj/mjtip.png'
@@ -21,6 +21,9 @@ export default (props) => {
       Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` })
     }
   }
+
+
+
   return (
     <view className='contentCard' style={style}>
       <view className='cardTop'>

src/pages/index/tabs/Guide.jsx

@@ -1,5 +1,5 @@
 import { useState, useEffect, useRef } from "react";
-import Taro from '@tarojs/taro'
+import Taro, { useDidShow } from '@tarojs/taro'
 import MoreGuide from "@/components/MoreGuide";
 import BossCard from '@/components/BossCard'
 import GPS from '@/assets/icons/GuideCheck/GPS.png'
@@ -55,8 +55,7 @@ export default (props) => {
     })
   }
 
-
-  useEffect(() => {
+  const goContent = () => {
     if (roomOrderId) {
       goToRoomForm(roomOrderId).then((res) => {
         if (res.status !== 1 && res.personNum > 0) {
@@ -66,8 +65,17 @@ export default (props) => {
         }
       })
     }
+  }
+
+
+  useEffect(() => {
+    goContent()
   }, [roomId, roomOrderId])
 
+  useDidShow(() => {
+    goContent()
+  })
+
 
   useEffect(() => {
 

src/pages/index/tabs/Recommend.jsx

@@ -1,4 +1,4 @@
-import Taro from '@tarojs/taro'
+import Taro, { useDidShow } from '@tarojs/taro'
 import { React, useState, useEffect, useRef } from 'react'
 import iconsearch from '@/assets/icons/housemantj/search.png'
 import locationimg from '@/assets/icons/housemantj/location.png'
@@ -55,8 +55,18 @@ export default (props) => {
     // 用绝对路径
     Taro.navigateTo({ url: '/pages/search/search' });
   }
+  // 联动收藏
+  const likeLook = () => {
+    getResourceList().then(e => {
+      setAllList(e.records)
+    })
+
+  }
 
 
+  useDidShow(() => {
+    likeLook()
+  })
 
 
 

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -102,47 +102,48 @@ export default (props) => {
       </view>
       <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
       <view style={{ padding: '30rpx', height: '100%' }}>
-        <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
-          <view className='storexx'>
-            <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder='请选择商铺' value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
-            <view onClick={ShowMoldeOn} className='User-info-cutover'>
-              <image className='User-info-cutover-image' src={cutoverUser} />
-            </view>
-            <view className='tip'>（计算收入以核销为准）</view>
-            <view className='money'>
-              <view className='sleft'>
-                <view className='lword'>全年订单收入（税前）</view>
-
-                <view className='yearMoney'>
-                  <text>{isyear ? (shopMoney?.totalCharges / 100).toFixed(2) : '******'}</text>元
-                  <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
-                </view>
+        <view className='storexx'>
+          <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder='请选择商铺' value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
+          <view onClick={ShowMoldeOn} className='User-info-cutover'>
+            <image className='User-info-cutover-image' src={cutoverUser} />
+          </view>
+          <view className='tip'>（计算收入以核销为准）</view>
+          <view className='money'>
+            <view className='sleft'>
+              <view className='lword'>全年订单收入（税前）</view>
+
+              <view className='yearMoney'>
+                <text>{isyear ? (shopMoney?.totalCharges / 100).toFixed(2) : '******'}</text>元
+                <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
               </view>
-              <view className='line' />
-              <view className='sright'>
-                <view className='rword'>当月订单收入（税前）</view>
-                <view className='monthMoney'>
-                  <text>{isMomth ? (shopMoney?.currentCharges / 100).toFixed(2) : '******'}</text>元
-                  <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
-                </view></view>
             </view>
+            <view className='line' />
+            <view className='sright'>
+              <view className='rword'>当月订单收入（税前）</view>
+              <view className='monthMoney'>
+                <text>{isMomth ? (shopMoney?.currentCharges / 100).toFixed(2) : '******'}</text>元
+                <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
+              </view></view>
           </view>
-          <view className='search'>
+        </view>
+        <view className='search'>
+
+          <SearchBar placeholder='搜索订单(输入客户手机号码)' onBlur={handelSearch} />
+        </view>
+        <view className='index-tabs'>
+          <mp-tabs
+            tabClass='tabs-Unselected'
+            swiperClass='tabs-swiper'
+            activeClass='tabs-Selected'
+            tabs={tabs}
+            current={activeTab}
+            onChange={handleTabChange}
+            activeTab={activeTab}
+          >
+          </mp-tabs>
+        </view>
+        <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
 
-            <SearchBar placeholder='搜索订单(输入客户手机号码)' onBlur={handelSearch} />
-          </view>
-          <view className='index-tabs'>
-            <mp-tabs
-              tabClass='tabs-Unselected'
-              swiperClass='tabs-swiper'
-              activeClass='tabs-Selected'
-              tabs={tabs}
-              current={activeTab}
-              onChange={handleTabChange}
-              activeTab={activeTab}
-            >
-            </mp-tabs>
-          </view>
           <view>
             {/* 未核销 */}
             {activeTab === 0 &&
@@ -175,8 +176,9 @@ export default (props) => {
               </>
             }
           </view>
-          {/* <view className='botton'>这是我的底线</view> */}
         </scroll-view>
+
+        {/* <view className='botton'>这是我的底线</view> */}
       </view>
     </view>
   )