Merge branch 'feature-appmarketv2' into 'develop'

应用市场样式更新

See merge request o2oa/o2oa!1575

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

@@ -230,8 +230,8 @@
     float:right;
 }
 .o2_appmarket_application{
-    width:285px;
-    height:452px;
+    width:240px;
+    height:462px;
     background:rgba(255,255,255,1);
     box-shadow:0px 0px 8px 0px rgba(0,0,0,0.25);
     border-radius:16px;
@@ -241,15 +241,14 @@
 
 }
 .o2_appmarket_application_icon{
-    height:70%;
+    height:65%;
     border-top-left-radius: 16px;
     border-top-right-radius: 16px;
     background-size:cover;
 }
 .o2_appmarket_application_info{
-    height:30%;
     width:90%;
-    margin:20px 20px auto 20px;
+    margin:20px 10px auto 10px;
 }
 .o2_appmarket_application_info_name{
     width:100%;

o2web/source/x_component_AppMarketV2/ApplicationsContent.js

@@ -189,11 +189,11 @@ MWF.xApplication.AppMarketV2.ApplicationsContent.Applications= new Class({
         var appsdiv = this.content.appList;
         var appsdivwidth= appsdiv.clientWidth-80;
         //appwidth = (appsdivwidth-200)/7;
-        rowappnum = parseInt(appsdivwidth/285);
-        rowappmargin = (appsdivwidth/285-rowappnum)  * 285  / (rowappnum-1);
+        rowappnum = parseInt(appsdivwidth/240);
+        rowappmargin = (appsdivwidth/240-rowappnum)  * 240  / (rowappnum-1);
         if (rowappmargin<10){
             rowappnum = rowappnum -1;
-            rowappmargin = (appsdivwidth/285-rowappnum)  * 285  / (rowappnum-1)
+            rowappmargin = (appsdivwidth/240-rowappnum)  * 240  / (rowappnum-1)
         }
         debugger;
         //appsdiv.setStyle("width","calc("+appwidth+"px)");