Merge branch 'feature-appmarketv2' into 'develop'

应用市场横向滚动条不显示调整

See merge request o2oa/o2oa!1587

o2web/source/x_component_AppMarketV2/$Main/default/recommendContent.html

@@ -10,7 +10,6 @@
                 <div class="o2_appmarket_recommendRightTopMask"></div>
                 <div class="o2_appmarket_recommendRightTitle" data-o2-element="recommendRightTopTitle"></div>
             </div>
-            <div style="clear:both;"></div>
             <div class="o2_appmarket_recommendRightBottom" data-o2-element="rightBottomCoverNode">
                 <div class="o2_appmarket_recommendRightBottomPic" data-o2-element="recommendRightBottomPic"></div>
                 <div class="o2_appmarket_recommendRightBottomMask"></div>

o2web/source/x_component_AppMarketV2/$Main/default/style.css

@@ -1,6 +1,5 @@
 .o2_appmarket_content {
-    margin: 40px 20px 0px 40px;
-    width:100%;
+    margin: 40px 0px 0px 40px;
     min-width: 1280px;
     min-height: 700px;
     font-size: 14px;
@@ -22,7 +21,7 @@
 }
 .o2_appmarket_recommendLeft {
     float: left;
-    width:65%;
+    width:63%;
     height:100%;
     border-radius:16px;
     border:1px solid rgba(151,151,151,1);
@@ -65,11 +64,9 @@
 }
 
 .o2_appmarket_recommendRight {
-    float: left;
     height: 100%;
-    width: 35%;
-    margin-left:10px;
-    margin-right:30px;
+    margin-left:64%;
+    margin-right:40px;
 }
 .o2_appmarket_recommendRightTop {
     height: 49%;

o2web/source/x_component_AppMarketV2/ApplicationsContent.js

@@ -192,7 +192,7 @@ MWF.xApplication.AppMarketV2.ApplicationsContent.Applications= new Class({
         //this.content.appCategory_count.empty();
         //new Element("div",{"text":this.content.currentcategory.name+"("+this.content.currentcategory.count+")"}).inject(this.content.appCategory_count);        
         var appsdiv = this.content.appList;
-        var appsdivwidth= appsdiv.clientWidth-70;
+        var appsdivwidth= appsdiv.clientWidth-40;
         //appwidth = (appsdivwidth-200)/7;
         rowappnum = parseInt(appsdivwidth/240);
         rowappmargin = (appsdivwidth/240-rowappnum)  * 240  / (rowappnum-1);

o2web/source/x_component_AppMarketV2/RecommendContent.js

@@ -83,11 +83,11 @@ MWF.xApplication.AppMarketV2.RecommendContent.Recommend= new Class({
     },
     loadItems: function(data){
         debugger;
-        var recommendWidth = this.content.topRecommendContent.clientWidth;
-        var recommendLeftWidth = (recommendWidth - 80-10)*0.65;
-        var recommendRightWidth = (recommendWidth - 80-10)*0.35;
-        this.content.leftCoverNode.setStyle("width",recommendLeftWidth+"px");
-        this.content.rightCoverNode.setStyle("width",recommendRightWidth+"px");
+        //var recommendWidth = this.content.topRecommendContent.clientWidth;
+        //var recommendLeftWidth = (recommendWidth - 80-10)*0.65;
+        //var recommendRightWidth = (recommendWidth - 80-10)*0.35;
+        //this.content.leftCoverNode.setStyle("width",recommendLeftWidth+"px");
+        //this.content.rightCoverNode.setStyle("width",recommendRightWidth+"px");
         data.each(function(d, i){
             this.loadItem(d, i);
         }.bind(this));