gaojian/xz_mini
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
wenc000 2020-06-27 15:57:16 +08:00
parent 0334854f3e
commit 6f01f7b5ee
30 changed files with 589 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/project.config.json

2
app.js
View File

@ -8,7 +8,7 @@ App({
libraryUrl: 'http://192.168.0.113:8081/library',
venueUrl: 'http://192.168.0.109:8082/venuebooking',
activityUrl: 'http://192.168.0.111:8080/culturalactivity',
volunteerUrl: 'http://192.168.0.111:8888/volunteer/',
volunteerUrl: 'http://192.168.0.111:8888/volunteer',
liveUrl: 'http://192.168.0.113:8084/live',
restAjax: restAjax,
dialog: dialog,

6
app.json
View File

@ -1,10 +1,14 @@
{
"pages": [
<<<<<<< HEAD
=======
"pages/center/center",
"pages/book/book",
>>>>>>> master
"pages/index/index",
"pages/broadcast/broadcast",
"pages/activityDialog/activityDialog",
"pages/teamDetail/teamDetail",
"pages/center/center",
"pages/volunteerRegister/volunteerRegister",
"pages/volunteer/volunteer",
"pages/heritage/heritage",

4
pages/activity/activity.js
View File

@ -19,12 +19,12 @@ Page({
*/
onLoad: function (options) {
var self = this;
app.restAjax.get(app.restAjax.path(app.activityUrl + 'wxminiapp/activitylibrary/listpageactivitylibraryfornetrelease', []),
app.restAjax.get(app.restAjax.path(app.activityUrl + '/wxminiapp/activitylibrary/listpageactivitylibraryfornetrelease', []),
{}, null, function(code, data) {
if('200' == code) {
for(var item of data.rows) {
if('' != item.activityImage) {
item.activityImage = app.activityUrl + 'route/file/downloadfile/true/' + item.activityImage;
item.activityImage = app.activityUrl + '/route/file/downloadfile/true/' + item.activityImage;
}
}
self.setData({

4
pages/activityDetail/activityDetail.js
View File

@ -19,10 +19,10 @@ Page({
onLoad: function (options) {
var self = this;
var id = options.id;
app.restAjax.get(app.restAjax.path(app.activityUrl + 'wxminiapp/activitylibrary/getactivitylibrarybyidrelease/' + id, []),
app.restAjax.get(app.restAjax.path(app.activityUrl + '/wxminiapp/activitylibrary/getactivitylibrarybyidrelease/' + id, []),
{}, null, function(code, data) {
if('200' == code) {
data.activityImage = app.activityUrl + 'route/file/downloadfile/true/' + data.activityImage;
data.activityImage = app.activityUrl + '/route/file/downloadfile/true/' + data.activityImage;
self.setData({
dataMap: data
})

20
pages/book/book.wxml
View File

@ -70,6 +70,26 @@
<view>12:00-13:00</view>
<view>15元</view>
</view>
<view class="time-box">
<view>2020-01-01</view>
<view>12:00-13:00</view>
<view>15元</view>
</view>
<view class="time-box">
<view>2020-01-01</view>
<view>12:00-13:00</view>
<view>15元</view>
</view>
<view class="time-box">
<view>2020-01-01</view>
<view>12:00-13:00</view>
<view>15元</view>
</view>
<view class="time-box">
<view>2020-01-01</view>
<view>12:00-13:00</view>
<view>15元</view>
</view>
</view>
<view class="bottom">
<view class="phone-code">

2
pages/book/book.wxss
View File

@ -97,6 +97,7 @@
}
.time{
padding: 0 30rpx;
margin-bottom: 260rpx;
}
.time-box{
display: inline-block;
@ -123,6 +124,7 @@
left: 0;
right: 0;
padding: 15rpx 30rpx;
background: #fff;
}
.phone-code{
margin-bottom: 20rpx;

1
pages/index/index.wxml
View File

@ -118,6 +118,7 @@
<view class="broadcast-box" bindtap="goBroadcastDetail" wx:for="{{live.liveList}}" wx:for-index="index" wx:for-item="item" wx:key="liveList">
<image src="{{live.liveUrl}}/route/file/downloadfile/true/{{item.livePlanPhoto}}"></image>
<view class="broadcast-text">文字</view>
<view class="broadcast-status">直播中</view>
</view>
</view>
</view>

10
pages/index/index.wxss
View File

@ -146,4 +146,14 @@
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.broadcast-status{
position: absolute;
top: 10rpx;
right: 10rpx;
padding: 5rpx;
background: #9F1512;
color: #fff;
font-size: 26rpx;
border-radius: 10rpx;
}

66
pages/myVenueOrder/myVenueOrder.js Normal file
View File

@ -0,0 +1,66 @@
// pages/myVenueOrder/myVenueOrder.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})

3
pages/myVenueOrder/myVenueOrder.json Normal file
View File

@ -0,0 +1,3 @@
{
"usingComponents": {}
}

44
pages/myVenueOrder/myVenueOrder.wxml Normal file
View File

@ -0,0 +1,44 @@
<view class="venue">
<view class="order-box">
<view class="venue-img">
<image src="../../images/center-bg.png"></image>
</view>
<view class="order-info">
<view class="venue-title">
<view class="title">场馆</view>
<view class="project">篮球</view>
</view>
<view class="number-time">订单编号：12456789</view>
<view class="number-time">下单时间：2020-01-01 10:00:00</view>
<view class="price">￥15元</view>
</view>
</view>
<view class="order-box">
<view class="venue-img">
<image src="../../images/center-bg.png"></image>
</view>
<view class="order-info">
<view class="venue-title">
<view class="title">场馆</view>
<view class="project">篮球</view>
</view>
<view class="number-time">订单编号：12456789</view>
<view class="number-time">下单时间：2020-01-01 10:00:00</view>
<view class="price">￥15元</view>
</view>
</view>
<view class="order-box">
<view class="venue-img">
<image src="../../images/center-bg.png"></image>
</view>
<view class="order-info">
<view class="venue-title">
<view class="title">场馆</view>
<view class="project">篮球</view>
</view>
<view class="number-time">订单编号：12456789</view>
<view class="number-time">下单时间：2020-01-01 10:00:00</view>
<view class="price">￥15元</view>
</view>
</view>
</view>

51
pages/myVenueOrder/myVenueOrder.wxss Normal file
View File

@ -0,0 +1,51 @@
.venue{
padding: 10rpx 30rpx;
}
.order-box{
border-radius: 10rpx;
padding: 10rpx;
box-shadow:0px 0px 17rpx 0px rgba(0,0,0,0.1);
display: flex;
justify-content: space-between;
margin-bottom: 20rpx;
}
.venue-img{
width: 35%;
height: 180rpx;
}
.venue-img image{
width: 100%;
height: 100%;
border-radius: 10rpx;
}
.order-info{
width: 62%;
}
.venue-title{
font-size: 32rpx;
display: flex;
justify-content: space-between;
}
.title{
width: 70%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.project{
font-size: 28rpx;
background: rgba(159,21,18,.1);
color: #9F1512;
padding: 0 5rpx;
border-radius: 10rpx;
}
.number-time{
font-size: 26rpx;
color: #949494;
margin-top: 10rpx;
}
.price{
font-size: 30rpx;
color: #9F1512;
margin-top: 10rpx;
}

12
pages/myVolunteerActivity/myVolunteerActivity.js
View File

@ -49,10 +49,10 @@ Page({
})
if(self.data.type === '1') {
// 我发起的活动
self.myActivity(app.volunteerUrl + 'wxminiapp/volunteerservice/listpagevolunteerservice');
self.myActivity(app.volunteerUrl + '/wxminiapp/volunteerservice/listpagevolunteerservice');
}else {
// 我参加的活动
self.myActivity(app.volunteerUrl + 'wxminiapp/volunteerservice/listpagemyjoinservice');
self.myActivity(app.volunteerUrl + '/wxminiapp/volunteerservice/listpagemyjoinservice');
}
},
myActivity: function(url) {
@ -67,7 +67,7 @@ Page({
for(var item of data.rows) {
if('' != item.photo) {
var photoArr = item.photo.split(",");
item.photo = app.volunteerUrl + 'route/file/downloadfile/true/' + photoArr[0];
item.photo = app.volunteerUrl + '/route/file/downloadfile/true/' + photoArr[0];
}
}
self.setData({
@ -93,14 +93,14 @@ Page({
var methodType;
var title;
if('1' == self.data.type) {
url = app.volunteerUrl + 'wxminiapp/teammember/saveteammember'
url = app.volunteerUrl + '/wxminiapp/teammember/saveteammember'
teamMemberVO = {
teamId: e.currentTarget.dataset.teamid
}
methodType = app.restAjax.post
title = '申请成功！'
}else {
url = app.volunteerUrl + 'wxminiapp/teammember/quitTeam/' + self.data.teamId
url = app.volunteerUrl + '/wxminiapp/teammember/quitTeam/' + self.data.teamId
methodType = app.restAjax.get
title = '退出成功！'
}
@ -128,7 +128,7 @@ Page({
*/
onLoad: function (options) {
this.getToken().then(result => {
this.myActivity(app.volunteerUrl + 'wxminiapp/volunteerservice/listpagevolunteerservice');
this.myActivity(app.volunteerUrl + '/wxminiapp/volunteerservice/listpagevolunteerservice');
})
},

13
pages/myVolunteerTeam/myVolunteerTeam.js
View File

@ -10,7 +10,6 @@ Page({
otherTeamMap: {},
type: '1',
teamId: '',
},
getToken: function() {
var self = this;
@ -26,6 +25,12 @@ Page({
})
})
},
toTeamDetail: function(e) {
var teamId = e.currentTarget.dataset.teamid;
wx.navigateTo({
url: '../teamDetail/teamDetail?teamId=' + teamId,
})
},
newTeam: function () {
wx.navigateTo({
url: '../newTeam/newTeam',
@ -63,14 +68,14 @@ Page({
var methodType;
var title;
if('1' == self.data.type) {
url = app.volunteerUrl + 'wxminiapp/teammember/saveteammember'
url = app.volunteerUrl + '/wxminiapp/teammember/saveteammember'
teamMemberVO = {
teamId: e.currentTarget.dataset.teamid
}
methodType = app.restAjax.post
title = '申请成功！'
}else {
url = app.volunteerUrl + 'wxminiapp/teammember/quitTeam/' + self.data.teamId
url = app.volunteerUrl + '/wxminiapp/teammember/quitTeam/' + self.data.teamId
methodType = app.restAjax.get
title = '退出成功！'
}
@ -98,7 +103,7 @@ Page({
*/
onLoad: function (options) {
this.getToken().then(result => {
this.otherTeam(app.volunteerUrl + 'wxminiapp/team/myteamm');
this.otherTeam(app.volunteerUrl + '/wxminiapp/team/myteamm');
})
},

2
pages/myVolunteerTeam/myVolunteerTeam.wxml
View File

@ -1,5 +1,5 @@
<view class="team">
<view class="team-box" wx:for="{{otherTeamMap}}" data-id="{{item.teamId}}">
<view class="team-box" bindtap="toTeamDetail" data-teamid="{{item.teamId}}" wx:for="{{otherTeamMap}}">
<view class="name-join">
<view class="name">{{item.teamName}}</view>
<view class="join" wx:if="{{item.checkStatus == '' && type == 1}}" data-teamid="{{item.teamId}}" bindtap="joinOrOutTeam">申请加入</view>

6
pages/newTeam/newTeam.js
View File

@ -64,7 +64,7 @@ Page({
success (res) {
const tempFilePaths = res.tempFilePaths
console.log(tempFilePaths)
app.restAjax.file(app.restAjax.path(app.volunteerUrl + 'app/file/uploadimage', []), tempFilePaths[0],
app.restAjax.file(app.restAjax.path(app.volunteerUrl + '/app/file/uploadimage', []), tempFilePaths[0],
'image', {
headers: {
token: self.data.token
@ -184,7 +184,7 @@ Page({
self.data.teamArea[self.data.teamAreaIndex].dictionaryId :
'',
};
app.restAjax.post(app.restAjax.path(app.volunteerUrl + 'wxminiapp/team/saveteam', []),
app.restAjax.post(app.restAjax.path(app.volunteerUrl + '/wxminiapp/team/saveteam', []),
teamVO, {
headers: {
'token': self.data.token
@ -208,7 +208,7 @@ Page({
getDataFromDict: function(dictId, type) {
var self = this;
return new Promise(resolve => {
app.restAjax.get(app.restAjax.path(app.volunteerUrl + 'app/datadictionary/listdictionarybyparentid/' + dictId, []),
app.restAjax.get(app.restAjax.path(app.volunteerUrl + '/app/datadictionary/listdictionarybyparentid/' + dictId, []),
{}, {
headers: {
token: self.data.token

4
pages/newVolunteerActivity/newVolunteerActivity.js
View File

@ -89,7 +89,7 @@ Page({
wx.chooseImage({
success (res) {
const tempFilePaths = res.tempFilePaths
app.restAjax.file(app.restAjax.path(app.volunteerUrl + 'app/file/uploadimage', []), tempFilePaths[0],
app.restAjax.file(app.restAjax.path(app.volunteerUrl + '/app/file/uploadimage', []), tempFilePaths[0],
'image', {
headers: {
token: self.data.token
@ -175,7 +175,7 @@ Page({
photo: self.data.photo,
serviceRequirement: self.data.serviceRequirement
};
app.restAjax.post(app.restAjax.path(app.volunteerUrl + 'wxminiapp/volunteerservice/savevolunteerservice', []),
app.restAjax.post(app.restAjax.path(app.volunteerUrl + '/wxminiapp/volunteerservice/savevolunteerservice', []),
volunteerServiceVO, {
headers: {
'token': self.data.token

66
pages/orderDetail/orderDetail.js Normal file
View File

@ -0,0 +1,66 @@
// pages/orderDetail/orderDetail.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})

3
pages/orderDetail/orderDetail.json Normal file
View File

@ -0,0 +1,3 @@
{
"usingComponents": {}
}

67
pages/orderDetail/orderDetail.wxml Normal file
View File

@ -0,0 +1,67 @@
<view class="venue">
<view class="venue-img">
<image src="../../images/center-bg.png"></image>
</view>
<view class="venue-info">
<view class="venue-title">场馆</view>
<view class="time-number">
<text>订单编号：</text>123456789
</view>
<view class="time-number">
<text>下单时间：</text>10:10:10
</view>
<view class="time-number">
<text>价　　格：</text>15元
</view>
</view>
</view>
<view class="book">
<view class="book-title">预定详情</view>
<view class="order">
<view class="order-box">
<view class="top">
<view>2020-01-01</view>
<view>12:00-13:00</view>
</view>
<view class="bottom">
<view>场地1</view>
<view>15元</view>
<view class="cancel">取消预定</view>
</view>
</view>
<view class="order-box">
<view class="top">
<view>2020-01-01</view>
<view>12:00-13:00</view>
</view>
<view class="bottom">
<view>场地1</view>
<view>15元</view>
<view class="cancel">取消预定</view>
</view>
</view>
<view class="order-box">
<view class="top">
<view>2020-01-01</view>
<view>12:00-13:00</view>
</view>
<view class="bottom">
<view>场地1</view>
<view>15元</view>
<view class="cancel">取消预定</view>
</view>
</view>
<view class="order-box">
<view class="top">
<view>2020-01-01</view>
<view>12:00-13:00</view>
</view>
<view class="bottom">
<view>场地1</view>
<view>15元</view>
<view class="cancel">取消预定</view>
</view>
</view>
</view>
</view>
<view class="cancel-all">全部取消</view>

85
pages/orderDetail/orderDetail.wxss Normal file
View File

@ -0,0 +1,85 @@
.venue{
padding: 15rpx 30rpx;
display: flex;
justify-content: space-between;
border-bottom: 3px solid #DEDEDE;
}
.venue-img{
width: 35%;
height: 180rpx;
}
.venue-img image{
width: 100%;
height: 100%;
}
.venue-info{
width: 63%;
}
.venue-title{
font-size: 32rpx;
color: #000;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.time-number{
font-size: 26rpx;
margin-top: 10rpx;
}
.time-number text{
color: #949494;
}
.book{
margin-top: 20rpx;
padding: 0 30rpx;
margin-bottom: 85rpx;
}
.book-title{
font-size: 32rpx;
padding-left: 25rpx;
border-left: 5px solid #9F1512;
}
.order{
margin-top: 20rpx;
}
.order-box{
display: inline-block;
width: 32%;
margin-right: 1%;
border: 1px solid #9F1512;
border-radius: 10rpx;
text-align: center;
margin-bottom: 10rpx;
}
.order-box:nth-child(3n){
margin-right: 0;
}
.top{
background: #9F1512;
color: #fff;
font-size: 28rpx;
}
.bottom{
font-size: 28rpx;
}
.cancel{
width: 70%;
margin: 0 auto 10rpx;
background: #9F1512;
color: #fff;
padding: 5rpx 0;
border-radius: 10rpx;
}
.cancel-all{
position: fixed;
bottom: 0;
left: 0;
right: 0;
height: 80rpx;
display: flex;
justify-content: center;
align-items: center;
background: #9F1512;
color: #fff;
font-size: 32rpx;
}

12
pages/serviceActivityDetail/serviceActivityDetail.js
View File

@ -32,14 +32,14 @@ Page({
},
getDetail: function(id) {
var self = this;
app.restAjax.get(app.restAjax.path(app.volunteerUrl + 'wxminiapp/volunteerservice/getvolunteerservicebyid/' + id, []),
app.restAjax.get(app.restAjax.path(app.volunteerUrl + '/wxminiapp/volunteerservice/getvolunteerservicebyid/' + id, []),
{}, {
headers: {
'token': self.data.token
}
}, function(code, data) {
if('200' == code) {
data.photo = app.volunteerUrl + 'route/file/downloadfile/true/' + data.photo;
data.photo = app.volunteerUrl + '/route/file/downloadfile/true/' + data.photo;
self.setData({
dataMap: data
})
@ -130,7 +130,7 @@ Page({
*/
sendEnrollRequest: function(serviceMemberVO) {
var self = this;
app.restAjax.post(app.restAjax.path(app.volunteerUrl + 'wxminiapp/servicemember/saveservicemember', []),
app.restAjax.post(app.restAjax.path(app.volunteerUrl + '/wxminiapp/servicemember/saveservicemember', []),
serviceMemberVO, {
headers: {
token: self.data.token
@ -155,9 +155,9 @@ Page({
var self = this;
var url;
if(self.data.teamArray.length > 0) {
url = app.volunteerUrl + 'wxminiapp/servicemember/cancelapply/'+ self.data.type +'/'+ self.data.serviceId +'/' + self.data.team[self.data.teamIndex].teamId;
url = app.volunteerUrl + '/wxminiapp/servicemember/cancelapply/'+ self.data.type +'/'+ self.data.serviceId +'/' + self.data.team[self.data.teamIndex].teamId;
}else {
url = app.volunteerUrl + 'wxminiapp/servicemember/cancelapply/'+ self.data.type +'/'+ self.data.serviceId +'/null';
url = app.volunteerUrl + '/wxminiapp/servicemember/cancelapply/'+ self.data.type +'/'+ self.data.serviceId +'/null';
}
app.restAjax.get(app.restAjax.path(url, []), {}, {
@ -183,7 +183,7 @@ Page({
getMyTeam: function() {
var self = this;
console.log(self.data.token)
app.restAjax.get(app.restAjax.path(app.volunteerUrl + 'wxminiapp/team/myteamm', []),
app.restAjax.get(app.restAjax.path(app.volunteerUrl + '/wxminiapp/team/myteamm', []),
{}, {
headers: {
token: self.data.token

106
pages/teamDetail/teamDetail.js
View File

@ -1,18 +1,120 @@
// pages/teamDetail/teamDetail.js
var app = getApp();
Page({
/**
* 页面的初始数据
*/
data: {
token: '',
teamId: '',
dataMap: [],
memberData: {},
checkData: {}
},
getToken: function() {
var self = this;
return new Promise(resolve =>{
wx.getStorage({
key: 'token',
success(res) {
self.setData({
token: res.data
})
return resolve();
}
})
})
},
getDetail(teamId) {
var self = this;
app.restAjax.get(app.restAjax.path(app.volunteerUrl + '/wxminiapp/team/getteambyid/' + teamId, []),
{}, {
headers: {
token: self.data.token
}
}, function(code, data) {
console.log(data)
if('200' == code) {
self.setData({
dataMap: data
})
}
}, function() {
}, function() {
})
},
getMember(teamId) {
var self = this;
app.restAjax.get(app.restAjax.path(app.volunteerUrl + '/wxminiapp/teammember/listteammember?teamId=' + teamId, []),
{}, {
headers: {
token: self.data.token
}
}, function(code, data) {
if('200' == code) {
var teamMember = [];
var checkMember = [];
for(var item of data) {
if('1' == item.status) {
teamMember.push(item);
}else {
checkMember.push(item);
}
}
self.setData({
memberData: teamMember,
checkData: checkMember
})
}
}, function() {
}, function() {
})
},
agree(e) {
var self = this;
console.log(e)
var id = e.currentTarget.dataset.teammemberid;
var type = e.currentTarget.dataset.type;
app.restAjax.get(app.restAjax.path(app.volunteerUrl + '/wxminiapp/teammember/checkmember/'+id+'/' + type + '?teamId=' + self.data.teamId, []),
{}, {
headers: {
token: self.data.token
}
}, function(code, data) {
if('200' == code) {
if('1' == type) {
app.dialog.msg('审核通过！');
}else {
app.dialog.msg('审核驳回！');
}
wx.navigateTo({
url: '../myVolunteerTeam/myVolunteerTeam',
})
}
}, function() {
}, function() {
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
var self = this;
self.setData({
teamId: options.teamId
})
this.getToken().then(result => {
this.getDetail(options.teamId);
this.getMember(options.teamId);
})
},
/**

49
pages/teamDetail/teamDetail.wxml
View File

@ -2,66 +2,55 @@
<view class="team-info">
<view class="row">
<view class="title">团队名称：</view>
<view class="content">团队名称</view>
<view class="content">{{dataMap.teamName}}</view>
</view>
<view class="row">
<view class="title">团队人数：</view>
<view class="content">1</view>
<view class="content">{{dataMap.count}}</view>
</view>
<view class="row">
<view class="title">所属区域：</view>
<view class="content">所属区域</view>
<view class="content">{{dataMap.teamCityDictionaryName}} {{dataMap.teamCountyDictionaryName}} {{dataMap.teamAreaDictionaryName}}</view>
</view>
<view class="row">
<view class="title">团队口号：</view>
<view class="content intro">{{dataMap.teamWatchword}}</view>
</view>
<view class="row">
<view class="title">团队介绍：</view>
<view class="content intro">团队介绍</view>
<view class="content intro">{{dataMap.content}}</view>
</view>
</view>
<view class="team-member">
<view class="member-title">团队成员</view>
<view class="member-box">
<view class="member-box" wx:for="{{memberData}}" data-teammemberid="{{item.teamMemberId}}">
<view class="member-avatar">
<image src="../../images/avatar.png"></image>
</view>
<view class="member-info">
<view class="name">名字<text class="post">队长</text></view>
<view class="join-time">加入时间：2020-02-02</view>
</view>
</view>
<view class="member-box">
<view class="member-avatar">
<image src="../../images/avatar.png"></image>
</view>
<view class="member-info">
<view class="name">名字<text class="post">队长</text></view>
<view class="join-time">加入时间：2020-02-02</view>
</view>
</view>
<view class="member-box">
<view class="member-avatar">
<image src="../../images/avatar.png"></image>
</view>
<view class="member-info">
<view class="name">名字<text class="post">队长</text></view>
<view class="join-time">加入时间：2020-02-02</view>
<view class="name">{{item.memberName}}
<text class="post" wx:if="{{item.memberType == '2'}}">队长</text>
<text class="post" wx:if="{{item.memberType == '1'}}">成员</text>
</view>
<view class="join-time">加入时间：{{item.inputTime}}</view>
</view>
</view>
</view>
<view class="team-member">
<view class="member-title">申请人员</view>
<view class="member-box">
<view class="member-box" wx:for="{{checkData}}">
<view class="member-avatar">
<image src="../../images/avatar.png"></image>
</view>
<view class="member-info">
<view class="name apply-member">
<view class="name-box">名字</view>
<view class="name-box">{{item.memberName}}</view>
<view class="btn">
<view class="agree">通过</view>
<view class="refuse">拒绝</view>
<view class="agree" bindtap="agree" data-teammemberid="{{item.teamMemberId}}" data-type="1">通过</view>
<view class="refuse" bindtap="agree" data-teammemberid="{{item.teamMemberId}}" data-type="2">拒绝</view>
</view>
</view>
<view class="join-time">加入时间：2020-02-02</view>
<view class="join-time">加入时间：{{item.inputTime}}</view>
</view>
</view>
</view>

2
pages/venue/venue.wxss
View File

@ -68,7 +68,7 @@
}
.name{
font-size: 30rpx;
width: 70%;
width: 60%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;

4
pages/volunteer/volunteer.js
View File

@ -36,14 +36,14 @@ Page({
*/
activityList: function() {
var self = this;
app.restAjax.get(app.restAjax.path(app.volunteerUrl + 'wxminiapp/volunteerservice/listpagevolunteerservicerelease', []),
app.restAjax.get(app.restAjax.path(app.volunteerUrl + '/wxminiapp/volunteerservice/listpagevolunteerservicerelease', []),
{}, null, function(code, data) {
if('200' == code) {
// 将活动照片，拼接为可访问地址
for(var item of data.rows) {
if('' != item.photo) {
var photoArr = item.photo.split(",");
item.photo = app.volunteerUrl + 'route/file/downloadfile/true/' + photoArr[0];
item.photo = app.volunteerUrl + '/route/file/downloadfile/true/' + photoArr[0];
}
}
self.setData({

4
pages/volunteerRegister/volunteerRegister.js
View File

@ -203,7 +203,7 @@ Page({
agree: self.data.isAgree,
openExperience : self.data.openExperience
};
app.restAjax.post(app.restAjax.path(app.volunteerUrl + 'wxminiapp/volunteer/savevolunteer', []),
app.restAjax.post(app.restAjax.path(app.volunteerUrl + '/wxminiapp/volunteer/savevolunteer', []),
volunteerVO, {
headers: {
'token': self.data.token
@ -227,7 +227,7 @@ Page({
getDataFromDict: function(dictId, type) {
var self = this;
return new Promise(resolve => {
app.restAjax.get(app.restAjax.path(app.volunteerUrl + 'app/datadictionary/listdictionarybyparentid/' + dictId, []),
app.restAjax.get(app.restAjax.path(app.volunteerUrl + '/app/datadictionary/listdictionarybyparentid/' + dictId, []),
{}, {
headers: {
'token': self.data.token

10
pages/volunteerTeam/volunteerTeam.js
View File

@ -37,9 +37,9 @@ Page({
type: e.currentTarget.dataset.type
})
if(self.data.type === '1') {
self.otherTeam(app.volunteerUrl + 'wxminiapp/team/otherteamm?otherTeam=true');
self.otherTeam(app.volunteerUrl + '/wxminiapp/team/otherteamm?otherTeam=true');
}else {
self.otherTeam(app.volunteerUrl + 'wxminiapp/team/myjointeam?myTeam=true');
self.otherTeam(app.volunteerUrl + '/wxminiapp/team/myjointeam?myTeam=true');
}
},
otherTeam: function(url) {
@ -74,14 +74,14 @@ Page({
var methodType;
var title;
if('1' == self.data.type) {
url = app.volunteerUrl + 'wxminiapp/teammember/saveteammember'
url = app.volunteerUrl + '/wxminiapp/teammember/saveteammember'
teamMemberVO = {
teamId: e.currentTarget.dataset.teamid
}
methodType = app.restAjax.post
title = '申请成功！'
}else {
url = app.volunteerUrl + 'wxminiapp/teammember/quitTeam/' + self.data.teamId
url = app.volunteerUrl + '/wxminiapp/teammember/quitTeam/' + self.data.teamId
methodType = app.restAjax.get
title = '退出成功！'
}
@ -109,7 +109,7 @@ Page({
*/
onLoad: function (options) {
this.getToken().then(result => {
this.otherTeam(app.volunteerUrl + 'wxminiapp/team/otherteamm?otherTeam=true');
this.otherTeam(app.volunteerUrl + '/wxminiapp/team/otherteamm?otherTeam=true');
})
},

61
project.config.json
View File

@ -1,61 +0,0 @@
{
"description": "项目配置文件",
"packOptions": {
"ignore": []
},
"setting": {
"urlCheck": false,
"es6": true,
"enhance": false,
"postcss": true,
"preloadBackgroundData": false,
"minified": true,
"newFeature": true,
"coverView": true,
"nodeModules": false,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false,
"compileHotReLoad": false,
"useIsolateContext": true
},
"compileType": "miniprogram",
"libVersion": "2.11.1",
"appid": "wxe17874894f7ff27b",
"projectname": "xz_mini",
"debugOptions": {
"hidedInDevtools": []
},
"isGameTourist": false,
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": {
"search": {
"current": -1,
"list": []
},
"conversation": {
"current": -1,
"list": []
},
"game": {
"currentL": -1,
"list": []
},
"miniprogram": {
"current": -1,
"list": []
}
}
}