From 07661a8439338cd8848f74b1798b600bed0f61d3 Mon Sep 17 00:00:00 2001
From: lfs3 <liangfengsi@0085.com>
Date: Fri, 1 Jun 2018 19:58:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity_detail/activity_detail.js   | 4 ++--
 pages/activity_detail/activity_detail.wxml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/activity_detail/activity_detail.js b/pages/activity_detail/activity_detail.js
index 9f5a58d..9224fed 100644
--- a/pages/activity_detail/activity_detail.js
+++ b/pages/activity_detail/activity_detail.js
@@ -148,7 +148,7 @@ Page({
                     one_content: "block",
                     two_content: "none",
                     bottomBGColor: '#F36619',
-                    buttomText: '团',
+                    buttomText: '我要开团',
                     grounpInfo: "none",
                     grounpInfo2: "block",
 
@@ -314,7 +314,7 @@ Page({
         }
       } else if (that.data.groupStatus == 20) {
          //拼团成功
-        if (that.data.currentMemberTyp == -1) {
+        if (that.data.currentMemberType == -1) {
           //游客
           url = '/mall/wxa/activity/group/open';
           this.groupOpenOrJoin(url);
diff --git a/pages/activity_detail/activity_detail.wxml b/pages/activity_detail/activity_detail.wxml
index acf77c8..93dbce2 100644
--- a/pages/activity_detail/activity_detail.wxml
+++ b/pages/activity_detail/activity_detail.wxml
@@ -40,7 +40,7 @@
     </view>
     <view class='grounp_info' style='display: {{grounpInfo}};'>
       <view class='status'>
-        <text class="tag" style='border-color: {{tagColor}};color: {{tagColor}};'>拼团中</text>
+        <text class="tag" style='border-color: {{tagColor}};color: {{tagColor}};'>{{activityDetail.statusDesc}}</text>
         <view class='remark' style='display: {{remark}};'>还差
           <text class='num'>{{activityDetail.limitNum - memberList.length}}</text>人拼团成功
         </view>