Merge branch 'master' of http://120.77.182.185/yanl/mini-shimao

pages/notice-detail/notice-detail.wxml

@@ -8,8 +8,8 @@
     <view class="date row con-s">
     <view class="date row con-s">
         <text>{{notice.date}}</text>
         <text>{{notice.date}}</text>
     </view>
     </view>
-    <view class="cover">
-        <image src="{{notice.cover}}" mode="center"></image>
+    <view class="cover" wx:if="{{notice.cover !== ''}}">
+        <image src="{{notice.cover}}" mode="widthFix"></image>
     </view>
     </view>
     <view class="describe">
     <view class="describe">
         <parser html="{{notice.describe}}"/>
         <parser html="{{notice.describe}}"/>

pages/notice-detail/notice-detail.wxss

@@ -25,7 +25,7 @@
 
 
 .cover image {
 .cover image {
     width: 670rpx;
     width: 670rpx;
-    height: 288rpx;
+    /* height: 288rpx; */
     /* margin-top: 14rpx; */
     /* margin-top: 14rpx; */
 }
 }
 
 

pages/notice/notice.wxml

@@ -18,7 +18,7 @@
                     <parser html="{{item.describe}}"/>
                     <parser html="{{item.describe}}"/>
                 </view>
                 </view>
                 <view class="notice-cover" wx:if="{{item.cover !== ''}}">
                 <view class="notice-cover" wx:if="{{item.cover !== ''}}">
-                    <image src="{{item.cover}}" mode="center"></image>
+                    <image src="{{item.cover}}" mode="widthFix"></image>
                 </view>
                 </view>
             </view>
             </view>
         </block>
         </block>

pages/notice/notice.wxss

@@ -52,6 +52,6 @@
 
 
 .notice-cover image {
 .notice-cover image {
     width: 670rpx;
     width: 670rpx;
-    height: 376rpx;
+    /* height: 376rpx; */
     margin-top: 40rpx;
     margin-top: 40rpx;
 }
 }
\ No newline at end of file

pages/strategy/strategy.wxss

@@ -101,7 +101,7 @@
 }
 }
 
 
 .relation-item-info text:nth-child(2) {
 .relation-item-info text:nth-child(2) {
-    margin-top: 38rpx;
+    margin-top: 30rpx;
     font-size: 26rpx;
     font-size: 26rpx;
     color: #656E7B;
     color: #656E7B;
 }
 }