李志伟 před 3 roky
rodič
revize
f431a1e081

+ 0
- 3
src/components/OrderMolded/index.jsx Zobrazit soubor

19
           <image className='image-2-cardOrder' src={food}></image>
19
           <image className='image-2-cardOrder' src={food}></image>
20
         </view>
20
         </view>
21
         <view className='title-content-cardOrder'>
21
         <view className='title-content-cardOrder'>
22
-
23
           <view className='title-text-cardOrder'>{item.description}</view>
22
           <view className='title-text-cardOrder'>{item.description}</view>
24
-
25
           <text className='title-money-cardOrder' >¥{(item.actualPrice / 100).toFixed(2)}元</text>
23
           <text className='title-money-cardOrder' >¥{(item.actualPrice / 100).toFixed(2)}元</text>
26
           <view className='title-time-cardOrder' >有效期:{formatTimes(item.startTime, "yyyy/MM/dd")}-{formatTimes(item.endTime, "yyyy/MM/dd")}</view>
24
           <view className='title-time-cardOrder' >有效期:{formatTimes(item.startTime, "yyyy/MM/dd")}-{formatTimes(item.endTime, "yyyy/MM/dd")}</view>
27
         </view>
25
         </view>
28
       </view>
26
       </view>
29
     </view>
27
     </view>
30
-    // </view >
31
   )
28
   )
32
 }
29
 }

+ 16
- 0
src/hotel/components/HouseManage/houseManage.jsx Zobrazit soubor

7
 import copyRoom from '@/assets/icons/landlord/copyroom.png'
7
 import copyRoom from '@/assets/icons/landlord/copyroom.png'
8
 import React, { useState, useEffect, useRef, useImperativeHandle, useMemo } from 'react'
8
 import React, { useState, useEffect, useRef, useImperativeHandle, useMemo } from 'react'
9
 import { getRoomList, saveRoom, deleteRoom } from '@/services/landlord'
9
 import { getRoomList, saveRoom, deleteRoom } from '@/services/landlord'
10
+import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
11
+import ToggleRole from '@/components/toggleRole/ToggleRole'
10
 import List from '@/components/List';
12
 import List from '@/components/List';
11
 import Picker from '@/components/Picker'
13
 import Picker from '@/components/Picker'
12
 import SearchBar from '@/components/SearchBar'
14
 import SearchBar from '@/components/SearchBar'
134
       })
136
       })
135
     })
137
     })
136
   }
138
   }
139
+  const [showCutover3, setShowCutover3] = useState(false)
140
+  const ShowMoldeOn3 = () => {
141
+    setShowCutover3(true)
142
+  }
143
+  const onClose3 = () => {
144
+    setShowCutover3(false)
145
+  }
137
   return (
146
   return (
138
     <view>
147
     <view>
139
       <view style={{ padding: '0 30rpx', height: '100%' }}>
148
       <view style={{ padding: '0 30rpx', height: '100%' }}>
149
+      <ToggleRole role='hotel' showCutover={showCutover3} maskClosable={showCutover3} onClose={onClose3} />
150
+
151
+        <View>
140
         <view className='storeName'>店名:<Picker style={{ display: 'inline-block' }} placeholder="请选择民宿" value={hotel?.hotelId} kv={['hotelName', 'hotelId']} dicts={hotelList} onChange={handleHotelChange} /></view>
152
         <view className='storeName'>店名:<Picker style={{ display: 'inline-block' }} placeholder="请选择民宿" value={hotel?.hotelId} kv={['hotelName', 'hotelId']} dicts={hotelList} onChange={handleHotelChange} /></view>
153
+        <view onClick={ShowMoldeOn3} className='User-info-cutover'>
154
+            <image className='User-info-cutover-image' src={cutoverUser} />
155
+          </view>
156
+        </View>
141
         <SearchBar placeholder='请输入房源名搜索' onBlur={onSearch} />
157
         <SearchBar placeholder='请输入房源名搜索' onBlur={onSearch} />
142
         <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
158
         <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
143
         <ShareCard showCutover={showCard} onClose={onClose2} />
159
         <ShareCard showCutover={showCard} onClose={onClose2} />

+ 10
- 0
src/hotel/components/HouseManage/houseManage.less Zobrazit soubor

5
   text-align: center;
5
   text-align: center;
6
 }
6
 }
7
 
7
 
