bug

pages/collect/collect.wxml

@@ -14,7 +14,7 @@
   </navigator>
 
 <navigator class="list" url="../eventDetail/eventDetail?id={{item.id}}"  wx:key="conference{{index}}" wx:if='{{item.target_type== "conference"}}'>
-                      <image  src="{{item.img}}"></image>
+                      <image style="height:60px;" src="{{item.img}}"></image>
                       <view>
                     <view class="title">{{item.name}}</view>
                         <view class="ly" style="text-align:right;"> 
@@ -24,12 +24,15 @@
                     </view>
 </navigator> 
 <navigator class="list" url="../news/news?id={{item.id}}"  wx:key="conference{{index}}" wx:if='{{item.target_type== "news"}}'>
-                      <image  src="{{item.img}}"></image>
+                      <image style="height:60px;" src="{{item.img}}"></image>
                       <view>
                     <view class="title">{{item.name}}</view>
-                        <view class="ly" style="text-align:left;"> 
-                            <text>{{item.publish_time}}</text>
-                        </view>
+                          <view class="ly"> 
+                              <view>
+                                  <text>{{item.publish_time}}</text>
+                              </view>
+                              <text class="nowrap">来源:{{item.journal_name}}</text>
+                          </view>
                         <text class="">{{item.desc}}</text>
                     </view>
 </navigator> 

pages/collect/collect.wxss

@@ -15,11 +15,11 @@
   
 }
 .list image{
-  width: 20%;
+  width: 25%;
   max-height: 100px;
 }
 .list>view{
-  width: 80%;
+  width: 75%;
   vertical-align: middle;
   padding-left: 20rpx;  
 }

pages/eventDetail/eventDetail.wxml

@@ -2,10 +2,9 @@
 <view class="{{show?'fixed':''}}">
 <image class='banner'  src="{{info.img}}"></image>
 <view class="info">
-    <view>{{info.name}}
-    <text wx:if='{{info.is_collected}}' class="collect" data-id='1' bindtap="collect">取消收藏</text>
+<text wx:if='{{info.is_collected}}' class="collect" data-id='1' bindtap="collect">取消收藏</text>
       <text wx:else class="collect" bindtap="collect">收藏</text>
-    </view>
+    <view>{{info.name}} </view>
     <text>主办单位：{{info.organizer_info.name}}</text>
     <!-- <text>主讲人：{{info.speaker}}</text> -->
     <text>时间：{{info.begin_time}}—{{info.end_time}} </text>

pages/knowledge/knowledge.wxml

@@ -17,7 +17,7 @@
 
 <view class="tab">
     <text bindtap="tab" data-id='0' class="{{act == 0?'active':''}}">精品导读</text>
-    <text bindtap="tab" data-id='1' class="{{act == 1?'active':''}}">刊群状态</text>
+    <text bindtap="tab" data-id='1' class="{{act == 1?'active':''}}">刊群动态</text>
 </view>
 
 <!-- <view style="text-align:center;margin:100px 0;" bindtap="getData" wx:if='{{list.length<=0}}'>点击重新加载</view> -->
@@ -47,7 +47,7 @@
   <swiper-item>
       <scroll-view scroll-y="true" scroll-into-view="{{scroll}}" bindscrolltolower='next1' class="content">
           <navigator url="../news/news?id={{item.id}}" class="list" wx:for='{{list1}}' wx:key="journals{{index}}">
-              <image   src="{{item.img}}"></image>
+              <image style="height:60px;"  src="{{item.img}}"></image>
               <view>
                           <view class="title"> <rich-text nodes="<div style='overflow:hidden;white-space:nowrap;text-overflow:ellipsis;'>{{item.name}}</div>"></rich-text></view>
                           <view class="ly"> 

pages/news/news.wxml

@@ -6,10 +6,10 @@
     <text wx:if='{{info.is_collected}}' class="collect" data-id='1' bindtap="collect">取消收藏</text>
       <text wx:else class="collect" bindtap="collect">收藏</text>
     </view>
-    <text>主办单位：{{info.organizer_info.name}}</text>
+    <text>来源：{{info.journal_name}}</text>
     <!-- <text>主讲人：{{info.speaker}}</text> -->
-    <text>时间：{{info.begin_time}}—{{info.end_time}} </text>
-    <text>地址：{{info.city}}{{info.address}}</text>
+    <text>发布时间：{{info.ctime}}</text>
+    <!-- <text>地址：{{info.city}}{{info.address}}</text> -->
 </view>
  
 <view class="content">

pages/news/news.wxss

@@ -49,6 +49,7 @@ page{
 .content{
    border-bottom: 1px solid #F0F0F0;
     padding-bottom: 28rpx;
+    overflow-x: hidden;
 }
 
 .post{