diff --git a/pages/topics/activity/activityDetail/index.js b/pages/topics/activity/activityDetail/index.js
index 527eee6..d80e72d 100644
--- a/pages/topics/activity/activityDetail/index.js
+++ b/pages/topics/activity/activityDetail/index.js
@@ -10,6 +10,7 @@ import {
TopicModel
} from '../../../../models/topic.js'
let topicModel = new TopicModel()
+const app = getApp()
Page({
/**
@@ -40,7 +41,9 @@ Page({
startX: 0, //开始坐标
startY: 0,
total: 0,
- confirmTag: true
+ confirmTag: true,
+ showMsg:false,
+ flagShow: 0,
},
/**
@@ -48,7 +51,8 @@ Page({
*/
onLoad: function (options) {
this.setData({
- activityId: options.activityId
+ activityId: options.activityId,
+ flagShow: app.globalData.flag
})
this.fetchDetail()
this.fetchDetailMessage()
diff --git a/pages/topics/activity/activityDetail/index.wxml b/pages/topics/activity/activityDetail/index.wxml
index 6a904c9..a35718e 100644
--- a/pages/topics/activity/activityDetail/index.wxml
+++ b/pages/topics/activity/activityDetail/index.wxml
@@ -9,7 +9,7 @@
-
+
@@ -17,42 +17,47 @@
-
-