Merge remote-tracking branch 'origin/develop' into wxl-develop

src/pages/websiteindex/businessinfolist.wxml

@@ -33,7 +33,7 @@
             <list-loading loading="{{listLoading}}" style="margin: 0 auto"></list-loading>   
         </view>  
         <view class="" wx:if="{{emptyPage}}">
-            <empty-content text="暂无数据" emptyimg="empty2"></empty-content>
+            <empty-content text="暂无数据" emptyimg="common/empty/empty_c_sraech.png.png"></empty-content>
         </view>
     </view>
 </view>

src/pages/websiteindex/clocklist.wxml

@@ -31,7 +31,7 @@
         <list-loading loading="{{listLoading}}"></list-loading>
     </view>
     <view class=""      wx:if="{{emptyPage}}">
-        <empty-content text="暂无数据" emptyimg="empty2"></empty-content>
+        <empty-content text="暂无数据" emptyimg="common/empty/empty_c_sraech.png.png"></empty-content>
     </view>
     <view class="videodialog"      wx:if="{{videostatus.videoShow}}">
         <view class="videodialogmask"      bindtap="closeVideo"></view>

src/pages/websiteindex/commentindex.wxml

@@ -31,7 +31,7 @@
         <list-loading loading="{{listLoading}}"></list-loading>
     </view>
     <view class=""      wx:if="{{emptyPage&&teacherEmpty}}">
-        <empty-content text="暂无数据" emptyimg="empty2"></empty-content>
+        <empty-content text="暂无数据" emptyimg="common/empty/empty_c_sraech.png.png"></empty-content>
     </view>
     <view class="footer"      style="bottom: {{inputHeight}}px">
         <input type="text" adjust-position="{{false}}" placeholder-class="placeholderclass" class="iteminput" bindfocus="bindfocus" bindblur='bindblur' maxlength="50" value="{{comment}}" bindinput="commentInput" placeholder="留下你的精彩评论吧" ></input> 

src/pages/websiteindex/index.wxml

@@ -305,7 +305,7 @@
             </view>
             <list-loading loading="{{subjectListLoading}}"></list-loading>
             <view class="subjectEmptyPage"      wx:if="{{subjectEmptyPage}}">
-                <empty-content text="学校暂未开设主题课，快去提醒学校设置更多主题课吧~" emptyimg="empty2.png"></empty-content>
+                <empty-content text="学校暂未开设主题课，快去提醒学校设置更多主题课吧~" emptyimg="common/empty/empty_c_sraech.png"></empty-content>
             </view>
         </view>
           

src/pages/websiteindex/index.wxss

@@ -1244,4 +1244,5 @@ page{
 }
 .subjectEmptyPage{
   padding-bottom: 400rpx;
+  position: relative;
 }
\ No newline at end of file

src/pages/websiteindex/onlineclassroomlist.wxml

@@ -24,7 +24,7 @@
         <list-loading loading="{{listLoading}}" style="margin: 0 auto"></list-loading>   
     </view>
     <view class="" wx:if="{{emptyPage}}">
-        <empty-content text="暂无数据" emptyimg="empty2"></empty-content>
+        <empty-content text="暂无数据" emptyimg="common/empty/empty_c_sraech.png.png"></empty-content>
     </view>
 </view>