Skip to content

C
Compass
Commit e264632e by tangjinlin
Options

Merge branch 'znz_dev' into 'master' 

0517

See merge request !10
parents e09ac8b7 18bc9920
Showing with 899 additions and 318 deletions
src/wx/app.json
...@@ -56,7 +56,8 @@ ...@@ -56,7 +56,8 @@
"pages/faqDetail/faqDetail", "pages/faqDetail/faqDetail",
"pages/faqConsult/faqConsult", "pages/faqConsult/faqConsult",
"pages/volunteerNews/volunteerNews", "pages/volunteerNews/volunteerNews",
"pages/vNewsDetail/vNewsDetail" "pages/vNewsDetail/vNewsDetail",
"pages/otherActivity/otherActivity"
], ],
"window": { "window": {
"backgroundTextStyle": "light", "backgroundTextStyle": "light",
......
src/wx/app.wxss
...@@ -222,6 +222,8 @@ web-view { ...@@ -222,6 +222,8 @@ web-view {
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
text-align: center; text-align: center;
color: #2D2D2D;
font-weight: 550;
/* border: 1px solid #ccc; */ /* border: 1px solid #ccc; */
font-size: 14px; font-size: 14px;
} }
......
src/wx/pages/classDetails/classDetails.js
...@@ -90,16 +90,6 @@ Page({ ...@@ -90,16 +90,6 @@ Page({
} }
}, },
classMoney(e) {
var id = e.currentTarget.dataset['id'];
var money = e.currentTarget.dataset['index'];
this.setData({
mediaId: id,
check: id,
money: money
})
},
cliLearn(e) { cliLearn(e) {
var that = this; var that = this;
let id = e.currentTarget.dataset['id']; let id = e.currentTarget.dataset['id'];
...@@ -171,7 +161,8 @@ Page({ ...@@ -171,7 +161,8 @@ Page({
mediaCount: res.data.result.mediaCount, mediaCount: res.data.result.mediaCount,
updateTime: res.data.result.updateTime, updateTime: res.data.result.updateTime,
viewCount: res.data.result.viewCount, viewCount: res.data.result.viewCount,
mediaList: res.data.result.mediaList mediaList: res.data.result.mediaList,
money: res.data.result.price
}) })
} }
}, },
......
src/wx/pages/classDetails/classDetails.wxml
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</view> </view>
<view class="sub_detail" wx:if="{{subTab2}}"> <view class="sub_detail" wx:if="{{subTab2}}">
<block wx:for="{{mediaList}}"> <block wx:for="{{mediaList}}">
<view class="{{check == item.id?'catalog1':'catalog'}}" bindtap="classMoney" data-id="{{item.id}}" data-index="{{item.price}}"> <view class="catalog">
<text bindtap='videoplay'>{{item.title}}</text> <text bindtap='videoplay'>{{item.title}}</text>
<image src='/img/suo1.png' class='suo' wx:if="{{!item.haveBuy&&!item.is_free}}"></image> <image src='/img/suo1.png' class='suo' wx:if="{{!item.haveBuy&&!item.is_free}}"></image>
</view> </view>
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
<image src="/img/share.png"></image> <image src="/img/share.png"></image>
课程分享 课程分享
</view> </view>
<view class="buyBtn" wx:if="{{mediaList.length > 1 && !check}}">课程金额：{{money}}</view> <!-- <view class="buyBtn" wx:if="{{mediaList.length > 1 && !check}}">课程金额：{{money}}</view> -->
<view class="buyBtn" wx:if="{{mediaList.length > 1 && check}}" bindtap="cliLearn" data-id="{{mediaId}}">课程金额：{{money}}</view> <view class="buyBtn" wx:if="{{mediaList.length > 1}}" bindtap="cliLearn" data-id="{{mediaId}}">课程金额：{{money}}</view>
<view class="buyBtn" wx:if="{{mediaList.length==1}}" bindtap="cliLearn" data-id="{{mediaList[0].id}}">课程金额：{{mediaList[0].price}}</view> <view class="buyBtn" wx:if="{{mediaList.length==1}}" bindtap="cliLearn" data-id="{{mediaList[0].id}}">课程金额：{{mediaList[0].price}}</view>
</view> </view>
</view> </view>
......
src/wx/pages/classDetails/classDetails.wxss
...@@ -121,18 +121,6 @@ page { ...@@ -121,18 +121,6 @@ page {
box-shadow: 1px 1px 8px -2px rgba(0, 0, 0, 0.3); box-shadow: 1px 1px 8px -2px rgba(0, 0, 0, 0.3);
} }
.sub_content .sub_detail .catalog1 {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
padding: 10px 0;
font-size: 16px;
border-radius: 5px;
box-shadow: 1px 1px 10px -2px rgba(255, 106, 165, 0.3);
}
.sub_content .sub_detail text { .sub_content .sub_detail text {
margin-left: 20px; margin-left: 20px;
} }
......
src/wx/pages/courseIndex/courseIndex.wxml
...@@ -45,9 +45,7 @@ ...@@ -45,9 +45,7 @@
<swiper style="width:100%;height:342rpx;border-radius: 0 0 5px 5px;" indicator-dots="true" autoplay="false" interval="2000" duration="500"> <swiper style="width:100%;height:342rpx;border-radius: 0 0 5px 5px;" indicator-dots="true" autoplay="false" interval="2000" duration="500">
<block wx:for="{{resultList.topMediaList}}" wx:key="id"> <block wx:for="{{resultList.topMediaList}}" wx:key="id">
<swiper-item> <swiper-item>
<navigator url=""> <image src="{{item.front_image}}" bindtap='classDetails' data-index="{{item.id}}" style="width:100%;border-radius: 0 0 5px 5px;" mode="widthFix" />
<image src="{{item.front_image}}" style="width:100%;border-radius: 0 0 5px 5px;" mode="widthFix" />
</navigator>
</swiper-item> </swiper-item>
</block> </block>
</swiper> </swiper>
......
src/wx/pages/index/index.js
...@@ -8,47 +8,47 @@ Page({ ...@@ -8,47 +8,47 @@ Page({
*/ */
data: { data: {
active: 0, active: 0,
isLogin:false, isLogin: false,
role:0, role: 0,
childAge:0, childAge: 0,
headerImg: '../../img/touxiang.png', headerImg: '../../img/touxiang.png',
roleTitle:'', roleTitle: '',
unreadMessageCount:0,//未读消息数量 unreadMessageCount: 0, //未读消息数量
showFamily: false, showFamily: false,
showSocial:false, showSocial: false,
showNews: true, showNews: true,
volunteerEventList:[], volunteerEventList: [],
familyEventList:[], familyEventList: [],
mediaList:[], mediaList: [],
newsList:[], newsList: [],
isMember:false, isMember: false,
isvolunteerEventList:false, isvolunteerEventList: false,
ismediaList:false ismediaList: false
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
var that=this; var that = this;
//获取用户当前的经纬度信息并调用接口判断用户身份 //获取用户当前的经纬度信息并调用接口判断用户身份
var config = wx.getStorageSync('config'); var config = wx.getStorageSync('config');
var location = wx.getStorageSync('location'); var location = wx.getStorageSync('location');
var latitude = location.latitude; var latitude = location.latitude;
var longitude = location.longitude; var longitude = location.longitude;
if(config.unionId!==undefined){ if (config.unionId !== undefined) {
that.getUserRole(config.unionId, latitude, longitude); that.getUserRole(config.unionId, latitude, longitude);
}else{ } else {
setTimeout(function(){ setTimeout(function () {
config = wx.getStorageSync('config'); config = wx.getStorageSync('config');
that.getUserRole(config.unionId, latitude, longitude); that.getUserRole(config.unionId, latitude, longitude);
},1000); }, 1000);
} }
}, },
getUserRole(unionId, latitude, longitude){ getUserRole(unionId, latitude, longitude) {
var that = this; var that = this;
var location = wx.getStorageSync('location'); var location = wx.getStorageSync('location');
var config = wx.getStorageSync('config'); var config = wx.getStorageSync('config');
...@@ -59,7 +59,9 @@ Page({ ...@@ -59,7 +59,9 @@ Page({
latitude: latitude, latitude: latitude,
longitude: longitude longitude: longitude
}, },
header: { 'content-type': 'application/json' }, header: {
'content-type': 'application/json'
},
method: 'GET', method: 'GET',
dataType: 'json', dataType: 'json',
success: function (res) { success: function (res) {
...@@ -80,11 +82,13 @@ Page({ ...@@ -80,11 +82,13 @@ Page({
that.setData({ that.setData({
isMember: res.data.result.isMember isMember: res.data.result.isMember
}) })
app.globalData.role = role;
wx.setStorage({ wx.setStorage({
key: 'location', key: 'location',
data: location, data: location,
}) })
//保存用户名称信息 //保存用户名称信息
app.globalData.name = res.data.result.name
config.name = res.data.result.name config.name = res.data.result.name
wx.setStorage({ wx.setStorage({
key: 'config', key: 'config',
...@@ -135,7 +139,7 @@ Page({ ...@@ -135,7 +139,7 @@ Page({
title: '数据获取异常', title: '数据获取异常',
}) })
}, },
complete: function (res) { }, complete: function (res) {},
}) })
}, },
...@@ -143,7 +147,7 @@ Page({ ...@@ -143,7 +147,7 @@ Page({
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
*/ */
onReady: function () { onReady: function () {
}, },
/** /**
...@@ -187,7 +191,9 @@ Page({ ...@@ -187,7 +191,9 @@ Page({
city: location.city, city: location.city,
district: location.district district: location.district
}, },
header: { 'content-type': 'application/json' }, header: {
'content-type': 'application/json'
},
method: 'GET', method: 'GET',
dataType: 'json', dataType: 'json',
success: function (res) { success: function (res) {
...@@ -198,25 +204,24 @@ Page({ ...@@ -198,25 +204,24 @@ Page({
socialEventList: res.data.result.socialEventList, socialEventList: res.data.result.socialEventList,
mediaList: res.data.result.mediaList, mediaList: res.data.result.mediaList,
newsList: res.data.result.newsList, newsList: res.data.result.newsList,
isvolunteerEventList: res.data.result.volunteerEventList.length>0?true:false, isvolunteerEventList: res.data.result.volunteerEventList.length > 0 ? true : false,
ismediaList: res.data.result.mediaList.length>0?true:false, ismediaList: res.data.result.mediaList.length > 0 ? true : false,
unreadMessageCount: res.data.result.unreadMessageCount unreadMessageCount: res.data.result.unreadMessageCount
}) })
//是否显示志愿者活动 //是否显示志愿者活动
if (res.data.result.volunteerEventList && res.data.result.volunteerEventList.length>0) { if (res.data.result.volunteerEventList && res.data.result.volunteerEventList.length > 0) {
that.setData({ that.setData({
isvolunteerEventList: true, isvolunteerEventList: true,
}) })
} }
console.log(res)
}, },
fail: function (res) { }, fail: function (res) {},
complete: function (res) { }, complete: function (res) {},
}) })
}, },
//志愿要闻详情 //志愿要闻详情
vNewsDetail(e){ vNewsDetail(e) {
let newsId = e.currentTarget.dataset['index'] let newsId = e.currentTarget.dataset['index']
wx.navigateTo({ wx.navigateTo({
url: '../vNewsDetail/vNewsDetail?newsId=' + newsId, url: '../vNewsDetail/vNewsDetail?newsId=' + newsId,
...@@ -224,7 +229,7 @@ Page({ ...@@ -224,7 +229,7 @@ Page({
}, },
//志愿者活动详情 //志愿者活动详情
volunteersEventDetail(e){ volunteersEventDetail(e) {
let eventId = e.currentTarget.dataset['index'] let eventId = e.currentTarget.dataset['index']
wx.navigateTo({ wx.navigateTo({
url: '../volunteersEventDetail/volunteersEventDetail?eventId=' + eventId, url: '../volunteersEventDetail/volunteersEventDetail?eventId=' + eventId,
...@@ -248,7 +253,7 @@ Page({ ...@@ -248,7 +253,7 @@ Page({
}, },
//查看更多志愿者活动 //查看更多志愿者活动
moreVolunteers(){ moreVolunteers() {
wx.navigateTo({ wx.navigateTo({
url: '../volunteers/volunteers', url: '../volunteers/volunteers',
}); });
...@@ -258,7 +263,7 @@ Page({ ...@@ -258,7 +263,7 @@ Page({
}, },
//获取用户授权 //获取用户授权
authorize(){ authorize() {
wx.getUserInfo({ wx.getUserInfo({
success: function (res) { success: function (res) {
var userInfo = res.userInfo var userInfo = res.userInfo
...@@ -296,14 +301,14 @@ Page({ ...@@ -296,14 +301,14 @@ Page({
}, },
//跳转到社会实践模块首页 //跳转到社会实践模块首页
socialEvent(){ socialEvent() {
wx.navigateTo({ wx.navigateTo({
url: '../socialEvent/socialEvent', url: '../socialEvent/socialEvent',
}) })
}, },
//跳转到亲子活动模块首页 //跳转到亲子活动模块首页
familyEvent(){ familyEvent() {
wx.navigateTo({ wx.navigateTo({
url: '../familyEvent/familyEvent', url: '../familyEvent/familyEvent',
}) })
...@@ -347,7 +352,7 @@ Page({ ...@@ -347,7 +352,7 @@ Page({
}) })
}, },
// 跳到会员 // 跳到会员
memberChange(){ memberChange() {
wx.navigateTo({ wx.navigateTo({
url: '../memberChange/memberChange', url: '../memberChange/memberChange',
}) })
......
src/wx/pages/index/index.wxml
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<view class='listActivity'> <view class='listActivity'>
<view class="activity" bindtap='volunteersEventDetail' wx:for="{{volunteerEventList}}" data-index='{{item.id}}' wx:key="{{index}}"> <view class="activity" bindtap='volunteersEventDetail' wx:for="{{volunteerEventList}}" data-index='{{item.id}}' wx:key="{{index}}">
<view class='activityContent'> <view class='activityContent'>
<text class="top_title">{{item.status_title}}</text> <text class="top_title" style="background:#{{item.status_title=='征集中'?'c1527e':'0a9a7b'}}">{{item.status_title}}</text>
<image src='{{item.front_image}}' mode="widthFix"></image> <image src='{{item.front_image}}' mode="widthFix"></image>
<text class="bottom_title">{{item.title}}</text> <text class="bottom_title">{{item.title}}</text>
</view> </view>
......
src/wx/pages/index/index.wxss
...@@ -132,6 +132,7 @@ ...@@ -132,6 +132,7 @@
right: 30px; right: 30px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center;
} }
.topTitle .lookmore text { .topTitle .lookmore text {
......
src/wx/pages/my/my.js
...@@ -9,14 +9,28 @@ Page({ ...@@ -9,14 +9,28 @@ Page({
active: 2, active: 2,
name:'', name:'',
headerImg:'', headerImg:'',
age:0 age:0,
role:0,
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function () { onLoad: function () {
//获取用户当前身份用来切换菜单
this.setData(
{
role: app.globalData.role
}
)
},
//跳转区域管理模块首页
area() {
wx.navigateTo({
url: '../area/area',
});
}, },
/** /**
......
src/wx/pages/my/my.wxml
...@@ -52,5 +52,12 @@ ...@@ -52,5 +52,12 @@
</view> </view>
<text></text> <text></text>
</view> </view>
<view class='con_mineList' bindtap='area' wx:if="{{role==4}}">
<image src='../../img/dingwei1.png'></image>
<view style='border-bottom:none;'>
区域管理<image src='../../img/left.png'></image>
</view>
<text></text>
</view>
</view> </view>
</view> </view>
src/wx/pages/otherActivity/otherActivity.js 0 → 100644
// pages/volunteers/volunteers.js
var app = getApp();
Page({
/**
* 页面的初始数据
*/
data: {
title: '',
page: 0, //当前页数
pageCount: 0, //总页数
list: []
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
var that = this;
that.setData({
title: options.type == 0 ? '附近活动' : '其他活动',
type: options.type
})
this.getList();
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
//触底以后加载更多
if ((this.data.page + 1) < this.data.pageCount) {
var pageIndex = this.data.page + 1
this.setData({
page: pageIndex
})
this.getList();
} else {
wx.showToast({
title: '没有更多消息啦。',
icon: 'success',
duration: 2000
});
}
},
getList() {
var that = this;
var config = wx.getStorageSync('config');
var location = wx.getStorageSync('location');
wx.request({
url: app.url + 'ajax_get_volunteer_event_list.php',
data: {
unionId: config.unionId,
province: location.province,
city: location.city,
district: location.district,
type: that.data.type == 0 ? 'nearby' : 'other',
page: that.data.page,
},
header: {
'content-type': 'application/json'
},
method: 'GET',
dataType: 'json',
success: function (res) {
if (res.statusCode == 200) {
console.log(res)
that.setData({
page: res.data.result.page,
pageCount: res.data.result.pageCount,
list: that.data.list.concat(res.data.result.volunteerEventList),
})
}
},
fail: function (res) {},
complete: function (res) {},
})
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
})
\ No newline at end of file
src/wx/pages/otherActivity/otherActivity.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
src/wx/pages/otherActivity/otherActivity.wxml 0 → 100644
<!--pages/volunteers/volunteers.wxml-->
<custom-navi text="{{title}}" back="{{true}}" home="{{true}}" bg1="#fff" bg2="#fff" bg3="#fff"></custom-navi>
<view class="activity_con">
<block wx:for="{{list}}" wx:key="id" wx:index="index">
<view class="view_content" bindtap='volunteersEventDetail' data-id='{{item.id}}'>
<image src="{{item.front_image}}"></image>
<text style="background:#{{item.status_title=='征集中'?'c1527e':'0a9a7b'}}">{{item.status_title}}</text>
<view>
<view>征集范围：{{item.scope}}</view>
<view>征集人数：{{item.max_member}}人</view>
<view>发布单位：{{item.author}}</view>
<view>报名截止：{{item.enroll_time}}</view>
</view>
</view>
</block>
</view>
\ No newline at end of file
src/wx/pages/otherActivity/otherActivity.wxss 0 → 100644
/* pages/volunteers/volunteers.wxss */
.activity_con {
width: 95%;
margin: 20px 0 20px 5%;
display: flex;
flex-direction: row;
align-items: center;
flex-wrap: wrap;
}
.activity_con .view_content {
position: relative;
width: 45%;
margin-right: 5%;
margin-bottom: 5%;
border-radius: 7px;
box-shadow: 0 0 8px -1px rgba(0, 0, 0, 0.3);
background: #fff;
}
.activity_con .view_content image {
width: 100%;
height: 110px;
border-radius: 7px 7px 0 0;
}
.activity_con .view_content text {
position: absolute;
top: 0;
right: 0;
color: #fff;
font-size: 12px;
padding: 3px 5px;
border-radius: 0 7px 7px 7px;
}
.activity_con .view_content view {
font-size: 12px;
color: #898989;
margin: 5px 7px;
}
\ No newline at end of file
src/wx/pages/volunteers/volunteers.js
...@@ -7,6 +7,10 @@ Page({ ...@@ -7,6 +7,10 @@ Page({
*/ */
data: { data: {
volunteerEventList:[], volunteerEventList:[],
list1: [],
list2: [],
list3: [],
list4: [],
place:'', place:'',
page: 0,//当前页数 page: 0,//当前页数
pageCount: 0,//总页数 pageCount: 0,//总页数
...@@ -47,7 +51,10 @@ Page({ ...@@ -47,7 +51,10 @@ Page({
that.setData({ that.setData({
page: res.data.result.page, page: res.data.result.page,
pageCount: res.data.result.pageCount, pageCount: res.data.result.pageCount,
volunteerEventList: res.data.result.volunteerEventList, list1: res.data.result.volunteerEventList1,
list2: res.data.result.volunteerEventList2,
list3: res.data.result.volunteerEventList3,
list4: res.data.result.volunteerEventList4,
abilityPoint: res.data.result.abilityPoint abilityPoint: res.data.result.abilityPoint
}) })
...@@ -101,19 +108,10 @@ Page({ ...@@ -101,19 +108,10 @@ Page({
}) })
}, },
//加载更多 moreActivity(e){
loadMore() { var type = e.currentTarget.dataset['id'];
if (this.data.page < this.data.pageCount) { wx.navigateTo({
var pageIndex = this.data.page + 1 url: '../otherActivity/otherActivity?type=' + type,
this.setData({ });
page: pageIndex }
})
} else {
wx.showToast({
title: '没有更多内容啦。',
icon: 'success',
duration: 2000
});
}
},
}) })
\ No newline at end of file
src/wx/pages/volunteers/volunteers.wxml
<!--pages/volunteers/volunteers.wxml--> <!--pages/volunteers/volunteers.wxml-->
<custom-navi text="志愿者活动" back="{{true}}" home="{{true}}" bg1="#fff" bg2="#fff" bg3="#fff"></custom-navi> <custom-navi text="志愿者活动" back="{{true}}" home="{{true}}" bg1="#fff" bg2="#fff" bg3="#fff"></custom-navi>
<view class='volunteers'> <view class="top_title">
<view class="top_title"> <view class='volunteersTitle'>
<view class='volunteersTitle'> <image src="/img/dingwei1.png"></image>
<image src="/img/dingwei1.png"></image> <text>{{place}}</text>
<text>{{place}}</text> </view>
</view> <view class='volunteersActive'>
<view class='volunteersActive'> <van-button type="info" size='mini' bind:click="rank1" style='margin-right:8px'>排名</van-button>志愿能力分：<text>{{abilityPoint}}</text>
<van-button type="info" size='mini' bind:click="rank1" style='margin-right:8px'>排名</van-button>志愿能力分：<text>{{abilityPoint}}</text> </view>
</view>
</view>
<view class='listVolunteers'>
<scroll-view scroll-y="true" style='height:1000rpx;bottom:10rpx;' class="listPublicWelfare" bindscrolltolower='loadMore'>
<view class='activelist' bindtap='volunteersEventDetail' wx:for="{{volunteerEventList}}" data-id='{{item.id}}'>
<view class='left_listVolunteers'>
<image src='{{item.front_image}}'></image>
<text>{{item.status_title}}</text>
</view>
<view class='right_listVolunteers'>
<text class="itemTitle">{{item.title}}</text>
<view>
<text>征集范围：{{item.scope}}\n</text>
<text>征集人数：{{item.max_member}}人\n</text>
<text>发布单位：{{item.author}}\n</text>
<text>报名截止：{{item.enroll_time}}</text>
</view>
</view>
<text></text>
</view>
</scroll-view>
</view>
</view> </view>
<view class="top_banner">
<swiper indicator-dots="true" autoplay="false" interval="2000" duration="500">
<block wx:for="{{list1}}" wx:key="id">
<swiper-item>
<image src="{{item.front_image}}" bindtap='volunteersEventDetail' data-id='{{item.id}}' />
</swiper-item>
</block>
</swiper>
</view>
<view class="new_activity">
<view class="title">
<image class="img1" src="/img/dian.png"></image>
<image class="img2" src="/img/dian.png"></image>
<text>最新活动</text>
</view>
<view class="content" bindtap='volunteersEventDetail' data-id='{{list2[0].id}}'>
<image src="{{list2[0].front_image}}"></image>
<text class="right_top" style="background:#{{list2[0].status_title=='征集中'?'c1527e':'0a9a7b'}}">{{list2[0].status_title}}</text>
<text class="bottom_title">{{list2[0].title}}</text>
</view>
</view>
<view class="nearby_activity">
<view class='topTitle'>
<view class='leftLine'></view>
<text class="title">附近活动</text>
<view class='lookmore' bindtap='moreActivity' data-id="0">
<text>更多</text>
<image src="/img/right.png"></image>
</view>
</view>
<view class="activity_con">
<block wx:for="{{list3}}" wx:key="id">
<view class="view_content" bindtap='volunteersEventDetail' data-id='{{item.id}}'>
<image src="{{item.front_image}}"></image>
<text style="background:#{{item.status_title=='征集中'?'c1527e':'0a9a7b'}}">{{item.status_title}}</text>
<view>
<view>征集范围：{{item.scope}}</view>
<view>征集人数：{{item.max_member}}人</view>
<view>发布单位：{{item.author}}</view>
<view>报名截止：{{item.enroll_time}}</view>
</view>
</view>
</block>
</view>
</view>
<view class="other_activity">
<view class='topTitle'>
<view class='leftLine'></view>
<text class="title">其他活动</text>
<view class='lookmore' bindtap='moreActivity' data-id="1">
<text>更多</text>
<image src="/img/right.png"></image>
</view>
</view>
<view class="activity_con">
<block wx:for="{{list4}}" wx:key="id">
<view class="view_content" bindtap='volunteersEventDetail' data-id='{{item.id}}'>
<image src="{{item.front_image}}"></image>
<text style="background:#{{item.status_title=='征集中'?'c1527e':'0a9a7b'}}">{{item.status_title}}</text>
<view>
<view>征集范围：{{item.scope}}</view>
<view>征集人数：{{item.max_member}}人</view>
<view>发布单位：{{item.author}}</view>
<view>报名截止：{{item.enroll_time}}</view>
</view>
</view>
</block>
</view>
</view>
<!-- <view class='listVolunteers'>
<scroll-view scroll-y="true" style='height:1000rpx;bottom:10rpx;' class="listPublicWelfare" bindscrolltolower='loadMore'>
<view class='activelist' bindtap='volunteersEventDetail' wx:for="{{volunteerEventList}}" data-id='{{item.id}}'>
<view class='left_listVolunteers'>
<image src='{{item.front_image}}'></image>
<text>{{item.status_title}}</text>
</view>
<view class='right_listVolunteers'>
<text class="itemTitle">{{item.title}}</text>
<view>
<text>征集范围：{{item.scope}}\n</text>
<text>征集人数：{{item.max_member}}人\n</text>
<text>发布单位：{{item.author}}\n</text>
<text>报名截止：{{item.enroll_time}}</text>
</view>
</view>
<text></text>
</view>
</scroll-view>
</view> -->
\ No newline at end of file
src/wx/pages/volunteers/volunteers.wxss
...@@ -37,4 +37,177 @@ ...@@ -37,4 +37,177 @@
.volunteersActive button view { .volunteersActive button view {
font-size: 12px; font-size: 12px;
}
.top_banner swiper {
width: 100%;
height: 342rpx;
border-radius: 0 0 5px 5px;
}
.top_banner swiper image {
width: 100%;
height: 342rpx;
border-radius: 0 0 5px 5px;
}
.new_activity {
position: relative;
width: 90%;
left: 5%;
margin-top: 5%;
padding-bottom: 5px;
border-radius: 10px;
box-shadow: 0 0 8px -1px rgba(0, 0, 0, 0.3);
background: #fff;
}
.new_activity .title {
text-align: center;
padding-top: 5px;
}
.new_activity .title text {
font-weight: bold;
background: linear-gradient(to right, #1ae8c8, #4a8aff);
-webkit-background-clip: text;
background-clip: text;
color: transparent;
font-size: 16px;
}
.new_activity .title .img1 {
position: absolute;
top: 0;
left: 0;
}
.new_activity .title .img2 {
position: absolute;
top: 0;
right: 0;
}
.new_activity .title image {
width: 20px;
height: 20px;
}
.new_activity .content {
position: relative;
top: 5px;
margin: 5px;
}
.new_activity .content .right_top {
position: absolute;
top: 0;
right: 0;
background: #c1527e;
color: #fff;
font-size: 14px;
padding: 5px 10px;
border-radius: 0 10px 10px 10px;
}
.new_activity .content .bottom_title {
position: absolute;
left: 0;
bottom: 3px;
width: 100%;
color: #fff;
border-radius: 0 0 10px 10px;
text-align: center;
padding: 5px 0;
background: rgba(0, 0, 0, 0.5);
}
.new_activity .content image {
width: 100%;
border-radius: 10px;
}
.nearby_activity,
.other_activity {
margin: 10px 0;
}
.topTitle {
position: static;
width: 100%;
height: 30px;
display: flex;
flex-direction: row;
align-items: center;
}
.topTitle .title {
margin-left: 10px;
font-size: 20px;
font-weight: bolder;
color: #000;
}
.topTitle .leftLine {
height: 20px;
width: 6px;
border-radius: 3px;
margin-left: 5%;
background-color: #eb5e76;
}
.topTitle .lookmore {
position: absolute;
right: 5%;
display: flex;
flex-direction: row;
align-items: center;
}
.topTitle .lookmore text {
margin-right: 5px;
}
.topTitle .lookmore image {
width: 8px;
height: 15px;
}
.activity_con {
width: 95%;
margin: 20px 0 20px 5%;
display: flex;
flex-direction: row;
align-items: center;
}
.activity_con .view_content {
position: relative;
width: 50%;
margin-right: 5%;
border-radius: 7px;
box-shadow: 0 0 8px -1px rgba(0, 0, 0, 0.3);
background: #fff;
}
.activity_con .view_content image {
width: 100%;
height: 110px;
border-radius: 7px 7px 0 0;
}
.activity_con .view_content text {
position: absolute;
top: 0;
right: 0;
color: #fff;
font-size: 12px;
padding: 3px 5px;
border-radius: 0 7px 7px 7px;
}
.activity_con .view_content view {
font-size: 12px;
color: #898989;
margin: 5px 7px;
} }
\ No newline at end of file
src/wx/pages/volunteersEventDetail/volunteersEventDetail.js
...@@ -19,11 +19,19 @@ Page({ ...@@ -19,11 +19,19 @@ Page({
isCircleOwner: false, isCircleOwner: false,
isMember: false, isMember: false,
isCircleOwner: false, isCircleOwner: false,
ownerCircleList:[],//圈主拥有的圈子列表 ownerCircleList:[],//圈主拥有的圈子列表
checkCircleIndex:[],//临时记录圈子选中状态 checkCircleIndex:[],//临时记录圈子选中状态
personalMemberList:[],//个人已报名 personalMemberList:[],//个人已报名
circleMemberList:[],//已报名团体 circleMemberList:[],//已报名团体
menuText:'', menuText:'',
circleButtonTitle: '圈子报名',
personalButtonTitle: '个人报名',
showOwnerDialog:false, showOwnerDialog:false,
showActionButton:false showActionButton:false
}, },
...@@ -77,14 +85,16 @@ Page({ ...@@ -77,14 +85,16 @@ Page({
//按钮文字控制 //按钮文字控制
if (res.data.result.isMember == false && res.data.result.isEnrollFinish==false){ if (res.data.result.isMember == false && res.data.result.isEnrollFinish==false){
that.setData({ that.setData({
menuText:'报名参加', circleButtonTitle: '圈子报名',
personalButtonTitle:'个人报名',
showActionButton:true, showActionButton:true,
buttonClass:'actionBtn' buttonClass:'actionBtn'
}) })
} }
if (res.data.result.isMember == true && res.data.result.isEnrollFinish == false) { if (res.data.result.isMember == true && res.data.result.isEnrollFinish == false) {
that.setData({ that.setData({
menuText: '取消报名', circleButtonTitle: '取消报名',
personalButtonTitle: '取消报名',
showActionButton: true, showActionButton: true,
buttonClass: 'cancelBtn' buttonClass: 'cancelBtn'
}) })
...@@ -92,7 +102,7 @@ Page({ ...@@ -92,7 +102,7 @@ Page({
if (res.data.result.isMember == true && res.data.result.isEnrollFinish == true && res.data.result.isComplete ==false) { if (res.data.result.isMember == true && res.data.result.isEnrollFinish == true && res.data.result.isComplete ==false) {
that.setData({ that.setData({
menuText: '上传凭证', menuText: '上传凭证',
showActionButton: true, //showActionButton: true,
buttonClass: 'actionBtn' buttonClass: 'actionBtn'
}) })
} }
...@@ -121,24 +131,25 @@ Page({ ...@@ -121,24 +131,25 @@ Page({
onShareAppMessage: function () { onShareAppMessage: function () {
}, },
//点击选中圈子或者取消 //展示对对话框
onClickCircle(e) { showDialog(event) {
// e.detail 为当前输入的值
var index = e.currentTarget.dataset['index'];
var tmp = this.data.checkCircleIndex;
//赋值选中状态
if (tmp[index] != e.detail) {
tmp[index] = e.detail;
}
this.setData({ this.setData({
checkCircleIndex: tmp showOwnerDialog: true
}) })
}, },
//点击切换 //点击切换圈子的选中状态
onChange(event) { clickCircle(e) {
let index = e.currentTarget.dataset['index']
let tmpList = this.data.ownerCircleList;
if (tmpList[index].itemClass == "circleItem") {
tmpList[index].itemClass = "circleItemSelected";
} else {
tmpList[index].itemClass = "circleItem";
}
this.setData({
ownerCircleList: tmpList
})
}, },
//圈主返回 //圈主返回
...@@ -219,51 +230,82 @@ Page({ ...@@ -219,51 +230,82 @@ Page({
} }
}, },
//个人报名 //个人报名/取消
personalEnroll() { personalEnroll() {
var that = this; var that = this;
var config = wx.getStorageSync('config'); var config = wx.getStorageSync('config');
wx.request({ if (that.data.personalButtonTitle == "取消报名") {
url: app.url + 'ajax_attend_volunteer_event_personal.php', //取消报名处理
data: { wx.request({
unionId: config.unionId, url: app.url + 'ajax_cancel_volunteer_event.php',
eventId: that.data.eventId, data: {
circleId: that.data.circleId unionId: config.unionId,
}, eventId: that.data.eventId
header: { 'content-type': 'application/json' }, },
method: 'GET', header: { 'content-type': 'application/json' },
dataType: 'json', method: 'GET',
success: function (res) { dataType: 'json',
console.log(res) success: function (res) {
if (res.statusCode == 200) { console.log(res)
Notify({ type: 'success', message: res.data.result.message }); if (res.statusCode == 200) {
//如果报名成功则刷新本页面 Notify({ type: 'success', message: res.data.result.message });
if (res.data.status == "OK") { //如果取消成功，停留在本页面
that.onLoad(); if (res.data.status == "OK") {
that.onLoad();
}
} }
} },
}, fail: function (res) {
fail: function (res) { Notify({ type: 'danger', message: res.data.result.message });
Notify({ type: 'danger', message: res.data.result.message }); },
}, complete: function (res) { },
complete: function (res) { }, })
}) } else {
//个人报名
wx.request({
url: app.url + 'ajax_attend_volunteer_event_personal.php',
data: {
unionId: config.unionId,
eventId: that.data.eventId,
circleId: that.data.circleId
},
header: { 'content-type': 'application/json' },
method: 'GET',
dataType: 'json',
success: function (res) {
console.log(res)
if (res.statusCode == 200) {
Notify({ type: 'success', message: res.data.result.message });
//如果报名成功则刷新本页面
if (res.data.status == "OK") {
that.onLoad();
}
}
},
fail: function (res) {
Notify({ type: 'danger', message: res.data.result.message });
},
complete: function (res) { },
})
}
}, },
//团体报名 //团体报名/取消
circleEnroll() { circleEnroll() {
var that = this; var that = this;
var config = wx.getStorageSync('config'); var config = wx.getStorageSync('config');
//获取选中的圈子id //获取选中的圈子id
var haveSelected = false; var haveSelected = false;
var circleIds = ""; var circleIds = "";
for(var i=0;i<that.data.checkCircleIndex.length;i++) { for (var i = 0; i < that.data.ownerCircleList.length;i++) {
if (that.data.checkCircleIndex[i] == true) { if (that.data.ownerCircleList[i].itemClass == "circleItemSelected") {
haveSelected = true haveSelected = true
circleIds += "|" + that.data.ownerCircleList[i].id circleIds += "|" + that.data.ownerCircleList[i].id + "_" + that.data.ownerCircleList[i].itemClass
} else {
circleIds += "|" + that.data.ownerCircleList[i].id + "_" + that.data.ownerCircleList[i].itemClass
} }
} }
if (haveSelected==false) { if (haveSelected == false && this.data.circleButtonTitle =="圈子报名") {
Notify('请选择圈子') Notify('请选择圈子')
return; return;
} }
......
src/wx/pages/volunteersEventDetail/volunteersEventDetail.wxml
<!--pages/activeDetails/activeDetails.wxml--> <!--pages/activeDetails/activeDetails.wxml-->
<custom-navi text="志愿者活动" back="{{true}}" home="{{true}}"></custom-navi> <custom-navi text="志愿者活动" back="{{true}}" home="{{true}}" bg1="#fff" bg2="#fff" bg3="#fff"></custom-navi>
<view class='activeDetails'> <view class='activeDetails'>
<image src='{{volunteerEventDat.front_image}}'></image> <image src='{{volunteerEventDat.front_image}}'></image>
<view class='con_activeDetails'> <view class='con_activeDetails'>
<view class="row"> <view class="row">
<text class="titleText">活动名称:</text><text class="dataText">{{volunteerEventDat.title}}</text> <text class="dataTextTitle">{{volunteerEventDat.title}}</text>
</view>
<view class="row">
<text class="dataTextDeadline">截止日期:{{volunteerEventDat.enroll_time}}</text>
</view> </view>
<view class="row"> <view class="row">
<text class="titleText">活动说明:</text><text class="dataText">{{volunteerEventDat.comment}}</text> <text class="titleText">活动说明:</text><text class="dataText">{{volunteerEventDat.comment}}</text>
...@@ -35,7 +38,7 @@ ...@@ -35,7 +38,7 @@
<text class="titleText">集合时间:</text><text class="dataText">{{volunteerEventDat.venue_time}}</text> <text class="titleText">集合时间:</text><text class="dataText">{{volunteerEventDat.venue_time}}</text>
</view> </view>
</view> </view>
<!-->
<view class='avtiveTab'> <view class='avtiveTab'>
<van-tabs active="{{ active }}" border="{{false}}" bind:change="onChange" tab-active-class="activebeijing"> <van-tabs active="{{ active }}" border="{{false}}" bind:change="onChange" tab-active-class="activebeijing">
<van-tab title="圈子报名"> <van-tab title="圈子报名">
...@@ -61,21 +64,27 @@ ...@@ -61,21 +64,27 @@
</van-tabs> </van-tabs>
<view class='{{buttonClass}}' bindtap='userAction' wx:if="{{showActionButton}}">{{menuText}}</view> <view class='{{buttonClass}}' bindtap='userAction' wx:if="{{showActionButton}}">{{menuText}}</view>
</view> </view>
-->
<view class="buttons" wx:if="{{showActionButton}}">
<view class="divButtonCircle" wx:if="{{isCircleOwner}}" bindtap="showDialog">{{circleButtonTitle}}</view>
<view class="divButtonPersonal" bindtap="personalEnroll">{{personalButtonTitle}}</view>
</view>
<view class="ownerAttendDialog" wx:if="{{showOwnerDialog}}"> <view class="dialogView" wx:if="{{showOwnerDialog}}">
<view class="dialogMsg">检测到您为圈主身份,是否以圈主身份参加，确认后，邀请参加信息会通知您的圈内成员?</view> </view>
<view class="circleList"> <view class="ownerAttendDialog" wx:if="{{showOwnerDialog}}">
<view class="circleItem" wx:for="{{ownerCircleList}}" wx:for-index="i"> <view class="dialogMsg">请选择参与活动的圈子，邀请消息会同步至成员的“消息通知”</view>
<van-checkbox value="{{ checkCircleIndex[i] }}" shape="square" bind:change="onClickCircle" icon-size="16px" data-index="{{i}}"/> <view class="circleList">
<view class="circleName">{{item.title}}</view> <view class="{{item.itemClass}}" wx:for="{{ownerCircleList}}" data-index="{{index}}" bindtap="clickCircle">
{{item.title}}
</view>
</view>
<view class="buttonRow">
<view class="button" bindtap="circleEnroll">圈子参加</view>
<view class="button" bindtap="personalEnroll">个人参加</view>
<view class="cancelButton" bindtap="back">返回</view>
</view> </view>
</view> </view>
<view class="buttonRow">
<view class="button" bindtap="circleEnroll">确认</view>
<view class="button" bindtap="personalEnroll">个人参加</view>
<view class="button" bindtap="back">返回</view>
</view>
</view>
</view> </view>
<van-dialog id="van-dialog" /> <van-dialog id="van-dialog" />
<van-notify id="van-notify" /> <van-notify id="van-notify" />
src/wx/pages/volunteersEventDetail/volunteersEventDetail.wxss
...@@ -41,6 +41,22 @@ ...@@ -41,6 +41,22 @@
color:#333333; color:#333333;
} }
.con_activeDetails .row .dataTextTitle{
display:flex;
width:100%;
flex-wrap: wrap;
color:#FF4040;
font-size: 18px;
font-weight: bold;
}
.con_activeDetails .row .dataTextDeadline{
display:flex;
width:100%;
flex-wrap: wrap;
color:#969696;
}
.activebeijing{ .activebeijing{
background: #0D76ED; background: #0D76ED;
color: #fff!important; color: #fff!important;
...@@ -106,10 +122,54 @@ ...@@ -106,10 +122,54 @@
color: #fff; color: #fff;
} }
.buttons{
margin-top: 20px;
margin-bottom: 20px;
width: 100%;
height: 40px;
display:flex;
flex-direction: row;
justify-content: space-around;
align-items: center;
}
.divButtonCircle{
width: 44%;
height: 40px;
font-size: 14px;
line-height: 40px;
text-align: center;
background: linear-gradient(to right, #e85c6d, #fb689b);
color: #fff;
border-radius: 20px;
}
.divButtonPersonal{
width: 48%;
height: 40px;
font-size: 14px;
line-height: 40px;
text-align: center;
border:1rpx solid #e85c6d;
color: #e85c6d;
border-radius: 20px;
}
/**圈主报名对话框**/ /**圈主报名对话框**/
.dialogView{
position: fixed;
top: 0;
left: 0;
width: 100%;
height:100%;
z-index: 99;
opacity:0.5;
background:#000;
}
.ownerAttendDialog{ .ownerAttendDialog{
position: fixed; position: fixed;
bottom: 100px; bottom: 50px;
width: 90%; width: 90%;
margin-left:5%; margin-left:5%;
display: flex; display: flex;
...@@ -121,12 +181,14 @@ ...@@ -121,12 +181,14 @@
color: #363636; color: #363636;
background:#fff; background:#fff;
border: 1rpx solid #969696; border: 1rpx solid #969696;
border-radius: 10px;
} }
.ownerAttendDialog .dialogMsg { .ownerAttendDialog .dialogMsg {
width: 90%; width: 90%;
margin:15px auto; margin:15px auto;
line-height: 20px; line-height: 22px;
font-size: 15px;
font-weight: bold; font-weight: bold;
} }
...@@ -134,39 +196,68 @@ ...@@ -134,39 +196,68 @@
width: 90%; width: 90%;
margin:10px auto; margin:10px auto;
display: flex; display: flex;
flex-direction: column; flex-direction: row;
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
} }
.ownerAttendDialog .circleList .circleItem{ .ownerAttendDialog .circleList .circleItem{
width: 100%; min-width: 65px;
margin:5px auto; height: 30px;
display: flex; line-height: 30px;
flex-direction: row; padding-left: 5px;
justify-content: flex-start; padding-right: 5px;
align-items: center; text-align: center;
border: 1rpx solid #8F8F8F;
color: #000;
border-radius: 15px;
font-size: 14px;
} }
.ownerAttendDialog .circleList .circleItem .circleName{ .ownerAttendDialog .circleList .circleItemSelected{
min-width: 65px;
height: 30px;
line-height: 30px;
padding-left: 5px; padding-left: 5px;
padding-right: 5px;
text-align: center;
background: linear-gradient(to right, #e85c6d, #fb689b);
color: #fff;
border-radius: 15px;
font-size: 14px;
} }
.ownerAttendDialog .buttonRow{ .ownerAttendDialog .buttonRow{
width: 90%; width: 90%;
margin:10px auto; margin:10px auto;
display: flex; display: flex;
flex-direction: row; flex-direction: column;
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
} }
.ownerAttendDialog .buttonRow .button{ .ownerAttendDialog .buttonRow .button{
width: 28%; margin-top: 8px;
height:32px; width: 90%;
line-height: 32px; height:40px;
line-height: 40px;
border-radius: 20px;
text-align: center; text-align: center;
border: 1rpx solid #969696; background: linear-gradient(to right, #e85c6d, #fb689b);
border-radius: 4px; color: #fff;
}
.ownerAttendDialog .buttonRow .cancelButton{
margin-top: 8px;
margin-bottom: 8px;
width: 90%;
height:40px;
line-height: 40px;
border-radius: 20px;
text-align: center;
color: #e85c6d;
border: 1rpx solid #e85c6d;
} }
\ No newline at end of file
src/wx/pages/volunteersRank1/volunteersRank1.js
...@@ -17,7 +17,7 @@ Page({ ...@@ -17,7 +17,7 @@ Page({
var config = wx.getStorageSync('config'); var config = wx.getStorageSync('config');
var that=this; var that=this;
that.setData({ that.setData({
name: config.name name: app.globalData.name
}) })
wx.request({ wx.request({
url: app.url + 'ajax_get_volunteer_rank1.php', url: app.url + 'ajax_get_volunteer_rank1.php',
......
src/wx/pages/volunteersRank1/volunteersRank1.wxml
<!--pages/volunteerRanking/volunteerRanking.wxml--> <!--pages/volunteerRanking/volunteerRanking.wxml-->
<custom-navi text="志愿者排名" back="{{true}}" home="{{true}}"></custom-navi> <custom-navi text="志愿者排名" back="{{true}}" home="{{true}}" bg1="#fff" bg2="#fff" bg3="#fff"></custom-navi>
<view class='volunteerRanking'> <view class='volunteerRanking'>
<view style="height:45px;"> <view style="height:45px;">
<view class="title" style="text-align:left;margin-left: 30px;"><text style="color:#82A4D4;">级别：</text><text>省份</text></view> <view class="title" style="text-align:left;margin-left: 30px;"><text style="color:#EA4968;">级别：</text><text style="color:#696969">省份</text></view>
<view class="title"><text style="color:#82A4D4;">角色：</text><text>{{name}}</text></view> <view class="title"><text style="color:#EA4968;">角色：</text><text style="color:#696969">{{name}}</text></view>
</view> </view>
<view class='table'> <view class='table'>
<view style="border-top: 4px solid #F5F5F5;"></view> <view style="border-top: 4px solid #F5F5F5;"></view>
<view class='tr'> <view class='tr'>
<view class='th'>排名</view> <view class='th'>排名</view>
<view class='th'>省份</view> <view class='th'>省份</view>
<view class='th'>城市</view> <view class='th'>城市</view>
<view class='th'>能力分</view> <view class='th'>能力分</view>
</view> </view>
<view style="border-bottom: 4px solid #F5F5F5;"></view> <view style="border-bottom: 4px solid #F5F5F5;"></view>
<view wx:for="{{rankList}}" class='tr' wx:key="{{index}}" data-index="{{item.province}}" bindtap="rank2" style="border-bottom:1px solid #F5F5F5;padding-bottom: 10px;"> <view wx:for="{{rankList}}" class='tr' wx:key="{{index}}" data-index="{{item.province}}" bindtap="rank2" style="border-bottom:1px solid #F5F5F5;padding-bottom: 10px;">
<block wx:if="{{index+1==1}}"> <block wx:if="{{index+1==1}}">
<view class='td'><text class="idNum" style="background:#FFF17C;">{{index+1}}</text></view> <view class='td'><text class="idNum" style="background:#FF696A;">{{index+1}}</text></view>
</block> </block>
<block wx:if="{{index+1==2}}"> <block wx:elif="{{index+1==2}}">
<view class='td'><text class="idNum" style="background:#F6F6F6;">{{index+1}}</text></view> <view class='td'><text class="idNum" style="background:#FFD36A;">{{index+1}}</text></view>
</block> </block>
<block wx:if="{{index+1==3}}"> <block wx:elif="{{index+1==3}}">
<view class='td'><text class="idNum" style="background:#FED650;color:#fff;">{{index+1}}</text></view> <view class='td'><text class="idNum" style="background:#FFF16A;">{{index+1}}</text></view>
</block> </block>
<block wx:else>
<view class='td'>{{item.province}}</view> <view class='td'><text class="idNum" style="background:#898989;color:#fff;">{{index+1}}</text></view>
<view class='td' style="color:#82A4D4;">{{item.city_count}}市</view> </block>
<view class='td'>{{item.ability_point}}</view>
</view> <view class='td' style="color:#EF5577;border-bottom:1rpx solid #EF5577;">{{item.province}}</view>
</view> <view class='td' style="color:#898989;">{{item.city_count}}市</view>
</view> <view class='td' style="color:#898989;">{{item.ability_point}}</view>
</view>
</view>
</view>
\ No newline at end of file
src/wx/pages/volunteersRank2/volunteersRank2.js
...@@ -18,7 +18,7 @@ Page({ ...@@ -18,7 +18,7 @@ Page({
var config = wx.getStorageSync('config'); var config = wx.getStorageSync('config');
var that = this; var that = this;
that.setData({ that.setData({
name: config.name, name: app.globalData.name,
province: options.province province: options.province
}) })
wx.request({ wx.request({
......
src/wx/pages/volunteersRank2/volunteersRank2.wxml
<!--pages/volunteerRanking/volunteerRanking.wxml--> <!--pages/volunteerRanking/volunteerRanking.wxml-->
<custom-navi text="志愿者排名" back="{{true}}" home="{{true}}"></custom-navi> <custom-navi text="志愿者排名" back="{{true}}" home="{{true}}" bg1="#fff" bg2="#fff" bg3="#fff"></custom-navi>
<view class='volunteerRanking'> <view class='volunteerRanking'>
<view style="height:45px;"> <view style="height:45px;">
<view class="title" style="text-align:left;margin-left: 30px;"><text style="color:#82A4D4;">级别：</text><text>城市</text></view> <view class="title" style="text-align:left;margin-left: 30px;"><text style="color:#EA4968;">级别：</text><text style="color:#696969">城市</text></view>
<view class="title"><text style="color:#82A4D4;">角色：</text><text>{{name}}</text></view> <view class="title"><text style="color:#EA4968;">角色：</text><text style="color:#696969">{{name}}</text></view>
</view> </view>
<view class='table'> <view class='table'>
<view style="border-top: 4px solid #F5F5F5;"></view> <view style="border-top: 4px solid #F5F5F5;"></view>
<view class='tr'> <view class='tr'>
<view class='th'>排名</view> <view class='th'>排名</view>
<view class='th'>城市</view> <view class='th'>城市</view>
<view class='th'>学校</view> <view class='th'>学校</view>
<view class='th'>能力分</view> <view class='th'>能力分</view>
</view> </view>
<view style="border-bottom: 4px solid #F5F5F5;"></view> <view style="border-bottom: 4px solid #F5F5F5;"></view>
<view wx:for="{{rankList}}" class='tr' wx:key="{{index}}" data-index="{{item.city}}" bindtap="rank3" style="border-bottom:1px solid #F5F5F5;padding-bottom: 10px;"> <view wx:for="{{rankList}}" class='tr' wx:key="{{index}}" data-index="{{item.city}}" bindtap="rank3" style="border-bottom:1px solid #F5F5F5;padding-bottom: 10px;">
<block wx:if="{{index+1==1}}"> <block wx:if="{{index+1==1}}">
<view class='td'><text class="idNum" style="background:#FFF17C;">{{index+1}}</text></view> <view class='td'><text class="idNum" style="background:#FF696A;">{{index+1}}</text></view>
</block> </block>
<block wx:if="{{index+1==2}}"> <block wx:elif="{{index+1==2}}">
<view class='td'><text class="idNum" style="background:#F6F6F6;">{{index+1}}</text></view> <view class='td'><text class="idNum" style="background:#FFD36A;">{{index+1}}</text></view>
</block> </block>
<block wx:if="{{index+1==3}}"> <block wx:elif="{{index+1==3}}">
<view class='td'><text class="idNum" style="background:#FED650;color:#fff;">{{index+1}}</text></view> <view class='td'><text class="idNum" style="background:#FFF16A;">{{index+1}}</text></view>
</block> </block>
<view class='td'>{{item.city}}</view> <block wx:else>
<view class='td' style="color:#82A4D4;">{{item.district_count}}所</view> <view class='td'><text class="idNum" style="background:#898989;color:#fff;">{{index+1}}</text></view>
<view class='td'>{{item.ability_point}}</view> </block>
</view> <view class='td' style="color:#EF5577;border-bottom:1rpx solid #EF5577;">{{item.city}}</view>
</view> <view class='td' style="color:#898989;">{{item.district_count}}所</view>
</view> <view class='td' style="color:#898989;">{{item.ability_point}}</view>
</view>
</view>
</view>
\ No newline at end of file
src/wx/pages/volunteersRank3/volunteersRank3.js
...@@ -19,7 +19,7 @@ Page({ ...@@ -19,7 +19,7 @@ Page({
var config = wx.getStorageSync('config'); var config = wx.getStorageSync('config');
var that = this; var that = this;
that.setData({ that.setData({
name: config.name, name: app.globalData.name,
province: options.province, province: options.province,
city: options.city city: options.city
}) })
......
src/wx/pages/volunteersRank3/volunteersRank3.wxml
<!--pages/volunteerRanking/volunteerRanking.wxml--> <!--pages/volunteerRanking/volunteerRanking.wxml-->
<custom-navi text="志愿者排名" back="{{true}}" home="{{true}}"></custom-navi> <custom-navi text="志愿者排名" back="{{true}}" home="{{true}}" bg1="#fff" bg2="#fff" bg3="#fff"></custom-navi>
<view class='volunteerRanking'> <view class='volunteerRanking'>
<view style="height:45px;"> <view style="height:45px;">
<view class="title" style="text-align:left;margin-left: 30px;"><text style="color:#82A4D4;">级别：</text><text>区</text></view> <view class="title" style="text-align:left;margin-left: 30px;"><text style="color:#EA4968;">级别：</text><text style="color:#696969">区</text></view>
<view class="title"><text style="color:#82A4D4;">角色：</text><text>{{name}}</text></view> <view class="title"><text style="color:#EA4968;">角色：</text><text style="color:#696969">{{name}}</text></view>
</view> </view>
<view class='table'> <view class='table'>
<view style="border-top: 4px solid #F5F5F5;"></view> <view style="border-top: 4px solid #F5F5F5;"></view>
<view class='tr'> <view class='tr'>
<view class='th'>排名</view> <view class='th'>排名</view>
<view class='th'>区</view> <view class='th'>区</view>
<view class='th'>学校</view> <view class='th'>学校</view>
<view class='th'>能力分</view> <view class='th'>能力分</view>
</view> </view>
<view style="border-bottom: 4px solid #F5F5F5;"></view> <view style="border-bottom: 4px solid #F5F5F5;"></view>
<view wx:for="{{rankList}}" class='tr' wx:key="{{index}}" data-index="{{item.district}}" bindtap="rank4" style="border-bottom:1px solid #F5F5F5;padding-bottom: 10px;"> <view wx:for="{{rankList}}" class='tr' wx:key="{{index}}" data-index="{{item.district}}" bindtap="rank4" style="border-bottom:1px solid #F5F5F5;padding-bottom: 10px;">
<block wx:if="{{index+1==1}}"> <block wx:if="{{index+1==1}}">
<view class='td'><text class="idNum" style="background:#FFF17C;">{{index+1}}</text></view> <view class='td'><text class="idNum" style="background:#FF696A;">{{index+1}}</text></view>
</block> </block>
<block wx:if="{{index+1==2}}"> <block wx:elif="{{index+1==2}}">
<view class='td'><text class="idNum" style="background:#F6F6F6;">{{index+1}}</text></view> <view class='td'><text class="idNum" style="background:#FFD36A;">{{index+1}}</text></view>
</block> </block>
<block wx:if="{{index+1==3}}"> <block wx:elif="{{index+1==3}}">
<view class='td'><text class="idNum" style="background:#FED650;color:#fff;">{{index+1}}</text></view> <view class='td'><text class="idNum" style="background:#FFF16A;">{{index+1}}</text></view>
</block> </block>
<view class='td'>{{item.district}}</view> <block wx:else>
<view class='td' style="color:#82A4D4;">{{item.school_count}}</view> <view class='td'><text class="idNum" style="background:#898989;color:#fff;">{{index+1}}</text></view>
<view class='td'>{{item.ability_point}}</view> </block>
</view> <view class='td' style="color:#EF5577;border-bottom:1rpx solid #EF5577;">{{item.district}}</view>
</view> <view class='td' style="color:#898989;">{{item.school_count}}</view>
</view> <view class='td' style="color:#898989;">{{item.ability_point}}</view>
</view>
</view>
</view>
\ No newline at end of file
src/wx/pages/volunteersRank4/volunteersRank4.js
...@@ -20,7 +20,7 @@ Page({ ...@@ -20,7 +20,7 @@ Page({
var config = wx.getStorageSync('config'); var config = wx.getStorageSync('config');
var that = this; var that = this;
that.setData({ that.setData({
name: config.name, name: app.globalData.name,
province: options.province, province: options.province,
city: options.city, city: options.city,
district: options.district district: options.district
......
src/wx/pages/volunteersRank4/volunteersRank4.wxml
<!--pages/volunteerRanking/volunteerRanking.wxml--> <!--pages/volunteerRanking/volunteerRanking.wxml-->
<custom-navi text="志愿者排名" back="{{true}}" home="{{true}}"></custom-navi> <custom-navi text="志愿者排名" back="{{true}}" home="{{true}}" bg1="#fff" bg2="#fff" bg3="#fff"></custom-navi>
<view class='volunteerRanking'> <view class='volunteerRanking'>
<view style="height:45px;"> <view style="height:45px;">
<view class="title" style="text-align:left;margin-left: 30px;"><text style="color:#82A4D4;">级别：</text><text>学校</text></view> <view class="title" style="text-align:left;margin-left: 30px;"><text style="color:#EA4968;">级别：</text><text style="color:#696969">学校</text></view>
<view class="title"><text style="color:#82A4D4;">角色：</text><text>{{name}}</text></view> <view class="title"><text style="color:#EA4968;">角色：</text><text style="color:#696969">{{name}}</text></view>
</view> </view>
<view class='table'> <view class='table'>
<view style="border-top: 4px solid #F5F5F5;"></view> <view style="border-top: 4px solid #F5F5F5;"></view>
<view class='tr'> <view class='tr'>
<view class='th'>排名</view> <view class='th'>排名</view>
<view class='th'>学校</view> <view class='th'>学校</view>
<view class='th'>人数</view> <view class='th'>人数</view>
<view class='th'>能力分</view> <view class='th'>能力分</view>
</view> </view>
<view style="border-bottom: 4px solid #F5F5F5;"></view> <view style="border-bottom: 4px solid #F5F5F5;"></view>
<view wx:for="{{rankList}}" class='tr' wx:key="{{index}}" style="border-bottom:1px solid #F5F5F5;padding-bottom: 10px;"> <view wx:for="{{rankList}}" class='tr' wx:key="{{index}}" style="border-bottom:1px solid #F5F5F5;padding-bottom: 10px;">
<block wx:if="{{index+1==1}}"> <block wx:if="{{index+1==1}}">
<view class='td'><text class="idNum" style="background:#FFF17C;">{{index+1}}</text></view> <view class='td'><text class="idNum" style="background:#FF696A;">{{index+1}}</text></view>
</block> </block>
<block wx:if="{{index+1==2}}"> <block wx:elif="{{index+1==2}}">
<view class='td'><text class="idNum" style="background:#F6F6F6;">{{index+1}}</text></view> <view class='td'><text class="idNum" style="background:#FFD36A;">{{index+1}}</text></view>
</block> </block>
<block wx:if="{{index+1==3}}"> <block wx:elif="{{index+1==3}}">
<view class='td'><text class="idNum" style="background:#FED650;color:#fff;">{{index+1}}</text></view> <view class='td'><text class="idNum" style="background:#FFF16A;">{{index+1}}</text></view>
</block> </block>
<view class='td'>{{item.school}}</view> <block wx:else>
<view class='td' style="color:#82A4D4;">{{item.user_count}}</view> <view class='td'><text class="idNum" style="background:#898989;color:#fff;">{{index+1}}</text></view>
<view class='td'>{{item.ability_point}}</view> </block>
</view> <view class='td' style="color:#EF5577;border-bottom:1rpx solid #EF5577;">{{item.school}}</view>
</view> <view class='td' style="color:#898989;">{{item.user_count}}</view>
</view> <view class='td' style="color:#898989;">{{item.ability_point}}</view>
</view>
</view>
</view>
\ No newline at end of file
src/wx/project.config.json
...@@ -108,6 +108,13 @@ ...@@ -108,6 +108,13 @@
"pathName": "pages/volunteers/volunteers", "pathName": "pages/volunteers/volunteers",
"query": "eventId=25", "query": "eventId=25",
"scene": null "scene": null
},
{
"id": -1,
"name": "pages/volunteersRank1/volunteersRank1",
"pathName": "pages/volunteersRank1/volunteersRank1",
"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