。

src/components/OrderMolded/index.jsx

@@ -19,14 +19,11 @@ export default (props) => {
           <image className='image-2-cardOrder' src={food}></image>
         </view>
         <view className='title-content-cardOrder'>
-
           <view className='title-text-cardOrder'>{item.description}</view>
-
           <text className='title-money-cardOrder' >￥{(item.actualPrice / 100).toFixed(2)}元</text>
           <view className='title-time-cardOrder' >有效期：{formatTimes(item.startTime, "yyyy/MM/dd")}-{formatTimes(item.endTime, "yyyy/MM/dd")}</view>
         </view>
       </view>
     </view>
-    // </view >
   )
 }

src/hotel/components/HouseManage/houseManage.jsx

@@ -7,6 +7,8 @@ import addImg from '@/assets/icons/landlord/add.png'
 import copyRoom from '@/assets/icons/landlord/copyroom.png'
 import React, { useState, useEffect, useRef, useImperativeHandle, useMemo } from 'react'
 import { getRoomList, saveRoom, deleteRoom } from '@/services/landlord'
+import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
+import ToggleRole from '@/components/toggleRole/ToggleRole'
 import List from '@/components/List';
 import Picker from '@/components/Picker'
 import SearchBar from '@/components/SearchBar'
@@ -134,10 +136,24 @@ export default React.forwardRef((props, ref) => {
       })
     })
   }
+  const [showCutover3, setShowCutover3] = useState(false)
+  const ShowMoldeOn3 = () => {
+    setShowCutover3(true)
+  }
+  const onClose3 = () => {
+    setShowCutover3(false)
+  }
   return (
     <view>
       <view style={{ padding: '0 30rpx', height: '100%' }}>
+      <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'>
+            <image className='User-info-cutover-image' src={cutoverUser} />
+          </view>
+        </View>
         <SearchBar placeholder='请输入房源名搜索' onBlur={onSearch} />
         <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
         <ShareCard showCutover={showCard} onClose={onClose2} />

src/hotel/components/HouseManage/houseManage.less

@@ -5,6 +5,16 @@
   text-align: center;
 }
 
+.User-info-cutover{
+  position: absolute;
+  top: 0;
+  right: 60px;
+  .User-info-cutover-image{
+    width: 36px;
+    height: 36px;
+  }
+}
+
 .houseCard{
   background: #FFFFFF;
   box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);

src/hotel/components/Income/income.jsx

@@ -2,9 +2,6 @@ import { useState, useMemo } from 'react'
 import eyes from '@/assets/icons/shopKeeper/eyesON.png'
 import ceyes from '@/assets/icons/shopKeeper/eyesOFF.png'
 import sImg from '@/assets/icons/landlord/money2.png'
-import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
-import ToggleRole from '@/components/toggleRole/ToggleRole'
-import Picker from '@/components/Picker'
 import formatTime from "@/utils/formatTime";
 import formatPrice from '@/utils/formatPrice'
 import { getAccountLogList } from '@/services/landlord'
@@ -30,22 +27,11 @@ export default (props) => {
   const handleMonth = () => {
     isMomth ? setMonth(false) : setMonth(true)
   }
-  const [showCutover, setShowCutover] = useState(false)
-  const ShowMoldeOn = () => {
-    setShowCutover(true)
-  }
-  const onClose = () => {
-    setShowCutover(false)
-  }
   return (
     <view>
-      <ToggleRole role='hotel' showCutover={showCutover} maskClosable={showCutover} onClose={onClose} />
       <view style={{ padding: '30rpx', height: '100%' }}>
         <view className='storexx'>
           <view className='storeName'>店名：{hotel.hotelName}</view>
-          <view onClick={ShowMoldeOn} className='User-info-cutover'>
-            <image className='User-info-cutover-image' src={cutoverUser} />
-          </view>
           <view className='money'>
             <view className='sleft'>
               <view className='lword'>全年收入（税前）</view>

src/hotel/components/Income/income.less

@@ -70,15 +70,6 @@
     color: #202020;
     margin-bottom:58px;
   }
-  .User-info-cutover{
-    position: absolute;
-    top: 60px;
-    right: 60px;
-    .User-info-cutover-image{
-      width: 36px;
-      height: 36px;
-    }
-  }
   .sleft{
     float: left;
     text-align: left;

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

@@ -1,8 +1,7 @@
 import { useState } from 'react';
 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 { View,  Image, Textarea, Label, Button } from '@tarojs/components';
 import { update, deleteExtend } from '@/services/landlord'
 import SlideView from '@/components/SlideView';
 import './style.less'
@@ -31,19 +30,23 @@ export default (props) => {
     setShowCutover(false)
     setReset(true)
   }
-  const detele = [
-    {
-      src: del, // icon的路径
-    }
-  ]
   const [content, setContent] = useState(item.content)
   const handelDelete = () => {
-    deleteExtend(item.extId)
-    setReset(true)
-  }
-  const handelDelete2 = () => {
-    deleteExtend(item.extId)
-    setReset(true)
+    Taro.showModal({
+      title: '提示',
+      content: `确认删除?`,
+      success: function (res) {
+        if (res.confirm) {
+          deleteExtend(item.extId).then(() => {
+            Taro.showToast({
+              title: '删除成功',
+              icon: 'none',
+            })
+            setReset(true)
+          })
+        }
+      }
+    })
   }
   //判断是否只有空 空格 回车
   const javaTrim = (str) => {
@@ -99,7 +102,7 @@ export default (props) => {
           :
           item.contentType == 'text' ?
             <View>
-              <SlideView del onDelete={handelDelete2}>
+              <SlideView del onDelete={handelDelete}>
                 <View className='storezn' onClick={showText}>{content}</View>
               </SlideView>
             </View>

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

@@ -6,6 +6,7 @@ import { useEffect, useState } from "react"
 import { saveRoom, getRoomDetail, updateRoom } from '@/services/landlord'
 import { getExtendContent } from "@/services/home";
 import { saveExtend } from '@/services/landlord'
+import uploadFile from '@/utils/request'
 import Popup from '@/components/Popup'
 import Extend from "../../components/Extend";
 import './addRoom.less'
@@ -127,15 +128,28 @@ export default withLayout((props) => {
     Taro.chooseImage({
       count: 1,
       success: function (res) {
-        const date = {
-          targetId: roomId,
-          targetType: 'room',
-          content: res.tempFilePaths[0],
-          contentType: 'image'
-        }
-        saveExtend(date)
-        setReset(!reset)
+        // const tempFilePaths = res.tempFilePaths[0]
+        console.log(res)
+          uploadFile(res.tempFilePaths[0]).then((res2)=>{
+            console.log(res2)
+          })
       }
+
+
+
+
+
+
+      // success: function (res) {
+      //   const date = {
+      //     targetId: roomId,
+      //     targetType: 'room',
+      //     content: res.tempFilePaths[0],
+      //     contentType: 'image'
+      //   }
+      //   saveExtend(date)
+      //   setReset(!reset)
+      // }
     })
   }
   const isError = (s) => {

src/pages/PayOrder/index.jsx

@@ -41,7 +41,7 @@ export default withLayout((props) => {
 
     if (BuyNumber <= 0) {
       Taro.showToast({
-        title: '最少需要一笔订单哦',
+        title: '最少需要一个套餐哦',
         icon: 'none',
         duration: 2000
       })

src/pages/PayOrder/style.less

@@ -122,7 +122,7 @@
         font-size: 30px;
       }
       .paycontent{
-        margin:0 15px;
+        margin:0 40px 0 20px;
         .paybuttontop{
           background: url(../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
           background-size: 100% 100%;