张延森 преди 3 години
родител
ревизия
131c5ecf0f

+ 10
- 15
src/components/List/index.jsx Целия файл

@@ -99,16 +99,14 @@ export default React.forwardRef((props, ref) => {
99 99
   }))
100 100
 
101 101
   return (
102
-
103
-    <ScrollView
104
-      scrollY
105
-      enhanced
106
-      onScrollToLower={handleScrollToLower}
107
-      {...leftProps}
108
-      className={`${className} list-view`}
109
-    >
110
-      <SpinBox loading={loading}>
111
-
102
+    <SpinBox loading={loading}>
103
+      <ScrollView
104
+        scrollY
105
+        enhanced
106
+        onScrollToLower={handleScrollToLower}
107
+        {...leftProps}
108
+        className={`${className} list-view`}
109
+      >
112 110
         {!render
113 111
           ? props.children
114 112
           : list.map((item, index) => render({ item, index }))
@@ -116,12 +114,9 @@ export default React.forwardRef((props, ref) => {
116 114
         {!list || !list.length && noData}
117 115
 
118 116
         {list && list.length > 0 && !hasMore &&
119
-
120 117
           <view className='botton'>这是我的底线</view>
121
-
122 118
         }
123
-      </SpinBox>
124
-
125
-    </ScrollView>
119
+      </ScrollView>
120
+    </SpinBox>
126 121
   )
127 122
 })

+ 7
- 8
src/hotel/components/HouseManage/houseManage.jsx Целия файл

@@ -131,15 +131,14 @@ export default React.forwardRef((props, ref) => {
131 131
   const handelCopy = (e, val) => {
132 132
     //阻止冒泡不允许执行父元素的点击事件
133 133
     e.stopPropagation()
134
-    // detail.map((item,index)=>{
135
-    //   if (item.roomId==val.roomId) {
136
-    //     console.log(index)
137
-    //   }
138
-    // })
134
+    let copy = 0
135
+    detail.map((item, index) => {
136
+      if (item.roomId === val.roomId) {
137
+        copy = index
138
+      }
139
+    })
139 140
     saveRoom({ ...val, roomId: null, roomName: val.roomName + '复制' }).then((res) => {
140
-      getRoomList({ hotelId: hotel.hotelId }).then((res) => {
141
-        setDetail(res.records || [])
142
-      })
141
+      setDetail([...detail.slice(0, copy), res, ...detail.slice(copy)])
143 142
     })
144 143
   }
145 144
   const [showCutover3, setShowCutover3] = useState(false)

+ 1
- 1
src/hotel/components/shareCard/shareCard.jsx Целия файл

@@ -12,7 +12,7 @@ export default (props) => {
12 12
       <Popup show={showCutover} onClose={onClose} maskClosable={showCutover}>
13 13
         <View className='card2'>
14 14
           <View className='text'>分享到微信</View>
15
-          <View className='share'>去分享<Button openType='share' className='btn'>去分享</Button></View>
15
+          <View className='share'>确定<Button openType='share' className='btn'>确定</Button></View>
16 16
         </View>
17 17
       </Popup>
18 18
     </View>

+ 8
- 2
src/hotel/pages/components/Extend/index.jsx Целия файл

@@ -1,7 +1,7 @@
1 1
 import { useState } from 'react';
2 2
 import Taro from '@tarojs/taro';
3 3
 import Popup from '@/components/Popup'
4
-import { View,  Image, Textarea, Label, Button } from '@tarojs/components';
4
+import { View, Image, Textarea, Label, Button, Video } from '@tarojs/components';
5 5
 import { update, deleteExtend } from '@/services/landlord'
6 6
 import SlideView from '@/components/SlideView';
7 7
 import './style.less'
@@ -106,7 +106,13 @@ export default (props) => {
106 106
                 <View className='storezn' onClick={showText}>{content}</View>
107 107
               </SlideView>
108 108
             </View>
109
-            : null
109
+            : item.contentType == 'video' ?
110
+              <View>
111
+                <SlideView del onDelete={handelDelete}>
112
+                  <Video className='storezn' style={{ width: '100%', display: 'block' }} src={eimg} />
113
+                </SlideView>
114
+              </View>
115
+              : null
110 116
       }
111 117
     </View>
112 118
   )

+ 1
- 49
src/pages/index/tabs/Guide.jsx Целия файл

@@ -63,55 +63,8 @@ export default (props) => {
63 63
 
64 64
   useDidShow(() => {
65 65
     goContent()
66
-    if (roomId) {
67
-      // 点击’去这里‘跳转导航
68
-      setLoading(true)
69
-      getTaRoom(roomId).then((res) => {
70
-        setTaRoomContent(res || [])
71
-        setLoading(false)
72
-
73
-      })
74
-      //更多指引
75
-      setLoading(true)
76
-
77
-      getExtendContent('room', roomId, {
78
-        pageNum: 99,
79
-        pageSize: 999,
80
-
81
-      }).then((res) => {
82
-        // setExtend(res.records || [])
83
-        setExtend(res.records)
84
-
85
-        setIfroomId('reality')
86
-
87
-        setLoading(false)
88
-
89
-      })
90
-      setLoading(true)
91
-
92
-      getRecommendList({ location: location }).then((res) => {
93
-        setPackage(res || [])
94
-        setLoading(false)
95
-
96
-      })
97
-
98
-    } else {
99
-      setLoading(true)
100
-
101
-      getRecommendList({ location: location }).then((res) => {
102
-        setPackage(res || [])
103
-        setLoading(false)
104
-
105
-      })
106
-      return
107
-    }
108
-    if (taRoomContent?.wifiPassword === "") {
109
-      setWifiButtonStyle('none')
110
-    }
111
-    if (taRoomContent?.parkingAddress === "") {
112
-      setParkingButtonStyle('none')
113
-    }
114 66
   })
67
+  
115 68
   const geiZy = () => {
116 69
     setLoading(true)
117 70
     getExtendContent('room', roomId, {
@@ -225,7 +178,6 @@ export default (props) => {
225 178
           {
226 179
             ifroomId === 'reality' && (
227 180
               <view>
228
-
229 181
                 <view className='room-box-info-ROOM'>
230 182
                   <view className='room-bi-name-ROOM' >
231 183
                     <view className='room-bin-title-ROOM'>房屋名称</view>