diff --git a/app.js b/app.js
index 8db9eef..65f9b5f 100644
--- a/app.js
+++ b/app.js
@@ -7,9 +7,15 @@ App({
   newsUrl: 'https://www.wgink.ink/news',
   newsContentUrl: 'https://www.wgink.ink',
   libraryUrl: 'https://www.wgink.ink/library',
+<<<<<<< HEAD
   venueUrl: 'http://192.168.0.109:8082/venuebooking',
   activityUrl: 'http://192.168.0.111:8080/culturalactivity',
   volunteerUrl: 'https://www.wgink.ink/volunteer',
+=======
+  venueUrl: 'https://www.wgink.ink/venuebooking',
+  activityUrl: 'http://192.168.0.111:8080/culturalactivity',
+  volunteerUrl: 'http://192.168.0.111:8888/volunteer',
+>>>>>>> 8555f8c2cd310ce9fdc19a34346841205d404f1a
   liveUrl: 'https://www.wgink.ink/live',
   liveRecordUrl: 'https://www.wgink.ink',
   socialUrl: 'https://www.wgink.ink/social',
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 @@
 <view class="dialog">
+  <view class="dialog-box" wx:if="{{dataList < 1}}">
+    暂无评论
+  </view>
   <view class="dialog-box" wx:for="{{dataList}}">
     <view class="avatar">
       <image wx:if="{{item.photo}}" src="{{item.photo}}"></image>
@@ -15,9 +18,6 @@
       </view>
       <view class="public-time">
         <view class="time">{{item.uploadTime}}</view>
-        <!--<view class="delete">
-          <image src="../../images/delete.png"></image>
-        </view>-->
       </view>
     </view>
   </view>
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 @@
     <view class="part">
       <view class="part-title">
         活动详情
-        <view class="comment-btn" bindtap="toActivityHis">评论列表</view>
+        <view class="comment-btn" bindtap="toActivityHis" data-status="{{dataMap.status}}">评论列表</view>
       </view>
       <rich-text class="part-content" nodes="{{dataMap.introduce}}"></rich-text>
     </view>