From fd4b0117e25a28b12427b76650e9f5b522124bab Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Sat, 9 Jun 2018 16:05:20 +0800
Subject: [PATCH] no message

---
 pages/activity_detail/activity_detail.wxml |   2 +-
 pages/index/index.wxss                     | 128 ++++++++++++---------
 2 files changed, 72 insertions(+), 58 deletions(-)

diff --git a/pages/activity_detail/activity_detail.wxml b/pages/activity_detail/activity_detail.wxml
index 9697c6e..8b2214a 100644
--- a/pages/activity_detail/activity_detail.wxml
+++ b/pages/activity_detail/activity_detail.wxml
@@ -70,7 +70,7 @@
         <image src='/images/空.png' class='image'></image>
         <text class='text'>你来晚了</text>
       </view>
-      <view class='row2'>176****6411发起的拼团已结束</view>
+      <view class='row2'>{{activityDetail.statusDesc}}</view>
     </view>
     <image src="{{activityDetail.ruleUrl}}" bindload="ruleImageLoad" style="width:100%;margin: 5rpx auto;height:{{rule_image_height}}px"></image>
     <view class="global_focus intro-box" style='margin: 5rpx auto;'>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 669592f..18cb7cb 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,32 +1,38 @@
-.content{
-    width: 100%;
-    height: 100%;
-    background-color: #F7F7F7;
+.content {
+  width: 100%;
+  height: 100%;
+  background-color: #f7f7f7;
 }
-.header{
+
+.header {
   width: 100%;
   background-color: #26ae76;
 }
-.title_img{
+
+.title_img {
   width: 24%;
   margin: 10rpx 10%;
   display: inline-block;
 }
-.top-left,.top-right{
+
+.top-left, .top-right {
   width: 28%;
   display: inline-block;
-  vertical-align:super;
+  vertical-align: super;
 }
-.address{
+
+.address {
   font-size: 30rpx;
-  color:#fff;
-  margin-left:44rpx;
+  color: #fff;
+  margin-left: 44rpx;
 }
-.middle{
+
+.middle {
   background: #fff;
   margin-bottom: 20rpx;
 }
-.middle_left,.middle_right{
+
+.middle_left, .middle_right {
   width: 27%;
   display: inline-block;
   font-size: 32rpx;
@@ -34,76 +40,81 @@
   text-align: center;
   margin: 10rpx 11% 0;
 }
-image{
+
+image {
   width: 100%;
   height: 100%;
 }
 
-.menu{
+.menu {
   width: 100%;
   background: white;
   height: 90rpx;
   margin: -10rpx auto;
 }
 
-.menu .list{
+.menu .list {
   width: 100%;
   height: 100%;
   display: flex;
-  flex-direction: row; 
-  justify-content:center;
+  flex-direction: row;
+  justify-content: center;
 }
 
-.menu .list .view{
+.menu .list .view {
   height: 46rpx;
   width: 150rpx;
   /* float: left; */
   margin: 22rpx auto;
 }
-.menu .list .view .green_button{
-  line-height: 46rpx; 
+
+.menu .list .view .green_button {
+  line-height: 46rpx;
   width: 130rpx;
-  background: #21BE8D;
+  background: #21be8d;
   color: white;
   font-size: 26rpx;
 }
 
-.menu .list .view .gray_button{
-  line-height: 46rpx; 
+.menu .list .view .gray_button {
+  line-height: 46rpx;
   width: 130rpx;
-  background: #E5E5E5;
+  background: #e5e5e5;
   color: gray;
   font-size: 26rpx;
 }
 
 /*商品列表*/
-.activity_list_view{
+
+.activity_list_view {
   margin: 30rpx 35rpx 11rpx 35rpx;
   background: white;
   height: 623rpx;
   border-radius: 10rpx;
-  text-align:center;
+  text-align: center;
+  box-shadow: 6px 12px 50px 10px #ccc;
 }
-.activity_list_view .view{
+
+.activity_list_view .view {
   height: 350rpx;
   width: 100%;
   display: inline-block;
   position: relative;
 }
 
-.activity_list_view .view .image{
+.activity_list_view .view .image {
   height: 350rpx;
   border-radius: 10rpx 10rpx 0 0;
 }
 
-.activity_list_view .view .num{
+.activity_list_view .view .num {
   display: block;
   padding: 1rpx 4rpx;
   font-size: 16rpx;
-  width:36px;
+  width: 36px;
   line-height: 15px;
-  background:rgba(255,160,67,1);
-  border-radius: 0 10rpx 0 10rpx ;
+  background: rgba(255, 160, 67, 1);
+  border-radius: 0 10rpx 0 10rpx;
   margin-left: 26rpx;
   text-align: center;
   color: white;
@@ -111,44 +122,47 @@ image{
   top: 0px;
   right: 0px;
 }
-.activity_list_view .p1{
+
+.activity_list_view .p1 {
   font-size: 40rpx;
   color: #191919;
   position: relative;
   width: 90%;
   font-weight: bold;
 }
-.activity_list_view .p2{
+
+.activity_list_view .p2 {
   font-size: 32rpx;
   display: inline-block;
 }
-.activity_list_view .p3{
-    color: #ff4040;
-    font-size: 40rpx;
-    font-family: '微软雅黑 Light';
-    font-weight: bold;
-    margin: 40rpx 0;
-    width: 100%;
-    text-align:center;
+
+.activity_list_view .p3 {
+  color: #ff4040;
+  font-size: 40rpx;
+  font-family: '微软雅黑 Light';
+  font-weight: bold;
+  margin: 40rpx 0;
+  width: 100%;
+  text-align: center;
 }
 
-.activity_list_view .del{
-    color: #c0c0c0;
-    font-size: 28rpx;
-    margin-left: 20rpx;
-    position:absolute;
-    margin-top: 10rpx;
-    font-family: "微软雅黑 Light";
-    font-weight: bold;
-    text-decoration: line-through;
+.activity_list_view .del {
+  color: #c0c0c0;
+  font-size: 28rpx;
+  margin-left: 20rpx;
+  position: absolute;
+  margin-top: 10rpx;
+  font-family: "微软雅黑 Light";
+  font-weight: bold;
+  text-decoration: line-through;
 }
 
-.openBtn{
+.openBtn {
   width: 60%;
   margin: -40rpx auto;
   text-align: center;
   color: #fff;
-  background: #F44053;
-  border-radius:20px; 
-  line-height: 80rpx; 
-}
\ No newline at end of file
+  background: #f44053;
+  border-radius: 20px;
+  line-height: 80rpx;
+}