merge

config/api.js

@@ -18,6 +18,10 @@ const $api = {
       method: 'PUT',
       url: `${BaseAPIURl}wx/user`
     },
+    signUpList: { // 报名过的活动
+      method: 'GET',
+      url: `${BaseAPIURl}wx/activity/byuser/:openid`
+    },
     appointment: {
       method: 'GET',
       url: `${BaseAPIURl}wx/appointment/:openid`
@@ -75,6 +79,10 @@ const $api = {
     detail: { // 活动详情
       method: 'GET',
       url: `${BaseAPIURl}wx/activity/:id`
+    },
+    signUp: { // 活动报名
+      method: 'POST',
+      url: `${BaseAPIURl}wx/signUpActivity/:openid`
     }
   },
   appointment: {
@@ -105,8 +113,16 @@ const $api = {
     list: { // 评论列表
       methods: 'GET',
       url: `${BaseAPIURl}/wx/comment/list`
+    },
+    add: { // 添加评论
+      method: 'POST',
+      url: `${BaseAPIURl}comment/add`
     }
-  }
+  },
+  uploadImage: { // 图片上传
+    method: 'POST',
+    url: `${BaseAPIURl}uploadImage`
+  },
 }
 
 const hasKey = (o, k) => Object.keys(o).indexOf(k) > -1

pages/ActivityDetail/comment.js

@@ -1,6 +1,9 @@
 //index.js
 //获取应用实例
+import fetch from '../../utils/http'
+
 const app = getApp()
+const $api = require('../../config/api.js').$api
 
 Page({
   onShow() {
@@ -8,30 +11,58 @@ Page({
       title: '添加评论'
     })
   },
+  onLoad(e) {
+    this.setData({
+      Id: e.id,
+      FormData: {
+        ...this.data.FormData,
+        mainId: e.id,
+        customerId: app.globalData.UserInfo.customerId
+      }
+    })
+    console.log(this.data.FormData.customerId)
+  },
   data: {
+    Id: '',
     UserInfo: app.globalData.UserInfo,
     SubmitOff: true,
     FormData: {
-      Comment: '',
-      ImgList: []
+      customerId: '',
+      commentType: 'activity',
+      mainId: '',
+      parentId: '',
+      commentContent: '',
+      imgArray: []
     }
   },
   AddImage() { // 添加图片
     let _self = this
     wx.chooseImage({
-      count: 4 - _self.data.FormData.ImgList.length,
+      count: 4 - _self.data.FormData.imgArray.length,
       sizeType: ['original', 'compressed'],
       sourceType: ['album', 'camera'],
       success(res) {
-        let aArr = _self.data.FormData.ImgList.slice(0)
-        res.tempFilePaths.map((item) => {
-          aArr.push(item)
-        })
-        _self.setData({
-          FormData: {
-            ..._self.data.FormData,
-            ImgList: aArr
-          }
+        const tempFilePaths = res.tempFilePaths || []
+        let aArr = _self.data.FormData.imgArray.slice(0)
+        let num = 0
+        tempFilePaths.map((item, index) => {
+          wx.uploadFile({
+            url: $api.uploadImage.url,
+            filePath: item,
+            name: 'uploadFiles',
+            success(resr) {
+              num += 1
+              aArr.push(JSON.parse(resr.data).data[0])
+              if (num === tempFilePaths.length) {
+                _self.setData({
+                  FormData: {
+                    ..._self.data.FormData,
+                    imgArray: aArr
+                  }
+                })
+              }
+            }
+          })
         })
       }
     })
@@ -45,20 +76,55 @@ Page({
     })
   },
   DeleteItem(e) { // 删除img
-    let aArr = this.data.FormData.ImgList.slice(0)
+    let aArr = this.data.FormData.imgArray.slice(0)
     aArr.splice(e.target.dataset.index, 1)
     this.setData({
       FormData: {
         ...this.data.FormData,
-        ImgList: aArr
+        imgArray: aArr
       }
     })
   },
   SubmitForm() { // 发布
+    if (this.data.FormData.commentContent === '') {
+      // Toast('评论内容不能为空！')
+      wx.showToast({
+        title: '评论内容不能为空！',
+        icon: 'none',
+      })
+      return false
+    }
     if (this.data.SubmitOff) {
       this.setData({
         SubmitOff: false
       })
+      fetch({
+        url: $api.comment.add.url,
+        method: $api.comment.add.method,
+        data: {
+          ...this.data.FormData
+        }
+      }).then((res) => {
+        if (res.code === 200) {
+          wx.showToast({
+            title: '添加评论成功！',
+            icon: 'success',
+          })
+          setTimeout(() => {
+            wx.navigateBack({
+              delta: 1
+            })
+          }, 500)
+        } else {
+          wx.showToast({
+            title: res.message,
+            icon: 'none',
+          })
+          this.setData({
+            SubmitOff: true
+          })
+        }
+      })
     }
   }
 })

pages/ActivityDetail/comment.json

@@ -1,3 +1,5 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "van-toast": "/dist/toast/index"
+  }
 }

pages/ActivityDetail/comment.wxml

