1111

src/cn/compass/entity/FamilyEventDat.inc

@@ -20,6 +20,9 @@ class FamilyEventDat extends CompassDynamicData
 	var $content;
 	var $delete_flg;
 	
+	var $school_title;
+	var $class_title;
+	
 	/**
 	 * 构造实现。family_event_dat创建实例。
 	 * 

src/cn/compass/entity/SocialEventDat.inc

@@ -20,6 +20,9 @@ class SocialEventDat extends CompassDynamicData
 	var $content;
 	var $delete_flg;
 	
+	var $school_title;
+	var $class_title;
+	
 	/**
 	 * 构造实现。social_event_dat创建实例。
 	 * 

src/user/if/ajax_get_family_event_list.php

@@ -37,10 +37,22 @@ $userMst = $userList[0];
 
 //亲子活动列表
 //todo 以后从家园数据库中查询
+$familyEventList = array();
 $param = array();
 $param['delete_flg'] = false;
-$familyEventList = FamilyEventDat::getList($param,'id','desc', $offset, $rowCount);
+$tmpList = FamilyEventDat::getList($param,'id','desc', $offset, $rowCount);
 $familyEventCount = FamilyEventDat::getListCount($param);
+$pageCount = ceil($familyEventCount/$rowCount);
+
+//数据加工
+if(!empty($tmpList)) {
+	foreach($tmpList as $tmp) {
+		$tmp->school_title = "#家园平台学校名#";
+		$tmp->class_title = "#家园平台班级名#";
+		$tmp->publish_time = substr($tmp->publish_time,0,10);
+		$familyEventList[]= $tmp;
+	}
+}
 
 
 //组装返回数据

src/user/if/ajax_get_social_event_list.php

@@ -35,15 +35,26 @@ $offset = $page * $rowCount;
 
 $userMst = $userList[0];
 
-//社会实践
+//社会实践[todo 以后从别的平台调取数据]
+$socialEventEventList = array();
 $param = array();
 $param['delete_flg'] = false;
-$socialEventEventList = SocialEventDat::getList($param,'id','desc', $offset, $rowCount);
+$tmpList = SocialEventDat::getList($param,'id','desc', $offset, $rowCount);
 $socialEventEvenCount = SocialEventDat::getListCount($param);
+$pageCount = ceil($socialEventEvenCount/$rowCount);
 
+//数据加工
+if(!empty($tmpList)) {
+	foreach($tmpList as $tmp) {
+		$tmp->school_title = "#家校平台学校名#";
+		$tmp->class_title = "#家校平台班级名#";
+		$tmp->publish_time = substr($tmp->publish_time,0,10);
+		$socialEventEventList[]= $tmp;
+	}
+}
 
 //组装返回数据
-$result["rowCount"] = $rowCount;
+$result["pageCount"] = $rowCount;
 $result["page"] = $page;
 $result["socialEventEvenCount"] = $socialEventEvenCount;
 $result["socialEventEventList"] = $socialEventEventList;

src/user/if/ajax_get_volunteer_event_detail.php

@@ -105,6 +105,17 @@ if(!empty($tmpMemberList2)) {
 	}
 }
 
+//数据加工
+$status_title = "征集中";
+if($volunteerDat->status == "FINISH") {
+	$status_title = "活动结束";
+}
+$volunteerDat->status_title = $status_title;
+$volunteerDat->scope = "校内";
+if($volunteerDat->include_social_user) {
+	$volunteerDat->scope = "校内.社会人士";
+}
+
 
 //组装返回数据
 $result["isEnrollFinish"] = $isEnrollFinish;

src/user/if/test.php

@@ -42,7 +42,7 @@ foreach($tmpList as $tmp) {
 }
 print_r($tmpList);
 
-*/
+
 
 
 $param = array();
@@ -56,6 +56,20 @@ foreach($tmpList as $tmp) {
 }
 print_r($tmpList);
 
+*/
+
+$param = array();
+$param['delete_flg'] = false;
+$tmpList = SocialEventDat::getList($param, 'id', 'asc');
+$index = 0;
+foreach($tmpList as $tmp) {
+	$index++;
+	$tmp->title = "社会实践活动" . $index;
+	$tmp->author = "老师" . $index;
+	$tmp->save();
+}
+print_r($tmpList);
+
 
 ErrorLogger::doOutput("Compass...test.php....End.", 0);
 

src/wx/app.json

