update

config/api.js

@@ -116,7 +116,7 @@ const $api = {
     },
     add: { // 添加评论
       method: 'POST',
-      url: `${BaseAPIURl}/comment/add`
+      url: `${BaseAPIURl}comment/add`
     }
   },
   uploadImage: { // 图片上传

pages/ActivityDetail/comment.js

@@ -20,6 +20,7 @@ Page({
         customerId: app.globalData.UserInfo.customerId
       }
     })
+    console.log(this.data.FormData.customerId)
   },
   data: {
     Id: '',

pages/ActivityDetail/index.js

@@ -7,6 +7,7 @@ const $api = require('../../config/api.js').$api
 
 Page({
   onShow() {
+    this.PageReset()
     if (this.data.Type === 1) {
       this.GetProjectDetail()
     } else {
@@ -18,7 +19,11 @@ Page({
   onLoad(e) {
     this.setData({
       Id: e.id,
-      Type: e.type - 0
+      Type: e.type - 0,
+      FormData: {
+        ...this.data.FormData,
+        activityId: e.id
+      }
     })
     if (e.type - 0 === 1) {
       wx.setNavigationBarTitle({
@@ -31,6 +36,7 @@ Page({
     }
   },
   data: {
+    HasSignUp: false,
     UserInfo: app.globalData.UserInfo,
     Id: null,
     Type: null,
@@ -43,9 +49,9 @@ Page({
     },
     SubmitOff: true,
     ActivityDetail: {
-      Title: '示例标题',
-      Publisher: '示例发布人',
-      CreateDate: '2019-02-02',
+      Title: '',
+      Publisher: '',
+      CreateDate: '',
       Content: ''
     },
     CommentList: []
@@ -53,23 +59,59 @@ Page({
   onReady() {
 
   },
-  GetSignUpList() {
+  PageReset() {
+    this.setData({
+      ActivityDetail: {
+        Title: '',
+        Publisher: '',
+        CreateDate: '',
+        Content: ''
+      },
+      CommentList: [],
+      SubmitOff: true,
+      ShowPopup: false
+    })
+  },
+  GetSignUpList() { // 获取报名情况
     fetch({
       url: $api.user.signUpList.url.replace(':openid', app.globalData.UserInfo.openid) + '?pageNum=1&pageSize=10000',
       method: $api.user.signUpList.method
     }).then((res) => {
-      console.log(res)
+      if (res.code === 200) {
+        res.data.records.map((item) => {
+          if (item.activityId === this.data.FormData.activityId) {
+            this.setData({
+              HasSignUp: true
+            })
+            return
+          }
+        })
+      }
     })
   },
   AddComment() { // 添加评论
-    wx.navigateTo({
-      url: '/pages/ActivityDetail/comment?id=' + this.data.Id
-    })
+    if (app.globalData.UserInfo.avatar === '' && app.globalData.UserInfo.name === '') {
+      wx.navigateTo({
+        url: '/pages/index/index?index=3'
+      })
+    } else {
+      wx.navigateTo({
+        url: '/pages/ActivityDetail/comment?id=' + this.data.Id
+      })
+    }
   },
   ShowSignUpPopup() { // 打开报名弹窗
-    this.setData({
-      ShowPopup: true
-    })
+    if (app.globalData.UserInfo.avatar === '' && app.globalData.UserInfo.name === '') {
+      wx.navigateTo({
+        url: '/pages/index/index?index=3'
+      })
+    } else {
+      if (!this.data.HasSignUp) {
+        this.setData({
+          ShowPopup: true
+        })
+      }
+    }
   },
   ClosePopup() { // 关闭报名弹窗
     this.setData({
@@ -160,6 +202,7 @@ Page({
             Content: item.commentContent,
             ImgList: item.commentImgList,
             LikeNum: '0',
+            ParentId: item.parentId,
             Childs: []
           })
           let aChild = []
@@ -174,6 +217,15 @@ Page({
           })
           CommentList[index].Childs = aChild
         })
+        let aArr = []
+        CommentList.map((item, index) => {
+          if (item.ParentId !== '') {
+            aArr.unshift(index)
+          }
+        })
+        aArr.map((item) => {
+          CommentList.splice(item - 0, 1)
+        })
         this.setData({
           CommentList: CommentList
         })

pages/ActivityDetail/index.wxml

@@ -92,7 +92,7 @@
   </view>
   <view class="SignUp" hidden="{{Type !== 2}}">
     <view>
-      <text bindtap="ShowSignUpPopup">我要报名</text>
+      <text bindtap="ShowSignUpPopup">{{HasSignUp ? '已报名' : '我要报名'}}</text>
     </view>
   </view>
 

pages/components/Concessions/index.js

@@ -21,17 +21,25 @@ Component({
     ListB: [],
     PostDataA: {
       PageNum: 1,
-      PageSize: 15
+      PageSize: 10000
     },
     PostDataB: {
       PageNum: 1,
-      PageSize: 15
+      PageSize: 10000
     }
   },
   lifetimes: {},
   ready: function() {
     this.GetProjectList()
     this.GetActivityList()
+    let _self = this
+    wx.getSystemInfo({
+      success(res) {
+        _self.setData({
+          WindowHeight: res.windowHeight
+        })
+      }
+    })
   },
   pageLifetimes: {
     show: function() {},

pages/components/Concessions/index.wxss

@@ -1,6 +1,14 @@
 /**index.wxss**/
 @import '../../../app.wxss';
 
+.SubContainer {
+  min-height: 100%;
+  overflow-y: scroll;
+  -webkit-overflow-scrolling: touch;
+  transform: translateZ(0);
+  -webkit-transform: translateZ(0);
+}
+
 .nav {
   width: 100%;
   position: relative;

pages/components/ConcessionsListItem/index.wxml

@@ -1,7 +1,7 @@
 <!--index.wxml-->
 <view class="component flex-h">
   <view class="img">
-    <image mode="widthFix" src="{{Params.Img}}" class="centerLabel cover"></image>
+    <image mode="aspectFill" src="{{Params.Img}}" class="centerLabel cover"></image>
   </view>
   <view class="flex-item">
     <text class="title">{{Params.Title}}</text>

pages/index/index.js

@@ -3,6 +3,11 @@
 const app = getApp()
 
 Page({
+  onLoad(e) {
+    this.setData({
+      NavActiveIndex: e.index || 0
+    })
+  },
   data: {
     UserInfo: app.globalData.UserInfo,
     NavList: [{ // navlist数据

pages/index/index.wxss

@@ -17,6 +17,10 @@
   -webkit-transform: translateZ(0);
 }
 
+.CutContent > view > view {
+  min-height: 100%;
+}
+
 .foot {
   background: #fff;
   position: relative;