From 63ba746c2a9e1eb3ad2aa21e66936e44ea08f6e3 Mon Sep 17 00:00:00 2001
From: lfs3 <liangfengsi@0085.com>
Date: Thu, 31 May 2018 10:29:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=AF=B7=E6=B1=82=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 | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pages/activity_detail/activity_detail.js b/pages/activity_detail/activity_detail.js
index 6fadc56..5af373b 100644
--- a/pages/activity_detail/activity_detail.js
+++ b/pages/activity_detail/activity_detail.js
@@ -20,30 +20,33 @@ Page({
     countDownSecond: 0, 
     memberList:[],
     activityDetail:{},
-    grounpInfo:"none",
+    grounpInfo:"block",
     activityNo:"",
+    groupNo: "",
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
-    this.getActivityDetail(options.activityNo)
+    
+    this.setData({
+      activityNo: options.activityNo == undefined ? "" : options.activityNo,
+      groupNo: options.groupNo == undefined ? "" : options.groupNo,
+    });
+    console.log("activityNo1231" + this.data.activityNo);
+    this.getActivityDetail()
   },
 
-  getActivityDetail: function (activityNo){
+  getActivityDetail: function (){
    let that = this;
-   that.setData({
-     activityNo: activityNo,
-   });
     wx.showNavigationBarLoading() //在标题栏中显示加载
     wx.request({
       url: app.gw.hostUrl + '/mall/wxa/activity/detail',
       method: 'get',
       data: {
-        activityNo: activityNo,
-        grounpInfo: "none",
+        activityNo: that.data.activityNo,
+        
       },
       header: {
         'Content-Type': 'application/x-www-form-urlencoded'
@@ -55,6 +58,7 @@ Page({
         if (status == 0) {
           that.setData({
             activityDetail: data.response,
+            grounpInfo: "none",
           });
           let activityContent = data.response.activityContent;
           WxParse.wxParse('activityContent', 'html', activityContent, that);
@@ -151,6 +155,7 @@ Page({
 
   groupTap:function(e){
     let that = this;
+    
     wx.showToast({
       title: '正在调起支付',
       icon: 'loading'