diff --git a/app.json b/app.json
index 527d68e..9acb075 100644
--- a/app.json
+++ b/app.json
@@ -61,9 +61,14 @@
       "name": "associationNew",
       "pages": [
         "pages/associationlist/associationlist",
+<<<<<<< HEAD
         "pages/community/community",
         "pages/gMembersList/gMembersList",
         "pages/gOfficialsList/gOfficialsList"
+=======
+        "pages/talklist/talklist",
+        "pages/eventlist/eventlist"
+>>>>>>> 8cb094475e355feb09b2c52a944da0015316e0df
       ]
     },
     {
diff --git a/subpages/associationNew/images/comment.png b/subpages/associationNew/images/comment.png
new file mode 100644
index 0000000..a1af885
Binary files /dev/null and b/subpages/associationNew/images/comment.png differ
diff --git a/subpages/associationNew/images/give.png b/subpages/associationNew/images/give.png
new file mode 100644
index 0000000..910694a
Binary files /dev/null and b/subpages/associationNew/images/give.png differ
diff --git a/subpages/associationNew/images/ic_huifu@2x.png b/subpages/associationNew/images/ic_huifu@2x.png
new file mode 100644
index 0000000..b66ac8c
Binary files /dev/null and b/subpages/associationNew/images/ic_huifu@2x.png differ
diff --git a/subpages/associationNew/pages/eventlist/eventlist.js b/subpages/associationNew/pages/eventlist/eventlist.js
new file mode 100644
index 0000000..76b74c5
--- /dev/null
+++ b/subpages/associationNew/pages/eventlist/eventlist.js
@@ -0,0 +1,70 @@
+// subpages/associationNew/pages/eventlist/eventlist.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    images:[
+      "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png",
+      "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png",
+      "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png"
+    ]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/subpages/associationNew/pages/eventlist/eventlist.json b/subpages/associationNew/pages/eventlist/eventlist.json
new file mode 100644
index 0000000..3cffbae
--- /dev/null
+++ b/subpages/associationNew/pages/eventlist/eventlist.json
@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "事好鼓个掌"
+}
\ No newline at end of file
diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxml b/subpages/associationNew/pages/eventlist/eventlist.wxml
new file mode 100644
index 0000000..d52a11a
--- /dev/null
+++ b/subpages/associationNew/pages/eventlist/eventlist.wxml
@@ -0,0 +1,45 @@
+<view class="item-list">
+	<view class="user-info">
+		<image src="https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png"></image>
+		<view class="name-date">
+			<view class="name">南宁路152号-梁先生</view>
+			<view class="date">2019-08-26 12:56:02</view>
+		</view>
+	</view>
+	<view class="details-info">庆祝建党97周年“党徽照耀新时代”庆祝建党97周年“党徽照耀新时代”庆祝建党97周年“党徽照耀新时代”庆祝建党97周年“党徽照耀新时代”庆祝建党97周年“党徽照耀新时代”</view>
+
+	<view wx:if="{{images.length > 0}}" class="image-list" style="height: {{images.length === 3 ? '160rpx' : images.length === 2 ? '205rpx' :  images.length ===  1 ? '350rpx' : '' }}">
+		<image mode="aspectFill" catchtap="previewImage" data-src="{{item}}" class="image-item" wx:for="{{images}}" wx:key="{{index}}" wx:for-index="index" wx:for-item="item" src="{{item}}" />
+	</view>
+	<view class="attitude">
+		<view class="all">
+			<image src="../../images/give.png"></image>
+			<view class="give-data">22222</view>
+		</view>
+		<view class="all">
+			<image src="../../images/comment.png"></image>
+			<view class="give-data">22222</view>
+		</view>
+		<view class="all">
+			<image src="../../images/ic_huifu@2x.png"></image>
+			<view class="give-data">评论</view>
+		</view>
+	</view>
+  <view class="comment">
+		<view class="comment-list"><text>张测试：</text>我们这个楼的小区门口也是这中事情我们这个楼的小区门口也是这中事情···我们这个楼的小区门口也是这中事情···</view>
+		<view class="comment-list"><text>张测试：</text>我们这个楼的小区门口也是这中事情我们这个楼的小区门口也是这中事情···我们这个楼的小区门口也是这中事情···</view>
+	</view>
+</view>
+
+<form bindsubmit="submitForm" report-submit="true">
+  <view class="release">
+    <view  wx:if="{{reply}}" class="replyinfo1">
+      回复<text class="text">{{replyUserName}}</text>
+      <button class="cancel" bindtap="cancleReply">取消回复</button>
+    </view>
+    <view class="replyinfo2">
+      <textarea placeholder-class="input_null" fixed="true" maxlength="-1" show-confirm-bar="false" cursor-spacing="15" auto-height="true" placeholder="请输入回复" name="comment"></textarea>
+      <button form-type="submit" class="submit">发送</button>
+    </view>
+  </view>
+</form>
\ No newline at end of file
diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxss b/subpages/associationNew/pages/eventlist/eventlist.wxss
new file mode 100644
index 0000000..5831e38
--- /dev/null
+++ b/subpages/associationNew/pages/eventlist/eventlist.wxss
@@ -0,0 +1,181 @@
+page {
+  background: #f7f7f7;
+}
+
+.item-list {
+  width: 100%;
+  padding: 40rpx 29rpx 20rpx 29rpx;
+  background: #fff;
+  margin-top: 20rpx;
+}
+
+.user-info {
+  width: calc(100% - 58rpx);
+  height: 64rpx;
+  display: flex;
+  align-items: center;
+}
+
+.user-info image {
+  width: 64rpx;
+  height: 64rpx;
+}
+
+.user-info .name-date {
+  margin-left: 14rpx;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.user-info .name-date .name {
+  font-size: 28rpx;
+  font-weight: bold;
+  color: rgba(51, 51, 51, 1);
+}
+
+.user-info .name-date .date {
+  font-size: 20rpx;
+  font-weight: 500;
+  color: rgba(153, 153, 153, 1);
+}
+
+.details-info {
+  width: calc(100% - 58rpx);
+  font-size: 36rpx;
+  font-weight: 500;
+  color: rgba(51, 51, 51, 1);
+  line-height: 54rpx;
+}
+
+.image-list {
+  width: calc(100% - 58rpx);
+  margin-top: 30rpx;
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(216rpx, 1fr));
+  grid-gap: 7rpx;
+}
+
+.image-list .image-item {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  border-radius: 8rpx;
+}
+
+.attitude {
+  width: calc(100% - 158rpx);
+  margin-top: 21rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  /* justify-content: center; */
+  height: 28rpx;
+  padding: 0 50rpx;
+}
+.attitude .all{
+  display: flex;
+  align-items: center;
+}
+.attitude .all image {
+  width: 28rpx;
+  height: 28rpx;
+}
+
+.attitude .all .give-data {
+  font-size: 24rpx;
+  font-weight: 500;
+  color: rgba(51, 51, 51, 1);
+  margin-left: 9rpx;
+  /* width: 196rpx; */
+}
+
+.comment {
+  width: calc(100% - 98rpx);
+  padding: 26rpx 20rpx;
+  background: #F2F2F2;
+  border-radius: 8rpx;
+  margin-top: 25rpx;
+}
+
+.comment .comment-list {
+  width: 100%;
+  margin-top: 11rpx;
+  font-size: 28rpx;
+  color: #999999;
+}
+
+.comment .comment-list text {
+  color: #333333;
+}
+
+/* 评论样式 */
+.release {
+  align-items: flex-end; /*底部对齐*/
+  box-sizing: border-box;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  padding: 13rpx 20rpx;
+  background-color: #fff;
+  font-size: 28rpx;
+  z-index: 999;
+}
+.replyinfo1{ 
+  display: flex;
+  justify-content: space-between; /*两端对齐*/
+  font-size: 35rpx;
+}
+.replyinfo2{ 
+  display: flex;
+  justify-content: space-between; /*两端对齐*/
+}
+ 
+.release textarea {
+  width: calc(100% - 200rpx);
+  min-height: 34rpx;
+  max-height: 102rpx; /*最多显示三行*/
+  border-width: 15rpx 20rpx; /*使用padding与预期留白不一致，故使用border*/
+  border-style: solid;
+  border-color: #F2F2F2;
+  line-height: 34rpx;
+  font-size: 28rpx;
+  background-color: #F2F2F2;
+  border-radius: 4rpx;
+}
+ 
+.release .text {
+  font-size: 40rpx;
+  color: #c9c9c9;
+}
+ 
+.cancel {
+  width: 240rpx;
+  height: 64rpx;
+  line-height: 64rpx;
+  text-align: center;
+  color: #6c0;
+  margin: 0 3px;
+  padding: 0;
+}
+ 
+.release .submit {
+  width: 120rpx;
+  height: 64rpx;
+  line-height: 64rpx;
+  text-align: center;
+  color: #6c0;
+  margin: 0 3px;
+  padding: 0;
+}
+ 
+.pro-box .info .text .delete {
+  color: #f68135;
+  border-radius: 50rpx;
+  border: 1px solid #f68135;
+  font-size: 28 rpx;
+  width: 150rpx;
+  height: 48rpx;
+  text-align: center;
+}
diff --git a/subpages/associationNew/pages/talklist/talklist.js b/subpages/associationNew/pages/talklist/talklist.js
new file mode 100644
index 0000000..7007d83
--- /dev/null
+++ b/subpages/associationNew/pages/talklist/talklist.js
@@ -0,0 +1,66 @@
+// subpages/associationNew/pages/talklist/talklist.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/subpages/associationNew/pages/talklist/talklist.json b/subpages/associationNew/pages/talklist/talklist.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/subpages/associationNew/pages/talklist/talklist.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/subpages/associationNew/pages/talklist/talklist.wxml b/subpages/associationNew/pages/talklist/talklist.wxml
new file mode 100644
index 0000000..5f4236a
--- /dev/null
+++ b/subpages/associationNew/pages/talklist/talklist.wxml
@@ -0,0 +1,2 @@
+<!--subpages/associationNew/pages/talklist/talklist.wxml-->
+<text>subpages/associationNew/pages/talklist/talklist.wxml</text>
diff --git a/subpages/associationNew/pages/talklist/talklist.wxss b/subpages/associationNew/pages/talklist/talklist.wxss
new file mode 100644
index 0000000..0d69917
--- /dev/null
+++ b/subpages/associationNew/pages/talklist/talklist.wxss
@@ -0,0 +1 @@
+/* subpages/associationNew/pages/talklist/talklist.wxss */
\ No newline at end of file