xcx 4 anni fa
parent
commit
d3c28ae236
3 ha cambiato i file con 15 aggiunte e 17 eliminazioni
  1. 1
    2
      src/pages/ShouYe/index.css
  2. 13
    13
      src/pages/ShouYe/index.jsx
  3. 1
    2
      src/pages/ShouYe/index.less

+ 1
- 2
src/pages/ShouYe/index.css Vedi File

@@ -42,11 +42,10 @@
42 42
   position: relative;
43 43
   overflow: hidden;
44 44
   margin-bottom: 10px;
45
-  margin-top: 10px;
45
+  background: #ff8d61;
46 46
 }
47 47
 .ShouYe > view.flex-item > .PageContainer .Content > view > .NoticeContent > view {
48 48
   height: 60px;
49
-  background: rgba(243, 91, 71, 0.12);
50 49
   position: relative;
51 50
   overflow: hidden;
52 51
   align-items: center;

+ 13
- 13
src/pages/ShouYe/index.jsx Vedi File

@@ -202,6 +202,19 @@ export default function Index (props) {
202 202
 
203 203
                 <view>
204 204
 
205
+                  {/* 通知栏 */}
206
+                  <view className='NoticeContent'>
207
+                    <view className='flex-h'>
208
+                      <text className='iconfont icontongzhi1'></text>
209
+                      <view id='NoticeParent' className='flex-item' onClick={() => { Taro.navigateTo({ url: `/pages/WuYe/GongGaoDetail/index?id=${NoticeInfo.id}` }) }}>
210
+                        <view style={{ width: `${NoticeWidth > NoticeParentWidth ? NoticeWidth : NoticeParentWidth}px` }}>
211
+                          <text id='NoticeText'>{NoticeInfo === null ? '' : NoticeInfo.announcementTitle}</text>
212
+                        </view>
213
+                      </view>
214
+                      <text className='iconfont iconguanbi' onClick={() => { setShowNotice(false) }}></text>
215
+                    </view>
216
+                  </view>
217
+
205 218
                   {/* 欢迎词 */}
206 219
                   <Text className='Welcome'>欢迎来到远道智慧社区!</Text>
207 220
 
@@ -224,19 +237,6 @@ export default function Index (props) {
224 237
                     </view>
225 238
                   </view>
226 239
 
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
-
240 240
                   {/* 导航 */}
241 241
                   <view className='NavContainer flex-h'>
242 242
                     {

+ 1
- 2
src/pages/ShouYe/index.less Vedi File

@@ -47,11 +47,10 @@
47 47
               position: relative;
48 48
               overflow: hidden;
49 49
               margin-bottom: 10px;
50
-              margin-top: 10px;
50
+              background: #ff8d61;
51 51
 
52 52
               >view {
53 53
                 height: 60px;
54
-                background: rgba(243, 91, 71, 0.12);
55 54
                 position: relative;
56 55
                 overflow: hidden;
57 56
                 align-items: center;