From 529584fe514b9132ed6eda15a068558599e5d0e9 Mon Sep 17 00:00:00 2001
From: slj <bad_girl520mm@sina.com>
Date: Sat, 12 Feb 2022 10:32:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/topics/activity/activityDetail/index.js |  8 ++-
 .../topics/activity/activityDetail/index.wxml | 65 ++++++++++---------
 2 files changed, 41 insertions(+), 32 deletions(-)

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 @@
       <image class="artice_collect" src="{{isStar ? star : unStar}}" bindtap="onClickCollect"></image>
     </view>
     <view class="artice_image" wx:if="{{image.length > 0}}">
-      <image class="title_image" src="{{image}}"  mode="widthFix"></image>
+      <image class="title_image" src="{{image}}" mode="widthFix"></image>
     </view>
   </view>
   <!-- 打算赋能中心用这个，不过下面要删掉，用block试试？-->
@@ -17,42 +17,47 @@
     <template is="wxParse" data="{{wxParseData:activity.nodes}}" />
   </view>
   <!--留言列表-->
-  <view class="section_line"></view>
-  <view class="topic_comment">
-    <view class="topic_comment_top">
-      <view>活动留言</view>
-      <button class="commnetBtn" size="mini" bindtap="onTapComment">留言</button>
-    </view>
-    <!--留言列表-->
-    <view class="comment_info">
-      <view class="touch-item {{item.isTouchMove ? 'touch-move-active' : ''}}" data-index="{{index}}"
-        data-name="{{item.userName}}" bindtouchstart="touchstart" bindtouchmove="touchmove" wx:for="{{commentList}}"
-        wx:key="{{index}}">
-        <view class="comment_content">
-          <view class="comment_info_left">
-            <image class="comment_icon" src="{{item.commentAvator}}"></image>
-          </view>
-          <view class="comment_info_right">
-            <view class="comment_top">
-              <view class="comment_info_userName">{{item.userName}}</view>
-              <view class="goodIdeaIcon" wx:if="{{item.isGoldenIdea === 1}}">
-                <image style="width:100%;height:100%;" src="/images/topic/gidea.png"></image>
-              </view>
+  <block wx:if="{{flagShow}}">
+  <block wx:if="{{showMsg}}">
+    <view class="section_line"></view>
+    <view class="topic_comment">
+      <view class="topic_comment_top">
+        <view>活动留言</view>
+        <button class="commnetBtn" size="mini" bindtap="onTapComment">留言</button>
+      </view>
+      <!--留言列表-->
+      <view class="comment_info">
+        <view class="touch-item {{item.isTouchMove ? 'touch-move-active' : ''}}" data-index="{{index}}"
+          data-name="{{item.userName}}" bindtouchstart="touchstart" bindtouchmove="touchmove" wx:for="{{commentList}}"
+          wx:key="{{index}}">
+          <view class="comment_content">
+            <view class="comment_info_left">
+              <image class="comment_icon" src="{{item.commentAvator}}"></image>
             </view>
-            <view class="comment_info_detail">{{item.detail}}</view>
-            <view class="comment_info_time">
-              <view class="comment_info_time_left">{{item.time}}</view>
-              <view class="comment_info_time_right" bindtap="onClickPraise" data-item="{{item}}" data-index='{{index}}'>
-                <view class="praiseNum">{{item.praiseNum}}</view>
-                <image class="praiseIcon" src="{{item.isSupport ==='0' ? unPraise : praise}}"></image>
+            <view class="comment_info_right">
+              <view class="comment_top">
+                <view class="comment_info_userName">{{item.userName}}</view>
+                <view class="goodIdeaIcon" wx:if="{{item.isGoldenIdea === 1}}">
+                  <image style="width:100%;height:100%;" src="/images/topic/gidea.png"></image>
+                </view>
+              </view>
+              <view class="comment_info_detail">{{item.detail}}</view>
+              <view class="comment_info_time">
+                <view class="comment_info_time_left">{{item.time}}</view>
+                <view class="comment_info_time_right" bindtap="onClickPraise" data-item="{{item}}"
+                  data-index='{{index}}'>
+                  <view class="praiseNum">{{item.praiseNum}}</view>
+                  <image class="praiseIcon" src="{{item.isSupport ==='0' ? unPraise : praise}}"></image>
+                </view>
               </view>
             </view>
           </view>
+          <view class="del" data-index="{{index}}" data-id="{{item.id}}" catchtap="del">删除</view>
         </view>
-        <view class="del" data-index="{{index}}" data-id="{{item.id}}" catchtap="del">删除</view>
       </view>
     </view>
-  </view>
+  </block>
+</block>
   <view class="standView"></view>
   <!--活动报名-->
   <view class="page_footer">