。

src/hotel/components/shareCard/shareCard.jsx

@@ -2,20 +2,22 @@ import React from 'react'
 import Popup from '@/components/Popup'
 import Taro from '@tarojs/taro'
 import { Input, Button, View, Picker, Label } from '@tarojs/components'
-import {shareRoom} from '@/services/landlord'
+import { shareRoom } from '@/services/landlord'
 import { useState } from 'react'
 import './shareCard.less'
 
 
 export default (props) => {
-  const { showCutover, onClose} = props
+  const { showCutover, onClose } = props
 
   return (
-    <Popup show={showCutover} onClose={onClose}>
-      <View className='card'>
-      <Label style={{color:'black',fontSize:'45rpx'}}>确认分享给游客</Label>      
-      <View><Button  className='cancel' onClick={onClose}>取消</Button><Button openType='share' className='btn'>确认</Button></View>
+    <View className='c1'>
+      <Popup show={showCutover} onClose={onClose}>
+        <View className='card2'>
+          <View className='text'>分享到微信</View>
+          <View className='share'>去分享<Button openType='share' className='btn'>去分享</Button></View>
+        </View>
+      </Popup>
     </View>
-    </Popup>
   )
 }

src/hotel/components/shareCard/shareCard.less

@@ -1,24 +1,27 @@
-.card{
-  font-size: 34px;
-  padding-top: 40px;
-}
-.cancel{
-  width: 150px;
-  height: 70px;
-  display: inline-block;
-  line-height: 70px;
-  border-radius: 12px;
-  font-size: 36px;
-  margin-top: 15px;
-  margin-right: 20px;
-}
-.btn {
-  width: 150px;
-  height: 70px;
-  background: #1A3B83;
-  display: inline-block;
-  line-height: 70px;
-  border-radius: 12px;
-  font-size: 36px;
-  color: #fff;
+.c1{
+  .weui-dialog__bd {
+    padding: 0;
+    margin: 0;
+  }
+  .card2{
+    text-align: center;
+    position: relative;
+    .text{
+      padding: 30px 0;
+      border-bottom: 6px solid #E9E9E9;
+      color: #000;
+    }
+    .share{
+      padding: 30px 0;
+      color: #618FE7;
+    }
+    .btn {
+      font-size: 36px;
+      background:#fff;
+      position: absolute;
+      width: 100%;
+      bottom: 0;
+      opacity: 0;
+    }
+  }
 }

src/hotel/components/shareRoom/ShareRoom.less

@@ -42,12 +42,14 @@
     margin: 20px 20px 0 0;
     width: 236px;
     height: 78px;
+    line-height: 78px;
     border: 2px solid #274190;
     border-radius: 12px;
   }
   .btn {
     width: 236px;
     height: 78px;
+    line-height: 78px;
     background: #274291;
     border-radius: 12px;
     display: inline-block;

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

@@ -3,22 +3,22 @@ import Taro from '@tarojs/taro';
 import del from '@/assets/icons/landlord/delete.png'
 import Popup from '@/components/Popup'
 import { View, Text, Image, Textarea, Label, Button } from '@tarojs/components';
-import { update,deleteExtend } from '@/services/landlord'
+import { update, deleteExtend } from '@/services/landlord'
 import './style.less'
 
 export default (props) => {
-  const { item,setReset } = props
+  const { item, setReset } = props
   const [eimg, seteImg] = useState(item.content)
   const handerChange = () => {
     Taro.chooseImage({
       count: 1,
       success: function (res) {
         seteImg(res.tempFilePaths[0])
-        const date={
-          content:res.tempFilePaths[0],
-          contentType:'image'
+        const date = {
+          content: res.tempFilePaths[0],
+          contentType: 'image'
         }
-        update(item.extId,{...item,...date} )
+        update(item.extId, { ...item, ...date })
       }
     })
   }
@@ -44,14 +44,32 @@ export default (props) => {
     deleteExtend(item.extId)
     setReset(true)
   }
-  const handelEdit = () => { 
+  //判断是否只有空 空格 回车
+  const javaTrim = (str) => {
+    for (var i = 0; (str.charAt(i) == ' ') && i < str.length; i++);
+    if (i == str.length) return ''; //whole string is space
+    var newstr = str.substr(i);
+    for (var i = newstr.length - 1; newstr.charAt(i) == ' ' && i >= 0; i--);
+    newstr = newstr.substr(0, i + 1);
+    return newstr;
+  }
+  const handelEdit = () => {
     var content = document.getElementById('content').value
+
+    content = content.replace(/\n/g, '');
+    if (javaTrim(content) == '') {
+      Taro.showToast({
+        title: '您还没有添加文字哦',
+        icon: 'none'
+      })
+      return;
+    }
     setContent(content)
-    const date={
+    const date = {
       content,
-      contentType:'text'
+      contentType: 'text'
     }
-    update(item.extId,{...item,...date})
+    update(item.extId, { ...item, ...date })
     onClose()
   }
   return (
@@ -62,7 +80,7 @@ export default (props) => {
             <View className='rzline' /><Label className='srl mg'>修改文字</Label><View className='rzline' />
           </View>
           <View>
-            <Textarea  className='storezn' value={content} id='content' />
+            <Textarea className='storezn' value={content} id='content' />
           </View>
           <View>
             <Button className='cancel' onClick={onClose}>取消</Button>

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

@@ -1,6 +1,6 @@
 #det{
   .editword{
-    padding: 30px;
+    padding-top: 60px;
     .srl{
       font-size: 30px;
       font-weight: bold;
@@ -13,35 +13,40 @@
     .rzline{
       border-top: 2px #999 dashed;
       height: 2px;
-      width: 80px;
+      width: 160px;
       display: inline-block;
       margin-bottom: 8px;
     } 
     .cancel{
       color: #274290;
       display: inline-block;
-      margin: 20px 20px 0 0;
-      width: 200px;
+      margin-right: 44px;
+      width: 240px;      
+      font-size: 30px;      
+      font-weight: bold;
       height: 78px;
       line-height: 78px;
       border: 2px solid #274190;
       border-radius: 12px;
+      letter-spacing: 3px;
     }
     .btn {
-      width: 200px;
+      letter-spacing: 3px;
+      width: 240px;
       height: 78px;
+      font-size: 30px;      
       line-height: 78px;
       background: #274290;
+      font-weight: bold;
       border-radius: 12px;
       display: inline-block;
       color: #fff;
     }  
   }
   .storezn{
-    font-size: 28px;    
     color: #202020;
     line-height: 54px;
-    margin-bottom: 40px;
+    margin-bottom: 60px;
     text-align: justify;
   }
   .weui-slideview__btn__wrp{
@@ -58,13 +63,13 @@
     line-height: 44px;
   }
   Textarea{
-    height: 200px;
+    height: 300px;
     width: 100%;
-    padding: 15px;
+    padding: 30px;
+    background: #F8F8F8;
+    border-radius: 8px;
     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);
+    font-size: 26px;
   }
 }

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

@@ -1,7 +1,7 @@
 import withLayout from '@/layouts'
 import Taro from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
-import { View, Input, Button, Label, Textarea } from '@tarojs/components';
+import { View, Input, Button, Label, Textarea,Text } from '@tarojs/components';
 import { useEffect, useState } from "react"
 import { saveRoom, getRoomDetail, updateRoom } from '@/services/landlord'
 import { getExtendContent } from "@/services/home";
@@ -79,15 +79,24 @@ export default withLayout((props) => {
 
   //新增文字
   const [showCutover, setShowCutover] = useState(false)
-  const [cont,setcont]=useState()
+  const [cont, setcont] = useState('')
   const onClose = () => {
     setShowCutover(false)
-    setReset(true)
-    setcont()
+  }
+  //判断是否只有空 空格 回车
+  const javaTrim = (str) => {
+    for (var i = 0; (str.charAt(i) == ' ') && i < str.length; i++);
+    if (i == str.length) return ''; //whole string is space
+    var newstr = str.substr(i);
+    for (var i = newstr.length - 1; newstr.charAt(i) == ' ' && i >= 0; i--);
+    newstr = newstr.substr(0, i + 1);
+    return newstr;
   }
   const handelAdd = () => {
-    var content = document.getElementById('content').value
-    if (content === '') {
+    var content = document.getElementById('cont').value
+
+    content = content.replace(/\n/g, '');
+    if (javaTrim(content) == '') {
       Taro.showToast({
         title: '您还没有添加文字哦',
         icon: 'none'
@@ -100,11 +109,30 @@ export default withLayout((props) => {
       content,
       contentType: 'text'
     }
+
     saveExtend(date)
+    setcont('')
     onClose()
+    setReset(!reset)
   }
   const showText = () => {
     setShowCutover(true)
+    setcont('')
+  }
+  const addImage = () => {
+    Taro.chooseImage({
+      count: 1,
+      success: function (res) {
+        const date = {
+          targetId: roomId,
+          targetType: 'room',
+          content: res.tempFilePaths[0],
+          contentType: 'image'
+        }
+        saveExtend(date)
+        setReset(!reset)
+      }
+    })
   }
   return (
     <view className='page-index'>
@@ -120,11 +148,11 @@ export default withLayout((props) => {
                   <View className='rzline' /><Label className='srl mg'>新增文字</Label><View className='rzline' />
                 </View>
                 <View>
-                  <Textarea className='storezn' id='content' value={cont} placeholder='请输入准备新增的文字' />
+                  <Textarea className='storezn' id='cont' value={cont} placeholder='请输入准备新增的文字' />
                 </View>
                 <View>
                   <Button className='cancel' onClick={onClose}>取消</Button>
-                  <Button className='btn' onClick={handelAdd}>确认修改</Button>
+                  <Button className='btn' onClick={handelAdd}>确认增加</Button>
                 </View>
               </View>
             </Popup>
@@ -169,12 +197,17 @@ export default withLayout((props) => {
                     ))}
                   </mp-cell>
               }
-              <mp-cell extClass='adds'>
-                <Button className='add' onClick={showText}>增加文字</Button><Button className='add'>增加图片</Button>
-                <Button className='button-OK' onClick={sumbit}>确定</Button>
-              </mp-cell>
             </mp-cells>
           </mp-form>
+          <View className='adds' >
+            <Text className='zuobian'>增加文字</Text>
+            <View className='add' onClick={showText}><Text className='jiahao'>+</Text><Text className='zengjia'>添加</Text></View>
+          </View>
+          <View className='adds' >
+            <Text className='zuobian'>增加图片</Text>
+            <View className='add' onClick={addImage}><Text className='jiahao'>+</Text><Text className='zengjia'>添加</Text></View>
+          </View>
+          <Button className='button-OK' onClick={sumbit}>确定</Button>
         </scroll-view>
       </view>
     </view>

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

@@ -11,27 +11,47 @@
   }
     
   .adds{
-    text-align: center;
+    width: 100%;
+    background-color: #fff;
+    border-radius: 12px;
+    font-weight: bold;
+    margin-top: 20px;
+    padding: 30px;
+    position: relative;
+    .zuobian{
+      text-align: left;
+      font-size: 32px;      
+    }
     .add{
-      display: inline-block;
-      width: 35%;
-      height: 78px;
-      line-height: 78px;
+      position: absolute;
+      right: 90px;
+      height: 60px;
+      top: calc(50% - 30px);
+      width: 170px;
+      border: 2px solid #000;
+      color: #202020;
+      line-height: 56px;
       border-radius: 12px;
       letter-spacing: 5px;
-      margin: 0 7%;
-      background: #274291;
-      color: #fff;
+      text-align: center;
+      .jiahao{        
+        font-size: 48px;
+      }
+      .zengjia{
+        position: relative;
+        bottom:  4px;
+      }
     }
   }  
   .button-OK {
-    width: calc(100% - 60px);
-    height: 88px;
+    height: 92px;
     background: #274291;
-    margin: 10px auto;
+    margin: 60px 0 30px 0;
     letter-spacing: 5px;
-    line-height: 88px;
+    line-height: 92px;
     border-radius: 12px;
+    font-size: 30px;
+    font-weight: bold;
     color: #fff;
   }
 }