。

src/hotel/components/HouseManage/houseManage.jsx

@@ -25,7 +25,7 @@ export default React.forwardRef((props, ref) => {
   const mounted = useRef(false)
 
   const handelClick = () => {
-    Taro.navigateTo({ url: `/hotel/pages/landlord/addRoom/addRoom?hotelId=${hotel.hotelId}&hotelName=${hotel.hotelName}` });
+    Taro.navigateTo({ url: `/hotel/pages/landlord/addRoom2/addRoom?hotelId=${hotel.hotelId}&hotelName=${hotel.hotelName}` });
   }
   const handelDelete = (val) => {
     Taro.showModal({
@@ -47,7 +47,7 @@ export default React.forwardRef((props, ref) => {
     })
   }
   const handelDetail = (val) => {
-    Taro.navigateTo({ url: `/hotel/pages/landlord/addRoom/addRoom?hotelId=${hotel.hotelId}&hotelName=${hotel.hotelName}&roomId=${val.roomId}` });
+    Taro.navigateTo({ url: `/hotel/pages/landlord/addRoom2/addRoom?hotelId=${hotel.hotelId}&hotelName=${hotel.hotelName}&roomId=${val.roomId}` });
   }
 
   const [showCutover, setShowCutover] = useState(false)

src/hotel/components/HouseManage/houseManage.less

@@ -33,12 +33,12 @@
   height: 88px;
   background: #274291;
   border-radius: 12px;
-  font-family: DengXian;
   font-weight: bold;
   color: #FFFFFF;
   text-align: center;
   line-height: 88px;
   position: absolute;
+  letter-spacing: 5px;
   bottom: 18px;
   image{
     width: 32px;

src/hotel/pages/components/Extend/index.jsx

@@ -0,0 +1,43 @@
+import { useState } from 'react';
+import Taro from '@tarojs/taro';
+import del from '@/assets/icons/landlord/delete.png'
+import { View,Text, Image } from '@tarojs/components';
+import { update } from '@/services/landlord'
+import './style.less'
+
+export default (props) => {
+  const { item } = props
+  const [eimg, seteImg] = useState(item.content)
+  const handerChange = () => {
+    Taro.chooseImage({
+      count: 1,
+      success: function (res) {
+        seteImg(res.tempFilePaths[0])
+        update(item.targetId, res.tempFilePaths[0]).then(() => { })
+      }
+    })
+  }
+  const detele=[
+    {
+      src: del, // icon的路径
+      extClass:'det'
+    }
+  ]
+  const handelDelete=()=>{
+    seteImg()
+    console.log("11111111111111111")
+  }
+  return (
+    <View>
+      {
+        item.contentType == 'image' ?
+          <mp-slideview  buttons={detele} icon onbuttontap={handelDelete}>
+            <Image src={eimg} mode='widthFix' style={{ width: '100%',display:'block' }} onClick={handerChange}/>
+          </mp-slideview> 
+          :
+          item.contentType == 'text' ?
+            <View className='storezn'>{item.content}</View> : null
+      }
+    </View>
+  )
+}

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

@@ -0,0 +1,9 @@
+.storezn{
+  font-size: 28px;    
+  color: #202020;
+  line-height: 54px;
+  margin-bottom: 40px;
+  text-align: justify;
+}
+.det{
+}

src/hotel/pages/landlord/addRoom/addRoom.config.js

@@ -4,6 +4,7 @@ export default {
   usingComponents: {
     "mp-cells": "weui-miniprogram/cells/cells",
     "mp-cell": "weui-miniprogram/cell/cell",
-    "mp-form": "weui-miniprogram/form/form"
+    "mp-form": "weui-miniprogram/form/form",
+    "mp-slideview": "weui-miniprogram/slideview/slideview",
   }
 }

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

@@ -2,8 +2,11 @@ import withLayout from '@/layouts'
 import Taro from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import { useEffect, useState } from "react"
-import './addRoom.less'
+import { Button, Label } from '@tarojs/components'
 import { saveRoom, getRoomDetail, updateRoom } from '@/services/landlord'
+import { getExtendContent } from "@/services/home";
+import Extend from "../../components/Extend";
+import './addRoom.less'
 
 
 export default withLayout((props) => {
@@ -54,52 +57,82 @@ export default withLayout((props) => {
       })
     }
   }
+  const [extend, setExtend] = useState([]);
 
   useEffect(() => {
     if (roomId) {
       getRoomDetail(roomId).then((res) => {
         setRoomModel(res)
       })
+      getExtendContent('room', roomId).then((res) => {
+        setExtend(res.records || []);
+      })
     }
-  }, [])
+  }, [roomId])//这个地方写这个单词的目的是   因为编辑时roomId有可能还没加载成功
 
 
 
   return (
     <view className='page-index'>
-      <CustomNav title={hotelName} />
-      <view className='from-room'  >
-        <mp-form models={roomModel} >
-          <mp-cells title='请填写新增的房源信息' footer='  ' >
-            <mp-cell title='房屋名称：' extClass='font'>
-              <input onInput={(e) => setRoomModel({ ...roomModel, roomName: e.detail.value })} value={roomModel.roomName} placeholder='请输入房屋名称（必填）' />
-            </mp-cell>
-            <mp-cell title='位置信息：' extClass='font'>
-              <input onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address} placeholder='请输入房屋位置（必填）' />
-            </mp-cell>
-            <mp-cell title='定位经纬度：' extClass='font'>
-              <label onClick={onRoomMap}>{roomModel.location == '' ? '房间定位（必填）' : roomModel.location}</label>
-            </mp-cell>
-            <mp-cell title='停车场位置：' extClass='font'>
-              <input onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress} placeholder='请输入停车场位置' />
-            </mp-cell>
-            <mp-cell title='定位经纬度：' extClass='font'>
-              <label onClick={onParkMap}>{roomModel.parkingLocation == '' ? '停车场定位' : roomModel.parkingLocation}</label>
-            </mp-cell>
-            <mp-cell title='Wi-Fi名称：' extClass='font'>
-              <input onInput={(e) => setRoomModel({ ...roomModel, wifiName: e.detail.value })} value={roomModel.wifiName} placeholder='请输入wifi名称' />
-            </mp-cell>
-            <mp-cell title='Wi-Fi密码：' extClass='font'>
-              <input onInput={(e) => setRoomModel({ ...roomModel, wifiPassword: e.detail.value })} value={roomModel.wifiPassword} placeholder='请输入wifi密码' />
-            </mp-cell>
-            <mp-cell title='权重：' extClass='font'>
-              <input type='number' value={roomModel.weight} onInput={(e) => setRoomModel({ ...roomModel, weight: e.detail.value })} placeholder='请输入权重（必填）' />
-            </mp-cell>
-            <mp-cell>
-              <button className='button-OK' onClick={sumbit}>确定</button>
-            </mp-cell>
-          </mp-cells>
-        </mp-form>
+      <view className="index-navbar">
+        <CustomNav title={hotelName} />
+      </view>
+      <view className='from-room' style={{ height: '100%', overflow: "hidden", }} >
+        <scroll-view scrollY style={{ height: '100%' }}>
+          <mp-form models={roomModel} >
+            <mp-cells title='房屋名称' footer='  ' >
+              <mp-cell extClass='font'>
+                <input onInput={(e) => setRoomModel({ ...roomModel, roomName: e.detail.value })} value={roomModel.roomName} placeholder='请输入房屋名称（必填）' />
+              </mp-cell>
+            </mp-cells>
+            <mp-cells title='房屋位置'>
+              <mp-cell extClass='font'>
+                <input onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address} placeholder='请输入房屋位置（必填）' />
+              </mp-cell>
+              <mp-cell extClass='font'>
+                <label onClick={onRoomMap}>{roomModel.location == '' ? '房间定位（必填）' : roomModel.location}</label>
+              </mp-cell>
+              </mp-cells>
+            <mp-cells title='停车场位置'>
+              <mp-cell extClass='font'>
+                <input onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress} placeholder='请输入停车场位置' />
+              </mp-cell>
+              <mp-cell title='停车场经纬度：' extClass='font'>
+                <label onClick={onParkMap}>{roomModel.parkingLocation == '' ? '停车场定位' : roomModel.parkingLocation}</label>
+              </mp-cell>              
+              </mp-cells>
+            <mp-cells title='WiFi'>
+              <mp-cell title='Wi-Fi名称：' extClass='font'>
+                <input onInput={(e) => setRoomModel({ ...roomModel, wifiName: e.detail.value })} value={roomModel.wifiName} placeholder='请输入wifi名称' />
+              </mp-cell>
+              <mp-cell title='Wi-Fi密码：' extClass='font'>
+                <input onInput={(e) => setRoomModel({ ...roomModel, wifiPassword: e.detail.value })} value={roomModel.wifiPassword} placeholder='请输入wifi密码' />
+              </mp-cell>                          
+              </mp-cells>
+            <mp-cells title='权重'>
+              <mp-cell  extClass='font'>
+                <input type='number' value={roomModel.weight} onInput={(e) => setRoomModel({ ...roomModel, weight: e.detail.value })} placeholder='请输入权重（必填）' />
+              </mp-cell>
+                             
+              </mp-cells>
+            <mp-cells title='更多指引'>              
+              {
+                extend == '' ? null :
+                  <mp-cell >
+                    {extend.map((item) => (
+                      <Extend key={item.extId} item={item} />
+                    ))}
+                  </mp-cell>
+              }
+              <mp-cell extClass='adds'>
+                <Button className='add'>增加文字</Button><Button className='add'>增加图片</Button>
+              </mp-cell>
+              <mp-cell>
+                <Button className='button-OK' onClick={sumbit}>确定</Button>
+              </mp-cell>
+            </mp-cells>
+          </mp-form>
+        </scroll-view>
       </view>
     </view>
   )

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

