feats

config/api.js

@@ -17,6 +17,7 @@ const $api = {
     update: {
       method: 'PUT',
       url: `${BaseAPIURl}wx/user`
+<<<<<<< HEAD
     },
     appointment: {
       method: 'GET',
@@ -29,12 +30,14 @@ const $api = {
     building: {
       method: 'GET',
       url: `${BaseAPIURl}wx/collection/:openid`
+=======
+>>>>>>> 5c1f000d3d23edddccfbdceb0974cdc69e7bd0ce
     }
   },
   dict: {
     list: {
       methods: 'GET',
-      url: `${BaseAPIURl}dict`
+      url: `${BaseAPIURl}/dict`
     }
   },
   banner: {
@@ -50,7 +53,7 @@ const $api = {
     },
     detail: {
       method: 'GET',
-      url: `${BaseAPIURl}wx/buildingSelectId/:id`
+      url: `${BaseAPIURl}/wx/buildingSelectId/:id`
     }
   },
   dynamic: { // 项目
@@ -76,25 +79,31 @@ const $api = {
   appointment: {
     getByUser: {
       method: 'GET',
-      url: `${BaseAPIURl}wx/appointment/:openid`
+      url: `${BaseAPIURl}/wx/appointment/:openid`
     },
     save: {
       method: 'POST',
-      url: `${BaseAPIURl}wx/appointment/:openid`
+      url: `${BaseAPIURl}/wx/appointment/:openid`
     }
   },
   collection: {
     getByUser: {
       method: 'GET',
-      url: `${BaseAPIURl}wx/collection/:openid`
+      url: `${BaseAPIURl}/wx/collection/:openid`
     },
     save: {
       method: 'POST',
-      url: `${BaseAPIURl}wx/collection/:openid`
+      url: `${BaseAPIURl}/wx/collection/:openid`
     },
     deleteById: {
       method: 'DELETE',
-      url: `${BaseAPIURl}wx/collection/:openid`
+      url: `${BaseAPIURl}/wx/collection/:openid`
+    }
+  },
+  comment: {
+    list: { // 评论列表
+      methods: 'GET',
+      url: `${BaseAPIURl}/wx/comment/list`
     }
   }
 }
@@ -140,4 +149,4 @@ function get(k = '', urlParams = {}) {
 module.exports = {
   $api: $api,
   get: get,
-}
+}

pages/ActivityDetail/index.js

@@ -39,47 +39,14 @@ Page({
       CreateDate: '2019-02-02',
       Content: ''
     },
-    CommentList: [{
-      FloorUserIcon: '/assets/images/img1.jpg',
-      FloorUserName: '楼主姓名',
-      CreateDate: '2019-02-02 22:05',
-      Content: '就看到杰卡斯大姐大就看到杰卡斯大姐大就看到杰卡斯大姐大就看到杰卡斯大姐大',
-      ImgList: ['/assets/images/img1.jpg', '/assets/images/img2.jpg', '/assets/images/img5.jpg'],
-      LikeNum: '0',
-      Childs: [{
-        Name: '回复人姓名',
-        CreateDate: '2019-02-02 22:07',
-        Content: 'us很大很大声',
-        LikeNum: '15',
-        ImgList: ['/assets/images/img1.jpg']
-      }, {
-        Name: '回复人姓名',
-        CreateDate: '2019-02-02 22:07',
-        Content: 'us很大很大声',
-        LikeNum: '15',
-        ImgList: []
-      }]
-    }, {
-      FloorUserIcon: '/assets/images/img1.jpg',
-      FloorUserName: '楼主姓名',
-      CreateDate: '2019-02-02 22:05',
-      Content: '就看到杰卡斯大姐大',
-      ImgList: [],
-      LikeNum: '0',
-      Childs: [{
-        Name: '回复人姓名',
-        CreateDate: '2019-02-02 22:07',
-        Content: 'us很大很大声',
-        LikeNum: '15',
-        ImgList: []
-      }]
-    }]
+    CommentList: []
   },
   onReady() {
     if (this.data.Type === 1) {
       this.GetProjectDetail()
     } else {
       this.GetActivityDetail()
+      this.GetCommentList()
     }
   },
   AddComment() { // 添加评论
@@ -118,13 +85,48 @@ Page({
 
     }
   },
+  GetCommentList() { // 获取评论列表
+    fetch({
+      url: $api.comment.list.url + '?pageNum=1&pageSize=10000&commentType=activity&mainId=' + this.data.Id,
+      method: $api.comment.list.method
+    }).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data.records)
+        let CommentList = []
+        res.data.records.map((item, index) => {
+          CommentList.push({
+            FloorUserIcon: item.avatar,
+            FloorUserName: item.customerName,
+            CreateDate: item.createDate,
+            Content: item.commentContent,
+            ImgList: item.commentImgList,
+            LikeNum: '0',
+            Childs: []
+          })
+          let aChild = []
+          item.childComment.map((subItem) => {
+            aChild.push({
+              Name: subItem.customerName,
+              CreateDate: subItem.createDate,
+              Content: subItem.commentContent,
+              LikeNum: '0',
+              ImgList: subItem.commentImgList
+            })
+          })
+          CommentList[index].Childs = aChild
+        })
+        this.setData({
+          CommentList: CommentList
+        })
+      }
+    })
+  },
   GetActivityDetail() { // 获取活动详情
     fetch({
       url: $api.activity.detail.url.replace(':id', this.data.Id),
       method: $api.activity.detail.method
     }).then((res) => {
       if (res.code === 200) {
-        console.log(res.data)
         this.setData({
           ActivityDetail: {
             Title: res.data.title,

pages/ActivityDetail/index.wxml

@@ -52,7 +52,7 @@
                 <!-- 评论图片列表 -->
                 <view class="imgList">
                   <view wx:for="{{item.ImgList}}" wx:for-item="subItem" wx:for-index="subIdx" wx:key="subKey">
-                    <image mode="aspectFit" src="{{subItem}}" class="centerLabel contain"></image>
+                    <image mode="aspectFit" src="{{subItem.imgUrl}}" class="centerLabel contain"></image>
                   </view>
                 </view>
 
@@ -73,7 +73,7 @@
                     <!-- 评论图片列表 -->
                     <view class="imgList">
                       <view wx:for="{{subItem.ImgList}}" wx:for-item="dSubItem" wx:for-index="dSubIdx" wx:key="dSubKey">
-                        <image mode="aspectFit" src="{{dSubItem}}" class="centerLabel contain"></image>
+                        <image mode="aspectFit" src="{{dSubItem.imgUrl}}" class="centerLabel contain"></image>
                       </view>
                     </view>