diff --git a/app.js b/app.js index c1ab62f..ce64a40 100644 --- a/app.js +++ b/app.js @@ -7,7 +7,7 @@ App({ newsUrl: 'http://192.168.0.113:8082/news', libraryUrl: 'http://192.168.0.113:8081/library', venueUrl: 'http://192.168.0.109:8082/venuebooking', - activityUrl: 'http://192.168.0.111:8080/culturalactivity/', + activityUrl: 'http://192.168.0.111:8080/culturalactivity', volunteerUrl: 'http://192.168.0.111:8888/volunteer/', liveUrl: 'http://192.168.0.113:8084/live', restAjax: restAjax, diff --git a/pages/index/index.js b/pages/index/index.js index c67720b..1bc8e00 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -16,10 +16,12 @@ Page({ newsList: [] }, venue: { - venueUrl: app.venueUrl + venueUrl: app.venueUrl, + venueList: [] }, activity: { - activityUrl: app.activityUrl + activityUrl: app.activityUrl, + activityList: [] }, live: { liveUrl: app.liveUrl, @@ -64,17 +66,31 @@ Page({ app.dialog.msg(data.msg); }); }, - doGetVenue: function() { - app.restAjax.get(app.restAjax.path('', []), { - + doGetVenueList: function() { + var self = this; + app.restAjax.get(app.restAjax.path('{venueUrl}/app/venuesinfo/listpagevenuesinforelease', [self.data.venue.venueUrl]), { + page: 1, + rows: 3 }, null, function(code, data) { - + self.setData({ + 'venue.venueList': data.rows + }); }, function(code, data) { app.dialog.msg(data.msg); }); }, - doGetActivity: function() { - + doGetActivityList: function() { + var self = this; + app.restAjax.get(app.restAjax.path('{activityUrl}/app/activitylibrary/listpageactivitylibraryrelease', [self.data.activity.activityUrl]), { + page: 1, + rows: 3 + }, null, function(code, data) { + self.setData({ + 'activity.activityList': data.rows + }); + }, function(code, data) { + app.dialog.msg(data.msg); + }); }, doGetNewsList: function() { var self = this; @@ -151,6 +167,8 @@ Page({ self.doGetLibrary(); self.doGetNewsList(); self.doGetLiveList(); + self.doGetVenueList(); + self.doGetActivityList(); }, /** diff --git a/pages/index/index.wxml b/pages/index/index.wxml index dbde2a7..2163cd7 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -36,20 +36,11 @@ - - + + - - - - - - - - - - - + +