@@ -2,22 +2,29 @@
   width: 100%;
   box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
   border-radius: 24px;
-  
-}
-.weui-agree .weui-agree__text {
-  display: inline;
-}
-button {
-  width: calc(100% - 60px);
-  height: 92px;
-  background: #1A3B83;
-  margin: 0 auto;
-  line-height: 92px;
-  border-radius: 12px;
-  font-size: 40px;
-  color: #ffffff;
-}
-.font{
-  font-size: 28px;
+  .button-OK {
+    width: calc(100% - 60px);
+    height: 92px;
+    background: #1A3B83;
+    margin: 0 auto;
+    line-height: 92px;
+    border-radius: 12px;
+    font-size: 40px;
+    color: #ffffff;
+  }
+  .font{
+    font-size: 28px;
     color: #202020;
-}
+  }
+  .adds{
+    text-align: center;
+    .add{
+      display: inline-block;
+      width: 40%;
+      height: 92px;
+      border-radius: 12px;
+      font-size: 40px;
+      margin: 0 5%;
+    }
+  }  
+}

src/hotel/pages/landlord/addRoom2/addRoom.config.js

@@ -0,0 +1,10 @@
+export default {
+  navigationBarTitleText: '',
+  navigationStyle: 'custom',
+  usingComponents: {
+    "mp-cells": "weui-miniprogram/cells/cells",
+    "mp-cell": "weui-miniprogram/cell/cell",
+    "mp-form": "weui-miniprogram/form/form",
+    "mp-slideview": "weui-miniprogram/slideview/slideview",
+  }
+}

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

