优化

5 years ago · 8791ff57ca
10 changed files with 125 additions and 71 deletions
--- a/pages/heart/heart.wxml
+++ b/pages/heart/heart.wxml
@ -31,15 +31,15 @@
  </view>
  <view class="toptabs">
    <wux-tabs controlled scroll current="{{ key }}" bindchange="onTabsChange">
-      <wux-tab key="tab1" title="招募令"></wux-tab>
+      <wux-tab key="tab1" title="下单参与"></wux-tab>
      <wux-tab key="tab2" title="精彩活动"></wux-tab>
-      <wux-tab key="tab3" title="已报名"></wux-tab>
+      <wux-tab key="tab3" title="参与记录"></wux-tab>
    </wux-tabs>
    <view class="top" bindtap="toLeaderboard">
      <view class="imgtop">
        <image class="topimg" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB71646VqAUpWyAAAC6j5D3pU580.png" />
      </view>
-      <view class="toptxt">爱心榜</view>
+      <view class="toptxt">志愿积分</view>
    </view>
  </view>
  <block>
--- a/pages/heart/heart.wxss
+++ b/pages/heart/heart.wxss
@ -4,40 +4,49 @@ page {
  line-height: 1.6;
  background: #f7f7f7;
 }
+
 .container {
  width: 100vw;
 }
+
 .page-body {
  padding-top: 30rpx;
-  background: #ffffff;
+  background: #fff;
 }
+
 .page-section {
  width: 100%;
  margin-bottom: 60rpx;
 }
+
 .page-section_center {
  display: flex;
  flex-direction: column;
  align-items: center;
 }
+
 .page-section:last-child {
  margin-bottom: 0;
 }
+
 .page-section-gap {
  box-sizing: border-box;
  padding: 0 30rpx;
 }
+
 .page-section-spacing {
  box-sizing: border-box;
  padding: 0 20rpx;
 }
+
 .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 {
  padding-left: 0;
  padding-right: 0;
@ -47,10 +56,11 @@ page {
  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 {
  content: 'A';
  position: absolute;
@ -58,14 +68,16 @@ page {
  left: 50%;
  transform: translate(-50%, -50%);
 }
+
 .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 {
  content: 'B';
  position: absolute;
@ -73,14 +85,16 @@ page {
  left: 50%;
  transform: translate(-50%, -50%);
 }
+
 .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 {
  content: 'C';
  position: absolute;
@ -92,17 +106,20 @@ page {
 button {
  margin-bottom: 30rpx;
 }
+
 button:last-child {
  margin-bottom: 0;
 }
+
 .page-section-title {
  padding: 0;
 }
+
 .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,56 +139,62 @@ 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 {
  margin-top: 60rpx;
  position: relative;
 }
+
 .info {
  position: absolute;
  right: 0;
  color: #353535;
  font-size: 30rpx;
 }
+
 .page-foot {
  margin-top: 50rpx;
 }
+
 swiper {
  height: 320rpx;
 }

-
-
 .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;
+  color: #8393a0 !important;
 }
+
 .wux-tabs__tab--current {
-  color:#333333!important;
+  color: #333 !important;
  font-weight: bold;
  font-size: 40rpx !important;
 }
+
 .wux-tabs__tab-bar {
-  background: #FB3535!important;
+  background: #fb3535 !important;
  height: 10rpx !important;
  border-radius: 6rpx !important;
  margin-top: -40rpx !important;
  width: 80% !important;
-  margin-left: 10%!important;
+  margin-left: 20rpx !important;
 }
+
 .top {
  position: absolute;
  width: 200rpx;
@ -178,10 +202,12 @@ swiper{
  right: 20rpx;
  margin-top: -80rpx;
 }
+
 .toptxt {
-  color: #8393A0;
+  color: #8393a0;
  line-height: 80rpx;
 }
+
 .imgtop {
  width: 44rpx;
  height: 32rpx;
@ -189,8 +215,13 @@ swiper{
  margin-top: 28rpx;
  margin-right: 10rpx;
 }
+
 .topimg {
  float: left;
  width: 44rpx;
  height: 32rpx;
 }
+
+.wux-tabs__tab--horizontal.wux-tabs__tab--scroll {
+  padding: 0 20rpx !important;
+}
--- a/pages/indexNew/indexNew.js
+++ b/pages/indexNew/indexNew.js
@ -418,7 +418,7 @@ Page({
  //功能暂未开放
  nofunction() {
    wx.showToast({
-      title: '功能暂未开放~',
+      title: '敬请期待',
      icon: 'none',
      duration: 1000
    })
--- a/pages/indexNew/indexNew.wxml
+++ b/pages/indexNew/indexNew.wxml
@ -125,7 +125,7 @@
      <button bindtap="moreNotice" class="grid-new-btn" form-type='submit' plain='true' hover-class="hover-btn">
        <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161ChOAayOhAACQGnm1tII484.png'></image>
      </button>
-      <view class="grid-new-text">通知公告</view>
+      <view class="grid-new-text">政策导航</view>
    </view>
    <view class="grid-new-item">
      <button bindtap="nofunction" class="grid-new-btn" form-type='submit' plain='true' hover-class="hover-btn">
@ -152,6 +152,9 @@
        </view>
      </view>
      <image src="{{item.newsImageUrl}}"></image>
+      <view wx:if="{{item.readFlag === '0'}}" class="label">
+        <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7169_pSALSbKAAALvZBEa2A131.png"></image>
+      </view>
    </view>
  </view>
  <!-- <view hidden="{{nomorenews}}" class="nomorenews">没有更多了~</view> -->
--- 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;
--- a/subpages/discussion/pages/addIssue/addIssue.wxml
+++ b/subpages/discussion/pages/addIssue/addIssue.wxml
@ -3,8 +3,8 @@
  <view class="issue-content">
    <textarea maxlength="500" value="{{issueContent}}" bindinput="bindTextareaInput">
      <view class="textarea-placeholder" style="display: {{issueContent ? 'none': 'block'}}">
-        <view>1、请对您反映的事儿尽量描述清楚</view>
-        <view>2、请提出您的诉求和希望</view>
+        <view>请把您要上报的事写明白</view>
+        <!-- <view>2、请提出您的诉求和希望</view> -->
      </view>
    </textarea>
    <view class="image-list">
--- 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"
  }
--- 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",
--- a/subpages/home/pages/notice/notice.json
+++ b/subpages/home/pages/notice/notice.json
@ -1,5 +1,5 @@
 {
  "usingComponents": {
  },
-  "navigationBarTitleText": "通知"
+  "navigationBarTitleText": "政策导航"
 }
--- a/subpages/integralCentre/pages/index/index.wxss
+++ b/subpages/integralCentre/pages/index/index.wxss
@ -1,6 +1,7 @@
 page {
  background: #f7f7f7;
 }
+
 .home {
  width: 100%;
  height: 100%;
@ -159,11 +160,13 @@ page{
 }

 /* 积分排行 */
+
 .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 {