diff --git a/components/activity/activity.wxml b/components/activity/activity.wxml
index 0f529da..87902be 100644
--- a/components/activity/activity.wxml
+++ b/components/activity/activity.wxml
@@ -1,4 +1,4 @@
-<view class="layout" wx:for="{{activityList}}">
+<view class="layout" wx:for="{{activityList}}" wx:key="index">
   <view data-id="{{item.id}}" 
         data-actCurrentState="{{item.actCurrentState}}" 
         data-signupFlag="{{item.signupFlag}}" 
@@ -25,7 +25,7 @@
           <text>活动地点：{{item.actAddress}}</text>
         </view>
       </view>
-      <view class="infos_nums" wx:if="{{!(state==2&&item.actCurrentState=='4')}}">
+      <view class="infos_nums" wx:if="{{!(state==2)}}">
     
         <span wx:if="{{item.actQuotaCategory == 0}}" class="total">不限名额</span>
         <span wx:else class="total">活动名额 {{item.actQuota}}人</span>
diff --git a/images/home/signin.png b/images/home/signin.png
new file mode 100644
index 0000000..dc4b961
Binary files /dev/null and b/images/home/signin.png differ
diff --git a/images/home/signined.png b/images/home/signined.png
new file mode 100644
index 0000000..2d5c436
Binary files /dev/null and b/images/home/signined.png differ
diff --git a/images/mine/topic-nodata.png b/images/mine/topic-nodata.png
index 34b8937..0a5543d 100644
Binary files a/images/mine/topic-nodata.png and b/images/mine/topic-nodata.png differ
diff --git a/images/search.png b/images/search.png
new file mode 100644
index 0000000..c6e6a6c
Binary files /dev/null and b/images/search.png differ
diff --git a/pages/discussion/components/issueList/issueList.js b/pages/discussion/components/issueList/issueList.js
index 5ff987d..fe74bcc 100644
--- a/pages/discussion/components/issueList/issueList.js
+++ b/pages/discussion/components/issueList/issueList.js
@@ -170,6 +170,11 @@ Component({
           this.data.selectedIssueId = ""
         })
       }
+    },
+
+    //跳转项目列表
+    goProjectComponent () {
+      this.triggerEvent('goProjectComponent')
     }
   }
 })
\ No newline at end of file
diff --git a/pages/discussion/components/issueList/issueList.wxml b/pages/discussion/components/issueList/issueList.wxml
index 43aeaf5..7196f2e 100644
--- a/pages/discussion/components/issueList/issueList.wxml
+++ b/pages/discussion/components/issueList/issueList.wxml
@@ -28,7 +28,7 @@
           wx:for="{{[1]}}"
           wx:for-index="index"
           wx:for-item="item"
-          wx:key="{{index}}">
+          wx:key="index">
         </preload-issue-item>
       </block>
       <block wx:if="{{issueList.length > 0}}">
@@ -44,6 +44,7 @@
       <view class="issue-nodata" wx:if="{{issueList.length === 0 && !preloadVisible}}">
         <image class="nodata-image" src="../../../../images/mine/topic-nodata.png" />
         <view class="nodata-tip">暂无议题</view>
+        <view class="nodata-tip">请前往“<text class="go-project" catchtap="goProjectComponent">项目</text>”进行查看</view>
       </view>
     </view>
   </pulldown-refresh>
diff --git a/pages/discussion/components/issueList/issueList.wxss b/pages/discussion/components/issueList/issueList.wxss
index ea09f5b..ff68680 100644
--- a/pages/discussion/components/issueList/issueList.wxss
+++ b/pages/discussion/components/issueList/issueList.wxss
@@ -92,7 +92,7 @@
 
 .issue-list .issue-nodata {
   width: 100%;
-  height: calc(100vh - 300rpx);
+  height: calc(100vh - 500rpx);
   background: #f7f7f7;
   display: flex;
   flex-direction: column;
@@ -100,8 +100,10 @@
   justify-content: center;
 }
 .issue-list .issue-nodata .nodata-image {
-  width: 256rpx;
-  height:245rpx;
+  /* width: 256rpx;
+  height:245rpx; */
+  width: 320rpx;
+  height:480rpx;
   object-fit: cover;
 }
 .issue-list .issue-nodata .nodata-tip {
@@ -109,4 +111,9 @@
   color: #bcbcbc;
   height: 50rpx;
   line-height: 50rpx;
+}
+
+.issue-list .issue-nodata .nodata-tip .go-project{
+  font-size: 28rpx;
+  color: #bcbcbc;
 }
\ No newline at end of file
diff --git a/pages/discussion/components/projectList/projectList.wxml b/pages/discussion/components/projectList/projectList.wxml
index 14d9015..b16cd1c 100644
--- a/pages/discussion/components/projectList/projectList.wxml
+++ b/pages/discussion/components/projectList/projectList.wxml
@@ -13,7 +13,7 @@
           wx:for="{{[1]}}"
           wx:for-index="index"
           wx:for-item="item"
-          wx:key="{{index}}">
+          wx:key="index">
         </preload-project-item>
       </block>
       <block wx:if="{{projectList.length > 0}}">
