1002884655 hace 3 años
padre
commit
c2ed8d75d5

+ 1
- 1
src/pages/index/buildingList/index.scss Ver fichero

@@ -82,7 +82,7 @@
82 82
       z-index: 1;
83 83
       > scroll-view {
84 84
         width: 100%;
85
-        height: 100%;
85
+        height: calc(100vh - 192px);
86 86
         .PageContent {
87 87
           position: relative;
88 88
           overflow: hidden;

+ 3
- 3
src/subpackages/pages/marketing/components/ResidentListItem/index.jsx Ver fichero

@@ -12,7 +12,7 @@ export default function ResidentListItem (props) {
12 12
   const [Status, setStatus] = useState(null)
13 13
 
14 14
   useEffect(() => {
15
-    setStatus(data.status)
15
+    setStatus(data.channelStatus)
16 16
   }, [])
17 17
 
18 18
   const ToUnVisable = () => {
@@ -107,11 +107,11 @@ export default function ResidentListItem (props) {
107 107
       </view>
108 108
       <view className='Opt'>
109 109
         {
110
-          !(data.type === 'report' && data.channelStatus - 0 === 3) && Status - 0 !== 3 &&
110
+          data.visitStatus && 
111 111
           <text className='active' onClick={() => { Taro.navigateTo({ url: `/subpackages/pages/marketing/changeVisit/index?id=${data.id}&name=${data.name}&buildingId=${data.buildingId}&type=${data.type}&channelId=${data.channelId}` }) }}>更新交易</text>
112 112
         }
113 113
         {
114
-          data.type === 'report' && data.channelStatus - 0 === 1 && Status - 0 !== 3 &&
114
+          data.type === 'report' && Status - 0 === 1 &&
115 115
           <text onClick={ToUnVisable}>无效</text>
116 116
         }
117 117
         {/* {