@@ -0,0 +1,133 @@
+import withLayout from '@/layouts'
+import Taro from '@tarojs/taro'
+import CustomNav from '@/components/CustomNav'
+import { View, Text, Image, Input, Button, Label } from '@tarojs/components';
+import { useEffect, useState } from "react"
+import { saveRoom, getRoomDetail, updateRoom } from '@/services/landlord'
+import { getExtendContent } from "@/services/home";
+import Extend from "../../components/Extend";
+import './addRoom.less'
+
+
+export default withLayout((props) => {
+  const { hotelId, hotelName, roomId } = props.router.params
+  const [roomModel, setRoomModel] = useState({
+    hotelId,
+    roomName: '',
+    address: '',
+    location: '',
+    parkingAddress: '',
+    parkingLocation: '',
+    wifiName: '',
+    wifiPassword: '',
+    weight: '',
+  })
+  const onRoomMap = () => {
+    Taro.chooseLocation().then((res) => {
+      setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude })
+
+    })
+  }
+  const onParkMap = () => {
+    Taro.chooseLocation().then((res) => {
+      setRoomModel({ ...roomModel, parkingLocation: res.longitude + ',' + res.latitude })
+
+    })
+  }
+  const sumbit = () => {
+    if (
+      roomModel.roomName != '' &&
+      roomModel.address != '' &&
+      roomModel.location != '' &&
+      roomModel.weight != ''
+    ) {
+      const seveices = roomId ? updateRoom : saveRoom
+      seveices(roomModel, roomId).then(() => {
+        Taro.showModal({
+          title: roomId ? '修改成功' : '保存成功',
+          showCancel: false
+        }).then(() => {
+          Taro.navigateBack()
+        })
+      })
+    } else {
+      Taro.showToast({
+        title: '有必填项未填哦',
+        icon: 'none',
+      })
+    }
+  }
+  const [extend, setExtend] = useState([]);
+
+  useEffect(() => {
+    if (roomId) {
+      getRoomDetail(roomId).then((res) => {
+        setRoomModel(res)
+      })
+      getExtendContent('room', roomId).then((res) => {
+        setExtend(res.records || []);
+      })
+    }
+  }, [roomId])//这个地方写这个单词的目的是   因为编辑时roomId有可能还没加载成功
+
+
+
+  return (
+    <view className='page-index'>
+      <view className="index-navbar">
+        <CustomNav title={hotelName} />
+      </view>
+      <view className='roomDetail' style={{ height: '100%', overflow: "hidden", }} >
+        <scroll-view scrollY style={{ height: '100%' }}>
+          <mp-form models={roomModel} >
+            <mp-cells title='房屋名称' footer='' ext-class='cells' >
+              <mp-cell>
+                <Input style={{fontWeight:'bold'}} onInput={(e) => setRoomModel({ ...roomModel, roomName: e.detail.value })} value={roomModel.roomName} placeholder='请输入房屋名称（必填）' />
+              </mp-cell>
+            </mp-cells>
+            <mp-cells title='房屋位置'>
+              <mp-cell>
+                <Input style={{color:'#000',fontWeight:'bold',marginBottom:'13px'}} onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address} placeholder='请输入房屋位置（必填）' />
+                <Label style={{ color: '#666'}} onClick={onRoomMap}>{roomModel.location == '' ? '房间定位（必填）' : roomModel.location}</Label>
+              </mp-cell>
+            </mp-cells>
+            <mp-cells title='停车场位置'>
+              <mp-cell>
+                <Input onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress} placeholder='请输入停车场位置' />
+                <Label style={{ color: '#666', lineHeight: '30px' }} onClick={onParkMap}>{roomModel.parkingLocation == '' ? '停车场定位' : roomModel.parkingLocation}</Label>
+              </mp-cell>
+            </mp-cells>
+            <mp-cells title='WiFi信息'>
+              <mp-cell>
+                <View style={{color:'#666'}}>
+                <Input style={{display:'inline-block',background:'#fff',width:'20%'}} value='名称：' disabled/><Input style={{display:'inline-block',width:'80%'}} onInput={(e) => setRoomModel({ ...roomModel, wifiName: e.detail.value })} value={roomModel.wifiName} placeholder='请输入wifi名称' />             
+                <Input style={{display:'inline-block',background:'#fff',width:'20%'}} value='密码：' disabled/><Input  style={{display:'inline-block',width:'80%'}} onInput={(e) => setRoomModel({ ...roomModel, wifiPassword: e.detail.value })} value={roomModel.wifiPassword} placeholder='请输入wifi密码' />
+              </View>
+              </mp-cell>
+            </mp-cells>
+            <mp-cells title='权重'>
+              <mp-cell>
+                <input type='number' value={roomModel.weight} onInput={(e) => setRoomModel({ ...roomModel, weight: e.detail.value })} placeholder='请输入权重（必填）' />
+              </mp-cell>
+
+            </mp-cells>
+            <mp-cells title='其他指引'>
+              {
+                extend == '' ? null :
+                  <mp-cell >
+                    {extend.map((item) => (
+                      <Extend key={item.extId} item={item} />
+                    ))}
+                  </mp-cell>
+              }
+              <mp-cell extClass='adds'>
+                <Button className='add'>增加文字</Button><Button className='add'>增加图片</Button>
+                <Button className='button-OK' onClick={sumbit}>确定</Button>
+              </mp-cell>
+            </mp-cells>
+          </mp-form>
+        </scroll-view>
+      </view>
+    </view>
+  )
+})

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

