Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
Compass
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zong
Compass
Commits
9e2e631d
Commit
9e2e631d
authored
4 years ago
by
tangjinlin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'znz_dev' into 'master'
0517 See merge request
!11
parents
e264632e
692941d9
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
46 additions
and
30 deletions
+46
-30
sanjiao.png
src/wx/img/sanjiao.png
+0
-0
myNews.wxml
src/wx/pages/myNews/myNews.wxml
+9
-5
myNews.wxss
src/wx/pages/myNews/myNews.wxss
+30
-25
project.config.json
src/wx/project.config.json
+7
-0
No files found.
src/wx/img/sanjiao.png
0 → 100644
View file @
9e2e631d
15.4 KB
This diff is collapsed.
Click to expand it.
src/wx/pages/myNews/myNews.wxml
View file @
9e2e631d
<!--pages/myNews/myNews.wxml-->
<custom-navi text="消息通知" back="{{true}}" home="{{true}}"></custom-navi>
<custom-navi text="消息通知" back="{{true}}" home="{{true}}"
bg1="#fff" bg2="#fff" bg3="#fff"
></custom-navi>
<view class="myNews">
<view bindtap='newsDetail' wx:for="{{messageList}}" wx:if="{{!item.is_read}}" class="newsUnread" data-index="{{item.id}}" wx:key="{{index}}">
<image src='../../img/unread.png'></image>{{item.title}}
<text>·您有一条新消息</text>
<view class="title">{{item.title}}</view>
<view class="time">{{item.registration_date}}</view>
</view>
<view bindtap='newsDetail' wx:for="{{messageList}}" wx:if="{{item.is_read}}" class="newsReaded" data-index="{{item.id}}" wx:key="{{index}}">
<image src='../../img/readed.png'></image>{{item.title}}
<text>·您有一条新消息\n</text>
<view class="title">{{item.title}}</view>
<view class="time">{{item.registration_date}}</view>
</view>
</view>
</view>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/wx/pages/myNews/myNews.wxss
View file @
9e2e631d
/* pages/myNews/myNews.wxss */
.myNews{
margin: 1%;
width:98%;
white-space:nowrap;
padding: 10px;
.myNews {
margin-left: 3%;
width: 94%;
white-space: nowrap;
}
.newsUnread{
height:45px;
line-height: 45px;
padding: 2px;
font-weight: bold;
border-bottom: 1rpx solid #f0f0f0;
.newsUnread {
border: 1px solid #f0f0f0;
display: flex;
align-items: center;
flex-direction: column;
align-items: flex-start;
padding: 10px 0 5px 10px;
margin-top: 20px;
}
.newsUnread>image{
width: 30px;
height: 18px;
margin-right: 8px;
.newsUnread text {
color: red;
}
.newsReaded{
height:45px;
line-height: 45px;
.newsReaded {
padding: 2px;
font-weight: normal;
border
-bottom: 1r
px solid #F0F0F0;
border
: 1
px solid #F0F0F0;
display: flex;
align-items: center;
flex-direction: column;
align-items: flex-start;
padding: 10px 0 5px 10px;
margin-top: 20px;
}
.newsReaded>image{
width: 30px;
height: 18px;
margin-right: 8px;
.title {
padding: 10px 0 0 5px;
}
.time {
color: #898989;
align-self: flex-end;
padding-right: 10px;
font-size: 12px;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/wx/project.config.json
View file @
9e2e631d
...
...
@@ -115,6 +115,13 @@
"pathName"
:
"pages/volunteersRank1/volunteersRank1"
,
"query"
:
""
,
"scene"
:
null
},
{
"id"
:
-1
,
"name"
:
"pages/myNews/myNews"
,
"pathName"
:
"pages/myNews/myNews"
,
"query"
:
""
,
"scene"
:
null
}
]
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment