From fa20f1656bd9417dd0aa5c5fbdce0924725dd064 Mon Sep 17 00:00:00 2001
From: shuiqing <luoshuiqing@1hhd.com>
Date: Thu, 26 Jul 2018 14:45:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity_detail/activity_detail.js   |  1 +
 pages/activity_detail/activity_detail.wxml |  2 +-
 pages/activity_detail/activity_detail.wxss | 12 ++++++------
 pages/index/index.wxml                     |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pages/activity_detail/activity_detail.js b/pages/activity_detail/activity_detail.js
index 1ee3951..e4f2b71 100644
--- a/pages/activity_detail/activity_detail.js
+++ b/pages/activity_detail/activity_detail.js
@@ -27,6 +27,7 @@ Page({
     grounpInfo2: "none",
     one_content: "none",
     two_content: "none",
+    // two_content: "block",
     bottomBGColor: '#F36619',
     buttomText: '我要拼团',
     tagColor: "#F8B551",
diff --git a/pages/activity_detail/activity_detail.wxml b/pages/activity_detail/activity_detail.wxml
index 9a63f31..0db0876 100644
--- a/pages/activity_detail/activity_detail.wxml
+++ b/pages/activity_detail/activity_detail.wxml
@@ -98,4 +98,4 @@
   </view>
 </view>
 <!--底部弹出框-->
-<zan-actionsheet show="{{ show }}" actions="{{ actions }}" cancel-with-mask="{{ cancelWithMask }}" bind:cancel="closeActionSheet" bind:actionclick="clickAction" mask-class="tiny" />
\ No newline at end of file
+<zan-actionsheet show="{{ show }}" actions="{{ actions }}" cancel-with-mask="{{ cancelWithMask }}" bind:cancel="closeActionSheet" bind:actionclick="clickAction" mask-class="tiny" />0
\ No newline at end of file
diff --git a/pages/activity_detail/activity_detail.wxss b/pages/activity_detail/activity_detail.wxss
index 2d9ff03..f7699f3 100644
--- a/pages/activity_detail/activity_detail.wxss
+++ b/pages/activity_detail/activity_detail.wxss
@@ -306,24 +306,24 @@ float:right;
 
 
 .bottom_view .two_content{
-  width:100%;
-  line-height: 50px;
-  float: left;
+ width:85%;
+line-height:50px;
+float:right;
+
 }
 
 .bottom_view .two_content .left{
-  width: 35%;
+  width: 28%;
   line-height: 50px;
   font-size: 23px;
   color: #F44054;
   font-weight: bold;
-  margin-left: 28px;
   background-color: white;
   text-align: center;
   float: left;
 }
 .bottom_view .two_content .right{
-  width: 65%;
+  width: 72%;
   line-height: 50px;
   font-size: 16px;
   color: white;
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index d35c557..e934eb1 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -32,7 +32,7 @@
         <view class='p2'>¥</view>{{item.participantPrice / 100}}
         <text class="del">原价:{{item.originalPrice / 100}}</text>
       </view>
-      <button class='openBtn' bindtap='openGroup' form-type="submit" data-item='{{item.activityNo}}' >去开团</button>
+      <button class='openBtn' bindtap='openGroup' form-type="submit" data-item='{{item.activityNo}}' >去拼团</button>
     </view>
   </view>
 </view>
\ No newline at end of file