|
@@ -202,17 +202,6 @@ export default function Index (props) {
|
202
|
202
|
|
203
|
203
|
<view>
|
204
|
204
|
|
205
|
|
- {/* 通知栏 */}
|
206
|
|
- <view className={ShowNotice ? 'NoticeContent flex-h active' : 'NoticeContent flex-h'}>
|
207
|
|
- <text className='iconfont icontongzhi1'></text>
|
208
|
|
- <view id='NoticeParent' className='flex-item' onClick={() => { Taro.navigateTo({ url: `/pages/WuYe/GongGaoDetail/index?id=${NoticeInfo.id}` }) }}>
|
209
|
|
- <view style={{ width: `${NoticeWidth > NoticeParentWidth ? NoticeWidth : NoticeParentWidth}px` }}>
|
210
|
|
- <text id='NoticeText'>{NoticeInfo === null ? '' : NoticeInfo.announcementTitle}</text>
|
211
|
|
- </view>
|
212
|
|
- </view>
|
213
|
|
- <text className='iconfont iconguanbi' onClick={() => { setShowNotice(false) }}></text>
|
214
|
|
- </view>
|
215
|
|
-
|
216
|
205
|
{/* 欢迎词 */}
|
217
|
206
|
<Text className='Welcome'>欢迎来到远道智慧社区!</Text>
|
218
|
207
|
|
|
@@ -235,6 +224,19 @@ export default function Index (props) {
|
235
|
224
|
</view>
|
236
|
225
|
</view>
|
237
|
226
|
|
|
227
|
+ {/* 通知栏 */}
|
|
228
|
+ <view className='NoticeContent'>
|
|
229
|
+ <view className='flex-h'>
|
|
230
|
+ <text className='iconfont icontongzhi1'></text>
|
|
231
|
+ <view id='NoticeParent' className='flex-item' onClick={() => { Taro.navigateTo({ url: `/pages/WuYe/GongGaoDetail/index?id=${NoticeInfo.id}` }) }}>
|
|
232
|
+ <view style={{ width: `${NoticeWidth > NoticeParentWidth ? NoticeWidth : NoticeParentWidth}px` }}>
|
|
233
|
+ <text id='NoticeText'>{NoticeInfo === null ? '' : NoticeInfo.announcementTitle}</text>
|
|
234
|
+ </view>
|
|
235
|
+ </view>
|
|
236
|
+ {/* <text className='iconfont iconguanbi' onClick={() => { setShowNotice(false) }}></text> */}
|
|
237
|
+ </view>
|
|
238
|
+ </view>
|
|
239
|
+
|
238
|
240
|
{/* 导航 */}
|
239
|
241
|
<view className='NavContainer flex-h'>
|
240
|
242
|
{
|
|
@@ -261,7 +263,7 @@ export default function Index (props) {
|
261
|
263
|
{
|
262
|
264
|
OwnerList.map((item, index) => (
|
263
|
265
|
<view className='flex-item' key={`Owners-${index}`} onClick={OwnerClick(item)}>
|
264
|
|
- <Text className={`iconfont ${item.icon}`} style={{fontWeight: item.bold !== undefined && item.bold === true ? 'bold' : 'normal'}}></Text>
|
|
266
|
+ <Text className={`iconfont ${item.icon}`} style={{ fontWeight: item.bold !== undefined && item.bold === true ? 'bold' : 'normal' }}></Text>
|
265
|
267
|
<view>
|
266
|
268
|
<view><Text>{item.name}</Text></view>
|
267
|
269
|
</view>
|