diff --git a/pages/activity/activity.js b/pages/activity/activity.js index f5ce8cc..f66230b 100644 --- a/pages/activity/activity.js +++ b/pages/activity/activity.js @@ -23,6 +23,7 @@ Page({ app.restAjax.get(app.restAjax.path(app.activityUrl + '/wxminiapp/activitylibrary/listpageactivitylibraryfornetrelease', []), self.data.pages, null, function(code, data) { if('200' == code) { + console.log(data.rows) for(var item of data.rows) { if('' != item.activityImage) { item.activityImage = app.activityUrl + '/route/file/downloadfile/true/' + item.activityImage; diff --git a/pages/activityDetail/activityDetail.js b/pages/activityDetail/activityDetail.js index 1f67409..c610f84 100644 --- a/pages/activityDetail/activityDetail.js +++ b/pages/activityDetail/activityDetail.js @@ -54,13 +54,16 @@ Page({ onLoad: function (options) { var self = this; this.getToken().then(result => { - console.log(self.data.token) var url; var id = options.id; if(!self.data.token) { url = '/wxminiapp/activitylibrary/getactivitylibrarybyidrelease/' + id; + self.setData({ + token: null + }) }else { url = '/wxminiapp/activitylibrary/getactivitylibrarybyid/' + id + self.getToken() } app.restAjax.get(app.restAjax.path(app.activityUrl + url, []), {}, { @@ -73,6 +76,7 @@ Page({ self.setData({ dataMap: data }) + console.log(self.data.dataMap) } }, function() { diff --git a/pages/activityDetail/activityDetail.wxml b/pages/activityDetail/activityDetail.wxml index b06f942..b636b25 100644 --- a/pages/activityDetail/activityDetail.wxml +++ b/pages/activityDetail/activityDetail.wxml @@ -41,9 +41,9 @@ - + 报名 - + 取消报名 diff --git a/pages/activitySign/activitySign.js b/pages/activitySign/activitySign.js index 6935898..81536c2 100644 --- a/pages/activitySign/activitySign.js +++ b/pages/activitySign/activitySign.js @@ -41,8 +41,8 @@ Page({ if('200' == code) { } - }, function() { - + }, function(code, data) { + app.dialog.msg(data.msg) }, function() { }) @@ -68,7 +68,7 @@ Page({ userName: self.data.name, userPhone: self.data.phone } - app.restAjax.post(app.restAjax.path(app.activityUrl + '/app/activityuserapply/saveactivityuserapplyrelease', []), + app.restAjax.post(app.restAjax.path(app.activityUrl + '/app/activityuserapply/saveactivityuserapply', []), activityUserApplyVO, { headers: { token: self.data.token @@ -76,7 +76,9 @@ Page({ }, function(code, data) { console.log(data) if('200' == code) { - + wx.navigateTo({ + url: '../activitySign/activitySign?id=' + self.data.activityId + }) } }, function() { diff --git a/pages/newTeam/newTeam.wxml b/pages/newTeam/newTeam.wxml index 844a71f..0ef715f 100644 --- a/pages/newTeam/newTeam.wxml +++ b/pages/newTeam/newTeam.wxml @@ -1,12 +1,11 @@ - + 团队头像: - + 点击上传 - diff --git a/pages/newTeam/newTeam.wxss b/pages/newTeam/newTeam.wxss index 0b4573b..ceb514f 100644 --- a/pages/newTeam/newTeam.wxss +++ b/pages/newTeam/newTeam.wxss @@ -11,6 +11,8 @@ color: #242424; font-size: 32rpx; width: 24%; + display: flex; + align-items: center; } .row-text{ width: 75%; @@ -73,4 +75,14 @@ label{ width: 77%; font-size: 26rpx; height: 55rpx; +} +.avatar{ + height: 150rpx; +} +.avatar image{ + width: 150rpx; + height: 150rpx; +} +.avatar-row{ + height: 150rpx; } \ No newline at end of file