@@ -1,16 +1,16 @@
 <!--index.wxml-->
 <view class="MainPage">
   <view class="textarea">
-    <textarea placeholder="请输入评论" bindinput="FormInput" data-name="Comment"></textarea>
+    <textarea placeholder="请输入评论" bindinput="FormInput" data-name="commentContent"></textarea>
   </view>
   <view class="photos">
     <view class="flex-h">
       <view class="flex-item">
-        <view class="item" wx:for="{{FormData.ImgList}}" wx:for-index="idx" wx:for-item="item" wx:key="key">
+        <view class="item" wx:for="{{FormData.imgArray}}" wx:for-index="idx" wx:for-item="item" wx:key="key">
           <image mode="aspectFit" src="{{item}}" class="centerLabel contain"></image>
           <text data-index="{{idx}}" bindtap="DeleteItem"></text>
         </view>
-        <view class="addBtn" wx:if="{{FormData.ImgList.length < 4}}" bindtap="AddImage">
+        <view class="addBtn" wx:if="{{FormData.imgArray.length < 4}}" bindtap="AddImage">
           <view class="centerLabel">
             <image mode="widthFix" src="/assets/images/icon35.png"></image>
             <text>相机/相册</text>

pages/ActivityDetail/index.js

@@ -6,11 +6,24 @@ const app = getApp()
 const $api = require('../../config/api.js').$api
 
 Page({
-  onShow() {},
+  onShow() {
+    this.PageReset()
+    if (this.data.Type === 1) {
+      this.GetProjectDetail()
+    } else {
+      this.GetActivityDetail()
+      this.GetCommentList()
+      this.GetSignUpList()
+    }
+  },
   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({
@@ -23,49 +36,91 @@ Page({
     }
   },
   data: {
+    HasSignUp: false,
     UserInfo: app.globalData.UserInfo,
     Id: null,
     Type: null,
     ShowPopup: false,
     FormData: {
-      Name: '',
-      PhoneNum: '',
-      IdCard: ''
+      customerName: '',
+      phone: '',
+      idNum: '',
+      activityId: ''
     },
     SubmitOff: true,
     ActivityDetail: {
-      Title: '示例标题',
-      Publisher: '示例发布人',
-      CreateDate: '2019-02-02',
+      Title: '',
+      Publisher: '',
+      CreateDate: '',
       Content: ''
     },
     CommentList: []
   },
   onReady() {
-    if (this.data.Type === 1) {
-      this.GetProjectDetail()
-    } else {
-      this.GetActivityDetail()
-      this.GetCommentList()
-    }
+
   },
-  AddComment() { // 添加评论
-    wx.navigateTo({
-      url: '/pages/ActivityDetail/comment?id=' + this.data.Id
+  PageReset() {
+    this.setData({
+      ActivityDetail: {
+        Title: '',
+        Publisher: '',
+        CreateDate: '',
+        Content: ''
+      },
+      CommentList: [],
+      SubmitOff: true,
+      ShowPopup: false
     })
   },
-  ShowSignUpPopup() { // 打开报名弹窗
-    this.setData({
-      ShowPopup: true
+  GetSignUpList() { // 获取报名情况
+    fetch({
+      url: $api.user.signUpList.url.replace(':openid', app.globalData.UserInfo.openid) + '?pageNum=1&pageSize=10000',
+      method: $api.user.signUpList.method
+    }).then((res) => {
+      if (res.code === 200) {
+        res.data.records.map((item) => {
+          if (item.activityId === this.data.FormData.activityId) {
+            this.setData({
+              HasSignUp: true
+            })
+            return
+          }
+        })
+      }
     })
   },
+  AddComment() { // 添加评论
+    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() { // 打开报名弹窗
+    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({
       ShowPopup: false,
       FormData: {
-        Name: '',
-        PhoneNum: '',
-        IdCard: ''
+        customerName: '',
+        phone: '',
+        idNum: '',
+        activityId: this.data.FormData.activityId
       }
     })
   },
@@ -78,11 +133,57 @@ Page({
     })
   },
   Submit() { // 提交报名信息
+    if (this.data.FormData.customerName === '') {
+      wx.showToast({
+        title: '姓名不能为空！',
+        icon: 'none'
+      })
+      return false
+    }
+    if (this.data.FormData.phone === '') {
+      wx.showToast({
+        title: '手机号不能为空！',
+        icon: 'none'
+      })
+      return false
+    }
+    if (this.data.FormData.idNum === '') {
+      wx.showToast({
+        title: '身份证号不能为空！',
+        icon: 'none'
+      })
+      return false
+    }
     if (this.data.SubmitOff) {
       this.setData({
         SubmitOff: false
       })
-
+      fetch({
+        url: $api.activity.signUp.url.replace(':openid', app.globalData.UserInfo.openid),
+        method: $api.activity.signUp.method,
+        data: {
+          ...this.data.FormData
+        }
+      }).then((res) => {
+        // console.log(res)
+        if (res.code === 200) {
+          wx.showToast({
+            title: '报名成功！',
+            icon: 'success'
+          })
+          this.setData({
+            ShowPopup: false
+          })
+        } else {
+          wx.showToast({
+            title: res.message,
+            icon: 'none'
+          })
+          this.setData({
+            SubmitOff: true
+          })
+        }
+      })
     }
   },
   GetCommentList() { // 获取评论列表
@@ -91,7 +192,7 @@ Page({
       method: $api.comment.list.method
     }).then((res) => {
       if (res.code === 200) {
-        console.log(res.data.records)
+        // console.log(res.data.records)
         let CommentList = []
         res.data.records.map((item, index) => {
           CommentList.push({
@@ -101,6 +202,7 @@ Page({
             Content: item.commentContent,
             ImgList: item.commentImgList,
             LikeNum: '0',
+            ParentId: item.parentId,
             Childs: []
           })
           let aChild = []
@@ -115,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>
 
@@ -105,15 +105,15 @@
           <text>填写报名信息</text>
           <view class="line flex-h">
             <image mode="widthFix" src="/assets/images/icon32.png" style="width: 28rpx;"></image>
-            <input class="flex-item" type="text" placeholder="姓名" bindinput="FormInput" data-name="Name"></input>
+            <input class="flex-item" type="text" placeholder="姓名" bindinput="FormInput" data-name="customerName"></input>
           </view>
           <view class="line flex-h">
             <image mode="widthFix" src="/assets/images/icon34.png" style="width: 22rpx;"></image>
-            <input type="number" class="flex-item" placeholder="手机号码" bindinput="FormInput" data-name="PhoneNum"></input>
+            <input type="number" class="flex-item" placeholder="手机号码" bindinput="FormInput" data-name="phone"></input>
           </view>
           <view class="line flex-h">
             <image mode="widthFix" src="/assets/images/icon33.png" style="width: 30rpx;"></image>
-            <input type="idcard" class="flex-item" placeholder="身份证号" bindinput="FormInput" data-name="IdCard"></input>
+            <input type="idcard" class="flex-item" placeholder="身份证号" bindinput="FormInput" data-name="idNum"></input>
           </view>
           <view class="btn">
             <text bindtap="Submit">提交报名信息</text>

pages/AppointmentTime/index.js

@@ -15,6 +15,13 @@ Page({
       BuildingId: page.getCurrentPageOptions().id,
       BuildingName: page.getCurrentPageOptions().name
     })
+    this.setData({
+      FormData: {
+        Name: app.globalData.UserInfo.customerName,
+        PhoneNum: app.globalData.UserInfo.phone,
+      }
+    })
+    
   },
   data: {
     UserInfo: app.globalData.UserInfo, // 用户信息

pages/SelfServiceTool/Cyclopedia/index.js

@@ -1,6 +1,8 @@
 //index.js
 //获取应用实例
 const app = getApp()
+import fetch from '../../../utils/http'
+const $api = require('../../../config/api.js').$api;
 
 Page({
   onShow() {

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() {},
@@ -92,7 +100,7 @@ Component({
       })
     },
     CutNav(e) { // 切换nav
-      if (e.target.dataset.index !== undefined) {
+      if (e.target.dataset.index !== undefined && e.target.dataset.index !== this.data.NavActiveIndex) {
         this.setData({
           NavActiveIndex: e.target.dataset.index
         })

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/components/Estate/index.wxml

@@ -1,9 +1,14 @@
 <!--index.wxml-->
 <view class="SubContainer">
   <view class="map">
-    <image mode="widthFix" src="/assets/images/img4.jpg" class="centerLabel cover bg"></image>
+    <movable-area style="height: 100%; width: 100%; background: #eee;position:absolute;left:0;top:0;">
+      <movable-view scale="{{true}}" scale-min="1" scale-max="2.5" x="{{x}}" y="{{y}}" direction="all">
+        <image mode="aspectFit" src="/assets/images/img4.jpg" class="centerLabel contian bg"></image>
+      </movable-view>
+    </movable-area>
+    <!-- <image mode="widthFix" src="/assets/images/img4.jpg" class="centerLabel cover bg"></image>
     <image mode="widthFix" src="/assets/images/icon15.png" class="AddIcon"></image>
-    <image mode="widthFix" src="/assets/images/icon14.png" class="SubtractIcon"></image>
+    <image mode="widthFix" src="/assets/images/icon14.png" class="SubtractIcon"></image> -->
   </view>
   <view class="EstateList">
     <text>附近楼盘</text>

pages/components/Estate/index.wxss

@@ -145,3 +145,15 @@
   font-size: 17rpx;
   line-height: 30rpx;
 }
+
+movable-view {
+  position: relative;
+  overflow: hidden;
+  min-height: 100%; 
+  min-width: 100%;
+}
+
+movable-view image {
+  width: 100%;
+  height: 100%;
+}

pages/index/index.js

@@ -4,6 +4,11 @@ import create from '../../utils/create'
 const app = getApp()
 
 create(store, {
+  onLoad(e) {
+    this.setData({
+      NavActiveIndex: e.index || 0
+    })
+  },
   data: {
     NavList: [{ // navlist数据
       value: '首页',

pages/index/index.wxss

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