diff --git a/pages/discussion/discussion.js b/pages/discussion/discussion.js
index b3e21b2..fec8283 100644
--- a/pages/discussion/discussion.js
+++ b/pages/discussion/discussion.js
@@ -104,6 +104,20 @@ Page({
   getIssueComponent () {
     this.issuelist = this.selectComponent("#issuelist")
   },
+  goProjectComponent () {
+    const list = this.data.typeList
+    list.forEach(item => {
+      if (item.type == '1') {
+        item.select = true
+      } else {
+        item.select = false
+      }
+    })
+    this.setData({
+      typeList: list,
+      discussionType: "project"
+    })
+  },
   // 检查 是否完善信息
   verifyCompleteInfo () {
     if (this.data.infoCompleted == 0) {
diff --git a/pages/discussion/discussion.wxml b/pages/discussion/discussion.wxml
index 9f5512b..2eaa322 100644
--- a/pages/discussion/discussion.wxml
+++ b/pages/discussion/discussion.wxml
@@ -18,7 +18,7 @@
   </view>
 
   <view class="issue-list" wx:if="{{discussionType === 'issue'}}">
-    <issue-list id="issuelist" bind:getIssueComponent="getIssueComponent"></issue-list>
+    <issue-list id="issuelist" bind:getIssueComponent="getIssueComponent" bind:goProjectComponent="goProjectComponent"></issue-list>
   </view>
   <view class="project-list" wx:else>
     <project-list id="projectlist" bind:getProjectComponent="getProjectComponent"></project-list>
diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js
index 6a46437..0a0cf07 100644
--- a/pages/heartNew/heartNew.js
+++ b/pages/heartNew/heartNew.js
@@ -36,7 +36,8 @@ Page({
     listLength:0,//数据长度判断是否需要加载
     getImgUrl:"",
     ifClickImage:false,//因为志友多多点击图片查看大图，会出现列表刷新的bug，所以加这个字段进行控制
-    tabFixed: false
+    tabFixed: false,
+    searchName: ''
   },
 
   /**
@@ -91,6 +92,7 @@ Page({
         let parms = {
           pageIndex: this.data.indexPage,
           pageSize: this.data.pageSize,
+          nickname: this.data.searchName
         }
         this.volunteerlist(parms)
       }
@@ -130,11 +132,13 @@ Page({
         dingdan: true,
         jingcai: true,
         volunteerlist:[],//列表置空
-        listLength:0
+        listLength:0,
+        searchName: ''
       })
       let parms = {
         pageIndex: this.data.indexPage,
         pageSize: this.data.pageSize,
+        nickname: this.data.searchName
       }
       this.volunteerlist(parms)
     } else if (e.currentTarget.dataset.tab == "tab2") {
@@ -204,7 +208,7 @@ Page({
         })
       }
       that.setData({
-        listLength:res.data.length,
+        listLength:res.data.volunteerList.length,
         volunteerlist:that.data.volunteerlist.concat(res.data.volunteerList),
         volunteerCount: res.data.volunteerCount
       })
@@ -242,7 +246,33 @@ Page({
     })
   },
 
+  bindInputValue (e) {
+    this.setData({
+      searchName: e.detail.value
+    })
+  },
 
+  searchName () {
+    console.log(this.data.searchName)     
+    if(!this.data.searchName) {
+      wx.showToast({
+        title: '请输入搜索的昵称',
+        icon: 'none',
+        duration: 2000
+      })
+      return;
+    }
+    this.setData({
+      volunteerlist: [],
+      indexPage: 1
+    })
+    let parms = {
+      pageIndex: this.data.indexPage,
+      pageSize: this.data.pageSize,
+      nickname: this.data.searchName
+    }
+    this.volunteerlist(parms)
+  },
   /**
    * 生命周期函数--监听页面隐藏
    */
@@ -318,6 +348,7 @@ Page({
       let parms = {
         pageIndex: this.data.indexPage,
         pageSize: this.data.pageSize,
+        nickname: this.data.searchName
       }
       this.volunteerlist(parms)
     } else if (this.data.selectedTab == "tab2") {
diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml
index 5677403..80f0191 100644
--- a/pages/heartNew/heartNew.wxml
+++ b/pages/heartNew/heartNew.wxml
@@ -77,9 +77,18 @@
 <!-- 志友朵朵 -->
 <block wx:if="{{ selectedTab == 'tab1' }}">
   <view class="details-top">
+  <view class="search">
+      <view class="item-all">
+          <view class="item-left">
+              <image src="../../images/search.png"></image>
+              <input placeholder-class="placeholder-style" placeholder="输入昵称关键字" bindinput="bindInputValue" value="{{searchName}}"></input>
+          </view>
+          <button class="item-right" bindtap="searchName" hover-class="none">搜索</button>
+      </view>
+  </view>
   <view class="reg-count">志愿者注册数：{{volunteerCount}}</view>
     <view class="volunteer-box">
-      <volunteer-list bind:clickImage="clickImage" wx:for="{{volunteerlist}}" volunteerItemObj="{{item}}" wx:for-index="index" wx:for-item="item" wx:key="{{index}}"></volunteer-list>
+      <volunteer-list bind:clickImage="clickImage" wx:for="{{volunteerlist}}" volunteerItemObj="{{item}}" wx:for-index="index" wx:for-item="item" wx:key="index"></volunteer-list>
     </view>
     <!-- <view class="show">*按姓氏拼音排序</view> -->
   </view>
diff --git a/pages/heartNew/heartNew.wxss b/pages/heartNew/heartNew.wxss
index 514d3a9..662a677 100644
--- a/pages/heartNew/heartNew.wxss
+++ b/pages/heartNew/heartNew.wxss
@@ -392,4 +392,73 @@ button:last-child {
   line-height: 24rpx;
   font-weight: 500;
   color: #C5C5C5;
-}
\ No newline at end of file
+}
+
+/* 搜索志愿者 start */
+.search {
+  /* margin-top: 17rpx; */
+  height: 66rpx;
+  background: rgba(255, 255, 255, 1);
+  border-radius: 33rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 10rpx 40rpx;
+}
+
+.search .item-all {
+  height: 30rpx;
+  width: 100%;
+  width: calc(100% - 60rpx);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.search .item-all .item-left {
+  /* background: red; */
+  width: calc(100% - 73rpx);
+  height: 30rpx;
+  border-right: 1rpx solid #BFBFBF;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.search .item-all .item-left image {
+  width: 30rpx;
+  height: 28rpx;
+}
+
+.search .item-all .item-left input {
+  width: calc(100% - 41rpx);
+  height: 30rpx;
+  font-size: 28rpx;
+  color: #333;
+}
+
+.placeholder-style {
+  font-size: 28rpx;
+  font-weight: 500;
+  color: rgba(168, 168, 168, 1);
+}
+
+.search .item-all .item-right {
+  font-size: 28rpx;
+  font-weight: 500;
+  color: rgba(51, 51, 51, 1);
+  background-color: #fff;
+}
+.search button {
+  width: 100rpx;
+  height: 58rpx;
+  padding: 0;
+  border-radius: 0;
+  line-height: 58rpx;
+}
+
+.search button::after {
+  border-radius: 0px;
+  border: none;
+}
+/* 搜索志愿者 end */
\ No newline at end of file
diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js
index 3d891c5..82b9c6b 100644
--- a/pages/indexNew/indexNew.js
+++ b/pages/indexNew/indexNew.js
@@ -75,11 +75,16 @@ Page({
     workGridId:'', //工作网格7.08
     completeInfoDialogVisible: false, //完善信息
     homePagePhone: {},
-    fromprogram: '' //来自工作端=work 或者 数据分析端=leader 的跳转
+    fromprogram: '', //来自工作端=work 或者 数据分析端=leader 的跳转,
+    visible: false,
+    signMsg: '',
+    signCode: 0,
+    isSignUp: 0
   },
   onShow: function () {
     if (wx.getStorageSync("token") != "" && wx.getStorageSync("token") != undefined && wx.getStorageSync("token") != null) {
       if (!this.data.first) {
+        this.getUserInfo()
         this.loadGridList()
         this.getBannerList()
         this.getFirstInfo()
@@ -99,6 +104,7 @@ Page({
       const para = {
         shareType: options.shareType,
         id: options.id,
+        detailId: options.detailId,
         type: options.type ? options.type : "",
         defaultGridId: options.defaultGridId ? options.defaultGridId : "",
       }
@@ -351,11 +357,16 @@ Page({
                     wx.navigateTo({
                       url: `/subpages/heart/pages/heartDetail/heartDetail?id=${para.id}`
                     })
-                  }
+                  } else if (para.shareType === 'newsDetail') {
+                    wx.navigateTo({
+                      url: `/subpages/home/pages/newsDetail/newsDetail?id=${para.detailId}`
+                    })
+                  } 
                   wx.removeStorageSync("shareObj")
                 }    
                 that.getResidentConfig()
                 that.getHomePhone()
+                that.getUserInfo()
                 that.loadGridList()
                 that.getBannerList()
                 that.getFirstInfo()
@@ -625,5 +636,49 @@ Page({
     } else {
       return false
     }
+  },
+  // 获取用户信息
+  getUserInfo () {
+    api.getUserInfo().then(res => {
+      console.log("用户信息", res)
+      this.setData({
+        isSignUp: res.data.isSignUp
+      })
+    }).catch(err => {
+      this.setData({
+        isSignUp: 0
+      })
+      console.log(err)
+    })
+  },
+  //签到 2020.07.31
+  toSignIn () {
+    if (this.data.isSignUp == 1) {
+      return
+    }
+    api.userInfoSignUp().then(res => {
+      console.log(res.data)
+      if (res.code === 0) {
+        // 显示提醒
+        this.setData({
+          signCode: res.code,
+          signMsg: res.data,
+          visible: true
+        });
+      } else {
+        this.setData({
+          signCode: res.code,
+          signMsg: res.msg,
+          visible: true
+        });
+      }
+    })
+  },
+  // 关闭签到提醒
+  onClose() {
+    this.getUserInfo()
+    this.setData({
+      visible: false
+    });
   }
 })
\ No newline at end of file
diff --git a/pages/indexNew/indexNew.json b/pages/indexNew/indexNew.json
index 0b63bd2..49f2c18 100644
--- a/pages/indexNew/indexNew.json
+++ b/pages/indexNew/indexNew.json
@@ -5,6 +5,7 @@
   "usingComponents": {
     "nav-bar": "/components/navbar/index",
     "load-more": "../../components/loadMore/loadMore",
-    "complete-info-dialog": "../../components/completeInfoDialog/completeInfoDialog"
+    "complete-info-dialog": "../../components/completeInfoDialog/completeInfoDialog",
+    "wux-popup": "../../dist/popup/index"
   }
 }
\ No newline at end of file
diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml
index 27124e0..e95deae 100644
--- a/pages/indexNew/indexNew.wxml
+++ b/pages/indexNew/indexNew.wxml
@@ -15,6 +15,10 @@
         <view class="grid-name">{{departmentName}}</view>
         <image class="more-grid" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nk3uAAMMcAAADckZSIh0279.png" />
       </view>
+      <view class="signin-btn" bindtap="toSignIn">
+        <image src="../../images/home/signin.png" wx:if="{{isSignUp == 0}}" />
+        <image src="../../images/home/signined.png" wx:else />
+      </view>
       <view class="my-and-news">
         <image wx:if="{{infoObj.title == ''}}" bindtap="noMore" class="news" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nk4yASWCrAAAKA-kIkt0142.png" />
         <image wx:else bindtap="toInfoList" class="news" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7161EWKAIXwXAAAD4DwRkd4543.png" />
@@ -169,4 +173,9 @@
   <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
 </view>
 
-<complete-info-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}"></complete-info-dialog>
\ No newline at end of file
+<complete-info-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}"></complete-info-dialog>
+
+<!-- 签到后提醒 -->
+<wux-popup visible="{{visible}}" title="{{signCode === 0 ? '签到成功' : '签到失败'}}" content="{{signMsg}}" bind:close="onClose">
+  <view slot="footer" class="popup__button" bindtap="onClose">确定</view>
+</wux-popup>
\ No newline at end of file
diff --git a/pages/indexNew/indexNew.wxss b/pages/indexNew/indexNew.wxss
index ac9a988..4000388 100644
--- a/pages/indexNew/indexNew.wxss
+++ b/pages/indexNew/indexNew.wxss
@@ -60,9 +60,22 @@ page {
   z-index: 10;
 }
 
+.belong-grid .newbelong-grid .signin-btn {
+  width: 140rpx;
+  height: 44rpx;
+  position: absolute;
+  z-index: 99;
+  right: 80rpx;
+}
+
+.belong-grid .newbelong-grid .signin-btn image {
+  width: 100%;
+  height: 100%;
+}
+
 .belong-grid .newbelong-grid .grid {
   /* width: 90%; */
-  width: calc(100% - 129rpx);
+  width: calc(100% - 240rpx);
   height: 34rpx;
   position: relative;
   z-index: 100;
@@ -89,7 +102,7 @@ page {
 }
 
 .belong-grid .newbelong-grid .my-and-news {
-  width: 129rpx;
+  width: 80rpx;
   height: 34rpx;
   position: relative;
   z-index: 100;
@@ -631,3 +644,10 @@ page {
   height: 100%;
   width: 100%;
 }
+
+.popup__button {
+  width: 100%;
+  text-align: center;
+  font-size: 36rpx;
+  color: #04BCA0;
+}
\ No newline at end of file
diff --git a/pages/mine/components/topicItemNew/topicItemNew.wxml b/pages/mine/components/topicItemNew/topicItemNew.wxml
index b886ff1..60d1785 100644
--- a/pages/mine/components/topicItemNew/topicItemNew.wxml
+++ b/pages/mine/components/topicItemNew/topicItemNew.wxml
@@ -1,4 +1,4 @@
-<view class="item-list">
+<view class="item-list" data-topicid="{{topicObj.id}}" bindtap="toDetail">
 	<view class="user-info">
 		<image src="{{topicObj.userFace}}"></image>
 		<view class="name-date">
@@ -34,4 +34,5 @@
 		<view wx:for="{{topicObj.comments}}" wx:key="index" wx:for-index="index" wx:for-item="item_"
 			class="comment-list"><text>{{item_.username}}：</text>{{item_.content}}</view>
 	</view>
+	<view class="shield-line" wx:if="{{topicObj.shieldFlag=='1'}}"><view class="shield-label">已屏蔽</view></view>
 </view>
\ No newline at end of file
diff --git a/pages/mine/components/topicItemNew/topicItemNew.wxss b/pages/mine/components/topicItemNew/topicItemNew.wxss
index 7a309d8..e05cae5 100644
--- a/pages/mine/components/topicItemNew/topicItemNew.wxss
+++ b/pages/mine/components/topicItemNew/topicItemNew.wxss
@@ -209,4 +209,20 @@
   width: 100%;
   height: 100%;
   object-fit: cover;
+}
+
+.shield-line {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10rpx;  
+}
+.shield-line .shield-label {
+  width: 90rpx;
+  height: 34rpx;
+  border-radius: 17rpx;
+  background: #F40C0C;
+  color: #fff;
+  font-size: 22rpx;
+  line-height: 34rpx;
+  text-align:center;
 }
\ No newline at end of file
diff --git a/pages/mine/mine.js b/pages/mine/mine.js
index 5395c43..e10a963 100644
--- a/pages/mine/mine.js
+++ b/pages/mine/mine.js
@@ -288,14 +288,15 @@ Page({
     })
   },
   // 话题列表 跳转详情
-  // toTopicDetail(e) {
-  //   const {
-  //     topicId
-  //   } = e.detail
-  //   wx.navigateTo({
-  //     url: `/subpages/association/pages/topicDetail/topicDetail?detailId=${topicId}`
-  //   })
-  // },
+  toTopicDetail(e) {
+    console.log(e.detail)
+    const {
+      topicId
+    } = e.detail
+    wx.navigateTo({
+      url: `/subpages/association/pages/topicDetail/topicDetail?detailId=${topicId}`
+    })
+  },
   // 我有事说
   addIssue () {
     if (this.data.infoCompleted == 0) {
@@ -335,34 +336,34 @@ Page({
     })
   },
 
-  //签到 2020.07.24
-  toSignUp () {
-    if (this.data.userInfo.isSignUp == 1) {
-      return
-    }
-    api.userInfoSignUp().then(res => {
-      console.log(res.data)
-      if (res.code === 0) {
-        // 显示提醒
-        this.setData({
-          signCode: res.code,
-          signMsg: res.data,
-          visible: true
-        });
-      } else {
-        this.setData({
-          signCode: res.code,
-          signMsg: res.msg,
-          visible: true
-        });
-      }
-    })
-  },
-  // 关闭签到提醒
-  onClose() {
-    this.getUserInfo()
-    this.setData({
-      visible: false
-    });
-  }
+  // 签到 2020.07.24
+  // toSignUp () {
+  //   if (this.data.userInfo.isSignUp == 1) {
+  //     return
+  //   }
+  //   api.userInfoSignUp().then(res => {
+  //     console.log(res.data)
+  //     if (res.code === 0) {
+  //       // 显示提醒
+  //       this.setData({
+  //         signCode: res.code,
+  //         signMsg: res.data,
+  //         visible: true
+  //       });
+  //     } else {
+  //       this.setData({
+  //         signCode: res.code,
+  //         signMsg: res.msg,
+  //         visible: true
+  //       });
+  //     }
+  //   })
+  // },
+  // // 关闭签到提醒
+  // onClose() {
+  //   this.getUserInfo()
+  //   this.setData({
+  //     visible: false
+  //   });
+  // }
 })
\ No newline at end of file
diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml
index c0f0554..3b0f0f7 100644
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -26,14 +26,14 @@
                 <image class="rightsword" src="../../images/mine/mine-rightsword.png" />
               </view>
             </view>
-            <view class="complete-info" bindtap="toSignUp">
+            <!-- <view class="complete-info" bindtap="toSignUp">
               <image class="complete-image" src="../../images/mine/signup.png"/>
               <view class="complete-content">
                 <view wx:if="{{userInfo.isSignUp == 0}}" class="tip">签  到</view>
                 <view wx:else class="tip" style="color:rgba(255,255,255,0.5);">已签到</view>
                 <image class="rightsword" style="{{userInfo.isSignUp == 1 ? 'opacity:0.5;' : ''}}" src="../../images/mine/mine-rightsword.png" />
               </view>
-            </view>
+            </view> -->
           </view>
         </view>
         <view class="bottom">
@@ -110,10 +110,10 @@
 
   <view class="topic-list" wx:elif="{{selectedTabBar === 'topic'}}">
     <block wx:if="{{topicList.length === 0 && preloadVisible}}">
-      <preload-topic-item wx:for="{{[1]}}" wx:key="{{index}}" wx:for-index="index"></preload-topic-item>
+      <preload-topic-item wx:for="{{[1]}}" wx:key="index" wx:for-index="index"></preload-topic-item>
     </block>
     <block wx:if="{{topicList.length > 0}}">
-      <topic-item wx:for="{{topicList}}" wx:for-item="item" wx:for-index="index" topicObj="{{item}}" bind:toTopicDetail="toTopicDetail" wx:key="{{item.id}}">
+      <topic-item wx:for="{{topicList}}" wx:for-item="item" wx:for-index="index" topicObj="{{item}}" bind:toTopicDetail="toTopicDetail" wx:key="id">
       </topic-item>
     </block>
     <view class="topic-nodata" wx:if="{{topicList.length === 0 && !preloadVisible}}">
diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 36d710e..3e20967 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.4.19"
+    const versionNum = "1.4.32"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag
diff --git a/project.config.json b/project.config.json
index 6d80207..0e8739b 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,136 +1,144 @@
 {
-	"description": "项目配置文件",
-	"packOptions": {
-		"ignore": []
-	},
-	"setting": {
-		"urlCheck": false,
-		"es6": true,
-		"postcss": true,
-		"preloadBackgroundData": false,
-		"minified": true,
-		"newFeature": true,
-		"coverView": true,
-		"autoAudits": false,
-		"showShadowRootInWxmlPanel": true,
-		"scopeDataCheck": false,
-		"checkInvalidKey": true,
-		"checkSiteMap": true,
-		"uploadWithSourceMap": true,
-		"compileHotReLoad": false,
-		"babelSetting": {
-			"ignore": [],
-			"disablePlugins": [],
-			"outputPath": ""
-		},
-		"useIsolateContext": true,
-		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false
-	},
-	"compileType": "miniprogram",
-	"libVersion": "2.8.2",
-	"appid": "wx6dcf544cdae7d4ec",
-	"projectname": "%E7%B2%BE%E8%87%B4%E9%94%A6%E6%B0%B4-%E5%B1%85%E6%B0%9                                   1%E7%AB%AF",
-	"debugOptions": {
-		"hidedInDevtools": []
-	},
-	"isGameTourist": false,
-	"simulatorType": "wechat",
-	"simulatorPluginLibVersion": {},
-	"condition": {
-		"search": {
-			"current": -1,
-			"list": []
-		},
-		"conversation": {
-			"current": -1,
-			"list": []
-		},
-		"plugin": {
-			"current": -1,
-			"list": []
-		},
-		"game": {
-			"currentL": -1,
-			"list": []
-		},
-		"gamePlugin": {
-			"current": -1,
-			"list": []
-		},
-		"miniprogram": {
-			"current": -1,
-			"list": [
-				{
-					"id": 0,
-					"name": "带参数二维码",
-					"pathName": "pages/index/index",
-					"query": "scene=1277169327606366209&inviteUserId=12345",
-					"scene": 1011
-				},
-				{
-					"id": 1,
-					"name": "pages/indexNew/indexNew",
-					"pathName": "pages/indexNew/indexNew",
-					"query": "gid=1175270967490244609",
-					"scene": 1011
-				},
-				{
-					"id": 2,
-					"name": "网格长注册",
-					"pathName": "pages/index/index",
-					"query": "scene=gridLeader",
-					"scene": 1011
-				},
-				{
-					"id": -1,
-					"name": "subpages/home/pages/newsDetail/newsDetail",
-					"pathName": "subpages/home/pages/newsDetail/newsDetail",
-					"query": "id=7c8bc749ff4b6380bf1d902c0bde0ba1",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "社群列表",
-					"pathName": "subpages/associationNew/pages/associationlist/associationlist",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": 5,
-					"name": "数据端跳转",
-					"pathName": "pages/indexNew/indexNew",
-					"query": "scene=1277169327606366209&from=analysis",
-					"scene": null
-				},
-				{
-					"id": 6,
-					"name": "工作端跳转",
-					"pathName": "pages/indexNew/indexNew",
-					"query": "scene=1280737901335838721&from=work",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "锦水档案",
-					"pathName": "subpages/understandJs/pages/archives/archives",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": 8,
-					"name": "搜索页面",
-					"pathName": "subpages/oneKeyService/pages/search/search",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "注册页面",
-					"pathName": "pages/toRegister/toRegister",
-					"scene": null
-				}
-			]
-		}
-	}
+  "description": "项目配置文件",
+  "packOptions": {
+    "ignore": []
+  },
+  "setting": {
+    "urlCheck": false,
+    "es6": true,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": true,
+    "coverView": true,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "useIsolateContext": true,
+    "useCompilerModule": false,
+    "userConfirmedUseCompilerModuleSwitch": false
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.8.2",
+  "appid": "wx6dcf544cdae7d4ec",
+  "projectname": "%E7%B2%BE%E8%87%B4%E9%94%A6%E6%B0%B4-%E5%B1%85%E6%B0%9                                   1%E7%AB%AF",
+  "debugOptions": {
+    "hidedInDevtools": []
+  },
+  "isGameTourist": false,
+  "simulatorType": "wechat",
+  "simulatorPluginLibVersion": {},
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "plugin": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "currentL": -1,
+      "list": []
+    },
+    "gamePlugin": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": -1,
+      "list": [
+        {
+          "id": 0,
+          "name": "pages/formid/formid",
+          "pathName": "pages/formid/formid",
+          "query": "gid=1233592630168813569",
+          "scene": 1011
+        },
+        {
+          "id": 1,
+          "name": "pages/indexNew/indexNew",
+          "pathName": "pages/indexNew/indexNew",
+          "query": "scene=1233592247862198274",
+          "scene": 1011
+        },
+        {
+          "id": 2,
+          "name": "网格长注册",
+          "pathName": "pages/index/index",
+          "query": "scene=gridLeader",
+          "scene": 1011
+        },
+        {
+          "id": 3,
+          "name": "subpages/home/pages/newsDetail/newsDetail",
+          "pathName": "subpages/home/pages/newsDetail/newsDetail",
+          "query": "id=7c8bc749ff4b6380bf1d902c0bde0ba&defaultGridId=1233592630168813569",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "社群列表",
+          "pathName": "subpages/associationNew/pages/associationlist/associationlist",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": 5,
+          "name": "数据端跳转",
+          "pathName": "pages/indexNew/indexNew",
+          "query": "scene=1277169327606366209&from=analysis",
+          "scene": null
+        },
+        {
+          "id": 6,
+          "name": "工作端跳转",
+          "pathName": "pages/indexNew/indexNew",
+          "query": "scene=1280737901335838721&from=work",
+          "scene": null
+        },
+        {
+          "id": 7,
+          "name": "我有事说",
+          "pathName": "subpages/discussion/pages/addIssue/addIssue",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": 8,
+          "name": "搜索页面",
+          "pathName": "subpages/oneKeyService/pages/search/search",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "注册页面",
+          "pathName": "pages/toRegister/toRegister",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "subpages/heart/pages/leaderboardNew/leaderboardNew",
+          "pathName": "subpages/heart/pages/leaderboardNew/leaderboardNew",
+          "query": "",
+          "scene": null
+        }
+      ]
+    }
+  }
 }
\ No newline at end of file
diff --git a/subpages/association/pages/topicDetail/topicDetail.js b/subpages/association/pages/topicDetail/topicDetail.js
index 0e4c0ad..63f2e59 100644
--- a/subpages/association/pages/topicDetail/topicDetail.js
+++ b/subpages/association/pages/topicDetail/topicDetail.js
@@ -1,11 +1,12 @@
 import { 
-  getTopicDetail, 
-  getRemarkList, 
-  closeTopic, 
+  getTopicDetailV2, 
+  //getRemarkList, 
+  //closeTopic, 
   // publishStatement, 
-  topicComLike,
-  topicComUnlike,
-  getCloseReason } from "../../utils/api"
+  //topicComLike,
+  //topicComUnlike,
+  //getCloseReason 
+} from "../../utils/api"
 const app = getApp()
 
 Page({
@@ -51,31 +52,30 @@ Page({
       detailId: options.detailId,
       infoCompleted: app.globalData.infoCompleted
     })
-    this.getCloseReason()
+    // this.getCloseReason()
   },
   onShow () {
-    this.setData({
-      pageNo: 1,
-      loadMoreType: "loading",
-      timestamp: ""
-    })
-    this.getTopicRemark()
-
+    // this.setData({
+    //   pageNo: 1,
+    //   loadMoreType: "loading",
+    //   timestamp: ""
+    // })
+    // this.getTopicRemark()
   },
   onReachBottom () {
-    if (!this.data.loadMoreVisible) {
-      this.setData({
-        loadMoreVisible: true
-      })
-    }
-    if (this.data.loadMoreType === "loading") {
-      this.setData({
-        pageNo: this.data.pageNo + 1
-      })
-      setTimeout(() => {
-        this.getTopicRemark()
-      },500)
-    }
+    // if (!this.data.loadMoreVisible) {
+    //   this.setData({
+    //     loadMoreVisible: true
+    //   })
+    // }
+    // if (this.data.loadMoreType === "loading") {
+    //   this.setData({
+    //     pageNo: this.data.pageNo + 1
+    //   })
+    //   setTimeout(() => {
+    //     this.getTopicRemark()
+    //   },500)
+    // }
   },
   // 跳转 评论
   inputFocus () {
@@ -104,20 +104,30 @@ Page({
   },
   // 获取话题详情
   getTopicDetail (detailId) {
-    getTopicDetail(detailId).then(res => {
+    getTopicDetailV2(detailId).then(res => {
       console.log("话题详情",res)
-      const detailInfo = {}
-      for(const key in this.data.detailInfo) {
-        detailInfo[key] = res.data[key]
-      }
+      // const detailInfo = {}
+      // for(const key in this.data.detailInfo) {
+      //   detailInfo[key] = res.data[key]
+      // }
+      // this.setData({
+      //   lordFlag: res.data.lordFlag,
+      //   detailInfo
+      // })
+      this.data.detailInfo = { ...res.data }
       this.setData({
-        lordFlag: res.data.lordFlag,
-        detailInfo
+        detailInfo: this.data.detailInfo
       })
     }).catch(err => {
       console.log(err)
     })
   },
+  previewImage (e) {
+    wx.previewImage({
+      urls: this.data.detailInfo.images,
+      current: e.currentTarget.dataset.src
+    })
+  },
   // 获取话题评论列表
   getTopicRemark () {
     const para = {
diff --git a/subpages/association/pages/topicDetail/topicDetail.wxml b/subpages/association/pages/topicDetail/topicDetail.wxml
index 854b197..197163f 100644
--- a/subpages/association/pages/topicDetail/topicDetail.wxml
+++ b/subpages/association/pages/topicDetail/topicDetail.wxml
@@ -1,4 +1,4 @@
-<view class="topic-detail">
+<!-- <view class="topic-detail">
 
   <topic-content detailInfo="{{detailInfo}}"></topic-content>
 
@@ -15,14 +15,14 @@
     bind:replyRemark="replyRemark"
     bind:changeRemarkType="changeRemarkType"
     bind:dispportReply="debiunceDispportReply">
-  </topic-remark>
+  </topic-remark> 
 
   <view style="margin-bottom: 100rpx;">
     <load-more
       loadMoreVisible="{{loadMoreVisible}}"
       loadMoreType="{{loadMoreType}}">
     </load-more>
-  </view>
+  </view> 
 
   
   <view class="bottom-operation">
@@ -32,7 +32,7 @@
     </view>
     <button wx:if="{{lordFlag == '1' && detailInfo.topicState == '0'}}" class="close-topic" hover-class="hover-close" bindtap="closeDialog">关闭话题</button>
     <button wx:if="{{lordFlag == '1' && detailInfo.topicState == '0'}}" bindtap="changeToIssue" class="change-issue" hover-class="hover-change">转成议题</button>
-  </view>
+  </view> 
 </view>
 
 <notice-verify
@@ -54,5 +54,37 @@
 
 <completeinfo-dialog
   completeInfoDialogVisible="{{completeInfoDialogVisible}}">
-</completeinfo-dialog>
+</completeinfo-dialog> -->
+
+<view class="topic-detail">
+  <view class="topic-content">
+    <view class="user-info">
+      <image class="avatar" src="{{detailInfo.userFace}}" />
+      <view class="identify">
+        <view class="identify-top">
+          <view class="nickname">{{detailInfo.nickname}}</view>
+          <!-- <image class="party-flag" wx:if="{{detailInfo.partyFlag == '1'}}" src="../../images/ic_dangbiaoqian.png" /> -->
+        </view>
+        <view class="identify-bottom">{{detailInfo.createdTime}}</view>
+      </view>
+    </view>
+    <view class="issue-content">{{detailInfo.topicContent}}</view>
+    <view class="image-list">
+      <image
+        catchtap="previewImage"
+        data-src="{{item}}"
+        wx:for="{{detailInfo.images}}"
+        wx:for-index="index"
+        wx:for-item="item"
+        mode="widthFix"
+        wx:key="index"
+        class="image-item"
+        src="{{item}}" />
+    </view>
+  </view>
 
+  <view class="handle-progress" wx:if="{{detailInfo.shieldFlag =='1'}}">
+    <view class="title">屏蔽原因</view>
+    <view class="handle-progress-content">{{detailInfo.shieldReason}}</view>
+  </view>
+</view>
diff --git a/subpages/association/pages/topicDetail/topicDetail.wxss b/subpages/association/pages/topicDetail/topicDetail.wxss
index dfdbdec..2306400 100644
--- a/subpages/association/pages/topicDetail/topicDetail.wxss
+++ b/subpages/association/pages/topicDetail/topicDetail.wxss
@@ -2,7 +2,7 @@ page {
   width: 100%;
   height: 100vh;
 }
-.topic-detail {
+/* .topic-detail {
   width: 100%;
   min-height: 101%;
   background: #f7f7f7;
@@ -77,4 +77,102 @@ page {
 }
 .bottom-operation .hover-change {
   background: red;
+} */
+page {
+  width: 100%;
+  min-height: 100vh;
+  height: auto;
+  overflow-y: auto;
+}
+.topic-detail {
+  width: 100%;
+  min-height: 100vh;
+  background: #f7f7f7;
+  box-sizing: border-box;
+  padding: 20rpx;
+}
+.topic-content {
+  width: 100%;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 0 25rpx;
+  overflow: hidden;
+}
+.topic-content .user-info {
+  width: 100%;
+  height: 64rpx;
+  display: flex;
+  align-items: center;
+  margin-top: 50rpx;
+}
+.topic-content .user-info .avatar {
+  width: 64rpx;
+  height: 64rpx;
+  object-fit: cover;
+  border-radius: 50rpx;
+  margin-right: 13rpx;
+}
+.topic-content .user-info .identify {
+  display: flex;
+  flex-direction:column;
+  justify-content: space-between;
+}
+.topic-content .user-info .identify .identify-top {
+  display: flex;
+  align-items: center;
+}
+.topic-content .user-info .identify .identify-top .nickname {
+  font-size: 28rpx;
+  color: #444;
+}
+.topic-content .user-info .identify .identify-top .party-flag {
+  width: 27rpx;
+  height: 27rpx;
+  object-fit: cover;
+  margin-left: 6rpx;
+}
+.topic-content .user-info .identify .identify-bottom {
+  font-size: 20rpx;
+  color: #999;
+}
+
+.topic-content .issue-content {
+  font-size: 38rpx;
+  color: #333;
+  line-height: 58rpx;
+  margin: 26rpx 0;
+}
+
+.topic-content .image-list {
+  width: 100%;
+  margin-bottom: 76rpx;
+}
+.topic-content .image-list .image-item {
+  width: 100%;
+  border-radius: 16rpx;
+}
+.topic-content .image-list .image-item + .image-item {
+  margin-top: 20rpx;
+}
+
+.handle-progress {
+  width: 100%;
+  overflow: hidden;
+}
+.handle-progress .title {
+  width: 100%;
+  font-size: 32rpx;
+  color: #333;
+  line-height: 86rpx;
+  height: 86rpx;
+  margin-top: 38rpx;
+  font-weight: bolder;
+}
+.handle-progress .handle-progress-content {
+  width: 100%;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 30rpx 25rpx;
+  font-size: 32rpx;
+  color: #F40D0D;
 }
\ No newline at end of file
diff --git a/subpages/association/utils/api.js b/subpages/association/utils/api.js
index 0be3eea..c9d87d0 100644
--- a/subpages/association/utils/api.js
+++ b/subpages/association/utils/api.js
@@ -149,7 +149,12 @@ export function getTopicList ({ pageIndex, pageSize, timestamp, groupId, topicId
 export function getTopicDetail (detailId) {
   return request.get(`group/topic/detail/${detailId}`)
 }
-
+/**
+  * 话题详情v2
+  */
+ export function getTopicDetailV2 (detailId) {
+  return request.get(`partyGroup/topic/detail/${detailId}`)
+}
 /**
  * 退群
  * @param groupId
diff --git a/subpages/associationNew/components/noticeVerify/noticeVerify.js b/subpages/associationNew/components/noticeVerify/noticeVerify.js
new file mode 100644
index 0000000..b1ff446
--- /dev/null
+++ b/subpages/associationNew/components/noticeVerify/noticeVerify.js
@@ -0,0 +1,91 @@
+Component({
+  data: {
+    visible: false,
+    textareaValue: ''
+  },
+  properties: {
+    noticeVerifyVisible: {
+      type: Boolean,
+      value: false,
+      observer: function (newValue) {
+        this.setData({
+          visible: !this.data.visible
+        })
+      }
+    },
+    title: {
+      type: String,
+      value: ''
+    },
+    cancelText: {
+      type: String,
+      value: ''
+    },
+    confirmText: {
+      type: String,
+      value: ''
+    },
+    tipVisible: {
+      type: Boolean,
+      value: false
+    },
+    tipValue: {
+      type: String,
+      value: '*请输入屏蔽该话题的原因'
+    }
+  },
+  lifetimes: {
+    attached () {
+      console.log('notice-verify')
+    },
+    deattached () {
+
+    }
+  },
+  pageLifetimes: {
+    show () {
+
+    },
+    hide () {
+
+    }
+  },
+  methods: {
+    close () {
+      this.triggerEvent('close', {data: this.data.textareaValue})
+      this.setData({
+        // visible: !this.data.visible,
+        textareaValue: ''
+      })
+    },
+    confirm () {
+      if (this.data.textareaValue === '') {
+        wx.showToast({
+          title: '原因不能为空',
+          icon: 'none',
+          duration: 2000
+        })
+        return false
+      }
+      this.triggerEvent('confirm', {data: this.data.textareaValue})
+      this.setData({
+        // visible: !this.data.visible,
+        textareaValue: ''
+      })
+    },
+    textareaInput (e) {
+      this.setData({
+        textareaValue: e.detail.value
+      })
+      // console.log(this.data.textareaValue)
+    },
+    closeDialog () {
+      this.setData({
+        visible: !this.data.visible
+      })
+    },
+    move () {
+      
+    }
+  }
+})
\ No newline at end of file
diff --git a/subpages/associationNew/components/noticeVerify/noticeVerify.json b/subpages/associationNew/components/noticeVerify/noticeVerify.json
new file mode 100644
index 0000000..32640e0
--- /dev/null
+++ b/subpages/associationNew/components/noticeVerify/noticeVerify.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
\ No newline at end of file
diff --git a/subpages/associationNew/components/noticeVerify/noticeVerify.wxml b/subpages/associationNew/components/noticeVerify/noticeVerify.wxml
new file mode 100644
index 0000000..8697dca
--- /dev/null
+++ b/subpages/associationNew/components/noticeVerify/noticeVerify.wxml
@@ -0,0 +1,16 @@
+<view class="notice-verify" wx:if="{{visible}}" capture-catch:touchmove="move">
+  <view class="content">
+    <view class="close" bindtap="closeDialog">
+      <!-- <image src="../../images/delete.png" /> -->
+    </view>
+    <view class="title">{{title}}</view>
+    <view class="textarea">
+      <textarea value="{{textareaValue}}" bindinput="textareaInput" placeholder-class="textarea-placeholder" placeholder="屏蔽原因（必填 100字以内）" maxlength="100"/>
+    </view>
+    <view class="note" wx:if="{{tipVisible}}">{{tipValue}}</view>
+    <view class="footer">
+      <view class="unpass" wx:if="{{cancelText != ''}}" bindtap="close">{{cancelText}}</view>
+      <view class="pass" wx:if="{{confirmText != ''}}" bindtap="confirm">{{confirmText}}</view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/subpages/associationNew/components/noticeVerify/noticeVerify.wxss b/subpages/associationNew/components/noticeVerify/noticeVerify.wxss
new file mode 100644
index 0000000..3745ae9
--- /dev/null
+++ b/subpages/associationNew/components/noticeVerify/noticeVerify.wxss
@@ -0,0 +1,100 @@
+.notice-verify {
+  width: 100%;
+  height: 100vh;
+  position: fixed;
+  left: 0;
+  top: 0;
+  background: rgba(0,0,0,0.3);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 1000;
+}
+.notice-verify .content {
+  width: 610rpx;
+  height: auto;
+  border-radius: 16rpx;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 0 30rpx;
+}
+.notice-verify .content .close {
+  width: 100%;
+  height: 62rpx;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+.notice-verify .content .close image {
+  width: 40rpx;
+  height: 40rpx;
+  object-fit:cover;
+  position: relative;
+  left: 7px;
+  top: 2px;
+}
+.notice-verify .content .title {
+  font-size: 40rpx;
+  color: #333;
+  line-height: 57rpx;
+  height: 57rpx;
+  width:100%;
+  text-align:center;
+  margin-bottom: 26rpx;
+}
+.notice-verify .content .textarea {
+  width: 100%;
+  height: 345rpx;
+  border-radius: 16rpx;
+  background: #f7f7f7;
+  box-sizing: border-box;
+  padding: 27rpx 17rpx 0;
+  margin-bottom: 20rpx;
+}
+.notice-verify .content .textarea textarea {
+  width: 100%;
+  height: 100%;
+  font-size: 32rpx;
+  line-height: 44rpx;
+  color: #666;
+}
+.notice-verify .content .textarea .textarea-placeholder {
+  font-size: 28rpx;
+  color: #999;
+  line-height: 40rpx;
+}
+.notice-verify .content .note {
+  font-size: 24rpx;
+  color: #999;
+  height:58rpx;
+  line-height: 58rpx;
+}
+.notice-verify .content .footer {
+  width: 100%;
+  height: 107rpx;
+  box-sizing: border-box;
+  padding: 15rpx 0;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  border-top: 1rpx solid #eaeaea;
+}
+.notice-verify .content .unpass {
+  height: 100%;
+  line-height: 77rpx;
+  font-size: 36rpx;
+  flex: 1;
+  color: #999;
+  text-align: center;
+}
+.notice-verify .content .unpass + .pass {
+  border-left: 1rpx solid #eaeaea;
+}
+.notice-verify .content .pass {
+  height: 100%;
+  line-height: 77rpx;
+  font-size: 36rpx;
+  flex: 1;
+  color: #04BCA0;
+  text-align: center;
+}
\ No newline at end of file
diff --git a/subpages/associationNew/images/shield.png b/subpages/associationNew/images/shield.png
new file mode 100644
index 0000000..3b56ca7
Binary files /dev/null and b/subpages/associationNew/images/shield.png differ
diff --git a/subpages/associationNew/pages/addTopic/addTopic.js b/subpages/associationNew/pages/addTopic/addTopic.js
index 7a2d686..d27b2ec 100644
--- a/subpages/associationNew/pages/addTopic/addTopic.js
+++ b/subpages/associationNew/pages/addTopic/addTopic.js
@@ -16,7 +16,9 @@ Page({
     },
     partyGroupId: "",
     topicType:"",//0:事好儿鼓个掌 1:话对捧个场
-    addTopicPrevious: 0
+    addTopicPrevious: 0,
+    violationsCount: 0,
+    isConReview: false
   },
   onShow () {
 
@@ -273,26 +275,62 @@ Page({
       topicLatitude: this.data.location.latitude,//话题位置纬度
       topicLongitude: this.data.location.longitude,//话题位置经度
       partyGroupId:this.data.partyGroupId,//党群ID
-      images: imagesList
+      images: imagesList,
+      isConReview: this.data.isConReview
     }
     wx.showLoading({
       title: "加载中",
     })
+    let that = this
     addTopic(para).then(res => {
       wx.hideLoading()
       console.log(res)
-      wx.showToast({
-        title: "发布成功",
-        icon: "none",
-        duration: 2000
-      })
-      // var prePages = pages[pages.length - 2]
-      setTimeout(() => {
-        // prePages.pullRefreshGetTopicList() 
-        wx.navigateBack()
-      }, 1000)
+      if (res.code == 0) {
+        wx.showToast({
+          title: "发布成功",
+          icon: "none",
+          duration: 2000
+        })
+        this.setData({
+          violationsCount: 0,
+          isConReview: false
+        })
+        // var prePages = pages[pages.length - 2]
+        setTimeout(() => {
+          // prePages.pullRefreshGetTopicList() 
+          wx.navigateBack()
+        }, 1000)
+      } else if (res.code == 533) {
+        this.data.violationsCount++
+        console.log(this.data.violationsCount)
+        if (this.data.violationsCount == 1){
+          wx.showToast({
+            title: res.msg,
+            icon: "none",
+            duration: 2000
+          })          
+        } else if (this.data.violationsCount == 2) {
+          wx.showModal({
+            title: '提示',
+            content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+            success (res) {
+              if (res.confirm) {
+                console.log('用户点击确定')
+                that.data.isConReview = true
+                that.addTopic()
+              } else if (res.cancel) {
+                console.log('用户点击取消')
+                that.setData({
+                  violationsCount: 0,
+                  isConReview: false
+                })
+              }
+            }
+          })
+        }
+      }
     }).catch(err => {
-      console.log(err)
+      console.log('err',err)
     })
   },
   // 删除图片
diff --git a/subpages/associationNew/pages/eventlist/eventlist.js b/subpages/associationNew/pages/eventlist/eventlist.js
index 4ff5133..4f3163d 100644
--- a/subpages/associationNew/pages/eventlist/eventlist.js
+++ b/subpages/associationNew/pages/eventlist/eventlist.js
@@ -1,6 +1,6 @@
 // subpages/associationNew/pages/eventlist/eventlist.js
 const app = getApp()
-import { topiclist, commentSubmit, statement } from "../../utils/api"
+import { topiclist, commentSubmit, statement, shieldTopic } from "../../utils/api"
 import {
   getTimestamp
 } from "../../../../utils/common"
@@ -28,7 +28,14 @@ Page({
     infoCompleted: 0,
     completeInfoDialogVisible: false,
     ifpreviewImage:false,//解决图片放大刷新列表的问题
-    commentViewContent: "发个小看法" // 写评论按钮 文字内容
+    commentViewContent: "发个小看法", // 写评论按钮 文字内容
+    violationsCount: 0,
+    isConReview: false,
+    lastTopicId: "",
+    currentUserIdentity: "", //当前用户是否 -群主0-副群主1-群成员2
+    showModal: false, //是否显示屏蔽原因模态框
+    shieldId: '', //被屏蔽话题的ID
+    shieldReason: '', //屏蔽的原因
   },
   /**
    * 生命周期函数--监听页面加载
@@ -67,6 +74,7 @@ Page({
       wx.stopPullDownRefresh();
       that.setData({
         bannedFlag: res.data.bannedFlag,
+        currentUserIdentity: res.data.currentUserIdentity,
         nodata: false,
         topiclist: that.data.topiclist.concat(res.data.topicList),
         loadMoreType: res.data.topicList.length === that.data.pageSize ? "loading" : "none",
@@ -221,6 +229,9 @@ Page({
       })
       return false
     }
+    if (this.data.topicId != e.currentTarget.dataset.id) {
+      this.data.violationsCount = 0
+    }
     this.setData({
       ifcomment: true,
       focus: true,
@@ -231,10 +242,14 @@ Page({
 
   // 失去焦点
   bindAddressInput () {
-    this.setData({ //失去焦点以后view隐藏
-      ifcomment: false,
-      commentContent: ""
-    })
+    setTimeout(() => {
+      if (this.data.violationsCount != 2){
+        this.setData({ //失去焦点以后view隐藏
+          ifcomment: false,
+          commentContent: ""
+        })      
+      }      
+    }, 500);
   },
   // 双向绑定
   bindIdentity (e) {
@@ -244,15 +259,63 @@ Page({
   },
   // 评论按钮点击事件
   commentSubmit () {
+    if (this.data.commentContent == '') {
+      wx.showToast({
+        title: "请输入评论内容",
+        icon: "none",
+        duration: 1500
+      })
+      return
+    }
     let that = this;
     const para = {
       topicId: that.data.topicId,//被评论的话题ID
       faCommentId: "",//父评论（被评论）ID
       content: that.data.commentContent,//评论内容
+      isConReview: that.data.isConReview
     }
-    commentSubmit(para).then(() => {
+    commentSubmit(para).then(res => {
       // 评论成功以后，调用接口比对出当前评论列表的数据，对已有列表数据进行替换
-      that.NowTopiclist()
+      if (res.code == 0) {
+        this.setData({
+          violationsCount: 0,
+          isConReview: false,
+          ifcomment: false,
+          commentContent: ""
+        })
+        that.NowTopiclist()
+      } else if (res.code == 533) {
+        this.data.violationsCount++
+        if (this.data.violationsCount == 1){
+          wx.showToast({
+            title: res.msg,
+            icon: "none",
+            duration: 2000
+          })          
+        } else if (this.data.violationsCount == 2) {
+          wx.showModal({
+            title: '提示',
+            content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+            success (res) {
+              if (res.confirm) {
+                console.log('用户点击确定')
+                that.setData({
+                  isConReview: true
+                })
+                that.commentSubmit()
+              } else if (res.cancel) {
+                console.log('用户点击取消')
+                that.setData({
+                  violationsCount: 0,
+                  isConReview: false,
+                  ifcomment: false,
+                  commentContent: ""
+                })
+              }
+            }
+          })
+        }
+      }
     }).catch(err => {
       console.log(err)
     })
@@ -347,5 +410,49 @@ Page({
     wx.navigateTo({
       url: `/subpages/associationNew/pages/guideInfo/guideInfo?partyGroupId=${this.data.partyGroupId}`
     })
+  },
+
+  // 群主或副群主 屏蔽话题操作
+  shieldTopic (e) {
+    this.setData({
+      showModal: true,
+      shieldId: e.currentTarget.dataset.id,
+      shieldReason: ''
+    })
+  },
+  modalCancel (e) {
+    this.setData({
+      showModal: false,
+      shieldReason: ''
+    })    
+  },
+  modalConfirm (e) {
+    this.setData({
+      showModal: false,
+      shieldReason: e.detail.data
+    })
+    const param = {
+      id: this.data.shieldId,
+      shieldReason: this.data.shieldReason
+    }
+    shieldTopic(param).then( res => {
+      console.log(res.data)
+      if (res.code == '0') {
+        wx.showToast({
+          title: '屏蔽成功',
+          icon: 'none',
+          duration: 2000
+        })
+        this.setData({
+          pageIndex: 1,
+          pageSize: 10,
+          nodata: false,
+          loadMoreType: "none",
+          loadMoreVisible: false,
+          topiclist: [],
+        })
+        this.topiclist()
+      }
+    })
   }
 })
\ No newline at end of file
diff --git a/subpages/associationNew/pages/eventlist/eventlist.json b/subpages/associationNew/pages/eventlist/eventlist.json
index 3250ef4..89e7d8b 100644
--- a/subpages/associationNew/pages/eventlist/eventlist.json
+++ b/subpages/associationNew/pages/eventlist/eventlist.json
@@ -2,7 +2,8 @@
   "usingComponents": {
     "load-more": "../../../../components/loadMore/loadMore",
     "no-data":"../../../../components/nodata/nodata",
-    "completeInfo-dialog": "../../../../components/completeInfoDialog/completeInfoDialog"
+    "completeInfo-dialog": "../../../../components/completeInfoDialog/completeInfoDialog",
+    "notice-verify": "../../components/noticeVerify/noticeVerify"
   },
   "navigationBarTitleText": "",
   "enablePullDownRefresh": true,
diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxml b/subpages/associationNew/pages/eventlist/eventlist.wxml
index c40d107..8aebc7c 100644
--- a/subpages/associationNew/pages/eventlist/eventlist.wxml
+++ b/subpages/associationNew/pages/eventlist/eventlist.wxml
@@ -31,13 +31,16 @@
 			<image src="../../images/comment.png"></image>
 			<view class="give-data-n">{{item.commentNum}}</view>
 		</view>
+		<view class="all" data-id="{{item.id}}" bindtap="shieldTopic" wx:if="{{currentUserIdentity=='0'||currentUserIdentity=='1'}}">
+			<image src="../../images/shield.png"></image>
+			<view class="give-data-m">屏蔽</view>
+		</view>
 		<view class="all" data-id="{{item.id}}" data-index="{{index}}" bindtap="clickTextarea">
       <!-- <image class="wcomment" src="../../images/wcomment@2x.png"></image> -->
-      
 			<view class="give-data-s">
-        <image class="comment_ic" src="../../images/comment_ic.png" ></image>
-        {{commentViewContent}}
-      </view>
+				<image class="comment_ic" src="../../images/comment_ic.png" ></image>
+				{{commentViewContent}}
+			</view>
 		</view>
 	</view>
 	<view wx:if="{{item.likes.length > 0}}"  class="likes">
@@ -75,4 +78,14 @@
    </movable-view>
  </movable-area>
 <completeInfo-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}">
-</completeInfo-dialog>
\ No newline at end of file
+</completeInfo-dialog>
+
+<notice-verify 
+  noticeVerifyVisible="{{showModal}}" 
+  bind:close="modalCancel"
+  bind:confirm="modalConfirm" 
+  title="屏蔽原因" 
+  tipVisible="{{true}}" 
+  cancelText="取消" 
+  confirmText="屏蔽">
+</notice-verify>
\ No newline at end of file
diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxss b/subpages/associationNew/pages/eventlist/eventlist.wxss
index a5c475d..0713caf 100644
--- a/subpages/associationNew/pages/eventlist/eventlist.wxss
+++ b/subpages/associationNew/pages/eventlist/eventlist.wxss
@@ -60,7 +60,7 @@ page {
 }
 
 .image-list {
-  width: calc(100% - 58rpx);
+  /* width: calc(100% - 58rpx); */
   margin-top: 30rpx;
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(208rpx, 1fr));
@@ -105,6 +105,13 @@ page {
   margin-right: 10rpx;
 }
 
+.attitude .all .give-data-m {
+  font-size: 26rpx;
+  font-weight: 500;
+  color: rgba(51, 51, 51, 1);
+  margin-left: 9rpx;
+  /* width: 196rpx; */
+}
 .attitude .all .give-data-n {
   font-size: 30rpx;
   font-weight: 500;
diff --git a/subpages/associationNew/utils/api.js b/subpages/associationNew/utils/api.js
index 8b603db..5c52091 100644
--- a/subpages/associationNew/utils/api.js
+++ b/subpages/associationNew/utils/api.js
@@ -89,7 +89,7 @@ export function topiclist ({pageIndex,pageSize,timestamp,topicType,partyGroupId,
  * 发布话题
  */
 
-export function addTopic ({topicType, topicContent,topicAddress,topicLatitude,topicLongitude,partyGroupId,images}) {
+export function addTopic ({topicType, topicContent,topicAddress,topicLatitude,topicLongitude,partyGroupId,images,isConReview}) {
   return request.post("partyGroup/topic/submit",{
     topicType,
     topicContent,
@@ -97,7 +97,8 @@ export function addTopic ({topicType, topicContent,topicAddress,topicLatitude,to
     topicLatitude,
     topicLongitude,
     partyGroupId,
-    images
+    images,
+    isConReview
   })
 }
 
@@ -105,11 +106,12 @@ export function addTopic ({topicType, topicContent,topicAddress,topicLatitude,to
  * 话题评论
  */
 
-export function commentSubmit ({topicId, faCommentId,content}) {
+export function commentSubmit ({topicId, faCommentId,content,isConReview}) {
   return request.post("partyGroup/comment/submit",{
     topicId,
     faCommentId,
-    content
+    content,
+    isConReview
   })
 }
 
@@ -130,6 +132,15 @@ export function getGuideInfo (partyGroupId) {
   return request.get("partyGroup/group/guideInfo/"+partyGroupId)
 }
 
+/**
+ * 群主或副群主 屏蔽话题
+ */
+export function shieldTopic ({id, shieldReason}) {
+  return request.post("partyGroup/topic/shield", {
+    id,
+    shieldReason
+  })
+}
 
 
 
diff --git a/subpages/discussion/pages/addIssue/addIssue.js b/subpages/discussion/pages/addIssue/addIssue.js
index 621500e..9af33ec 100644
--- a/subpages/discussion/pages/addIssue/addIssue.js
+++ b/subpages/discussion/pages/addIssue/addIssue.js
@@ -16,6 +16,8 @@ Page({
     publishIssuePrevious: 0,
     focus: false,
     isBlock: true,
+    violationsCount: 0,
+    isConReview: false
   },
   onLoad () {
     this.data.qqMapWX = new QQMapWX({
@@ -228,17 +230,50 @@ Page({
       issueAddress: this.data.addressContent,
       issueLongitude: this.data.longitude,
       issueLatitude: this.data.latitude,
-      images: imagesList
+      images: imagesList,
+      isConReview: this.data.isConReview
     }
     wx.showLoading({
       title: "加载中..."
     })
+    let that = this
     addIssue(para).then(res => {
       wx.hideLoading()
       console.log("发布议题", res)
-      this.setData({
-        dialogVisible: !this.data.dialogVisible
-      })
+      if (res.code == 0) {
+        this.setData({
+          dialogVisible: !this.data.dialogVisible,
+          violationsCount: 0,
+          isConReview: false
+        })
+      } else if (res.code == 533) {
+        this.data.violationsCount++
+        if (this.data.violationsCount == 1){
+          wx.showToast({
+            title: res.msg,
+            icon: "none",
+            duration: 2000
+          })          
+        } else if (this.data.violationsCount == 2) {
+          wx.showModal({
+            title: '提示',
+            content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+            success (res) {
+              if (res.confirm) {
+                console.log('用户点击确定')
+                that.data.isConReview = true
+                that.publishIssue()
+              } else if (res.cancel) {
+                console.log('用户点击取消')
+                that.setData({
+                  violationsCount: 0,
+                  isConReview: false
+                })
+              }
+            }
+          })
+        }
+      }
     }).catch(err => {
       wx.showToast({
         title: err,
diff --git a/subpages/discussion/pages/addIssue/addIssue.wxml b/subpages/discussion/pages/addIssue/addIssue.wxml
index 3cc1255..f6c3167 100644
--- a/subpages/discussion/pages/addIssue/addIssue.wxml
+++ b/subpages/discussion/pages/addIssue/addIssue.wxml
@@ -22,10 +22,17 @@
     </view>
 
     <view class="info-tips">
-      <view class="tips" bindtap="toOperationDesc" data-phrase="希望人大代表倾听">
+      <view class="tips" bindtap="toOperationDesc" data-phrase="人大在倾听">
         <!-- <view class="spot"></view> -->
         <checkbox></checkbox>
-        <view class="content display-inline">希望人大代表倾听</view>
+        <view class="content display-inline">人大在倾听</view>
+      </view>
+    </view>
+    <view class="info-tips">
+      <view class="tips" bindtap="toOperationDesc" data-phrase="政协好商量">
+        <!-- <view class="spot"></view> -->
+        <checkbox></checkbox>
+        <view class="content display-inline">政协在监督</view>
       </view>
     </view>
     <!-- <view class="new-info">希望人大代表倾听</view> -->
diff --git a/subpages/discussion/pages/addIssue/addIssue.wxss b/subpages/discussion/pages/addIssue/addIssue.wxss
index 3b22264..f874734 100644
--- a/subpages/discussion/pages/addIssue/addIssue.wxss
+++ b/subpages/discussion/pages/addIssue/addIssue.wxss
@@ -13,7 +13,7 @@ page {
 
 .add-issue .issue-content {
   width: 100%;
-  height: 650rpx;
+  height: 730rpx;
   border-radius: 16rpx;
   background: #fff;
   box-sizing: border-box;
@@ -137,7 +137,7 @@ page {
   display: flex;
   justify-content: center;
   align-items: center;
-  margin-top: 180rpx;
+  margin-top: 100rpx;
 }
 
 .add-issue .publish-issue button {
@@ -164,7 +164,7 @@ page {
 }
 
 .info-tips {
-  width: 300rpx;
+  width: 400rpx;
   height: auto;
   /* display: flex;
   flex-direction: column;
diff --git a/subpages/discussion/pages/publishEvaluation/publishEvaluation.js b/subpages/discussion/pages/publishEvaluation/publishEvaluation.js
index 746f9b7..a39cdd5 100644
--- a/subpages/discussion/pages/publishEvaluation/publishEvaluation.js
+++ b/subpages/discussion/pages/publishEvaluation/publishEvaluation.js
@@ -11,7 +11,9 @@ Page({
     textareaValue: "",
     evaluationCallbackVisible: false,
     satisifyType: "",
-    itemId: ""
+    itemId: "",
+    violationsCount: 0,
+    isConReview: false
   },
   onLoad (options) {
     if (options.itemId) {
@@ -49,17 +51,49 @@ Page({
     const para = {
       itemId: this.data.itemId,
       evaluationScore: this.data.satisifyType === "notSatisify" ? 0 : this.data.satisifyType === "normalSatisify" ? 1 : this.data.satisifyType === "verySatisify" ? 2 : "",
-      evaluationContent: this.data.textareaValue
+      evaluationContent: this.data.textareaValue,
+      isConReview: this.data.isConReview
     }
     wx.showLoading({
       title: "加载中..."
     })
+    let that = this
     satisfyEvaluation(para).then(res => {
       wx.hideLoading()
       console.log("满意度评价", res)
-      this.setData({
-        evaluationCallbackVisible: !this.data.evaluationCallbackVisible
-      })
+      if (res.code == 0) {
+        this.setData({
+          evaluationCallbackVisible: !this.data.evaluationCallbackVisible
+        })        
+      } else if (res.code == 533) {
+        this.data.violationsCount++
+        console.log(this.data.violationsCount)
+        if (this.data.violationsCount == 1){
+          wx.showToast({
+            title: res.msg,
+            icon: "none",
+            duration: 2000
+          })          
+        } else if (this.data.violationsCount == 2) {
+          wx.showModal({
+            title: '提示',
+            content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+            success (res) {
+              if (res.confirm) {
+                console.log('用户点击确定')
+                that.data.isConReview = true
+                that.publishEvaluation()
+              } else if (res.cancel) {
+                console.log('用户点击取消')
+                that.setData({
+                  violationsCount: 0,
+                  isConReview: false
+                })
+              }
+            }
+          })
+        }
+      }
     }).catch(err => {
       wx.hideLoading()
       console.log(err)
diff --git a/subpages/discussion/pages/remarkOrReply/remarkOrReply.js b/subpages/discussion/pages/remarkOrReply/remarkOrReply.js
index c449ce3..a2dbff0 100644
--- a/subpages/discussion/pages/remarkOrReply/remarkOrReply.js
+++ b/subpages/discussion/pages/remarkOrReply/remarkOrReply.js
@@ -9,7 +9,9 @@ Page({
     faCommentId: "",
     detailType: "issue",
     issueId: "",
-    projectId: ""
+    projectId: "",
+    violationsCount: 0, //违规次数
+    isConReview: false
   },
   onLoad (options) {
     if (options.detailType === "issue") {
@@ -47,29 +49,62 @@ Page({
       issueId: this.data.detailType === "issue" ? this.data.issueId : "",
       faCommentId: this.data.faCommentId,
       content: this.data.textareaValue,
-      itemId: this.data.detailType === "project" ? this.data.projectId : ""
+      itemId: this.data.detailType === "project" ? this.data.projectId : "",
+      isConReview: this.data.isConReview
     }
     wx.showLoading({
       title: "加载中..."
     })
+    let that = this
     if (this.data.faCommentId) { //评论 回复 回调
       if (this.data.detailType === "issue") { //议题
         issueComReply(para).then(res => {
           wx.hideLoading()
           console.log("评论或回复", res)
-          wx.showToast({
-            title: "评论成功",
-            icon: "none",
-            duration: 1000
-          })
-          const pages = getCurrentPages()
-          const page = pages[pages.length - 2]
-          if (page.getRemarkList) {
-            page.getRemarkList()
+          if (res.code == 0) {
+            wx.showToast({
+              title: "评论成功",
+              icon: "none",
+              duration: 1000
+            })
+            const pages = getCurrentPages()
+            const page = pages[pages.length - 2]
+            if (page.getRemarkList) {
+              page.getRemarkList()
+            }
+            setTimeout(() => {
+              wx.navigateBack()
+            }, 500)            
+          } else if (res.code == 533) {
+            this.data.violationsCount++
+            if (this.data.violationsCount == 1){
+              wx.showToast({
+                title: res.msg,
+                icon: "none",
+                duration: 2000
+              })          
+            } else if (this.data.violationsCount == 2) {
+              wx.showModal({
+                title: '提示',
+                content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+                success (res) {
+                  if (res.confirm) {
+                    console.log('用户点击确定')
+                    that.setData({
+                      isConReview: true
+                    })
+                    that.remarkOrReply()
+                  } else if (res.cancel) {
+                    console.log('用户点击取消')
+                    that.setData({
+                      violationsCount: 0,
+                      isConReview: false
+                    })
+                  }
+                }
+              })
+            }
           }
-          setTimeout(() => {
-            wx.navigateBack()
-          }, 500)
         }).catch(err => {
           console.log(err)
         })
@@ -77,19 +112,50 @@ Page({
         itemComReply(para).then(res => {
           wx.hideLoading()
           console.log("评论或回复", res)
-          wx.showToast({
-            title: "评论成功",
-            icon: "none",
-            duration: 1000
-          })
-          const pages = getCurrentPages()
-          const page = pages[pages.length - 2]
-          if (page.getRemarkList) {
-            page.getRemarkList()
+          if (res.code == 0) {
+            wx.showToast({
+              title: "评论成功",
+              icon: "none",
+              duration: 1000
+            })
+            const pages = getCurrentPages()
+            const page = pages[pages.length - 2]
+            if (page.getRemarkList) {
+              page.getRemarkList()
+            }
+            setTimeout(() => {
+              wx.navigateBack()
+            }, 500)            
+          } else if (res.code == 533) {
+            this.data.violationsCount++
+            if (this.data.violationsCount == 1){
+              wx.showToast({
+                title: res.msg,
+                icon: "none",
+                duration: 2000
+              })          
+            } else if (this.data.violationsCount == 2) {
+              wx.showModal({
+                title: '提示',
+                content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+                success (res) {
+                  if (res.confirm) {
+                    console.log('用户点击确定')
+                    that.setData({
+                      isConReview: true
+                    })
+                    that.remarkOrReply()
+                  } else if (res.cancel) {
+                    console.log('用户点击取消')
+                    that.setData({
+                      violationsCount: 0,
+                      isConReview: false
+                    })
+                  }
+                }
+              })
+            }
           }
-          setTimeout(() => {
-            wx.navigateBack()
-          }, 500)
         }).catch(err => {
           console.log(err)
         })
@@ -99,19 +165,50 @@ Page({
         issueCom(para).then(res => {
           wx.hideLoading()
           console.log("评论或回复", res)
-          wx.showToast({
-            title: "评论成功",
-            icon: "none",
-            duration: 1000
-          })
-          const pages = getCurrentPages()
-          const page = pages[pages.length - 2]
-          if (page.getRemarkList) {
-            page.getRemarkList()
+          if (res.code == 0) {
+            wx.showToast({
+              title: "评论成功",
+              icon: "none",
+              duration: 1000
+            })
+            const pages = getCurrentPages()
+            const page = pages[pages.length - 2]
+            if (page.getRemarkList) {
+              page.getRemarkList()
+            }
+            setTimeout(() => {
+              wx.navigateBack()
+            }, 500)            
+          } else if (res.code == 533) {
+            this.data.violationsCount++
+            if (this.data.violationsCount == 1){
+              wx.showToast({
+                title: res.msg,
+                icon: "none",
+                duration: 2000
+              })          
+            } else if (this.data.violationsCount == 2) {
+              wx.showModal({
+                title: '提示',
+                content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+                success (res) {
+                  if (res.confirm) {
+                    console.log('用户点击确定')
+                    that.setData({
+                      isConReview: true
+                    })
+                    that.remarkOrReply()
+                  } else if (res.cancel) {
+                    console.log('用户点击取消')
+                    that.setData({
+                      violationsCount: 0,
+                      isConReview: false
+                    })
+                  }
+                }
+              })
+            }
           }
-          setTimeout(() => {
-            wx.navigateBack()
-          }, 500)
         }).catch(err => {
           console.log(err)
         })
@@ -119,19 +216,50 @@ Page({
         itemCom(para).then(res => {
           wx.hideLoading()
           console.log("评论或回复", res)
-          wx.showToast({
-            title: "评论成功",
-            icon: "none",
-            duration: 1000
-          })
-          const pages = getCurrentPages()
-          const page = pages[pages.length - 2]
-          if (page.getRemarkList) {
-            page.getRemarkList()
+          if (res.code == 0) {
+            wx.showToast({
+              title: "评论成功",
+              icon: "none",
+              duration: 1000
+            })
+            const pages = getCurrentPages()
+            const page = pages[pages.length - 2]
+            if (page.getRemarkList) {
+              page.getRemarkList()
+            }
+            setTimeout(() => {
+              wx.navigateBack()
+            }, 500)            
+          } else if (res.code == 533) {
+            this.data.violationsCount++
+            if (this.data.violationsCount == 1){
+              wx.showToast({
+                title: res.msg,
+                icon: "none",
+                duration: 2000
+              })          
+            } else if (this.data.violationsCount == 2) {
+              wx.showModal({
+                title: '提示',
+                content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+                success (res) {
+                  if (res.confirm) {
+                    console.log('用户点击确定')
+                    that.setData({
+                      isConReview: true
+                    })
+                    that.remarkOrReply()
+                  } else if (res.cancel) {
+                    console.log('用户点击取消')
+                    that.setData({
+                      violationsCount: 0,
+                      isConReview: false
+                    })
+                  }
+                }
+              })
+            }
           }
-          setTimeout(() => {
-            wx.navigateBack()
-          }, 500)
         }).catch(err => {
           console.log(err)
         })
diff --git a/subpages/discussion/utils/api.js b/subpages/discussion/utils/api.js
index 49ac866..06b764d 100644
--- a/subpages/discussion/utils/api.js
+++ b/subpages/discussion/utils/api.js
@@ -3,13 +3,14 @@ const request = require("../../../utils/request")
 /**
  * 发布议题
  */
-export function addIssue ({ eventContent, issueAddress, issueLongitude, issueLatitude, images }) {
+export function addIssue ({ eventContent, issueAddress, issueLongitude, issueLatitude, images, isConReview }) {
   return request.post("events/issue/submit", {
     eventContent,
     issueAddress,
     issueLongitude,
     issueLatitude,
-    images
+    images,
+    isConReview
   })
 }
 
@@ -107,46 +108,50 @@ export function topicReply ({ issueId, faCommentId, content, itemId }) {
  * 议题评论 v2
  */
 
-export function issueCom ({ issueId, faCommentId, content, itemId }) {
+export function issueCom ({ issueId, faCommentId, content, itemId, isConReview }) {
   return request.post("events/comment/issueCom", {
     issueId,
     faCommentId,
     content,
-    itemId
+    itemId,
+    isConReview
   })
 }
 /**
  * 议题评论的回复 v2
  */
-export function issueComReply ({ issueId, faCommentId, content, itemId }) {
+export function issueComReply ({ issueId, faCommentId, content, itemId, isConReview }) {
   return request.post("events/comment/issueComReply", {
     issueId,
     faCommentId,
     content,
-    itemId
+    itemId,
+    isConReview
   })
 }
 
 /**
  * 项目评论 v2
  */
-export function itemCom ({ issueId, faCommentId, content, itemId }) {
+export function itemCom ({ issueId, faCommentId, content, itemId, isConReview }) {
   return request.post("events/comment/itemCom", {
     issueId,
     faCommentId,
     content,
-    itemId
+    itemId,
+    isConReview
   })
 }
 /**
  * 项目评论的回复 v2
  */
-export function itemComReply ({ issueId, faCommentId, content, itemId }) {
+export function itemComReply ({ issueId, faCommentId, content, itemId, isConReview }) {
   return request.post("events/comment/itemComReply", {
     issueId,
     faCommentId,
     content,
-    itemId
+    itemId,
+    isConReview
   })
 }
 /**
@@ -286,11 +291,12 @@ export function getProjectList (params) {
 /**
  * 项目满意度评价
  */
-export function satisfyEvaluation ({ itemId, evaluationScore, evaluationContent }) {
+export function satisfyEvaluation ({ itemId, evaluationScore, evaluationContent, isConReview }) {
   return request.post("events/item/evaluation", {
     itemId,
     evaluationScore,
-    evaluationContent
+    evaluationContent,
+    isConReview
   })
 }
 
diff --git a/subpages/heart/pages/clockIn/clockIn.js b/subpages/heart/pages/clockIn/clockIn.js
index b131fd6..4c0728e 100644
--- a/subpages/heart/pages/clockIn/clockIn.js
+++ b/subpages/heart/pages/clockIn/clockIn.js
@@ -23,7 +23,10 @@ Page({
     effectiveFlag: Number, //打卡是否有效（0-否，1-是）
     phraseList: [], //常用于列表
     phraseId: "", //常用语id
-    ldata: false
+    ldata: false,
+    violationsCount: 0, //违规次数
+    isConReview: false,
+    submissionDisabled: false
   },
   /**
    * 生命周期函数--监听页面加载
@@ -234,6 +237,9 @@ Page({
       return false
     }
 
+    this.setData({
+      submissionDisabled: true
+    })
     if (this.data.phraseId) {
       api.sagenumAddOne(this.data.phraseId).then(function () {
         // console.log('常用语言：' + res)
@@ -290,10 +296,15 @@ Page({
       clockAddress: this.data.operationAddress,
       images: this.data.images,
       clockType: this.data.clockType, //打卡类型（0-打卡，1-更新打卡）
-      effectiveFlag: this.data.effectiveFlag //打卡是否有效（0-否，1-是）
+      effectiveFlag: this.data.effectiveFlag, //打卡是否有效（0-否，1-是）
+      isConReview: this.data.isConReview
     }
     // console.log('~~~~~~~":::::' + JSON.stringify(params))
+    let that = this
     api.clock(params).then(function (res) {
+      that.setData({
+        submissionDisabled: false
+      })
       if (res.code == 0) {
         wx.showToast({
           title: "打卡成功",
@@ -305,8 +316,39 @@ Page({
             }, 1000);
           }
         })
+      } else if (res.code == 533) {
+        that.data.violationsCount++
+        if (that.data.violationsCount == 1){
+          wx.showToast({
+            title: res.msg,
+            icon: "none",
+            duration: 2000
+          })          
+        } else if (that.data.violationsCount == 2) {
+          wx.showModal({
+            title: '提示',
+            content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+            success (res) {
+              if (res.confirm) {
+                console.log('用户点击确定')
+                that.data.isConReview = true
+                that.submission()
+              } else if (res.cancel) {
+                console.log('用户点击取消')
+                that.setData({
+                  violationsCount: 0,
+                  isConReview: false
+                })
+              }
+            }
+          })
+        }
       }
-
+    }).catch(err => {
+      console.log(err)
+      that.setData({
+        submissionDisabled: false
+      })
     })
   },
   Rad (d) { //经纬度转换成三角函数中度分表形式。
diff --git a/subpages/heart/pages/clockIn/clockIn.wxml b/subpages/heart/pages/clockIn/clockIn.wxml
index f372817..139f94c 100644
--- a/subpages/heart/pages/clockIn/clockIn.wxml
+++ b/subpages/heart/pages/clockIn/clockIn.wxml
@@ -41,5 +41,5 @@
     <view class="clear"></view>
   </view>
 
-  <view class="button" bindtap="submission">提交打卡</view>
+  <view class="button" bindtap="submission" disabled="{{submissionDisabled}}">提交打卡</view>
 </view>
\ No newline at end of file
diff --git a/subpages/heart/pages/heartDetail/heartDetail.js b/subpages/heart/pages/heartDetail/heartDetail.js
index 4228b60..cf21efd 100644
--- a/subpages/heart/pages/heartDetail/heartDetail.js
+++ b/subpages/heart/pages/heartDetail/heartDetail.js
@@ -26,6 +26,7 @@ Page({
     preloadVisible: true,
     timeJudge: false,//根据当前时间比较活动结束时间，判断活动是否已经结束，用以判断显示订单多多里面的志愿者
     defaultGridId:"",//默认网格
+    actType: ""
   },
   onLoad: function (options) {
     console.log("当前时间" + getTimestamp())
@@ -34,6 +35,7 @@ Page({
       actCurrentState: options.actcurrentstate,
       signupFlag: options.signupflag,
       selectedTab: options.selectedTab,
+      actType: options.selectedTab==undefined?'':options.selectedTab=='tab0'?'0':options.selectedTab=='tab2'?'1':''
     })
     // this.getDetail();//活动详情
     // this.clockList();//打卡列表
@@ -45,8 +47,12 @@ Page({
   },
   // 获取详情信息
   getDetail () {
-    let id = this.data.id
-    api.detail(id).then(res => {
+    // let id = this.data.id
+    const param = {
+      id: this.data.id,
+      actType: this.data.actType
+    }
+    api.detail(param).then(res => {
       if (res.code === 0 && res.msg === "success") {
         this.setData({
           detail: res.data,
diff --git a/subpages/heart/pages/heartDetail/heartDetail.wxml b/subpages/heart/pages/heartDetail/heartDetail.wxml
index 7158c50..0f3bef4 100644
--- a/subpages/heart/pages/heartDetail/heartDetail.wxml
+++ b/subpages/heart/pages/heartDetail/heartDetail.wxml
@@ -118,7 +118,7 @@
         </view>
       </view>
     </block>
-    <block wx:else>
+    <block wx:elif="{{actNewsContent!=''}}">
       <!-- 新闻稿 -->
       <view class="require">  
         <view class="info-box-last-require">
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.js b/subpages/heart/pages/leaderboardNew/leaderboardNew.js
index 3afe0b1..63b17df 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.js
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.js
@@ -87,8 +87,11 @@ Page({
   },
   preViewImage (e) {
     let list = [];
-    list.push(this.data.banner[0].bannerImg)
-    list.push(this.data.banner[1].bannerImg)
+    list.push(this.data.banner[e.currentTarget.dataset.listIndex].bannerImg)
+    console.log(list)
+    if (e.currentTarget.dataset.listIndex+1 < this.data.banner.length) {
+      list.push(this.data.banner[e.currentTarget.dataset.listIndex+1].bannerImg)
+    }    
     wx.previewImage({
       urls: list,
       current: e.currentTarget.dataset.src
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
index ccc5361..e3d1969 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
@@ -1,6 +1,10 @@
 <view class="banner" wx:if="{{banner.length > 0}}">
-  <image data-src="{{banner[0].bannerImg}}" data-list="{{banner}}" bindtap="preViewImage" src="{{banner[0].bannerImg}}"></image>
-  <image data-src="{{banner[1].bannerImg}}" data-list="{{banner}}" bindtap="preViewImage" src="{{banner[1].bannerImg}}"></image>
+  <swiper class="swiper">
+    <swiper-item class="swiper-item" wx:for="{{banner}}" wx:for-item="item" wx:for-index="index" wx:key="index" wx:if="{{index%2==0&&(index+1)%2==1}}">
+      <image data-src="{{banner[index].bannerImg}}" data-list-index="{{index}}" bindtap="preViewImage" src="{{banner[index].bannerImg}}"></image>
+      <image data-src="{{banner[index+1].bannerImg}}" data-list-index="{{index}}" bindtap="preViewImage" src="{{banner[index+1].bannerImg}}" wx:if="{{banner[index+1].bannerImg!=undefined}}"></image>
+    </swiper-item>
+  </swiper>
 </view>
 <!-- tabbar -->
   <view class="tab-bar">
@@ -26,7 +30,7 @@
             <view class="name">{{item.nickname}}</view>
             <view class="info-detail">
               <image class="heart-time" src="../../images/aixin.png"></image>
-              <view> 爱心时长 {{item.kindnessTime}}分钟</view>
+              <view> 爱心时长 {{item.kindnessTime}}小时</view>
               <image class="enter-times" src="../../images/bofangcishu.png"></image>
               <view> 参加次数 {{item.participationNum}}次</view>
             </view>
@@ -56,7 +60,7 @@
     <pulldown-refresh id="pulldown-refresh" bind:pullDownRefresh="pulldownRefresh">
       <view class="activity-list" slot="content">
         <block wx:if="{{preloadVisible}}">
-          <preload-activity-item wx:for="{{[1,2]}}" wx:for-index="index" wx:for-item="item" wx:key="{{index}}">
+          <preload-activity-item wx:for="{{[1,2]}}" wx:for-index="index" wx:for-item="item" wx:key="index">
           </preload-activity-item>
         </block>
         <block wx:elif="{{signedList.length > 0 && !preloadVisible}}">
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
index 32d8470..67a7db2 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
@@ -248,4 +248,15 @@ button::after {
   .banner image{
       width: 310rpx;
       height: 440rpx;
+  }
+
+  .banner .swiper {
+      width: 100%;
+      height: 100%;
+  }
+  .banner .swiper .swiper-item {
+      display: flex;
+      flex-direction: row;
+      justify-content: center;
+      align-items: center;
   }
\ No newline at end of file
diff --git a/subpages/heart/pages/volunteer/volunteer.js b/subpages/heart/pages/volunteer/volunteer.js
index 91aa803..0726aeb 100644
--- a/subpages/heart/pages/volunteer/volunteer.js
+++ b/subpages/heart/pages/volunteer/volunteer.js
@@ -19,7 +19,7 @@ Page({
     wxCode: "", //用户unionId为空时 传入
     encryptedData: "", //用户unionId为空时 传入
     iv: "", //用户unionId为空时 传入
-    introduce: "", //自我介绍
+    // introduce: "", //自我介绍
     volunteerNickname:"",//昵称
     volunteerSignature:"",//签名
     volunteerFaceImg:"",//头像
@@ -87,11 +87,11 @@ Page({
     })
   },
 
-  adInputIntroduce (e) {
-    this.setData({
-      introduce: e.detail.value
-    })
-  },
+  // adInputIntroduce (e) {
+  //   this.setData({
+  //     introduce: e.detail.value
+  //   })
+  // },
   volunteerSignature (e) {
     this.setData({
       volunteerSignature: e.detail.value
@@ -156,7 +156,7 @@ Page({
           volunteerNickname:res.data.volunteerNickname,
           volunteerSignature:res.data.volunteerSignature,
           volunteerFaceImg:res.data.volunteerFaceImg,
-          introduce:res.data.introduce
+          // introduce:res.data.introduce
         })
         resolve(true)
       }).catch(() => {
@@ -233,7 +233,7 @@ Page({
       return false
     }
     if(!this.data.volunteerSignature){
-      this.showToast("请输入签名")
+      this.showToast("请输入格言")
       return false
     }
     if (!this.data.road) {
@@ -244,15 +244,15 @@ Page({
       this.showToast("小区或所在道路不能超过100个字")
       return false
     }
-    if (!this.data.introduce) {
-      this.showToast("请输入自我介绍")
-      return false
-    }
+    // if (!this.data.introduce) {
+    //   this.showToast("请输入自我介绍")
+    //   return false
+    // }
 
-    if (!this.data.introduce.length > 200) {
-      this.showToast("自我介绍输入内容不超过200字")
-      return false
-    }
+    // if (!this.data.introduce.length > 200) {
+    //   this.showToast("自我介绍输入内容不超过200字")
+    //   return false
+    // }
     const params = {
       smsCode: this.data.smsCode,
       realName: this.data.realName,
@@ -262,7 +262,7 @@ Page({
       villageName: this.data.villageName,
       dwellingPlace: this.data.dwellingPlace,
       gridId: this.data.gridId,
-      introduce: this.data.introduce,
+      // introduce: this.data.introduce,
       volunteerFaceImg:this.data.volunteerFaceImg,
       volunteerNickname:this.data.volunteerNickname,
       volunteerSignature:this.data.volunteerSignature,
diff --git a/subpages/heart/pages/volunteer/volunteer.wxml b/subpages/heart/pages/volunteer/volunteer.wxml
index e5fe5ca..96dc13d 100644
--- a/subpages/heart/pages/volunteer/volunteer.wxml
+++ b/subpages/heart/pages/volunteer/volunteer.wxml
@@ -79,11 +79,11 @@
       </view>
 
       <view class="head-portrait-last">
-        <view class="head-portrait-name-last">签名</view>
+        <view class="head-portrait-name-last">格言</view>
       </view>
       <view class="info-box-last-v2">
         <view class="introduce">
-          <textarea disabled= '{{disabled}}' placeholder-class="placeholder-style" value="{{volunteerSignature}}" placeholder="请输入您的签名" bindblur="volunteerSignature" bindinput="volunteerSignature" maxlength="20"></textarea>
+          <textarea disabled= '{{disabled}}' placeholder-class="placeholder-style" value="{{volunteerSignature}}" placeholder="请输入您的格言" bindblur="volunteerSignature" bindinput="volunteerSignature" maxlength="20"></textarea>
         </view>
       </view>
 
@@ -128,7 +128,7 @@
     </view>
 
     <!-- 居住地址 -->
-    <view class="info magin-top">
+    <!-- <view class="info magin-top">
       <view class="info-box">
         <view class="info-left header">
           自我介绍
@@ -141,7 +141,7 @@
           <textarea disabled= '{{disabled}}' placeholder-class="placeholder-style" value="{{introduce}}" placeholder="请输入自我介绍、是否参加过公益活动、参加了哪些公益活动" bindblur="adInputIntroduce" bindinput="adInputIntroduce" maxlength="500"></textarea>
         </view>
       </view>
-    </view>
+    </view> -->
 
     <view class="submit-btn" wx:if="{{unionIdStatus === '1'}}">
       <button hover-class="hover-button" bindtap="submission">提交认证</button>
diff --git a/subpages/home/pages/newsDetail/newsDetail.js b/subpages/home/pages/newsDetail/newsDetail.js
index a114cb8..adfad9b 100644
--- a/subpages/home/pages/newsDetail/newsDetail.js
+++ b/subpages/home/pages/newsDetail/newsDetail.js
@@ -11,6 +11,7 @@ Page({
     infoCompleted: 0,
     noticeObjContent: "",
     residentValue:0,//配置时间
+    defaultGridId: '' //默认网格id
   },
   onLoad (options) {
     this.setData({
@@ -162,7 +163,7 @@ Page({
       // })
     }
   },
-  // 获取默认配置 阅读时间
+  // 获取默认配置, 阅读时间, 获取默认网格
   getResidentConfig (){
     let that = this
     api_getResidentConfig.getResidentConfig().then(res => {
@@ -172,6 +173,10 @@ Page({
             that.setData({
               residentValue:parseInt(item.residentValue)
             })
+          } else if (item.residentCode === "default_grid" && item.residentType === "default_grid") {
+            that.setData({
+              defaultGridId: item.residentValue
+            })
           }
         })
         that.countDown()
@@ -213,4 +218,11 @@ Page({
   onUnload: function () {
     clearInterval(this.data.timer)
   },
+  //2020.7.29 新闻转发-没注册过的人进入默认网格
+  onShareAppMessage(res) {
+    return {
+      title: '新闻资讯-新闻详情',
+      path: `/pages/indexNew/indexNew?shareType=newsDetail&detailId=${this.data.detailId}&defaultGridId=${this.data.defaultGridId}`
+    }
+  },
 })
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/index/index.js b/subpages/oneKeyService/pages/index/index.js
index e3e88f3..be2b1eb 100644
--- a/subpages/oneKeyService/pages/index/index.js
+++ b/subpages/oneKeyService/pages/index/index.js
@@ -59,6 +59,18 @@ Page({
       wx.navigateTo({
         url: `../directTo/directTo?modulecode=${e.currentTarget.dataset.modulecode}`
       })
+    } else if (e.currentTarget.dataset.modulecode == 'notice_zcwsc') {
+      wx.navigateTo({
+        url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}`
+      })
+    } else if (e.currentTarget.dataset.modulecode == 'notice_aq') {
+      wx.navigateTo({
+        url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}`
+      })
+    } else if (e.currentTarget.dataset.modulecode == 'notice_cgjj') {
+      wx.navigateTo({
+        url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}`
+      })
     }
   }
 })
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js
index e557b32..8746f45 100644
--- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js
+++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js
@@ -26,6 +26,21 @@ Page({
         title: '锦水警事' 
       })
       this.noticeDetail(options.id)
+    } else if(options.modulecode == 'notice_zcwsc'){
+      wx.setNavigationBarTitle({
+        title: '众创卫生城' 
+      })
+      this.noticeDetail(options.id)
+    } else if(options.modulecode == 'notice_aq'){
+      wx.setNavigationBarTitle({
+        title: '安全365' 
+      })
+      this.noticeDetail(options.id)
+    } else if(options.modulecode == 'notice_cgjj'){
+      wx.setNavigationBarTitle({
+        title: '城管聚焦' 
+      })
+      this.noticeDetail(options.id)
     }
   },
 
diff --git a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.json b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.json
index b86ff26..d8bbc60 100644
--- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.json
+++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.json
@@ -1,4 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "锦水"
+  "navigationBarTitleText": ""
 }
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml
index 9c43ce3..632d7db 100644
--- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml
+++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml
@@ -5,7 +5,7 @@
     <view class="detail-subtitle">
       <view class="left">
         <span>{{noticeObj.deptName}}</span>
-        <span>{{filter.formatTime(noticeObj.newsStartTime, 'yyyy-MM-dd')}}</span>
+        <span>{{filter.formatTime(noticeObj.noticeTime, 'yyyy-MM-dd')}}</span>
       </view>
       <view class="right">
         <view class="readNum">
diff --git a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxss b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxss
index 82e108b..0ea7945 100644
--- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxss
+++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxss
@@ -14,7 +14,7 @@ page{
 }
 .selfContent {
   width: 100%;
-  display: table;
+  /* display: table; */
   background: #ffffff;
   border-radius: 16rpx;
   box-sizing: border-box;
diff --git a/subpages/oneKeyService/pages/warning/warning.js b/subpages/oneKeyService/pages/warning/warning.js
index d09c359..b5890d0 100644
--- a/subpages/oneKeyService/pages/warning/warning.js
+++ b/subpages/oneKeyService/pages/warning/warning.js
@@ -18,7 +18,7 @@ Page({
     indicatorDots: false, //指示点
     autoplay: true, //true,//自动播放
     circular: true, //衔接滑动
-    interval: 3000, //自动播放间隔时长(ms)
+    interval: 5000, //自动播放间隔时长(ms)
     duration: 500, //幻灯片切换时长(ms)
     currentSwiper: 0,
   },
@@ -34,14 +34,29 @@ Page({
       wx.setNavigationBarTitle({
         title: '锦水印象' 
       })
+    }else if(options.modulecode == 'notice_zcwsc'){
+      this.getBannerList('4')
+      wx.setNavigationBarTitle({
+        title: '众创卫生城' 
+      })
+    }else if(options.modulecode == 'notice_aq'){
+      this.getBannerList('5')
+      wx.setNavigationBarTitle({
+        title: '安全365' 
+      })
+    }else if(options.modulecode == 'notice_cgjj'){
+      this.getBannerList('6')
+      wx.setNavigationBarTitle({
+        title: '城管聚焦'
+      })
     }else{
+      this.getBannerList('2')
       wx.setNavigationBarTitle({
         title: '锦水警事' 
       })
     }
 
     this.noticelist()
-    this.getBannerList()
   },
 
   /**
@@ -105,9 +120,9 @@ Page({
     })
   },
 
-  getBannerList: function() {
+  getBannerList: function(bannerNum) {
     let that = this
-    api.bannerList('2').then(function(res) {
+    api.bannerList(bannerNum).then(function(res) {
       // console.log('res==', res.data)
       that.setData({
         swiperBannerList: res.data
@@ -115,10 +130,34 @@ Page({
     })
   },
   swiperChange: function(e) {
+    wx.createVideoContext('video'+this.data.currentSwiper).pause()
     this.setData({
-      currentSwiper: e.detail.current
+      currentSwiper: e.detail.current,
+      autoplay: true
     })
   },
+  bindplay() {
+    this.setData({
+      autoplay: false
+    })
+    wx.getNetworkType({
+      success (res) {
+        const networkType = res.networkType
+        if (res.networkType != 'wifi') {
+          wx.showToast({
+            title: '当前为非WI-FI环境，请注意流量消耗',
+            icon: 'none',
+            duration: 3000
+          })
+        }
+      }
+    })
+  },
+  bindended() {
+    this.setData({
+      autoplay: true
+    })    
+  },
   // swiperChange2: function(e) {
   //   this.setData({
   //     'options2.currentSwiper': e.detail.current,
diff --git a/subpages/oneKeyService/pages/warning/warning.json b/subpages/oneKeyService/pages/warning/warning.json
index 25bf808..8db8a6b 100644
--- a/subpages/oneKeyService/pages/warning/warning.json
+++ b/subpages/oneKeyService/pages/warning/warning.json
@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "锦水警事",
+  "navigationBarTitleText": "",
   "usingComponents": {
     "load-more": "../../../../components/loadMore/loadMore",
     "no-data":"../../../../components/nodata/nodata"
diff --git a/subpages/oneKeyService/pages/warning/warning.wxml b/subpages/oneKeyService/pages/warning/warning.wxml
index 090b059..7cae75d 100644
--- a/subpages/oneKeyService/pages/warning/warning.wxml
+++ b/subpages/oneKeyService/pages/warning/warning.wxml
@@ -1,5 +1,5 @@
 <!-- banner swiperBannerList -->
-<view class="banner">
+<view class="banner" wx:if="{{swiperBannerList.length>0}}">
   <view class="page-section page-section-spacing swiper">
     <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" circular="{{circular}}" interval="{{interval}}" duration="{{duration}}" bindchange="swiperChange">
       <block wx:for="{{swiperBannerList}}" wx:for-item="item" wx:for-index="index" wx:key="index">
@@ -9,7 +9,8 @@
               <!-- <view class="altitle">
               <view class="altitle-name">{{item.title}}</view>
             </view> -->
-              <image class="banner" src='{{item.imgUrl}}' mode="aspectFill" />
+              <image wx:if="{{item.imgUrl!=''}}" class="banner" src='{{item.imgUrl}}' mode="aspectFill" />
+              <video wx:elif="{{item.videoUrl!=''}}" id="video{{index}}" class="banner" src="{{item.videoUrl}}" bindplay='bindplay' bindended='bindended'/>
             </view>
           </view>
         </swiper-item>
@@ -33,7 +34,8 @@
     data-id="{{item.id}}">
     <view class="name">{{item.noticeTitle}}</view>
     <view class="info">
-        <rich-text space="nbsp" nodes="{{item.noticeContentNew}}"></rich-text>
+        <!-- <rich-text space="nbsp" nodes="{{item.noticeContentNew}}"></rich-text> -->
+        <text>{{common.getStr(item.noticeContentNew)}}</text>
     </view>
 </view>
 
@@ -41,4 +43,9 @@
  <!--加载更多提示-->
  <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
 
-<no-data isShow="{{nodata}}"></no-data>
\ No newline at end of file
+<no-data isShow="{{nodata}}"></no-data>
+<wxs module="common">
+    module.exports.getStr = function(content) {
+        return content.replace(getRegExp('<\/?.+?\/?>|[&nbsp;]','g'),'')
+    }
+</wxs>
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/warning/warning.wxss b/subpages/oneKeyService/pages/warning/warning.wxss
index ca7e46b..bfa09c4 100644
--- a/subpages/oneKeyService/pages/warning/warning.wxss
+++ b/subpages/oneKeyService/pages/warning/warning.wxss
@@ -51,6 +51,16 @@ page {
   -webkit-box-orient: vertical;
 }
 
+.list-item .info text {
+  line-height: 46rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-wrap: break-word;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  font-size: 30rpx;
+}
 /* 轮播图start */
 
 .altitle {
@@ -164,6 +174,10 @@ page {
 swiper {
   height: 300rpx;
   box-shadow: 0px 4px 29px 0px rgba(63, 63, 63, 0.1);
+  border-radius: 16rpx;
+  overflow: hidden;
+  -webkit-backface-visibility: hidden;
+  -webkit-transform: translate3d(0, 0, 0);
 }
 
 /* 轮播图end */
\ No newline at end of file
diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.js b/subpages/understandJs/pages/noticeDetail/noticeDetail.js
index 2077daa..684cd29 100644
--- a/subpages/understandJs/pages/noticeDetail/noticeDetail.js
+++ b/subpages/understandJs/pages/noticeDetail/noticeDetail.js
@@ -65,8 +65,10 @@ Page({
   },
 
   swiperChange: function(e) {
+    wx.createVideoContext('video'+this.data.currentSwiper).pause()
     this.setData({
-      currentSwiper: e.detail.current
+      currentSwiper: e.detail.current,
+      autoplay: true
     })
   },  
   bindplay() {
@@ -91,16 +93,6 @@ Page({
       autoplay: true
     })    
   },
-  bindVideoEnterPictureInPicture() {
-    console.log('进入小窗模式')
-  },
-  bindVideoLeavePictureInPicture() {
-    console.log('退出小窗模式')
-  },
-  videoErrorCallback(e) {
-    console.log('视频错误信息:')
-    console.log(e.detail.errMsg)
-  },
   videoBannerList () {
     api.videoBannerList('3').then( res => {
       this.setData({
diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml b/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml
index 47a8177..8afa456 100644
--- a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml
+++ b/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml
@@ -9,20 +9,9 @@
               <view class="swiper-item" data-id="{{item.id}}">
                 <!-- <view class="altitle">
                 <view class="altitle-name">{{item.title}}</view>
-              </view> 
-                <image class="banner" src='{{item.imgUrl}}' mode="aspectFill" />-->
-                <video 
-                  id="myVideo" 
-                  src="{{item.videoUrl}}" 
-                  binderror="videoErrorCallback" 
-                  show-center-play-btn='{{true}}' 
-                  show-play-btn="{{true}}" 
-                  picture-in-picture-mode="{{['push', 'pop']}}"
-                  bindplay='bindplay'
-                  bindended='bindended'
-                  bindenterpictureinpicture='bindVideoEnterPictureInPicture'
-                  bindleavepictureinpicture='bindVideoLeavePictureInPicture'
-                ></video>
+              </view>  -->
+                <image wx:if="{{item.imgUrl!=''}}" class="banner" src='{{item.imgUrl}}' mode="aspectFill" />
+                <video wx:elif="{{item.videoUrl!=''}}" id="video{{index}}" src="{{item.videoUrl}}" show-center-play-btn='{{true}}' bindplay='bindplay' bindended='bindended'></video>
               </view>
             </view>
           </swiper-item>
@@ -41,7 +30,7 @@
     <view class="detail-subtitle">
       <view class="left">
         <span>{{noticeObj.deptName}}</span>
-        <span>{{filter.formatTime(noticeObj.newsStartTime, 'yyyy-MM-dd')}}</span>
+        <span>{{filter.formatTime(noticeObj.noticeTime, 'yyyy-MM-dd')}}</span>
       </view>
       <view class="right">
         <view class="readNum">
diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxss b/subpages/understandJs/pages/noticeDetail/noticeDetail.wxss
index 6d664ca..c889c9b 100644
--- a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxss
+++ b/subpages/understandJs/pages/noticeDetail/noticeDetail.wxss
@@ -14,7 +14,7 @@ page{
 }
 .selfContent {
   width: 100%;
-  display: table;
+  /* display: table; */
   background: #ffffff;
   border-radius: 16rpx;
   box-sizing: border-box;
diff --git a/subpages/understandJs/pages/sclerotia/sclerotia.wxml b/subpages/understandJs/pages/sclerotia/sclerotia.wxml
index 6d7e767..a44cd86 100644
--- a/subpages/understandJs/pages/sclerotia/sclerotia.wxml
+++ b/subpages/understandJs/pages/sclerotia/sclerotia.wxml
@@ -2,6 +2,7 @@
 <!-- 列表 -->
 <view class="list-all">
     <view class="list-item" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{sclerotialist}}" data-id="{{item.id}}" bindtap="toDetail">
+        <image src="{{item.imgUrl}}"></image>
         <view class="item-info">
         <view class="item-info-name">{{item.noticeTitle}}
         </view>
@@ -10,7 +11,6 @@
             <text>{{filter.formatTime(item.noticeTime, 'yyyy-MM-dd')}}</text>
         </view>
         </view>
-        <image src="{{item.imgUrl}}"></image>
     </view>
 </view>
  <!--加载更多提示-->
diff --git a/subpages/understandJs/pages/sclerotia/sclerotia.wxss b/subpages/understandJs/pages/sclerotia/sclerotia.wxss
index 55527f3..84488fe 100644
--- a/subpages/understandJs/pages/sclerotia/sclerotia.wxss
+++ b/subpages/understandJs/pages/sclerotia/sclerotia.wxss
@@ -44,6 +44,7 @@ page {
     -webkit-box-orient: vertical;
     -webkit-line-clamp: 2;
     overflow: hidden;
+    margin: 0 auto;
   }
   
   .list-all .list-item .item-info .item-info-time {
@@ -54,6 +55,7 @@ page {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
+    left: 22rpx;
   }
   
   .list-all .list-item .item-info .item-info-time text {
diff --git a/utils/api.js b/utils/api.js
index a7e143c..620c78e 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -323,8 +323,11 @@ function leaderboard () {
 /**
  * 活动详情
  */
-function detail (id) {
-  return fly.get(`heart/act/detail/${id}`)
+function detail ({id,actType}) {
+  return fly.get(`heart/act/detail`,{
+    id: id,
+    actType: actType
+  })
 }
 
 /**
diff --git a/utils/config.js b/utils/config.js
index 5986183..58acdf1 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -8,12 +8,12 @@ module.exports = {
 function BASEURL() {
   // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
   // return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址
-  // return "http://219.146.91.110:9094/epdc-api/api/"  // 测试环境 ip接口地址
+  // return "http://192.168.43.19:9094/epdc-api/api/"  // 测试环境 ip接口地址
   // return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址
   // return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址
   //  return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址
   return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
-  // return 'http://192.168.43.19:9094/epdc-api/api/'
+  // return 'http://10.10.10.63:9094/epdc-api/api/'
 }
 
 function WEBROOT() {
diff --git a/utils/request.js b/utils/request.js
index d527ad5..67ff2ec 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -15,7 +15,7 @@ const request =  function (url, options) {
       },
       success (response) {
         if (response.statusCode === 200) {
-          if(response.data.code===0){
+          if(response.data.code===0 || response.data.code===533){
             resolve(response.data)
           }else{
             let errmsg = response.data.msg