Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop

@@ -12,7 +12,7 @@ window.NETSALEDATA=require('./partials/data.js');
 console.log(window.NETSALEDATA);
 console.log(window.NETSALEDATA);
 
 
 /*加载其他模块*/
 /*加载其他模块*/
-require('./partials/xiaobian');
+require('./partials/editor_recommend');
 
 
 
 
 
 

@@ -18,7 +18,6 @@
 
 
 <div class="contentpanel">
 <div class="contentpanel">
     
     
-    {{# data}}
     <div class="panel panel-danger">
     <div class="panel panel-danger">
         <div class="panel-heading">
         <div class="panel-heading">
             <div class="panel-btns" style="display: none;">
             <div class="panel-btns" style="display: none;">
@@ -227,7 +226,6 @@
             {{> netsale/video}}
             {{> netsale/video}}
         </div>
         </div>
     </div>
     </div>
-    {{/ data}}
 </div>
 </div>