@@ -23,7 +23,6 @@
     "pages/uploadDocuments/uploadDocuments",
     "pages/leaderRegister/leaderRegister",
     "pages/register/register",
-    "pages/registered/registered",
     "pages/courseIndex/courseIndex",
     "pages/circleMembers/circleMembers",
     "pages/newCircle1/newCircle1",

src/wx/app.wxss

@@ -45,7 +45,7 @@ video, live-player, live-pusher, open-data, web-view {
   align-items: center;
 }
 .activelist{
-  width: 90%;
+  width: 92%;
   height: 110px;
   margin: 0 auto;
   display: flex;
@@ -254,7 +254,7 @@ video, live-player, live-pusher, open-data, web-view {
   color: #666;
 }
 .conSwiper{
-  width: 90%;
+  width: 92%;
   height: 40px;
   margin: 20px auto;
   display: flex;
@@ -262,14 +262,14 @@ video, live-player, live-pusher, open-data, web-view {
   align-items: center;
   font-size: 12px;
   background: #f6f6f6;
-  border-radius: 15px;
+  border-radius: 10px;
   box-sizing: border-box;
   padding: 0 10px;
 }
 .conSwiper>view{
   width: 60px;
   height: 25px;
-  background: #698FBB;
+  background: #0D76ED;
   color: #fff;
   font-size: 12px;
   line-height: 25px;

src/wx/pages/familyEvent/familyEvent.js

@@ -102,7 +102,7 @@ Page({
     })
   },
   loadMore() {
-    if (this.data.page < this.data.pageCount) {
+    if ((this.data.page + 1) < this.data.pageCount) {
       var pageIndex = this.data.page + 1
       this.setData({
         page: pageIndex

src/wx/pages/index/index.js

@@ -166,54 +166,26 @@ Page({
 
   //志愿者活动详情
   volunteersEventDetail(e){
-    let volunteersEventId = e.currentTarget.dataset['index']
+    let eventId = e.currentTarget.dataset['index']
     wx.navigateTo({
-      url: '../volunteersEventDetail/volunteersEventDetail?volunteersEventId' + volunteersEventId,
+      url: '../volunteersEventDetail/volunteersEventDetail?eventId=' + eventId,
     });
-    wx.setNavigationBarTitle({
-      title: '活动详情'
-    })
   },
 
   //亲子活动详情
   familyEventDetail(e) {
     let eventId = e.currentTarget.dataset['index']
     wx.navigateTo({
-      url: '../familyEventDetail/familyEventDetail?eventId' + eventId,
+      url: '../familyEventDetail/familyEventDetail?eventId=' + eventId,
     });
-    wx.setNavigationBarTitle({
-      title: '活动详情'
-    })
   },
 
   //社会实践详情
   socialEventDetail(e) {
     let eventId = e.currentTarget.dataset['index']
     wx.navigateTo({
-      url: '../socialEventDetail/socialEventDetail?eventId' + eventId,
+      url: '../socialEventDetail/socialEventDetail?eventId=' + eventId,
     });
-    wx.setNavigationBarTitle({
-      title: '活动详情'
-    })
-  },
-
-  checksession(){
-    if(!this.data.isLogin){
-      Dialog.confirm({
-        title: '标题',
-        message: '请先登录！'
-      }).then(() => {
-        this.setData({
-          isLogin: true
-        })
-        wx.redirectTo({
-          url: '../registered/registered',
-        })
-      }).catch(() => {
-        // on cancel
-      });
-      
-    }
   },
 
   //查看更多志愿者活动

src/wx/pages/registered/registered.js

-// pages/registered/registered.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
-  stuRegistered(){
-    wx.navigateTo({
-      url: '../stuRegistered/stuRegistered',
-    });
-    wx.setNavigationBarTitle({
-      title: '区域管理'
-    })
-  },
-  jigouRegistered(){
-    wx.navigateTo({
-      url: '../jigouRegistered/jigouRegistered',
-    });
-    wx.setNavigationBarTitle({
-      title: '区域管理'
-    })
-  }
-})
\ No newline at end of file

src/wx/pages/registered/registered.json

-{
-  "usingComponents": {}
-}
\ No newline at end of file

src/wx/pages/registered/registered.wxml

-<!--pages/registered/registered.wxml-->
-<view class='registeredBox'>
-  <text class='registeredTitle'>HI，欢迎加入志愿者</text>
-  <image class='img'></image>
-  <text class='changeRole'>选择您的角色吧</text>
-  <view class='buttonChange'>
-    <van-button type="default" size="large" bind:click="stuRegistered">学生</van-button>
-    <van-button type="default" size="large" style='display:block;margin-top:20px' bind:click="stuRegistered">家长</van-button>
-    <van-button type="default" size="large" style='display:block;margin-top:20px' bind:click="stuRegistered">教师</van-button>
-    <van-button type="default" size="large" style='display:block;margin-top:20px' bind:click="jigouRegistered">社会</van-button>
-  </view>
-</view>

src/wx/pages/registered/registered.wxss

-/* pages/registered/registered.wxss */
-.registeredBox{
-  color: #000;
-}
-.registeredTitle{
-  display: block;
-  width: 100%;
-  text-align: center;
-  font-size: 18px;
-  margin-top: 30px
-}
-.img{
-  display: block;
-  width: 100px;
-  height: 100px;
-  border-radius: 50%;
-  background: #666;
-  margin: 50px auto 20px;
-}
-.changeRole{
-  display: block;
-  width: 100%;
-  text-align: center;
-  font-size: 14px;
-}
-.buttonChange{
-  width: 60%;
-  margin: 20px auto 0;
-}
-.buttonChange .van-button{
-  height: 30px;
-  line-height: 30px;
-}
\ No newline at end of file

src/wx/pages/schoolDetails/schoolDetails.js

@@ -82,12 +82,9 @@ Page({
 
   //志愿者活动详情
   volunteersEventDetail(e) {
-    let volunteersEventId = e.currentTarget.dataset['index']
+    let eventId = e.currentTarget.dataset['index']
     wx.navigateTo({
-      url: '../volunteersEventDetail/volunteersEventDetail?volunteersEventId' + volunteersEventId,
+      url: '../volunteersEventDetail/volunteersEventDetail?eventId=' + eventId,
     });
-    wx.setNavigationBarTitle({
-      title: '活动详情'
-    })
   },
 })
\ No newline at end of file

src/wx/pages/searchCircle/searchCircle.json

 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "圈子检索"
 }
\ No newline at end of file

src/wx/pages/socialEvent/socialEvent.js

@@ -35,13 +35,6 @@ Page({
   },
 
   /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
    * 生命周期函数--监听页面卸载
    */
   onUnload: function () {
@@ -49,38 +42,24 @@ Page({
   },
 
   /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
    * 用户点击右上角分享
    */
   onShareAppMessage: function () {
 
   },
+
+  //跳转到社会实践详情页面
   socialEventDetail(e){
     var eventId = e.currentTarget.dataset['eventid']
     wx.navigateTo({
       url: '../socialEventDetail/socialEventDetail?eventid='+eventId,
     })
-    wx.setNavigationBarTitle({
-      title: '社会实践详情'
-    })
     wx.setNavigationBarColor({
       frontColor: '#ffffff',
       backgroundColor: '#00C56B'
     })
   },
+
   // 社会实践列表
   socialList(){
     var that = this;
@@ -88,12 +67,11 @@ Page({
       showLoading: true,
     });
     var config = wx.getStorageSync('config');
-    var jingweidu = wx.getStorageSync('jingweidu');
-    wx: wx.request({
+    wx.request({
       url: app.url + 'ajax_get_social_event_list.php',
       data: {
         unionId: config.unionId,
-        page:0
+        page: that.data.page
       },
       header: { 'content-type': 'application/json' },
       method: 'GET',
@@ -110,8 +88,10 @@ Page({
       complete: function (res) { },
     })
   },
+
+  //下拉加载更多
   loadMore() {
-    if (this.data.page < this.data.pageCount) {
+    if ((this.data.page+1) < this.data.pageCount) {
       var pageIndex = this.data.page + 1
       this.setData({
         page: pageIndex

src/wx/pages/socialEvent/socialEvent.json

 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "社会实践"
 }
\ No newline at end of file

src/wx/pages/socialEvent/socialEvent.wxml

@@ -2,19 +2,15 @@
 <view class='socialEvent'>
   <view class='listVolunteers'>
     <scroll-view  scroll-y="true" style='height:1100rpx;bottom:10rpx;' class="listPublicWelfare" bindscrolltolower='loadMore'>
-      <view class='activelist' bindtap='socialEventDetail' wx:for="{{socialEventEventList}}" wx:key="{{socialEventEventList[index].id}}" data-eventid='{{item.event_id}}'>
+      <view class='activelist' bindtap='socialEventDetail' wx:for="{{socialEventEventList}}"  data-index='{{item.id}}'>
         <view class='left_listVolunteers'>
-          <image src='../../img/3.jpg'></image>
-          <text>征集中</text>
-          <view>(市)</view>
+          <image src='{{item.front_image}}'></image>
         </view>
         <view class='right_listVolunteers'>
-          <text>{{item.title}}</text>
+          <text>{{item.class_title}}{{item.title}}</text>
           <view>
-            <text>征集范围：校内\n</text>
-            <text>征集人数：10人\n</text>
-            <text>发布单位：南京市教育局\n</text>
-            <text>报名截止：{{item.registration_date}}</text>
+            <text>发布人：{{item.author}}\n</text>
+            <text>发布时间：{{item.publish_time}}\n</text>
           </view>
         </view>
       </view>

src/wx/pages/socialEventDetail/socialEventDetail.json

 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "社会实践详情"
 }
\ No newline at end of file

src/wx/pages/volunteers/volunteers.js

@@ -95,11 +95,13 @@ Page({
 
   //志愿者活动详情页面
   volunteersEventDetail(e){
-    let id = e.currentTarget.dataset['id'];
+    let eventId = e.currentTarget.dataset['id'];
     wx.navigateTo({
-      url: '../volunteersEventDetail/volunteersEventDetail?id='+id,
+      url: '../volunteersEventDetail/volunteersEventDetail?eventId=' + eventId,
     })
   },
+
+  //加载更多
   loadMore() {
     if (this.data.page < this.data.pageCount) {
       var pageIndex = this.data.page + 1

src/wx/pages/volunteersEventDetail/volunteersEventDetail.js

@@ -8,11 +8,18 @@ Page({
    * 页面的初始数据
    */
   data: {
+    eventId:0,
     active: 0,
-    isMember:'',
+   
     volunteerEventDat:[],
-    zhuangtai:'',
-    quanzhu:true
+    isEnrollFinish:false,
+    isComplete: false,
+    isCircleOwner: false,
+    isMember: false,
+    isCircleOwner: false,
+    personalMemberList:[],
+    circleMemberList:[],
+    menuText:''
   },
 
   /**
@@ -20,14 +27,15 @@ Page({
    */
   onLoad: function (options) {
     var that=this;
+    that.setData({
+      eventId: options.eventId
+    })
     var config = wx.getStorageSync('config');
-    var location = wx.getStorageSync('location');
-    wx: wx.request({
+    wx.request({
       url: app.url + 'ajax_get_volunteer_event_detail.php',
       data: {
         unionId: config.unionId,
-        eventId: options.id,
-        circleId:1
+        eventId: that.data.eventId
       },
       header: { 'content-type': 'application/json' },
       method: 'GET',
@@ -36,21 +44,27 @@ Page({
         console.log(res)
         if(res.statusCode==200){
           that.setData({
-            volunteerEventDat:res.data.result.volunteerEventDat,
-            isMember: res.data.result.isMember
+            volunteerEventDat: res.data.result.volunteerEventDat,
+            isEnrollFinish: res.data.result.isEnrollFinish,
+            isComplete: res.data.result.isComplete,
+            isCircleOwner: res.data.result.isCircleOwner,
+            isMember: res.data.result.isMember,
+            personalMemberList: res.data.result.personalMemberList,
+            circleMemberList: res.data.result.circleMemberList
           })
+          //按钮文字控制
           if(res.data.result.isMember==false){
             that.setData({
-              zhuangtai:'报名参加'
+              menuText:'报名参加'
             })
           }else{
             if(res.data.result.isEnrollFinish==false){
               that.setData({
-                zhuangtai: '上传凭证'
+                menuText: '上传凭证'
               })
             }else{
               that.setData({
-                zhuangtai: '取消报名'
+                menuText: '取消报名'
               })
             }
           }
@@ -65,57 +79,30 @@ Page({
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {
-
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
   },
 
   /**
    * 用户点击右上角分享
    */
   onShareAppMessage: function () {
-
   },
+
+  
   onChange(event) {
     
   },
+
+  //报名参加
   btnBaoming(){
     var config = wx.getStorageSync('config');
     // if(this.data.zhuangtai=='报名参加'){
-    //   if(this.data.quanzhu==true){
+    //   if(this.data.isOwner==true){
     //     Dialog.confirm({
     //       title: '',
     //       message: '检测到您为圈主,是否团队报名?',

src/wx/pages/volunteersEventDetail/volunteersEventDetail.json

 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "志愿者活动详情"
 }
\ No newline at end of file

src/wx/pages/volunteersEventDetail/volunteersEventDetail.wxml

 <!--pages/activeDetails/activeDetails.wxml-->
 <view class='activeDetails'>
-  <image src='../../img/1.jpg'></image>
+  <image src='{{volunteerEventDat.front_image}}'></image>
   <view class='con_activeDetails'>
     <text>活动名称：{{volunteerEventDat.title}}</text>
-    <text>活动地点：马群区2号地铁站南出口处</text>
-    <text wx:if="{{volunteerEventDat.include_social_user=='true'}}">征集范围：不限\n</text>
-          <text wx:else>征集范围：校内\n</text>
-    <text>活动人数：{{volunteerEventDat7.max_member}}人</text>
-    <text>活动时长：2.5h</text>
-    <text>活动期限：2019.10.11-2019.10.30</text>
+    <text>活动地点：{{volunteerEventDat.position}}</text>
+    <text>征集范围：{{volunteerEventDat.scope}}\n</text>
+    <text>活动人数：{{volunteerEventDat.max_member}}人</text>
+    <text>活动时长：{{volunteerEventDat.time_length}}</text>
+    <text>活动期限：{{volunteerEventDat.start_time}}-{{volunteerEventDat.finish_time}}</text>
   </view>
   <view class='botCon_activeDetails'>
     <view>
-      <text>联系人：邵帅</text>
-      <text>联系方式：19308903183</text>
-      <text>集合地点：马群街道</text>
-      <text>集合时间：2019.11.10 12:00</text>
+      <text>联系人：{{volunteerEventDat.leader_name}}</text>
+      <text>联系方式：{{volunteerEventDat.leader_contact}}</text>
+      <text>集合地点：{{volunteerEventDat.venue}}</text>
+      <text>集合时间：{{volunteerEventDat.venue_time}}</text>
     </view>
   </view>
   <view class='activejieshao'>
-    活动介绍：*************
+    活动介绍：{{volunteerEventDat.comment}}
   </view>
   <view class='avtiveTab'>
-    <van-tabs active="{{ active }}" bind:change="onChange" tab-active-class="activebeijing">
+    <van-tabs active="{{ active }}" border="{{false}}" bind:change="onChange" tab-active-class="activebeijing">
       <van-tab title="圈子报名">
         <view class='quanzi'>
           <view>
@@ -56,7 +55,7 @@
         </view>
       </van-tab>
     </van-tabs>
-    <view class='btnBaoming' bindtap='btnBaoming'>{{zhuangtai}}</view>
+    <view class='btnBaoming' bindtap='btnBaoming'>{{menuText}}</view>
   </view>
 </view>
 <van-dialog id="van-dialog" />

src/wx/pages/volunteersEventDetail/volunteersEventDetail.wxss

@@ -34,10 +34,13 @@
   box-sizing: border-box;
   padding: 10px;
   font-size: 12px;
-  border-bottom: 1px solid #ccc;
 }
 .activebeijing{
-  background: #666;
+  background: #0D76ED;
+  color: #fff!important;
+}
+.avtiveTab .van-tabs__wrap{
+  border-bottom: 1px solid #0D76ED;
 }
 .avtiveTab .van-tabs__line{
   display: none;
@@ -75,12 +78,14 @@
   align-items: center;
 }
 .btnBaoming{
-  width: 100%;
-  height: 30px;
-  line-height: 30px;
+  width: 75%;
+  height: 40px;
+  line-height: 40px;
   text-align: center;
-  font-size: 13px;
-  border-top: 1px solid #ccc;
-  border-bottom: 1px solid #ccc;
-  margin-bottom: 3px;
+  font-size: 14px;
+  margin: 10px auto;
+  background: #0D76ED;
+  margin-bottom: 10px;
+  color: #fff;
+  border-radius: 15px;
 }
\ No newline at end of file

src/wx/pages/volunteersRank1/volunteersRank1.json

 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "志愿者排名"
 }
\ No newline at end of file

src/wx/pages/volunteersRank2/volunteersRank2.json

 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "志愿者排名"
 }
\ No newline at end of file

src/wx/pages/volunteersRank3/volunteersRank3.json

 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "志愿者排名"
 }
\ No newline at end of file

src/wx/pages/volunteersRank4/volunteersRank4.json

 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "志愿者排名"
 }
\ No newline at end of file