feats

app.js

@@ -1,8 +1,46 @@
 //app.js
+import fetch from '/utils/http'
+const $api = require('/config/api.js').$api
 
 App({
   onLaunch: function() {
     let _self = this
+    wx.login({
+      success(res) {
+        if (res.code) {
+          // 发起网络请求
+          fetch({
+            url: $api.user.getCode.url + '?code=' + res.code,
+            method: $api.user.getCode.method
+          }).then((res) => {
+            if (res.code === 200) {
+              _self.globalData.UserInfo = res.data
+            }
+          })
+        } else {
+          console.log('登录失败！' + res.errMsg)
+        }
+      }
+    })
+    wx.getSetting({
+      success: res => {
+        if (res.authSetting['scope.userInfo']) {
+          // 已经授权，可以直接调用 getUserInfo 获取头像昵称，不会弹框
+          wx.getUserInfo({
+            success: res => {
+              // 可以将 res 发送给后台解码出 unionId
+              this.globalData.UserInfo = res.userInfo
+
+              // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
+              // 所以此处加入 callback 以防止这种情况
+              if (this.userInfoReadyCallback) {
+                this.userInfoReadyCallback(res)
+              }
+            }
+          })
+        }
+      }
+    })
     wx.getSystemInfo({
       success(res) {
         if (res.model.indexOf('iPhone') !== -1 && res.system.indexOf('iOS') !== -1 && res.screenHeight >= 812) { // iphoneX及以上机型适配

config/api.js

@@ -10,6 +10,14 @@ const $api = {
       methods: 'GET',
       url: `${BaseAPIURl}/wx/info/:appid`
     },
+    getCode: {
+      methods: 'GET',
+      url: `${BaseAPIURl}/wx/getOpenid`
+    },
+    update: {
+      methods: 'PUT',
+      url: `${BaseAPIURl}/wx/user`
+    }
   },
   banner: {
     list: {
@@ -23,19 +31,26 @@ const $api = {
       url: `${BaseAPIURl}/wx/building/list`
     },
   },
-  dynamic: {
-    list: {
+  dynamic: { // 项目
+    list: { // 项目列表
       methods: 'GET',
       url: `${BaseAPIURl}/wx/buildingDynamiceList`
     },
-    detail: {
+    detail: { // 项目详情
       methods: 'GET',
       url: `${BaseAPIURl}/wx/buildingDynamiceInfo/:id`
     }
   },
   activity: {
-    
-  }
+    list: { // 活动列表
+      methods: 'GET',
+      url: `${BaseAPIURl}/wx/activity`
+    },
+    detail: { // 活动详情
+      methods: 'GET',
+      url: `${BaseAPIURl}/wx/activity/:id`
+    }
+  },
 }
 
 module.exports = {

config/code.js

@@ -4,10 +4,7 @@
  *  user 用户未登录
  */
 module.exports.apiCode = {
-  common: {
-    successCode: 200,
-    errorCode: 400
-  },
+  success: 200,
   user: {
     notLogin: 401,
   }

pages/ActivityDetail/index.js

@@ -1,15 +1,31 @@
 //index.js
 //获取应用实例
+import fetch from '../../utils/http'
+
 const app = getApp()
+const $api = require('../../config/api.js').$api
 
 Page({
-  onShow() {
-    wx.setNavigationBarTitle({
-      title: '活动详情'
+  onShow() {},
+  onLoad(e) {
+    this.setData({
+      Id: e.id,
+      Type: e.type - 0
     })
+    if (e.type - 0 === 1) {
+      wx.setNavigationBarTitle({
+        title: '项目详情'
+      })
+    } else {
+      wx.setNavigationBarTitle({
+        title: '活动详情'
+      })
+    }
   },
   data: {
     UserInfo: app.globalData.UserInfo,
+    Id: null,
+    Type: null,
     ShowPopup: false,
     FormData: {
       Name: '',
@@ -21,47 +37,54 @@ Page({
       Title: '示例标题',
       Publisher: '示例发布人',
       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: []
-        }]
+      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']
       }, {
-        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: []
-        }]
+        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: []
       }]
+    }]
+  },
+  onReady() {
+    if (this.data.Type === 1) {
+      this.GetProjectDetail()
+    } else {
+      this.GetActivityDetail()
     }
   },
   AddComment() { // 添加评论
     wx.navigateTo({
-      url: '/pages/ActivityDetail/comment?id='
+      url: '/pages/ActivityDetail/comment?id=' + this.data.Id
     })
   },
   ShowSignUpPopup() { // 打开报名弹窗
@@ -94,5 +117,40 @@ Page({
       })
 
     }
+  },
+  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,
+            Publisher: '江北公司',
+            CreateDate: res.data.activityDate,
+            Content: res.data.context
+          }
+        })
+      }
+    })
+  },
+  GetProjectDetail() { // 获取项目详情
+    fetch({
+      url: $api.dynamic.detail.url.replace(':id', this.data.Id),
+      method: $api.dynamic.detail.method
+    }).then((res) => {
+      if (res.code === 200) {
+        this.setData({
+          ActivityDetail: {
+            Title: res.data.title,
+            Publisher: '发布人',
+            CreateDate: res.data.createDate,
+            Content: res.data.url
+          }
+        })
+      }
+    })
   }
 })

