Bläddra i källkod

Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

吃个甘蔗嚼一年 3 år sedan
förälder
incheckning
8f76bf958a
1 ändrade filer med 9 tillägg och 5 borttagningar
  1. 9
    5
      src/hotel/pages/landlord/roomOrder/roomOrder.jsx

+ 9
- 5
src/hotel/pages/landlord/roomOrder/roomOrder.jsx Visa fil

13
 export default withLayout((props) => {
13
 export default withLayout((props) => {
14
   const { roomId, roomName } = props.router.params
14
   const { roomId, roomName } = props.router.params
15
   const [detail, setDetail] = useState([])
15
   const [detail, setDetail] = useState([])
16
+
16
   useEffect(() => {
17
   useEffect(() => {
17
     getRoomOrderList({ roomId: roomId }).then((res) => {
18
     getRoomOrderList({ roomId: roomId }).then((res) => {
18
       setDetail(res.records || [])
19
       setDetail(res.records || [])
19
     })
20
     })
20
   }, [])
21
   }, [])
22
+
21
   const CopyName = (val) => {
23
   const CopyName = (val) => {
22
     Taro.setClipboardData({
24
     Taro.setClipboardData({
23
       data: val,
25
       data: val,
30
       }
32
       }
31
     })
33
     })
32
   }
34
   }
35
+
33
   const CopyPhone = (val) => {
36
   const CopyPhone = (val) => {
34
     Taro.setClipboardData({
37
     Taro.setClipboardData({
35
       data: val,
38
       data: val,
42
       }
45
       }
43
     })
46
     })
44
   }
47
   }
48
+
45
   return (
49
   return (
46
     <View style={{ padding: '0 30px' }}>
50
     <View style={{ padding: '0 30px' }}>
47
       <view className="index-navbar">
51
       <view className="index-navbar">
48
-        <CustomNav title={roomName ? roomName : '房间名'} />
52
+        <CustomNav title={roomName ? decodeURIComponent(roomName) : '房间名'} />
49
       </view>
53
       </view>
50
       <scroll-view scrollY style={{ height: 'calc(100vh - 65px)' }}>
54
       <scroll-view scrollY style={{ height: 'calc(100vh - 65px)' }}>
51
 
55
 
52
         {
56
         {
53
           detail.length == 0 ? <View className='houseCard'>暂无入住人数据</View>
57
           detail.length == 0 ? <View className='houseCard'>暂无入住人数据</View>
54
-            : detail.map((item) =>
55
-              <View className='houseCard'>
58
+            : detail.map((item, index) =>
59
+              <View className='houseCard' key={index}>
56
                 {
60
                 {
57
-                  (item.personList || []).map((item2) =>
58
-                    <View className='operation'>
61
+                  (item.personList || []).map((item2, inx) =>
62
+                    <View className='operation' key={inx}>
59
                       <View style={{ display: 'inline-block' }} onClick={() => CopyName(item2.customerName)}>
63
                       <View style={{ display: 'inline-block' }} onClick={() => CopyName(item2.customerName)}>
60
                         <Label>{item2.customerName}</Label>
64
                         <Label>{item2.customerName}</Label>
61
                         <Image src={copy} />
65
                         <Image src={copy} />