Merge branch 'wxl-develop' of git.server:wangxuelai/wechatapp.shangjiadao.com into lvtz2

business/pages/organizationalmgt/index.wxml

@@ -64,7 +64,7 @@
               <button form-type="submit" class="createidbutton">生成form</button>
             </form>
             <view class="item-left" hover-class="none" hover-stop-propagation="false">
-              <image class="item-icon icona" src="{{imageRoot}}2b/organizationalmgt/icon5.png?{{imageVersion}}" lazy-load="false" binderror="" bindload=""></image>
+              <image class="item-icon icona" src="{{imageRoot}}2b/organizationalmgt/officialweb.png?{{imageVersion}}" lazy-load="false" binderror="" bindload=""></image>
             </view>
             <view class="item-right" hover-class="none" hover-stop-propagation="false">
               <text class="right-text">微官网管理</text>

src/pages/officialweb/officialwebindex.js

@@ -117,6 +117,7 @@ Page({
         }
         data.banner = banner;
         data.news = news;
+        console.log(data, 'datadatadatadatadatadatadata');
         this.setData({
           homeDetail: data
         })

src/pages/officialweb/officialwebindex.wxml

@@ -19,7 +19,7 @@
       <view class="pagination-dot {{swiperIndex == index ? 'active' : ''}}" hover-class="none" hover-stop-propagation="false" wx:for="{{homeDetail.banner}}" wx:key="{{index}}"></view>
     </view>
   </view>
-  <view class="newsbox" hover-class="none" hover-stop-propagation="false" wx:if="{{homeDetail.news.length>0}}">
+  <view class="newsbox" hover-class="none" hover-stop-propagation="false" wx:if="{{homeDetail.news && homeDetail.news.length>0}}">
     <image class="news-logo" src="{{localImageRoot}}2c/officialweb/index/icon_news.png?{{imageVersion}}"></image>
     <view class="newsbox-content">
       <swiper autoplay="{{true}}" interval="3000" vertical="true">

src/pages/officialweb/officialwebindex.wxss

@@ -47,7 +47,7 @@ image {
 }
 .share-image {
     width: 41rpx;
-    height: 44rpx;
+    height: 38rpx;
 }
 .swiper-box {
     margin: 0 auto 40rpx;