pages/ActivityDetail/index.wxml

@@ -1,7 +1,8 @@
 <!--index.wxml-->
 <view class="container">
   <view class="container" style="z-index: 1;">
-    <view class="MainPage">
+    <web-view wx:if="{{Type === 1}}" src="{{ActivityDetail.Content}}"></web-view>
+    <view class="MainPage" wx:if="{{Type === 2}}">
 
       <!-- 文章主体 -->
       <view class="article">
@@ -25,7 +26,7 @@
 
         <!-- 评论列表 -->
         <view class="list">
-          <view class="flex-h" wx:for="{{ActivityDetail.CommentList}}" wx:for-item="item" wx:for-index="idx" wx:key="key">
+          <view class="flex-h" wx:for="{{CommentList}}" wx:for-item="item" wx:for-index="idx" wx:key="key">
 
             <!-- 头像 -->
             <view class="userIcon">
@@ -89,7 +90,7 @@
 
     </view>
   </view>
-  <view class="SignUp">
+  <view class="SignUp" hidden="{{Type !== 2}}">
     <view>
       <text bindtap="ShowSignUpPopup">我要报名</text>
     </view>

pages/UserCenter/UserInfo/index.js

@@ -18,6 +18,8 @@ create(store, {
       this.setData({
         loadding: true
       })
+
+
     }
   },
   FormInput(e) { // 表单输入数据绑定

pages/components/Concessions/index.js

@@ -1,6 +1,8 @@
 //index.js
+import fetch from '../../../utils/http'
 //获取应用实例
 const app = getApp()
+const $api = require('../../../config/api.js').$api
 
 Component({
   behaviors: [],
@@ -15,87 +17,80 @@ Component({
       id: ''
     }],
     NavActiveIndex: 0,
-    ListA: [{
-      Title: '示例数据A',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据A',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据A',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据A',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据A',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据A',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }],
-    ListB: [{
-      Title: '示例数据B',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据B',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据B',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据B',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据B',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据B',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }]
+    ListA: [],
+    ListB: [],
+    PostDataA: {
+      PageNum: 1,
+      PageSize: 15
+    },
+    PostDataB: {
+      PageNum: 1,
+      PageSize: 15
+    }
   },
   lifetimes: {},
-  ready: function() {},
+  ready: function() {
+    this.GetProjectList()
+    this.GetActivityList()
+  },
   pageLifetimes: {
     show: function() {},
   },
   methods: {
+    GetActivityList() { // 获取活动列表
+      fetch({
+        url: $api.activity.list.url + '?pageNum=' + this.data.PostDataB.PageNum + '&pageSize=' + this.data.PostDataB.PageSize,
+        method: $api.activity.list.method
+      }).then((res) => {
+        if (res.code === 200) {
+          let arr = res.data.records || []
+          let pArr = this.data.ListB
+          arr.map((item) => {
+            pArr.push({
+              Title: item.title,
+              CreateDate: item.activityDate,
+              Org: item.buildingName,
+              Img: item.imgUrl,
+              Id: item.activityId
+            })
+          })
+          this.setData({
+            ListB: pArr,
+            PostDataB: {
+              PageNum: res.data.total === this.data.ListB.length ? this.data.PostDataB.PageNum : this.data.PostDataB.PageNum + 1,
+              PageSize: this.data.PostDataB.PageSize
+            }
+          })
+        }
+      })
+    },
+    GetProjectList() { // 获取项目动态列表
+      fetch({
+        url: $api.dynamic.list.url + '?pageNum=' + this.data.PostDataA.PageNum + '&pageSize=' + this.data.PostDataA.PageSize,
+        method: $api.dynamic.list.method
+      }).then((res) => {
+        if (res.code === 200) {
+          let arr = res.data.records || []
+          let pArr = this.data.ListA
+          arr.map((item) => {
+            pArr.push({
+              Title: item.title,
+              CreateDate: item.createDate,
+              Org: item.buildingName,
+              Img: item.imgUrl,
+              Id: item.dynamicId
+            })
+          })
+          this.setData({
+            ListA: pArr,
+            PostDataA: {
+              PageNum: res.data.total === this.data.ListA.length ? this.data.PostDataA.PageNum : this.data.PostDataA.PageNum + 1,
+              PageSize: this.data.PostDataA.PageSize
+            }
+          })
+        }
+      })
+    },
     CutNav(e) { // 切换nav
       if (e.target.dataset.index !== undefined) {
         this.setData({
@@ -103,8 +98,11 @@ Component({
         })
       }
     },
-    ItemClick() {
-      console.log(111)
+    ItemTap(e) {
+      // console.log(e.target.dataset)
+      wx.navigateTo({
+        url: '/pages/ActivityDetail/index?type=' + e.target.dataset.type + '&id=' + e.target.dataset.id
+      })
     }
   }
 })

pages/components/Concessions/index.wxml

@@ -7,10 +7,10 @@
   </view>
   <view class="content">
     <view hidden="{{NavActiveIndex !== 0}}">
-      <ConcessionsListItem wx:for="{{ListA}}" wx:for-item="item" wx:for-index="index" wx:key="key" Params="{{item}}" />
+      <ConcessionsListItem wx:for="{{ListA}}" wx:for-item="item" wx:for-index="index" wx:key="key" Params="{{item}}" data-id="{{item.Id}}" data-type="1" bindtap="ItemTap" />
     </view>
     <view hidden="{{NavActiveIndex !== 1}}">
-      <ConcessionsListItem wx:for="{{ListB}}" wx:for-item="item" wx:for-index="index" wx:key="key" Params="{{item}}" />
+      <ConcessionsListItem wx:for="{{ListB}}" wx:for-item="item" wx:for-index="index" wx:key="key" Params="{{item}}" data-id="{{item.Id}}" data-type="2" bindtap="ItemTap" />
     </view>
   </view>
 </view>

pages/components/ConcessionsListItem/index.js

@@ -14,9 +14,9 @@ Component({
   },
   methods: {
     TapItem() {
-      wx.navigateTo({
-        url: '/pages/ActivityDetail/index'
-      })
+      // wx.navigateTo({
+      //   url: '/pages/ActivityDetail/index'
+      // })
     }
   }
 })

pages/components/Estate/index.js

@@ -1,7 +1,9 @@
 //index.js
+import fetch from '../../../utils/http'
+
 //获取应用实例
 const app = getApp()
-const HttpSever = require('../../../utils/http.js').HttpSever;
+
 const $api = require('../../../config/api.js').$api;
 
 Component({
@@ -78,7 +80,7 @@ Component({
         type: 'wgs84',
         success(res) {
           console.log(res)
-          HttpSever.Ajax({
+          fetch({
             url: $api.building.list.url,
             method: $api.building.list.method,
           }).then((data) => {

utils/http.js

@@ -1,39 +1,23 @@
 const apiCode = require('../config/code.js').apiCode;
-const $api = require('../config/api.js').$api;
-const $HttpSever = function () { }
 
-$HttpSever.prototype = {
-  /**
-   *  通用请求方法
-   * 
-   * @param {any} [config={}] 
-   * @returns 
-   */
-  Ajax(config = {}) {
-    return new Promise((resolve, reject) => {
-      wx.request({
-        url: config.url,
-        method: config.method,
-        data: {
-          ...config.data
-        },
-        header: {
-          'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8'
-        },
-        success(res) {
-          if (res.statusCode && res.statusCode === apiCode.common.successCode) {
-            resolve(res.data)
-          } else {
-            resolve(res.data.message + "失败")
-          }
-        },
-        error(msg) {
-          reject(msg)
+export default (config = {}) => {
+  return new Promise((resolve, reject) => {
+    wx.request({
+      url: config.url,
+      method: config.method,
+      data: {
+        ...config.data
+      },
+      success(res) {
+        if (res.statusCode && res.statusCode === apiCode.success) {
+          resolve(res.data)
+        } else {
+          resolve(res.data.message + "失败")
         }
-      })
+      },
+      error(msg) {
+        reject(msg)
+      }
     })
-  },
+  })
 }
-module.exports = {
-  HttpSever: new $HttpSever()
-}