Merge branch 'dev_2.2' into test

xuhongyun
Commit 33d64cdf5472eab929e1a5ee06fb05ce799bcd21 2 parents d4a6f20d 823bfb7f
Showing 1 changed file with 8 additions and 4 deletions
code/static/js.jquery/module/shop/Decoration.js
--- a/code/static/js.jquery/module/shop/Decoration.js
View file @33d64cd
+++ b/code/static/js.jquery/module/shop/Decoration.js
View file @33d64cd
@@ -438,7 +438,8 @@ function gridInit(id){
                 el:"#"+id,
                 columns:[
                     {display:"店铺banner图片", render:function(item){
-                        return "<input type=file name='shopBannerImage' id='shopBannerImage_"+item.__index+"' value='"+item.shopSrc+"' />";
+                        return "<div><input type=file name='shopBannerImage' id='shopBannerImage_"+item.__index+"' value='"+item.shopSrc+"' /></div>" +
+                            "<div style='color: #ec971f;clear: both;padding-top: 5px;'>* 店铺banner图片尺寸：1150*200</div>"; 
                     }},
                     {display:"是否显示店铺名称", render:function(item){
                         if(item.isShowShopName == "Y"){
@@ -450,7 +451,8 @@ function gridInit(id){
                         }
                     }},
                     {display:"商品详情页banner图片", render:function(item){
-                        return "<input type=file name='DetailbannerImage' id='DetailbannerImage_"+item.__index+"' value='"+item.detailSrc+"' />";
+                        return "<div><input type=file name='DetailbannerImage' id='DetailbannerImage_"+item.__index+"' value='"+item.detailSrc+"' /></div>" +
+                            "<div style='color: #ec971f;clear: both;padding-top: 5px;'>* 商品详情页banner图片尺寸：1920*45</div>";
                     }}
                 ]
             });
@@ -466,7 +468,8 @@ function gridInit(id){
                     el:"#"+id,
                     columns:[
                         {display:"店铺banner图片", render:function(item){
-                            return "<input type=file name='shopBannerImage' id='shopBannerImage_"+item.__index+"' value='"+item.shopSrc+"' />";
+                            return "<div><input type=file name='shopBannerImage' id='shopBannerImage_"+item.__index+"' value='"+item.shopSrc+"' /></div>" +
+                            "<div style='color: #ec971f;clear: both;padding-top: 5px;'>* 店铺banner图片尺寸：1150*200</div>";
                         }},
                         {display:"是否显示店铺名称", render:function(item){
                             if(item.isShowShopName == "Y"){
@@ -478,7 +481,8 @@ function gridInit(id){
                             }
                         }},
                         {display:"商品详情页banner图片", render:function(item){
-                            return "<input type=file name='DetailbannerImage' id='DetailbannerImage_"+item.__index+"' value='"+item.detailSrc+"' />";
+                            return "<div><input type=file name='DetailbannerImage' id='DetailbannerImage_"+item.__index+"' value='"+item.detailSrc+"' /></div>" +
+                            "<div style='color: #ec971f;clear: both;padding-top: 5px;'>* 商品详情页banner图片尺寸：1920*45</div>";
                         }}
                     ]
                 });