From e4cd8d049433c7b58c810c89829f7009c8bbb0fb Mon Sep 17 00:00:00 2001
From: bailsw <565850092@qq.com>
Date: Thu, 7 May 2020 18:11:25 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=A6=96=E9=A1=B5project=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E4=BF=AE=E6=94=B9=E3=80=91=20-=E5=88=98=E7=BB=8D?=
 =?UTF-8?q?=E6=96=87=20-2020/05/07?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index/components/project/project.wxml     | 10 +++---
 .../index/components/project/project.wxss     | 31 ++++++++++---------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/epdc-resident-mp-yushan/pages/index/components/project/project.wxml b/epdc-resident-mp-yushan/pages/index/components/project/project.wxml
index bfeb3ee..8172a49 100644
--- a/epdc-resident-mp-yushan/pages/index/components/project/project.wxml
+++ b/epdc-resident-mp-yushan/pages/index/components/project/project.wxml
@@ -42,16 +42,14 @@
             <view>
               <image class="project-status" src="{{filters.formatState(item.stateName)}}" />
             </view>
-            <view class="progress">
-              <view class="image-logo">
-                <image class="progress-logo" src="../../../../images/home/new-progress.png"/>
-              </view>
-              <view class="progress-content">最新进展：{{item.latestProgress.progressName}}</view>
-            </view>
+            
           </view>
         </view>
         <view class="bottom">
           <view class="title">{{item.itemContent}}</view>
+          <view class="progress">
+            <view class="progress-content">进度：{{item.latestProgress.progressName}}</view>
+          </view>
           <view class="info">
             <view class="left">
               <image class="avatar" src="{{item.avatar}}" />
diff --git a/epdc-resident-mp-yushan/pages/index/components/project/project.wxss b/epdc-resident-mp-yushan/pages/index/components/project/project.wxss
index b71b5a5..bce8584 100644
--- a/epdc-resident-mp-yushan/pages/index/components/project/project.wxss
+++ b/epdc-resident-mp-yushan/pages/index/components/project/project.wxss
@@ -11,7 +11,7 @@
 }
 .project .swiper {
   width: 100%;
-  height: 380rpx;
+  height: 430rpx;
   display: inline-block;
   white-space: nowrap;
   overflow-x: scroll;
@@ -21,11 +21,11 @@
   box-sizing: border-box;
   padding: 0 30rpx;
   width:60%;
-  height: 380rpx;
+  height: 430rpx;
 }
 .project .content { 
   width: 100%;
-  height: 380rpx;
+  height: 430rpx;
   background: #fff;
   overflow: hidden;
   padding: 0 30rpx;
@@ -56,42 +56,43 @@
   width: 110rpx;
   height: 42rpx;
 }
-.project .content .top .top-content  .progress {
+.progress {
   height: 36rpx;
-  width: 60%;
-  margin-left: 20rpx;
-  background: rgba(0,0,0, 0.4);
+  width: 94%;
+  background: #f7f7f7;
   border-radius: 17rpx;
   margin-bottom: 10rpx;
   display: flex;
   align-items: center;
 }
-.project .content .top .top-content .progress .image-logo {
+ .progress .image-logo {
   width: 36rpx;
   height:36rpx;
 }
-.project .content .top .top-content .progress .progress-logo {
+.progress .progress-logo {
   width: 36rpx;
   height: 36rpx;
   position: relative;
   top: -2rpx;
 }
-.project .content .top .top-content  .progress .progress-content {
-  color: #fff;
+.progress-content {
+  color: #b0b0b0;
   font-size: 22rpx;
   line-height: 36rpx;
-  margin-left: 5rpx;
+  padding: 20rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 .project .content .bottom {
   width: 100%;
   height: 120rpx;
   box-sizing: border-box;
-  padding: 0 20rpx;
 }
 .project .content .bottom .title {
   color: #333;
   font-size: 30rpx;
-  width: 100%;
+  width: 94%;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -123,7 +124,7 @@
 .project .content .bottom .info .right {
   color: #aaa;
   font-size: 20rpx;
-  padding-right: 15rpx;
+  padding-right: 40rpx;
 }
 
 /* 自定义轮播指示点样式 */