@@ -0,0 +1,36 @@
+.roomDetail{
+  padding: 30px;
+  background-color: #F8F8F8;
+  .weui-cells__title{
+    font-size: 34px;
+  }
+  .weui-cells_after-title{
+    border-radius: 50px;
+    font-size: 30px;
+    margin-top: 40px;
+  }  
+  .adds{
+    text-align: center;
+    .add{
+      display: inline-block;
+      width: 35%;
+      height: 78px;
+      line-height: 78px;
+      border-radius: 12px;
+      letter-spacing: 5px;
+      margin: 0 7%;
+      background: #274291;
+      color: #fff;
+    }
+  }  
+  .button-OK {
+    width: calc(100% - 60px);
+    height: 88px;
+    background: #274291;
+    margin: 10px auto;
+    letter-spacing: 5px;
+    line-height: 88px;
+    border-radius: 12px;
+    color: #fff;
+  }
+}

src/hotel/pages/landlord/landlord.jsx

@@ -1,12 +1,12 @@
 import React, { useState, useEffect, useRef } from 'react'
-import Taro,{ useRouter,useShareAppMessage } from '@tarojs/taro'
+import Taro, { useRouter, useShareAppMessage } from '@tarojs/taro'
 import TabBar from '@/components/CustTabBar'
 import incomeImg from '@/assets/icons/landlord/money.png'
 import onincomeImg from '@/assets/icons/landlord/moneyON.png'
 import houseImg from '@/assets/icons/landlord/roomOff.png'
 import onhouseImg from '@/assets/icons/landlord/roomON.png'
 import withLayout from '@/layouts'
