xcx 4 gadus atpakaļ
vecāks
revīzija
beec9e6753
3 mainītis faili ar 58 papildinājumiem un 52 dzēšanām
  1. 12
    10
      src/pages/ShouYe/index.css
  2. 14
    12
      src/pages/ShouYe/index.jsx
  3. 32
    30
      src/pages/ShouYe/index.less

+ 12
- 10
src/pages/ShouYe/index.css Parādīt failu

@@ -39,35 +39,37 @@
39 39
 }
40 40
 .ShouYe > view.flex-item > .PageContainer .Content > view > .NoticeContent {
41 41
   padding: 0 30px;
42
+  position: relative;
43
+  overflow: hidden;
44
+  margin-bottom: 10px;
45
+  margin-top: 10px;
46
+}
47
+.ShouYe > view.flex-item > .PageContainer .Content > view > .NoticeContent > view {
42 48
   height: 60px;
43
-  background: #FFC412;
49
+  background: rgba(243, 91, 71, 0.12);
44 50
   position: relative;
45 51
   overflow: hidden;
46
-  margin-bottom: 20px;
47 52
   align-items: center;
48
-  display: none;
49
-}
50
-.ShouYe > view.flex-item > .PageContainer .Content > view > .NoticeContent.active {
51
-  display: flex;
53
+  border-radius: 24px;
52 54
 }
53
-.ShouYe > view.flex-item > .PageContainer .Content > view > .NoticeContent > text {
55
+.ShouYe > view.flex-item > .PageContainer .Content > view > .NoticeContent > view > text {
54 56
   color: #fff;
55 57
   font-size: 32px;
56 58
   line-height: 60px;
57 59
 }
58
-.ShouYe > view.flex-item > .PageContainer .Content > view > .NoticeContent > .flex-item {
60
+.ShouYe > view.flex-item > .PageContainer .Content > view > .NoticeContent > view > .flex-item {
59 61
   margin: 0 10px;
60 62
   position: relative;
61 63
   overflow: hidden;
62 64
   height: 60px;
63 65
 }
64
-.ShouYe > view.flex-item > .PageContainer .Content > view > .NoticeContent > .flex-item > view {
66
+.ShouYe > view.flex-item > .PageContainer .Content > view > .NoticeContent > view > .flex-item > view {
65 67
   display: block;
66 68
   position: relative;
67 69
   overflow: hidden;
68 70
   height: 60px;
69 71
 }
70
-.ShouYe > view.flex-item > .PageContainer .Content > view > .NoticeContent > .flex-item > view > text {
72
+.ShouYe > view.flex-item > .PageContainer .Content > view > .NoticeContent > view > .flex-item > view > text {
71 73
   display: inline-block;
72 74
   font-size: 28px;
73 75
   color: #fff;

+ 14
- 12
src/pages/ShouYe/index.jsx Parādīt failu

@@ -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>

+ 32
- 30
src/pages/ShouYe/index.less Parādīt failu

@@ -44,46 +44,48 @@
44 44
 
45 45
             >.NoticeContent {
46 46
               padding: 0 30px;
47
-              height: 60px;
48
-              background: #FFC412;
49 47
               position: relative;
50 48
               overflow: hidden;
51
-              margin-bottom: 20px;
52
-              align-items: center;
53
-              display: none;
54
-
55
-              &.active {
56
-                display: flex;
57
-              }
58
-
59
-              >text {
60
-                color: #fff;
61
-                font-size: 32px;
62
-                line-height: 60px;
63
-              }
49
+              margin-bottom: 10px;
50
+              margin-top: 10px;
64 51
 
65
-              >.flex-item {
66
-                margin: 0 10px;
52
+              >view {
53
+                height: 60px;
54
+                background: rgba(243, 91, 71, 0.12);
67 55
                 position: relative;
68 56
                 overflow: hidden;
69
-                height: 60px;
57
+                align-items: center;
58
+                border-radius: 24px;
70 59
 
71
-                >view {
72
-                  display: block;
60
+                >text {
61
+                  color: #fff;
62
+                  font-size: 32px;
63
+                  line-height: 60px;
64
+                }
65
+
66
+                >.flex-item {
67
+                  margin: 0 10px;
73 68
                   position: relative;
74 69
                   overflow: hidden;
75 70
                   height: 60px;
76 71
 
77
-                  >text {
78
-                    display: inline-block;
79
-                    font-size: 28px;
80
-                    color: #fff;
81
-                    white-space: nowrap;
82
-                    line-height: 60px;
83
-                    position: absolute;
84
-                    top: 0;
85
-                    animation: 5s move infinite linear;
86
-                    -webkit-animation: 5s move infinite linear;
72
+                  >view {
73
+                    display: block;
74
+                    position: relative;
75
+                    overflow: hidden;
76
+                    height: 60px;
77
+
78
+                    >text {
79
+                      display: inline-block;
80
+                      font-size: 28px;
81
+                      color: #fff;
82
+                      white-space: nowrap;
83
+                      line-height: 60px;
84
+                      position: absolute;
85
+                      top: 0;
86
+                      animation: 5s move infinite linear;
87
+                      -webkit-animation: 5s move infinite linear;
88
+                    }
87 89
                   }
88 90
                 }
89 91
               }