Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/zkyxcx

pages/eventDetail/eventDetail.wxml

@@ -4,7 +4,7 @@
     <view>{{info.name}}</view>
     <text>主办单位：{{info.organizer_info.name}}</text>
     <text>主讲人：{{info.speaker}}</text>
-    <text>时间：{{info.begin_time}}-{{info.end_time}} </text>
+    <text>时间：{{info.begin_time}}—{{info.end_time}} </text>
     <text>地址：{{info.city}}{{info.address}}</text>
 </view>
  

pages/index/index.wxml

@@ -80,7 +80,7 @@
               <text wx:if='{{item.total_journal>0}}'>{{item.total_journal}} </text> 
               </navigator>
               <view class="dw_list">
-                    <navigator wx:for='{{item.journals}}' url="../journalDetail/journalDetail?id={{item.id}}"  wx:key="*this" wx:for-item='jour'>
+                    <navigator wx:for='{{item.journals}}' url="../journalDetail/journalDetail?id={{jour.id}}"  wx:key="*this" wx:for-item='jour'>
                         <view>{{jour.name}}</view>
                         <text>{{jour.desc}}</text>
                     </navigator>