-import { getHotelManage,  getNowHotelManage } from '@/services/landlord'
+import { getHotelManage, getNowHotelManage } from '@/services/landlord'
 import NoData from '@/components/NoData'
 import CustomNav from '@/components/CustomNav'
 import { withSubscribeMessage } from '@/utils/subscribeMessage'
@@ -68,10 +68,12 @@ export default withLayout((props) => {
 
   return (
     <view className='page-index'>
-      <CustomNav title={hotel?.hotelName} logo={hotel?.logo} />
+      <view className="index-navbar">
+        <CustomNav title={hotel?.hotelName} logo={hotel?.logo} />
+      </view>
       <view className='index-container'>
-        {currentTab === 0 && <Income hotelList={hotelList} hotel={hotel}  account={account} onHotelChange={handleHotelChange} />}
-        {hotel?.hotelId?currentTab === 1 && <HouseManage hotel={hotel} ref={houseRef} disabled={!hotel.hotelId}/>:<NoData />}
+        {currentTab === 0 && <Income hotelList={hotelList} hotel={hotel} account={account} onHotelChange={handleHotelChange} />}
+        {hotel?.hotelId ? currentTab === 1 && <HouseManage hotel={hotel} ref={houseRef} disabled={!hotel.hotelId} /> : <NoData />}
       </view>
       <view className='index-tabbar'>
         <TabBar extClass='custom-tabbar bottomTab' current={currentTab} onChange={handleTabChange}>

src/hotel/pages/landlord/roomOrder/roomOrder.jsx

@@ -44,34 +44,36 @@ export default withLayout((props) => {
   }
   return (
     <View style={{ padding: '0 30px' }}>
-      <CustomNav title={roomName ? roomName : '房间名'} />
+      <view className="index-navbar">
+        <CustomNav title={roomName ? roomName : '房间名'} />
+      </view>
       <scroll-view scrollY style={{ height: 'calc(100vh - 65px)' }}>
 
         {
-          detail.length==0?<View className='houseCard'>暂无入住人数据</View>
-           :detail.map((item) =>
-            <View className='houseCard'>
-              {
-                (item.personList||[]).map((item2) =>
-                  <View className='operation'>
-                    <View style={{display:'inline-block'}} onClick={()=>CopyName(item2.customerName)}>
-                      <Label>{item2.customerName}</Label>
-                      <Image src={copy} />
+          detail.length == 0 ? <View className='houseCard'>暂无入住人数据</View>
+            : detail.map((item) =>
+              <View className='houseCard'>
+                {
+                  (item.personList || []).map((item2) =>
+                    <View className='operation'>
+                      <View style={{ display: 'inline-block' }} onClick={() => CopyName(item2.customerName)}>
+                        <Label>{item2.customerName}</Label>
+                        <Image src={copy} />
+                      </View>
+                      <View style={{ display: 'inline-block', marginLeft: '40rpx' }} onClick={() => CopyPhone(item2.customerPhone)}>
+                        <Label>{item2.customerPhone}</Label>
+                        <Image src={copy} />
+                      </View>
                     </View>
-                    <View style={{display:'inline-block',marginLeft:'40rpx'}} onClick={()=>CopyPhone(item2.customerPhone)}>
-                      <Label>{item2.customerPhone}</Label>
-                      <Image src={copy} />
-                    </View>
-                  </View>
 
-                )
-              }              
-              <View className='operation'>入住时间：{item.startDate}  -  {item.endDate}</View>
+                  )
+                }
+                <View className='operation'>入住时间：{item.startDate}  -  {item.endDate}</View>
 
-            </View>
-          )
+              </View>
+            )
         }
-        
+
       </scroll-view>
     </View>
   )

src/routes.js

@@ -80,6 +80,10 @@ const hotelPages = [
     title: '新增房源',
     page: 'pages/landlord/addRoom/addRoom',
   },
+  {
+    title: '新增房源2',
+    page: 'pages/landlord/addRoom2/addRoom',
+  },
   {
     title: '查看入住人',
     page: 'pages/landlord/roomOrder/roomOrder',

src/services/landlord.js

@@ -87,4 +87,12 @@ export const shareRoom = (data) => request('/roomOrder', { method: 'post', data
 * @param {*} id 
 * @returns 
 */
-export const getRoomOrderList = (params) => request('/roomOrder', { params })
+export const getRoomOrderList = (params) => request('/roomOrder', { params })
+
+
+/**
+ * 修改房源更多指引信息
+ * @param {*} data 
+ * @returns 
+ */
+ export const update = (id, data) => request(`/taExtendContent/${id}`, { method: 'put', data })

src/shop/pages/spread/spreadIndex.jsx

@@ -116,7 +116,9 @@ export default withLayout((props) => {
 
   return (
     <view className='page-index'>
-      <CustomNav title={shop?.shopName} />
+      <view className="index-navbar">
+        <CustomNav title={shop?.shopName} />
+      </view>
       <view className='index-container'>
         {currentTab === 0 && <ShopKeeper isVerified={isVerified} shopId={shopId} amountType={amountType} setVer={setVer} onVarifiedTwo={onVarifiedTwo} onVarified={onVarified} verifiedOrder={verifiedOrder} shopList={shopList} shop={shop} onHotelChange={handleHotelChange} shopMoney={shopMoney} />
         }

src/utils/hooks/useRouter.js

@@ -41,7 +41,5 @@ export default () => {
       }
     }
   }, [qrCode, scene])
-
-  console.log('-----------routerRef.current---------------', routerRef.current)
   return routerRef.current
 }