update

pages/conference/conference.js

@@ -21,7 +21,7 @@ Page({
       url: host + '/api/detail',
       method: 'GET',
       data: {
-        type: 'conference',
+        type: 'activity',
         id: options.id
       },
       success: function (res) {

pages/learning/learning.wxml

@@ -38,7 +38,7 @@
               </view>
 
               <view class="part">
-                  <view class="title">热门活动   <text bindtap="more" data-id='2'>查看更多</text></view>
+                  <view class="title">热门会议   <text bindtap="more" data-id='2'>查看更多</text></view>
                   <view class="hd">
                       <navigator class="list" wx:for='{{hot_arct}}' wx:key="hot_arct{{index}}"  url="../eventDetail/eventDetail?id={{item.id}}">
                           <image src="{{item.img}}"></image>