diff --git a/pages/heart/heart.wxml b/pages/heart/heart.wxml
index 0f7b527..056c9c1 100644
--- a/pages/heart/heart.wxml
+++ b/pages/heart/heart.wxml
@@ -31,15 +31,15 @@
-
+
-
+
- 爱心榜
+ 志愿积分
diff --git a/pages/heart/heart.wxss b/pages/heart/heart.wxss
index 662add2..cde6fb4 100644
--- a/pages/heart/heart.wxss
+++ b/pages/heart/heart.wxss
@@ -4,84 +4,98 @@ page {
line-height: 1.6;
background: #f7f7f7;
}
-.container{
+
+.container {
width: 100vw;
}
-.page-body{
+
+.page-body {
padding-top: 30rpx;
- background: #ffffff;
+ background: #fff;
}
-.page-section{
+
+.page-section {
width: 100%;
margin-bottom: 60rpx;
}
-.page-section_center{
+
+.page-section_center {
display: flex;
flex-direction: column;
align-items: center;
}
-.page-section:last-child{
+
+.page-section:last-child {
margin-bottom: 0;
}
-.page-section-gap{
+
+.page-section-gap {
box-sizing: border-box;
padding: 0 30rpx;
}
-.page-section-spacing{
+
+.page-section-spacing {
box-sizing: border-box;
padding: 0 20rpx;
}
-.page-section-title{
+
+.page-section-title {
font-size: 28rpx;
- color: #999999;
+ color: #999;
margin-bottom: 10rpx;
padding-left: 30rpx;
padding-right: 30rpx;
}
-.page-section-gap .page-section-title{
+
+.page-section-gap .page-section-title {
padding-left: 0;
padding-right: 0;
}
-.demo-text-1{
+.demo-text-1 {
position: relative;
align-items: center;
justify-content: center;
- background-color: #1AAD19;
- color: #FFFFFF;
+ background-color: #1aad19;
+ color: #fff;
font-size: 36rpx;
}
-.demo-text-1:before{
+
+.demo-text-1:before {
content: 'A';
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
-.demo-text-2{
+
+.demo-text-2 {
position: relative;
align-items: center;
justify-content: center;
- background-color: #2782D7;
- color: #FFFFFF;
+ background-color: #2782d7;
+ color: #fff;
font-size: 36rpx;
}
-.demo-text-2:before{
+
+.demo-text-2:before {
content: 'B';
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
-.demo-text-3{
+
+.demo-text-3 {
position: relative;
align-items: center;
justify-content: center;
- background-color: #F1F1F1;
+ background-color: #f1f1f1;
color: #353535;
font-size: 36rpx;
}
-.demo-text-3:before{
+
+.demo-text-3:before {
content: 'C';
position: absolute;
top: 50%;
@@ -89,20 +103,23 @@ page {
transform: translate(-50%, -50%);
}
-button{
+button {
margin-bottom: 30rpx;
}
-button:last-child{
+
+button:last-child {
margin-bottom: 0;
}
-.page-section-title{
+
+.page-section-title {
padding: 0;
}
-.swiper-item{
+
+.swiper-item {
display: block;
height: 300rpx;
-
}
+
.banner {
overflow: hidden;
height: 300rpx;
@@ -110,6 +127,7 @@ button:last-child{
width: 100%;
border-radius: 16rpx;
}
+
.dots {
display: flex;
justify-content: center;
@@ -121,76 +139,89 @@ button:last-child{
height: 16rpx;
border-radius: 8rpx;
margin-left: 10rpx;
- background: #D2D5DA;
- transition: all .3s;
+ background: #d2d5da;
+ transition: all 0.3s;
}
.dots .dot.active {
width: 40rpx;
- background-image: linear-gradient(90deg, #FC5555 58%, #FC5555 100%);
+ background-image: linear-gradient(90deg, #fc5555 58%, #fc5555 100%);
}
-.page-section-title{
+
+.page-section-title {
margin-top: 60rpx;
position: relative;
}
-.info{
+
+.info {
position: absolute;
right: 0;
color: #353535;
font-size: 30rpx;
}
-.page-foot{
+
+.page-foot {
margin-top: 50rpx;
}
-swiper{
- height: 320rpx;
-}
-
+swiper {
+ height: 320rpx;
+}
-.tab-view{
+.tab-view {
height: 98rpx;
width: 100wh;
- background-color: #FFFFFF;
+ background-color: #fff;
margin-top: 30rpx;
}
+
.wux-tabs__tab {
- font-size:32rpx!important;
- color: #8393A0!important;
+ font-size: 32rpx !important;
+ color: #8393a0 !important;
}
+
.wux-tabs__tab--current {
- color:#333333!important;
+ color: #333 !important;
font-weight: bold;
- font-size: 40rpx!important;
+ font-size: 40rpx !important;
}
-.wux-tabs__tab-bar{
- background: #FB3535!important;
- height: 10rpx!important;
- border-radius: 6rpx!important;
- margin-top: -40rpx!important;
- width: 80%!important;
- margin-left: 10%!important;
+
+.wux-tabs__tab-bar {
+ background: #fb3535 !important;
+ height: 10rpx !important;
+ border-radius: 6rpx !important;
+ margin-top: -40rpx !important;
+ width: 80% !important;
+ margin-left: 20rpx !important;
}
-.top{
+
+.top {
position: absolute;
width: 200rpx;
height: 80rpx;
right: 20rpx;
margin-top: -80rpx;
}
-.toptxt{
- color: #8393A0;
+
+.toptxt {
+ color: #8393a0;
line-height: 80rpx;
}
-.imgtop{
+
+.imgtop {
width: 44rpx;
height: 32rpx;
float: left;
margin-top: 28rpx;
margin-right: 10rpx;
}
-.topimg{
+
+.topimg {
float: left;
width: 44rpx;
height: 32rpx;
-}
\ No newline at end of file
+}
+
+.wux-tabs__tab--horizontal.wux-tabs__tab--scroll {
+ padding: 0 20rpx !important;
+}
diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js
index 5c18287..b6705f9 100644
--- a/pages/indexNew/indexNew.js
+++ b/pages/indexNew/indexNew.js
@@ -418,7 +418,7 @@ Page({
//功能暂未开放
nofunction() {
wx.showToast({
- title: '功能暂未开放~',
+ title: '敬请期待',
icon: 'none',
duration: 1000
})
diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml
index 41d2c07..60a96fc 100644
--- a/pages/indexNew/indexNew.wxml
+++ b/pages/indexNew/indexNew.wxml
@@ -125,7 +125,7 @@
- 通知公告
+ 政策导航
+
+
+
diff --git a/pages/indexNew/indexNew.wxss b/pages/indexNew/indexNew.wxss
index ad508c2..426a014 100644
--- a/pages/indexNew/indexNew.wxss
+++ b/pages/indexNew/indexNew.wxss
@@ -510,7 +510,7 @@ page {
border-bottom: 1rpx solid #eaeaea;
padding: 41rpx 18rpx 31rpx 15rpx;
display: flex;
- align-items: center;
+ /* align-items: center; */
}
.list-all .list-item:first-child {
@@ -562,6 +562,20 @@ page {
border-radius: 10rpx;
}
+.list-all .list-item .label {
+ position: absolute;
+ z-index: 999;
+ width: 34rpx;
+ height: 34rpx;
+ right: 45rpx;
+}
+
+.list-all .list-item .label image {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+}
+
.nomorenews {
display: flex;
justify-content: center;
diff --git a/subpages/discussion/pages/addIssue/addIssue.wxml b/subpages/discussion/pages/addIssue/addIssue.wxml
index 184eef2..b367be7 100644
--- a/subpages/discussion/pages/addIssue/addIssue.wxml
+++ b/subpages/discussion/pages/addIssue/addIssue.wxml
@@ -3,8 +3,8 @@
diff --git a/subpages/heart/pages/leaderboard/leaderboard.json b/subpages/heart/pages/leaderboard/leaderboard.json
index 7f07fd6..c2ab94f 100644
--- a/subpages/heart/pages/leaderboard/leaderboard.json
+++ b/subpages/heart/pages/leaderboard/leaderboard.json
@@ -1,5 +1,5 @@
{
- "navigationBarTitleText": "爱心排行榜",
+ "navigationBarTitleText": "志愿积分榜",
"usingComponents": {
"preload-loveranking-item": "./components/preloadLoverankingItem/preloadLoverankingItem"
}
diff --git a/subpages/heart/pages/signed/signed.json b/subpages/heart/pages/signed/signed.json
index a668d5e..06e1c58 100644
--- a/subpages/heart/pages/signed/signed.json
+++ b/subpages/heart/pages/signed/signed.json
@@ -1,5 +1,5 @@
{
- "navigationBarTitleText": "已报名活动",
+ "navigationBarTitleText": "参与记录",
"usingComponents": {
"activity-item": "./components/activityItem/activityItem",
"pulldown-refresh": "/components/pullDownRefresh/pullDownRefresh",
diff --git a/subpages/home/pages/notice/notice.json b/subpages/home/pages/notice/notice.json
index 8b3c515..93c39fd 100644
--- a/subpages/home/pages/notice/notice.json
+++ b/subpages/home/pages/notice/notice.json
@@ -1,5 +1,5 @@
{
"usingComponents": {
},
- "navigationBarTitleText": "通知"
+ "navigationBarTitleText": "政策导航"
}
\ No newline at end of file
diff --git a/subpages/integralCentre/pages/index/index.wxss b/subpages/integralCentre/pages/index/index.wxss
index 3093d36..0573137 100644
--- a/subpages/integralCentre/pages/index/index.wxss
+++ b/subpages/integralCentre/pages/index/index.wxss
@@ -1,6 +1,7 @@
-page{
+page {
background: #f7f7f7;
}
+
.home {
width: 100%;
height: 100%;
@@ -159,11 +160,13 @@ page{
}
/* 积分排行 */
-.Top{
+
+.Top {
height: 20rpx;
width: 100%;
background: #fff;
}
+
.tab-item {
background: #fff;
height: 80rpx;
@@ -281,11 +284,14 @@ button::after {
font-weight: 500;
color: rgba(51, 51, 51, 1);
margin-left: 90rpx;
- width: calc(100% - 131rpx);
- display: -webkit-box;
+ width: 330rpx;
+ /* display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
+ overflow: hidden; */
overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
.ph-list .right {