Skip to content

C
Compass
Commit 6761e7c2 by biao
Options

1111111

parent 4dc0d064
Showing with 294 additions and 126 deletions
doc/指南针测试.docx
No preview for this file type
src/cn/compass/entity/DonationsEventDat.inc
......@@ -21,6 +21,8 @@ class DonationsEventDat extends CompassDynamicData
var $money;
var $status;
var $delete_flg;
var $status_title;
/**
* 构造实现。donations_event_dat创建实例。
......
src/cn/compass/entity/definition/AcountModule.inc
......@@ -3,7 +3,7 @@
* 管理员权限分配用静态类
* $Id$
* @author zongbiao
* @package jp.fishow.entity.definition
* @package cn.compass.entity.definition
*/
class AcountModule
{
......
src/cn/compass/entity/definition/AuthorityLevel.inc
......@@ -3,7 +3,7 @@
* 管理员权限分配用静态类
* $Id$
* @author zongbiao
* @package jp.fishow.entity.definition
* @package cn.compass.entity.definition
*/
class AuthorityLevel
{
......
src/cn/compass/entity/definition/DonationEventStatus.inc 0 → 100644
<?php
/**
* 募捐活动状态
* $Id$
* @author zongbiao
* @package cn.compass.entity.definition
*/
class DonationEventStatus
{
public $id;
public $name;
public $title;
function __construct($record) {
$this->id = $record["id"];
$this->name = $record["name"];
$this->title = $record["title"];
}
/**
* 返回示例的列表
* @return array ImageType一覧
*/
public static function getList() {
static $result;
if ((!is_array($result)) || (count($result) < 1)) {
$data = array();
$tmp = array("id"=>1, "name"=>"NEW", "title"=>"审核中");
array_push($data, $tmp);
$tmp = array("id"=>2, "name"=>"NG", "title"=>"审核不通过");
array_push($data, $tmp);
$tmp = array("id"=>3, "name"=>"OK", "title"=>"募捐中");
array_push($data, $tmp);
$tmp = array("id"=>4, "name"=>"FINISH", "title"=>"已结束");
array_push($data, $tmp);
$result = array();
foreach ($data as $row) {
$tmp2 = new DonationEventStatus($row);
array_push($result, $tmp2);
}
}
return $result;
}
/**
* 通过定义名称获取object
* @return DonationEventStatus 对应实例。没有的时候返回null。
*/
public static function getByName($name) {
$list = DonationEventStatus::getList();
foreach ($list as $tmp) {
if ($tmp->name == $name) {
return $tmp;
}
}
return null;
}
/**
* 通过定义名称获取title
*/
public static function getTitleByName($name) {
$list = DonationEventStatus::getList();
foreach ($list as $tmp) {
if ($tmp->name == $name) {
return $tmp->title;
}
}
return null;
}
}
\ No newline at end of file
src/cn/compass/entity/definition/ImageType.inc
<?php
/**
* ImageType
* イメージ画像のタイプ定義
* mobieのmedia_type_defとcontent-typeの一部をstaticに定義したもの。
* 图片类型
* $Id: ImageType.inc 90242 2015-09-29 11:27:35Z wulk $
* @author iimuro
* @access public
* @package jp.aimsweb.entity.definition
* @package cn.compass.entity.definition
*/
class ImageType{
......
src/cn/compass/entity/definition/OrderStatus.inc
......@@ -3,7 +3,7 @@
* 用户订单状态表
* $Id$
* @author zongbiao
* @package jp.fishow.entity.definition
* @package cn.compass.entity.definition
*/
class OrderStatus
{
......
src/cn/compass/entity/definition/OrganizationStatus.inc
......@@ -3,7 +3,7 @@
* 管理员权限分配用静态类
* $Id$
* @author zongbiao
* @package jp.fishow.entity.definition
* @package cn.compass.entity.definition
*/
class OrganizationStatus
{
......
src/cn/compass/entity/definition/PointActionType.inc
......@@ -4,7 +4,7 @@
* $Id: PointActionType.inc 81583 2015-04-02 08:59:46Z wanggb $
* @author wanggb
* @access public
* @package jp.fishow.entity.definition
* @package cn.compass.entity.definition
*/
......
src/cn/compass/entity/definition/SystemFunction.inc
......@@ -3,7 +3,7 @@
* 管理员权限分配用静态类
* $Id$
* @author zongbiao
* @package jp.fishow.entity.definition
* @package cn.compass.entity.definition
*/
class SystemFunction
{
......
src/manager/templates/donations_event_list.inc
......@@ -28,7 +28,7 @@
</tr>
<tr>
<td>
<span>活动时间: </span>{{tmp.start_time}} — {{tmp.finish_time}}
<span>募捐时间: </span>{{tmp.start_time}} — {{tmp.finish_time}}
<el-button type="primary"size="mini" @click="editChange(tmp)" style="margin-left: 50px;">修改</el-button>&nbsp;&nbsp;&nbsp;
<el-button type="primary"size="mini" @click="deleteRow(tmp)">删除</el-button>&nbsp;&nbsp;&nbsp;
<el-button type="primary"size="mini" @click="handleDetail(tmp)">查看数据</el-button>
......@@ -36,7 +36,7 @@
</tr>
<tr>
<td>
<span>最大募捐金额: </span>{{tmp.max_money}}元 <span>已募捐金额: </span>{{tmp.money}}元 <span>
<span>拟募捐金额: </span>{{tmp.max_money}}元 <span>已募捐金额: </span>{{tmp.money}}元 <span>
</td>
</tr>
</table>
......
src/settings/compass_include.inc
......@@ -66,6 +66,7 @@ require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/AcountModule.inc"
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/OrderStatus.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/CourseParentCategory.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/EventStatus.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/DonationEventStatus.inc");
// Action
require_once(COMPASS_LIB_ROOT . "/cn/compass/action/TemplateAction.inc");
......
src/user/if/ajax_get_donation_event_list.php
......@@ -33,15 +33,25 @@ $result = array();
$offset = $page * $rowCount;
//检索数据库
$donationEventlist = array();
$param = array();
$param['status_NOT'] = 'NEW';
$param['status_NOT'] = 'NG';
$param['status_NOT'] = array('NEW','NG');
$param['delete_flg'] = false;
$donationEventlist = DonationsEventDat::getList($param,'id','desc', $offset, $rowCount);
$tmpList = DonationsEventDat::getList($param,'id','desc', $offset, $rowCount);
$allCount = DonationsEventDat::getListCount($param);
$pageCount = ceil($allCount/$rowCount);
if(!empty($tmpList)) {
foreach($tmpList as $tmp) {
$tmp->start_time = substr($tmp->start_time, 0, 10);
$tmp->finish_time = substr($tmp->finish_time, 0, 10);
$tmp->status_title = DonationEventStatus::getTitleByName($tmp->status);
$donationEventlist[] = $tmp;
}
}
//接口返回数据
$result["allCount"] = $allCount;
$result["pageCount"] = $pageCount;
$result["page"] = $page;
$result["rowCount"] = $rowCount;
$result["list"] = $donationEventlist;
......
src/user/if/ajax_get_social_event_list.php
......@@ -54,7 +54,7 @@ if(!empty($tmpList)) {
}
//组装返回数据
$result["pageCount"] = $rowCount;
$result["pageCount"] = $pageCount;
$result["page"] = $page;
$result["socialEventEvenCount"] = $socialEventEvenCount;
$result["socialEventEventList"] = $socialEventEventList;
......
src/user/if/ajax_get_user_role.php
......@@ -32,6 +32,7 @@ $userMst = $userList[0];
//接口返回数据
$result["name"] = $userMst->name;
$result["headerImg"] = $userMst->header_img;
$result["role"] = $userMst->role;
$result["isMember"] = $userMst->is_member;
$result["childAge"] = $userMst->child_age;
......
src/wx/app.json
{
"pages": [
"pages/circle/circle",
"pages/index/index",
"pages/circle/circle",
"pages/my/my",
"pages/familyEvent/familyEvent",
"pages/socialEvent/socialEvent",
......
src/wx/app.wxss
......@@ -112,17 +112,20 @@ video, live-player, live-pusher, open-data, web-view {
font-size: 14px;
}
.right_listVolunteers{
width: 60%;
width: 62%;
font-size: 12px;
color: #666;
}
.right_listVolunteers>text{
color: #000;
color: #969696;
}
.right_listVolunteers>view{
margin-top: 5px
}
.right_listVolunteers .itemTitle{
color:#363636;
font-size: 15px;
}
.formtable>view{
display: flex;
align-items: center;
......@@ -287,7 +290,7 @@ video, live-player, live-pusher, open-data, web-view {
.right_listPublicWelfare .activeTitle{
font-size: 15px;
font-weight: bold;
color: #000;
color: #363636;
}
.right_listPublicWelfare>view{
height: 30px;
......
src/wx/pages/classDetails/classDetails.wxml
......@@ -11,7 +11,7 @@
</view>
</view>
<view class='kechengjianjie'>
<view style="color:#4F4F4F">课程简介</view>
<view style="color:#363636">课程简介</view>
<view style="color:#969696">{{courseComment}}</view>
</view>
<view class='classfenji'>
......
src/wx/pages/courseIndex/courseIndex.js
......@@ -49,7 +49,7 @@ Page({
subId: res.data.result[0].subCategorys[0].id
})
}
that.courselist()
that.getCourselist()
},
fail: function(res) {},
complete: function(res) {},
......@@ -102,7 +102,7 @@ Page({
parentId: this.data.parentCategorys[index].id
})
//检索课程数据
this.courselist()
this.getCourselist()
},
//切换二级分类
......@@ -121,7 +121,7 @@ Page({
}
//检索课程数据
this.courselist()
this.getCourselist()
},
......@@ -132,6 +132,7 @@ Page({
this.setData({
page: pageIndex
})
this.getCourselist();
} else {
wx.showToast({
title: '没有更多内容啦。',
......@@ -152,7 +153,7 @@ Page({
},
// 获取分类的对应的课程列表
courselist(){
getCourselist(){
var that=this;
that.setData({
showLoading: true,
......@@ -170,7 +171,7 @@ Page({
success: function (res) {
console.log(res)
that.setData({
list:res.data.result.list,
list: that.data.list.concat(res.data.result.list),
pageCount:res.data.result.pageCount
})
},
......
src/wx/pages/donationDetail/donationDetail.json
{
"usingComponents": {}
"usingComponents": {},
"navigationBarTitleText": "慈善募捐"
}
\ No newline at end of file
src/wx/pages/donationIndex/donationIndex.js
......@@ -6,35 +6,16 @@ Page({
* 页面的初始数据
*/
data: {
list:[]
page:0,
pageCount:0,
donationList:[]
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
var that = this;
var config = wx.getStorageSync('config');
wx: wx.request({
url: app.url + 'ajax_get_donation_event_list.php',
data: {
unionId: config.unionId,
page:0
},
header: { 'content-type': 'application/json' },
method: 'GET',
dataType: 'json',
success: function (res) {
console.log(res)
if (res.statusCode == 200) {
that.setData({
list:res.data.result.list
})
}
},
fail: function (res) { },
complete: function (res) { },
})
this.getDonationList();
},
/**
......@@ -52,20 +33,6 @@ Page({
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
......@@ -76,7 +43,19 @@ Page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
if (this.data.page < this.data.pageCount) {
var pageIndex = this.data.page + 1
this.setData({
page: pageIndex
})
this.getDonationList();
} else {
wx.showToast({
title: '没有更多内容啦。',
icon: 'success',
duration: 2000
});
}
},
/**
......@@ -85,9 +64,39 @@ Page({
onShareAppMessage: function () {
},
donationDetail(){
//获取募捐列表
getDonationList() {
var that = this;
var config = wx.getStorageSync('config');
wx: wx.request({
url: app.url + 'ajax_get_donation_event_list.php',
data: {
unionId: config.unionId,
page: that.data.page
},
header: { 'content-type': 'application/json' },
method: 'GET',
dataType: 'json',
success: function (res) {
console.log(res)
if (res.statusCode == 200) {
that.setData({
pageCount: res.data.result.pageCount,
donationList: res.data.result.list
})
}
},
fail: function (res) { },
complete: function (res) { },
})
},
//查看详情
donationDetail(e){
let donationId = e.currentTarget.dataset['index']
wx.navigateTo({
url: '../donationDetail/donationDetail',
url: '../donationDetail/donationDetail?donationId=' + donationId,
})
}
})
\ No newline at end of file
src/wx/pages/donationIndex/donationIndex.json
{
"usingComponents": {}
"usingComponents": {},
"navigationBarTitleText": "慈善募捐"
}
\ No newline at end of file
src/wx/pages/donationIndex/donationIndex.wxml
<!--pages/donationIndex/donationIndex.wxml-->
<view class='activeManagement'>
<!--pages/volunteers/volunteers.wxml-->
<view class='volunteers'>
<view class='volunteersActive'>
<view style='font-size:15px;padding-left:15px'>
<image src='../../img/sanjiao.png'></image>慈善募捐
</view>
</view>
<view class='listVolunteers'>
<view wx:for="{{list}}" wx:key="{{index}}" bindtap='donationDetail'>
<view class='activelist' bindtap='donationDetail' wx:for="{{donationList}}" data-index='{{item.id}}'>
<view class='left_listVolunteers'>
<image src='{{item.front_image}}'></image>
<text>征集中</text>
<view>(市)</view>
<text>{{item.status_title}}</text>
</view>
<view class='right_listVolunteers'>
<text>{{item.title}}</text>
<text class="itemTitle">{{item.title}}</text>
<view>
<text>征集范围：校内\n</text>
<text>征集人数：10人\n</text>
<text>发布单位：南京市教育局\n</text>
<text>报名截止：{{item.finish_time}}</text>
<text>募捐金额：{{item.money}}/{{item.max_money}}\n</text>
<text>发布单位：{{item.author}}\n</text>
<text>募捐时间：{{item.start_time}}-{{item.finish_time}}</text>
</view>
</view>
<text></text>
</view>
</view>
</view>
src/wx/pages/donationIndex/donationIndex.wxss
/* pages/donationIndex/donationIndex.wxss */
\ No newline at end of file
/* pages/donationIndex/donationIndex.wxss */
.volunteersActive{
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 20px;
margin-bottom: 10px;
}
.volunteersActive>view{
display: flex;
align-items: center;
}
.volunteersActive>view>image{
width: 10px;
height: 10px;
}
.left_listVolunteers{
margin-left: 10px;
}
\ No newline at end of file
src/wx/pages/familyEvent/familyEvent.wxml
......@@ -7,7 +7,7 @@
<image src='{{item.front_image}}'></image>
</view>
<view class='right_listPractice'>
<text>{{item.class_title}}{{item.title}}\n</text>
<text class="itemTitle">{{item.class_title}}{{item.title}}\n</text>
<view>
<text>发布人：{{item.author}}\n</text>
<text>发布时间：{{item.publish_time}}\n</text>
......
src/wx/pages/index/index.js
......@@ -11,6 +11,7 @@ Page({
isLogin:false,
role:0,
childAge:0,
headerImg: '../../img/touxiang.png',
roleTitle:'',
showFamily: false,
......@@ -101,6 +102,11 @@ Page({
role: res.data.result.role,
childAge: res.data.result.childAge
})
if (res.data.result.headerImg) {
that.setData({
headerImg: res.data.result.headerImg,
})
}
//菜单控制[亲子活动]
if (res.data.result.role == 1 || res.data.result.childAge == 1) {
that.setData({
......
src/wx/pages/index/index.wxml
......@@ -6,7 +6,7 @@
<image src='../../img/conHeader.png'></image>
</view>
</view>
<view class='title' bindtap='authorize'><image src='../../img/touxiang.png'></image>{{roleTitle}}欢迎回来</view>
<view class='title' bindtap='authorize'><image src='{{headerImg}}'></image>{{roleTitle}}欢迎回来</view>
</view>
<view class='girdList'>
<view bindtap="volunteers">
......@@ -53,7 +53,7 @@
<text>{{item.status_title}}</text>
</view>
<view class='right_listVolunteers'>
<text>{{item.title}}</text>
<text class="itemTitle" >{{item.title}}</text>
<view>
<text>征集范围：{{item.scope}}\n</text>
<text>征集人数：{{item.max_member}}人\n</text>
......@@ -82,7 +82,7 @@
</view>
<view class='right_listPractice'>
<view>
<text>{{item.title}}\n</text>
<text class="itemTitle">{{item.title}}\n</text>
<text>{{item.publish_time}}</text>
</view>
<text>{{item.author}}</text>
......@@ -110,7 +110,7 @@
<image src='{{item.front_image}}'></image>
</view>
<view class='right_listPractice'>
<text>{{item.title}}\n</text>
<text class="itemTitle">{{item.title}}\n</text>
<view>
<text>发布人：{{item.author}}\n</text>
<text>发布时间：{{item.publish_time}}\n</text>
......
src/wx/pages/socialEvent/socialEvent.js
......@@ -48,6 +48,26 @@ Page({
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
//触底以后加载更多
if ((this.data.page + 1) < this.data.pageCount) {
var pageIndex = this.data.page + 1
this.setData({
page: pageIndex
})
this.socialList();
} else {
wx.showToast({
title: '没有更多啦。',
icon: 'success',
duration: 2000
});
}
},
//跳转到社会实践详情页面
socialEventDetail(e){
var eventId = e.currentTarget.dataset['index']
......@@ -77,29 +97,12 @@ Page({
if (res.statusCode == 200) {
that.setData({
pageCount: res.data.result.pageCount,
socialEventEventList: res.data.result.socialEventEventList
socialEventEventList: that.data.socialEventEventList.concat(res.data.result.socialEventEventList)
})
}
},
fail: function (res) { },
complete: function (res) { },
})
},
//下拉加载更多
loadMore() {
if ((this.data.page+1) < this.data.pageCount) {
var pageIndex = this.data.page + 1
this.setData({
page: pageIndex
})
this.socialList()
} else {
wx.showToast({
title: '没有更多内容啦。',
icon: 'success',
duration: 2000
});
}
}
})
\ No newline at end of file
src/wx/pages/socialEvent/socialEvent.wxml
<!--pages/socialEvent/socialEvent.wxml-->
<view class='socialEvent'>
<view class='volunteers'>
<view class='volunteersActive'>
<view style='font-size:15px;padding-left:15px'>
<image src='../../img/sanjiao.png'></image>社会实践
</view>
</view>
<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}}" data-index='{{item.id}}'>
<view class='left_listVolunteers'>
<image src='{{item.front_image}}'></image>
</view>
<view class='right_listVolunteers'>
<text>{{item.class_title}}{{item.title}}</text>
<view>
<text>发布人：{{item.author}}\n</text>
<text>发布时间：{{item.publish_time}}\n</text>
</view>
<view class='activelist' bindtap='socialEventDetail' wx:for="{{socialEventEventList}}" data-index='{{item.id}}'>
<view class='left_listVolunteers'>
<image src='{{item.front_image}}'></image>
</view>
<view class='right_listVolunteers'>
<text class="itemTitle">{{item.class_title}}{{item.title}}</text>
<view>
<text>发布人：{{item.author}}\n</text>
<text>发布时间：{{item.publish_time}}\n</text>
</view>
<text class='activeLine'></text>
</view>
</scroll-view>
<text class='activeLine'></text>
</view>
</view>
</view>
src/wx/pages/socialEvent/socialEvent.wxss
/* pages/socialEvent/socialEvent.wxss */
\ No newline at end of file
/* pages/socialEvent/socialEvent.wxss */
.volunteersActive{
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 20px;
margin-bottom: 10px;
}
.volunteersActive>view{
display: flex;
align-items: center;
}
.volunteersActive>view>image{
width: 10px;
height: 10px;
}
.left_listVolunteers{
margin-left: 10px;
}
\ No newline at end of file
src/wx/pages/volunteers/volunteers.wxml
......@@ -2,10 +2,10 @@
<view class='volunteers'>
<text class='volunteersTitle'>所在区域：<text>{{place}}</text></text>
<view class='volunteersActive'>
<view style='font-size:14px;padding-left:15px'>
<view style='font-size:15px;padding-left:15px'>
<image src='../../img/sanjiao.png'></image>志愿者活动
</view>
<view style='font-size:12px;color:#666;padding-right:15px'>
<view style='font-size:15px;color:#666;padding-right:15px'>
<van-button type="info" size='mini' bind:click="rank1" style='margin-right:8px'>排名</van-button>志愿能力分：<text>{{abilityPoint}}</text>
</view>
</view>
......@@ -17,7 +17,7 @@
<text>{{item.status_title}}</text>
</view>
<view class='right_listVolunteers'>
<text>{{item.title}}</text>
<text class="itemTitle">{{item.title}}</text>
<view>
<text>征集范围：{{item.scope}}\n</text>
<text>征集人数：{{item.max_member}}人\n</text>
......
src/wx/project.config.json
......@@ -73,6 +73,13 @@
"pathName": "pages/inviteCircleMember/inviteCircleMember",
"query": "circleId=12&inviteUserName=宗彪",
"scene": null
},
{
"id": 4,
"name": "捐献",
"pathName": "pages/donationIndex/donationIndex",
"query": "",
"scene": null
}
]
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment