From 4ad292c0b4ba9f5423ebfc100b17fe19ab333719 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Thu, 16 Jan 2020 22:46:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B0=8F=E5=8C=BA=E6=96=87?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activites/activites.js   | 30 +++++++++++++++---------------
 pages/activites/activites.wxml | 26 ++++++++++++++------------
 pages/activites/activites.wxss | 34 ++++++++++++++++++++++++++++------
 pages/index/index.wxss         |  1 +
 4 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/pages/activites/activites.js b/pages/activites/activites.js
index 2262a48..54d60ae 100644
--- a/pages/activites/activites.js
+++ b/pages/activites/activites.js
@@ -15,21 +15,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-    let _that =this;
+    let _that = this;
     context.getOwner(function (_owner) {
       let _communityId = '';
       if (_owner == null) {
@@ -48,6 +34,20 @@ Page({
     });
   },
 
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    
+  },
+
   /**
    * 生命周期函数--监听页面隐藏
    */
diff --git a/pages/activites/activites.wxml b/pages/activites/activites.wxml
index ad4381d..eed9371 100644
--- a/pages/activites/activites.wxml
+++ b/pages/activites/activites.wxml
@@ -2,19 +2,21 @@
 <view class="act">
   <block wx:for="{{activities}}" wx:key="index">
     <navigator url="/pages/activitesDetail/activitesDetail?activitiesId={{item.activitiesId}}&title={{item.title}}&communityId={{item.communityId}}">
-      <view class="act_title">
-        <van-row>
-          <van-col span="20">
-            <text>{{item.title}}</text>
-          </van-col>
-          <van-col span="4">
-            <text>{{item.userName}}</text>
-          </van-col>
-        </van-row>
-      </view>
+      <view class="act_item">
+        <view class="act_img">
+          <image class="headImg" src="{{item.src}}"></image>
+        </view>
 
-      <view class="act_img">
-        <image class="headImg" src="{{item.src}}"></image>
+        <view class="act_title">
+          <van-row>
+            <van-col span="18">
+              <text>{{item.title}}</text>
+            </van-col>
+            <van-col span="4" offset="2">
+              <text>{{item.userName}}</text>
+            </van-col>
+          </van-row>
+        </view>
       </view>
     </navigator>
   </block>
diff --git a/pages/activites/activites.wxss b/pages/activites/activites.wxss
index f083c70..ce2de14 100644
--- a/pages/activites/activites.wxss
+++ b/pages/activites/activites.wxss
@@ -1,11 +1,33 @@
-.act{
+/* .act{
   background-color: #fff;
-}
-.act .act_title{
-  padding: 10rpx 80rpx 10rpx 20rpx;
+} */
+
+.act .act_item{
+  background-color: #fff;
+  margin: 30rpx 0rpx;
+  padding: 30rpx 20rpx 15rpx 20rpx;
 }
 
-.headImg{
+.act .act_item .headImg{
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
   width: 100%;
   height: 400rpx;
-}
\ No newline at end of file
+}
+
+.act .act_title{
+  margin-top: 10rpx;
+  width: 100%;
+  overflow: hidden;
+}
+
+.act .act_title van-col view{
+  overflow: hidden;
+}
+
+.act .act_title text{
+  overflow: hidden;
+  font-size: 28rpx;
+  white-space:nowrap;
+  text-overflow: ellipsis;
+}
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 2aef59e..ca3791c 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -256,6 +256,7 @@ page {
   width: 200rpx;
   height: 150rpx;
   margin: 10rpx 20rpx 0rpx 20rpx;
+  border-radius: 10rpx;
 }
 .notices-info{
   margin: 10rpx 0rpx 0rpx 20rpx;