diff --git a/app.js b/app.js index ec50428..09ffa24 100644 --- a/app.js +++ b/app.js @@ -8,7 +8,7 @@ App({ newsContentUrl: 'https://www.wgink.ink', libraryUrl: 'https://www.wgink.ink/library', venueUrl: 'https://www.wgink.ink/venuebooking', - activityUrl: 'https://www.wgink.ink/culturalactivity', + activityUrl: 'http://192.168.0.111:8080/culturalactivity', volunteerUrl: 'http://192.168.0.111:8888/volunteer', liveUrl: 'https://www.wgink.ink/live', liveRecordUrl: 'https://www.wgink.ink', diff --git a/pages/activityDialog/activityDialog.js b/pages/activityDialog/activityDialog.js index 915664e..5afb011 100644 --- a/pages/activityDialog/activityDialog.js +++ b/pages/activityDialog/activityDialog.js @@ -12,7 +12,8 @@ Page({ page: 1, rows: 5 }, - dataList: {} + dataList: {}, + status: '' }, getToken: function() { var self = this; @@ -61,6 +62,7 @@ Page({ self.setData({ dataList: data.rows }) + console.log(self.data.dataList) }else { if(data.rows.length == 0) { self.setData({ @@ -88,7 +90,8 @@ Page({ onLoad: function (options) { var self = this; self.setData({ - serviceId: options.serviceId + serviceId: options.serviceId, + status: options.status }) this.getToken().then(result => { this.getActivityHis() diff --git a/pages/activityDialog/activityDialog.wxml b/pages/activityDialog/activityDialog.wxml index b01d618..48a8c04 100644 --- a/pages/activityDialog/activityDialog.wxml +++ b/pages/activityDialog/activityDialog.wxml @@ -1,4 +1,7 @@ + + 暂无评论 + @@ -15,9 +18,6 @@ {{item.uploadTime}} - diff --git a/pages/serviceActivityDetail/serviceActivityDetail.js b/pages/serviceActivityDetail/serviceActivityDetail.js index 55b32b6..f00dc9f 100644 --- a/pages/serviceActivityDetail/serviceActivityDetail.js +++ b/pages/serviceActivityDetail/serviceActivityDetail.js @@ -224,10 +224,11 @@ Page({ }) }, - toActivityHis: function() { + toActivityHis: function(e) { var self = this; + const status = e.currentTarget.dataset.status; wx.navigateTo({ - url: '../activityDialog/activityDialog?serviceId=' + self.data.serviceId, + url: '../activityDialog/activityDialog?serviceId=' + self.data.serviceId + '&status=' + status, }) }, /** diff --git a/pages/serviceActivityDetail/serviceActivityDetail.wxml b/pages/serviceActivityDetail/serviceActivityDetail.wxml index 9d86543..5b40e73 100644 --- a/pages/serviceActivityDetail/serviceActivityDetail.wxml +++ b/pages/serviceActivityDetail/serviceActivityDetail.wxml @@ -24,7 +24,7 @@ 活动详情 - 评论列表 + 评论列表