。

src/components/CouponCard/Card/style.less

@@ -8,7 +8,7 @@
   border-radius: 12px;
 
   & + & {
-    margin-top: 36rpx;
+    margin-top: 36px;
   }
 
   & > view {

src/hotel/components/Income/income.jsx

@@ -72,7 +72,7 @@ export default (props) => {
         <view className='title' >推广收入记录</view>
 
         <List
-          style={{ height: 'calc(100vh - 390px)' }}
+          style={{ height: 'calc(100vh - 375px)' }}
           request={fetchAPI}
           params={queryParams}
           noData={<NoData />}

src/hotel/components/shareRoom/ShareRoom.jsx

@@ -22,7 +22,8 @@ export default (props) => {
     var myDate = new Date();
     shareRoom({
       hotelId: room.hotelId,
-      personNum: roomNum == '' ? 0 : roomNum, roomId: room.roomId,
+      personNum: roomNum == '' ? 0 : roomNum, 
+      roomId: room.roomId,
       startDate: startDate == '' ? myDate.toLocaleDateString() : startDate,
       endDate: endDate == '' ? myDate.toLocaleDateString() : endDate
     }).then((res) => {

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

@@ -1,42 +1,90 @@
 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 Popup from '@/components/Popup'
+import { View, Text, Image, Textarea, Label, Button } from '@tarojs/components';
+import { update,deleteExtend } from '@/services/landlord'
 import './style.less'
 
 export default (props) => {
-  const { item } = props
+  const { item,setReset } = 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 date={
+          content:res.tempFilePaths[0],
+          contentType:'image'
+        }
+        update(item.extId,{...item,...date} )
       }
     })
   }
-  const detele=[
+  const [showCutover, setShowCutover] = useState(false)
+  const showText = () => {
+    setShowCutover(true)
+  }
+  const onClose = () => {
+    setShowCutover(false)
+    setReset(true)
+  }
+  const detele = [
     {
       src: del, // icon的路径
-      extClass:'det'
     }
   ]
-  const handelDelete=()=>{
-    seteImg()
-    console.log("11111111111111111")
+  const [content, setContent] = useState(item.content)
+  const handelDelete = () => {
+    deleteExtend(item.extId)
+    setReset(true)
+  }
+  const handelDelete2 = () => {
+    deleteExtend(item.extId)
+    setReset(true)
+  }
+  const handelEdit = () => { 
+    var content = document.getElementById('content').value
+    setContent(content)
+    const date={
+      content,
+      contentType:'text'
+    }
+    update(item.extId,{...item,...date})
+    onClose()
   }
   return (
-    <View>
+    <View id='det'>
+      <Popup show={showCutover} onClose={onClose}>
+        <View className='editword'>
+          <View style={{ marginBottom: '25px' }}>
+            <View className='rzline' /><Label className='srl mg'>修改文字</Label><View className='rzline' />
+          </View>
+          <View>
+            <Textarea  className='storezn' value={content} id='content' />
+          </View>
+          <View>
+            <Button className='cancel' onClick={onClose}>取消</Button>
+            <Button className='btn' onClick={handelEdit}>确认修改</Button>
+          </View>
+        </View>
+      </Popup>
       {
         item.contentType == 'image' ?
-          <mp-slideview  buttons={detele} icon onbuttontap={handelDelete}>
-            <Image src={eimg} mode='widthFix' style={{ width: '100%',display:'block' }} onClick={handerChange}/>
-          </mp-slideview> 
+          <View>
+            <mp-slideview buttons={detele} icon onbuttontap={handelDelete}>
+              <Image src={eimg} mode='widthFix' style={{ width: '100%', display: 'block' }} onClick={handerChange} />
+            </mp-slideview>
+          </View>
           :
           item.contentType == 'text' ?
-            <View className='storezn'>{item.content}</View> : null
+            <View>
+              <mp-slideview buttons={detele} icon onbuttontap={handelDelete2}>
+                <View className='storezn' onClick={showText}>{content}</View>
+              </mp-slideview>
+            </View>
+            : null
       }
     </View>
   )

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

@@ -1,9 +1,70 @@
-.storezn{
-  font-size: 28px;    
-  color: #202020;
-  line-height: 54px;
-  margin-bottom: 40px;
-  text-align: justify;
-}
-.det{
+#det{
+  .editword{
+    padding: 30px;
+    .srl{
+      font-size: 30px;
+      font-weight: bold;
+      color: #202020;
+    }  
+    .mg{
+      font-size: 38px;
+      margin: 0 20px 50px 20px;
+    }
+    .rzline{
+      border-top: 2px #999 dashed;
+      height: 2px;
+      width: 80px;
+      display: inline-block;
+      margin-bottom: 8px;
+    } 
+    .cancel{
+      color: #274290;
+      display: inline-block;
+      margin: 20px 20px 0 0;
+      width: 200px;
+      height: 78px;
+      line-height: 78px;
+      border: 2px solid #274190;
+      border-radius: 12px;
+    }
+    .btn {
+      width: 200px;
+      height: 78px;
+      line-height: 78px;
+      background: #274290;
+      border-radius: 12px;
+      display: inline-block;
+      color: #fff;
+    }  
+  }
+  .storezn{
+    font-size: 28px;    
+    color: #202020;
+    line-height: 54px;
+    margin-bottom: 40px;
+    text-align: justify;
+  }
+  .weui-slideview__btn__wrp{
+    background: #FFFFFF;
+    box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
+    border-radius: 12px;
+    margin: 5px 5px 5px 20px;
+    height: 97%;
+    width: 67px;
+  }
+  .weui-slideview__btn{
+    width: 44px;
+    height: 44px;
+    line-height: 44px;
+  }
+  Textarea{
+    height: 200px;
+    width: 100%;
+    padding: 15px;
+    box-sizing: border-box;
+    height: 254px;
+    border: 1px solid #b5b5b5;
+    font-size: 24px;
+    box-shadow: 0px 4px 24px 0px rgba(0, 0, 0, 0.08);
+  }
 }

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

@@ -6,5 +6,6 @@ export default {
     "mp-cell": "weui-miniprogram/cell/cell",
     "mp-form": "weui-miniprogram/form/form",
     "mp-slideview": "weui-miniprogram/slideview/slideview",
+    "mp-dialog": "weui-miniprogram/dialog/dialog",
   }
 }

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

@@ -1,10 +1,12 @@
 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 { View, Input, Button, Label, Textarea } from '@tarojs/components';
 import { useEffect, useState } from "react"
 import { saveRoom, getRoomDetail, updateRoom } from '@/services/landlord'
 import { getExtendContent } from "@/services/home";
+import { saveExtend } from '@/services/landlord'
+import Popup from '@/components/Popup'
 import Extend from "../../components/Extend";
 import './addRoom.less'
 
@@ -58,20 +60,52 @@ export default withLayout((props) => {
     }
   }
   const [extend, setExtend] = useState([]);
-
   useEffect(() => {
     if (roomId) {
       getRoomDetail(roomId).then((res) => {
         setRoomModel(res)
       })
-      getExtendContent('room', roomId).then((res) => {
+    }
+  }, [roomId])//这个地方写这个单词的目的是   因为编辑时roomId有可能还没加载成功
+  const [reset, setReset] = useState(false)
+  useEffect(() => {
+    if (roomId) {
+      getExtendContent('room', roomId, { pageSize: 999 }).then((res) => {
         setExtend(res.records || []);
       })
+      setReset(false)
     }
-  }, [roomId])//这个地方写这个单词的目的是   因为编辑时roomId有可能还没加载成功
-
-
+  }, [reset])
 
+  //新增文字
+  const [showCutover, setShowCutover] = useState(false)
+  const [cont,setcont]=useState()
+  const onClose = () => {
+    setShowCutover(false)
+    setReset(true)
+    setcont()
+  }
+  const handelAdd = () => {
+    var content = document.getElementById('content').value
+    if (content === '') {
+      Taro.showToast({
+        title: '您还没有添加文字哦',
+        icon: 'none'
+      })
+      return;
+    }
+    const date = {
+      targetId: roomId,
+      targetType: 'room',
+      content,
+      contentType: 'text'
+    }
+    saveExtend(date)
+    onClose()
+  }
+  const showText = () => {
+    setShowCutover(true)
+  }
   return (
     <view className='page-index'>
       <view className="index-navbar">
@@ -79,16 +113,32 @@ export default withLayout((props) => {
       </view>
       <view className='roomDetail' style={{ height: '100%', overflow: "hidden", }} >
         <scroll-view scrollY style={{ height: '100%' }}>
+          <View id='det'>
+            <Popup show={showCutover} onClose={onClose}>
+              <View className='editword'>
+                <View style={{ marginBottom: '25px' }}>
+                  <View className='rzline' /><Label className='srl mg'>新增文字</Label><View className='rzline' />
+                </View>
+                <View>
+                  <Textarea className='storezn' id='content' value={cont} placeholder='请输入准备新增的文字' />
+                </View>
+                <View>
+                  <Button className='cancel' onClick={onClose}>取消</Button>
+                  <Button className='btn' onClick={handelAdd}>确认修改</Button>
+                </View>
+              </View>
+            </Popup>
+          </View>
           <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='请输入房屋名称（必填）' />
+                <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>
+                <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='停车场位置'>
@@ -99,29 +149,28 @@ export default withLayout((props) => {
             </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>
+                <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} />
+                      <Extend key={item.extId} item={item} setReset={setReset} />
                     ))}
                   </mp-cell>
               }
               <mp-cell extClass='adds'>
-                <Button className='add'>增加文字</Button><Button className='add'>增加图片</Button>
+                <Button className='add' onClick={showText}>增加文字</Button><Button className='add'>增加图片</Button>
                 <Button className='button-OK' onClick={sumbit}>确定</Button>
               </mp-cell>
             </mp-cells>

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

@@ -8,7 +8,8 @@
     border-radius: 50px;
     font-size: 30px;
     margin-top: 40px;
-  }  
+  }
+    
   .adds{
     text-align: center;
     .add{

src/hotel/pages/landlord/landlord.jsx

@@ -26,6 +26,8 @@ export default withLayout((props) => {
   const houseRef = useRef()
 
   useEffect(() => {
+    // 禁止右上角分享
+    Taro.hideShareMenu()
     getHotelManage().then((res) => {
       const { hotelList: list, account: acc, hotel: current } = res
       setHotelList(list)
@@ -47,7 +49,6 @@ export default withLayout((props) => {
   const handleTabChange = (e) => {
     const { index } = e.detail
     setCurrentTab(index)
-
     withSubscribeMessage('hotel_check_in')
   }
 
@@ -61,27 +62,22 @@ export default withLayout((props) => {
     return houseRef.current.getShareMessage()
   })
 
-  useEffect(() => {
-    // 禁止右上角分享
-    Taro.hideShareMenu()
-  }, [])
-
   return (
     <view className='page-index'>
       <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 === 1 && <Income hotelList={hotelList} hotel={hotel} account={account} onHotelChange={handleHotelChange} />}
+        {hotel?.hotelId ? currentTab === 0 && <HouseManage hotel={hotel} ref={houseRef} disabled={!hotel.hotelId} /> : <NoData />}
       </view>
       <view className='index-tabbar'>
         <TabBar extClass='custom-tabbar bottomTab' current={currentTab} onChange={handleTabChange}>
-          <view className={`${currentTab === 0 ? 'incomeTab' : ''}`}>
-            <image className='incomes' src={currentTab === 0 ? onincomeImg : incomeImg} /><text>我的收入</text>
+          <view className={`${currentTab === 0 ? 'houseTab' : ''}`}>
+            <image className='house' src={currentTab === 0 ? onhouseImg : houseImg} /><text>房源管理</text>
           </view>
-          <view className={`${currentTab === 1 ? 'houseTab' : ''}`}>
-            <image className='house' src={currentTab === 1 ? onhouseImg : houseImg} /><text>房源管理</text>
+          <view className={`${currentTab === 1 ? 'incomeTab' : ''}`}>
+            <image className='incomes' src={currentTab === 1 ? onincomeImg : incomeImg} /><text>我的收入</text>
           </view>
         </TabBar>
       </view>

src/pages/details/components/Extend/extend.jsx

@@ -4,7 +4,7 @@ import './extend.less'
 export default (props) => {
   const { item } = props
   return (
-    <view>
+    <view className='cardext'>
     {
       item.contentType == 'image' ?
         <image src={item.content} mode='widthFix' style={{ width: '100%'}} /> :

src/pages/details/components/Extend/extend.less

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

src/services/landlord.js

@@ -95,4 +95,18 @@ export const getRoomOrderList = (params) => request('/roomOrder', { params })
  * @param {*} data 
  * @returns 
  */
- export const update = (id, data) => request(`/taExtendContent/${id}`, { method: 'put', data })
+ export const update = (id, data) => request(`/taExtendContent/${id}`, { method: 'put', data })
+
+ /**
+* 删除更多指引
+* @param {*} data 
+* @returns 
+*/
+export const deleteExtend = (id) => request(`/taExtendContent/${id}`, { method: 'delete' })
+
+/**
+ * 新增更多指引
+ * @param {*} data 
+ * @returns 
+ */
+ export const saveExtend = (data) => request('/taExtendContent', { method: 'post', data })