8
+.User-info-cutover{
9
+  position: absolute;
10
+  top: 0;
11
+  right: 60px;
12
+  .User-info-cutover-image{
13
+    width: 36px;
14
+    height: 36px;
15
+  }
16
+}
17
+
8
 .houseCard{
18
 .houseCard{
9
   background: #FFFFFF;
19
   background: #FFFFFF;
10
   box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
20
   box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);

+ 0
- 14
src/hotel/components/Income/income.jsx Zobrazit soubor

2
 import eyes from '@/assets/icons/shopKeeper/eyesON.png'
2
 import eyes from '@/assets/icons/shopKeeper/eyesON.png'
3
 import ceyes from '@/assets/icons/shopKeeper/eyesOFF.png'
3
 import ceyes from '@/assets/icons/shopKeeper/eyesOFF.png'
4
 import sImg from '@/assets/icons/landlord/money2.png'
4
 import sImg from '@/assets/icons/landlord/money2.png'
5
-import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
6
-import ToggleRole from '@/components/toggleRole/ToggleRole'
7
-import Picker from '@/components/Picker'
8
 import formatTime from "@/utils/formatTime";
5
 import formatTime from "@/utils/formatTime";
9
 import formatPrice from '@/utils/formatPrice'
6
 import formatPrice from '@/utils/formatPrice'
10
 import { getAccountLogList } from '@/services/landlord'
7
 import { getAccountLogList } from '@/services/landlord'
30
   const handleMonth = () => {
27
   const handleMonth = () => {
31
     isMomth ? setMonth(false) : setMonth(true)
28
     isMomth ? setMonth(false) : setMonth(true)
32
   }
29
   }
33
-  const [showCutover, setShowCutover] = useState(false)
34
-  const ShowMoldeOn = () => {
35
-    setShowCutover(true)
36
-  }
37
-  const onClose = () => {
38
-    setShowCutover(false)
39
-  }
40
   return (
30
   return (
41
     <view>
31
     <view>
42
-      <ToggleRole role='hotel' showCutover={showCutover} maskClosable={showCutover} onClose={onClose} />
43
       <view style={{ padding: '30rpx', height: '100%' }}>
32
       <view style={{ padding: '30rpx', height: '100%' }}>
44
         <view className='storexx'>
33
         <view className='storexx'>
45
           <view className='storeName'>店名:{hotel.hotelName}</view>
34
           <view className='storeName'>店名:{hotel.hotelName}</view>
46
-          <view onClick={ShowMoldeOn} className='User-info-cutover'>
47
-            <image className='User-info-cutover-image' src={cutoverUser} />
48
-          </view>
49
           <view className='money'>
35
           <view className='money'>
50
             <view className='sleft'>
36
             <view className='sleft'>
51
               <view className='lword'>全年收入(税前)</view>
37
               <view className='lword'>全年收入(税前)</view>

+ 0
- 9
src/hotel/components/Income/income.less Zobrazit soubor

70
     color: #202020;
70
     color: #202020;
71
     margin-bottom:58px;
71
     margin-bottom:58px;
72
   }
72
   }
73
-  .User-info-cutover{
74
-    position: absolute;
75
-    top: 60px;
76
-    right: 60px;
77
-    .User-info-cutover-image{
78
-      width: 36px;
79
-      height: 36px;
80
-    }
81
-  }
82
   .sleft{
73
   .sleft{
83
     float: left;
74
     float: left;
84
     text-align: left;
75
     text-align: left;

+ 17
- 14
src/hotel/pages/components/Extend/index.jsx Zobrazit soubor

1
 import { useState } from 'react';
1
 import { useState } from 'react';
2
 import Taro from '@tarojs/taro';
2
 import Taro from '@tarojs/taro';
3
-import del from '@/assets/icons/landlord/delete.png'
4
 import Popup from '@/components/Popup'
3
 import Popup from '@/components/Popup'
5
-import { View, Text, Image, Textarea, Label, Button } from '@tarojs/components';
4
+import { View,  Image, Textarea, Label, Button } from '@tarojs/components';
6
 import { update, deleteExtend } from '@/services/landlord'
5
 import { update, deleteExtend } from '@/services/landlord'
7
 import SlideView from '@/components/SlideView';
6
 import SlideView from '@/components/SlideView';
8
 import './style.less'
7
 import './style.less'
31
     setShowCutover(false)
30
     setShowCutover(false)
32
     setReset(true)
31
     setReset(true)
33
   }
32
   }
34
-  const detele = [
35
-    {
36
-      src: del, // icon的路径
37
-    }
38
-  ]
39
   const [content, setContent] = useState(item.content)
33
   const [content, setContent] = useState(item.content)
40
   const handelDelete = () => {
34
   const handelDelete = () => {
41
-    deleteExtend(item.extId)
42
-    setReset(true)
43
-  }
44
-  const handelDelete2 = () => {
45
-    deleteExtend(item.extId)
46
-    setReset(true)
35
+    Taro.showModal({
36
+      title: '提示',
37
+      content: `确认删除?`,
38
+      success: function (res) {
39
+        if (res.confirm) {
40
+          deleteExtend(item.extId).then(() => {
41
+            Taro.showToast({
42
+              title: '删除成功',
43
+              icon: 'none',
44
+            })
45
+            setReset(true)
46
+          })
47
+        }
48
+      }
49
+    })
47
   }
50
   }
48
   //判断是否只有空 空格 回车
51
   //判断是否只有空 空格 回车
49
   const javaTrim = (str) => {
52
   const javaTrim = (str) => {
99
           :
102
           :
100
           item.contentType == 'text' ?
103
           item.contentType == 'text' ?
101
             <View>
104
             <View>
102
-              <SlideView del onDelete={handelDelete2}>
105
+              <SlideView del onDelete={handelDelete}>
103
                 <View className='storezn' onClick={showText}>{content}</View>
106
                 <View className='storezn' onClick={showText}>{content}</View>
104
               </SlideView>
107
               </SlideView>
105
             </View>
108
             </View>

+ 22
- 8
src/hotel/pages/landlord/addRoom/addRoom.jsx Zobrazit soubor

6
 import { saveRoom, getRoomDetail, updateRoom } from '@/services/landlord'
6
 import { saveRoom, getRoomDetail, updateRoom } from '@/services/landlord'
7
 import { getExtendContent } from "@/services/home";
7
 import { getExtendContent } from "@/services/home";
8
 import { saveExtend } from '@/services/landlord'
8
 import { saveExtend } from '@/services/landlord'
9
+import uploadFile from '@/utils/request'
9
 import Popup from '@/components/Popup'
10
 import Popup from '@/components/Popup'
10
 import Extend from "../../components/Extend";
11
 import Extend from "../../components/Extend";
11
 import './addRoom.less'
12
 import './addRoom.less'
127
     Taro.chooseImage({
128
     Taro.chooseImage({
128
       count: 1,
129
       count: 1,
129
       success: function (res) {
130
       success: function (res) {
130
-        const date = {
131
-          targetId: roomId,
132
-          targetType: 'room',
133
-          content: res.tempFilePaths[0],
134
-          contentType: 'image'
135
-        }
136
-        saveExtend(date)
137
-        setReset(!reset)
131
+        // const tempFilePaths = res.tempFilePaths[0]
132
+        console.log(res)
133
+          uploadFile(res.tempFilePaths[0]).then((res2)=>{
134
+            console.log(res2)
135
+          })
138
       }
136
       }
137
+
138
+
139
+
140
+
141
+
142
+
143
+      // success: function (res) {
144
+      //   const date = {
145
+      //     targetId: roomId,
146
+      //     targetType: 'room',
147
+      //     content: res.tempFilePaths[0],
148
+      //     contentType: 'image'
149
+      //   }
150
+      //   saveExtend(date)
151
+      //   setReset(!reset)
152
+      // }
139
     })
153
     })
140
   }
154
   }
141
   const isError = (s) => {
155
   const isError = (s) => {

+ 1
- 1
src/pages/PayOrder/index.jsx Zobrazit soubor

41
 
41
 
42
     if (BuyNumber <= 0) {
42
     if (BuyNumber <= 0) {
43
       Taro.showToast({
43
       Taro.showToast({
44
-        title: '最少需要一笔订单哦',
44
+        title: '最少需要一个套餐哦',
45
         icon: 'none',
45
         icon: 'none',
46
         duration: 2000
46
         duration: 2000
47
       })
47
       })

+ 1
- 1
src/pages/PayOrder/style.less Zobrazit soubor

122
         font-size: 30px;
122
         font-size: 30px;
123
       }
123
       }
124
       .paycontent{
124
       .paycontent{
125
-        margin:0 15px;
125
+        margin:0 40px 0 20px;
126
         .paybuttontop{
126
         .paybuttontop{
127
           background: url(../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
127
           background: url(../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
128
           background-size: 100% 100%;
128
           background-size: 100% 100%;