资源位增加推手推荐楼层

@@ -2915,3 +2915,27 @@
     </div>
 
 </script>
+<!--推手商品轮播-->
+<script type="text/template" id="pusherGoodsRoll-template">
+  <div class="rows">
+    <div class="row mb8">
+      <label class="col-sm-2 control-label text-right">标题:</label>
+      <div class="col-sm-8">
+        <input style="width: 200px;" type="text" placeholder="标题" class="observe number form-control input-form" id="title" data-field="title" value="[[contentData.data.title]]" >
+      </div>
+    </div>
+    <div class="row mb8">
+      <label class="col-sm-2 control-label text-right">优先的skn:</label>
+      <div class="col-sm-8">
+                <textarea rows="5" class="form-control observe form-control input-form" placeholder="多个skn用英文逗号分隔"
+                          data-field="productSkns" style="resize: none; width: 400px;">[[contentData.data.productSkns]]</textarea>
+      </div>
+    </div>
+    <div class="row">
+      <label class="col-sm-2 control-label text-right">轮播速度:</label>
+      <div class="col-sm-8">
+        <input type="text" placeholder="轮播速度" class="observe number form-control input-form" id="speed" data-field="speed" value="[[contentData.data.speed]]" > ms
+      </div>
+    </div>
+  </div>
+</script>
\ No newline at end of file

@@ -2118,6 +2118,18 @@ var Button = [
         __title:"动画",
         data: {"configUrl":""},
         isNewFloor:"1"
+    },
+    {
+      button_name: "推手商品轮播",
+      template_intro: "推手商品轮播",
+      template_name: "pusherGoodsRoll",
+      dialog: "pusherGoodsRoll-template",
+      __title:"推手商品轮播",
+      data: {
+        "title": "",
+        "productSkns": "",
+        "speed": 0,
+      },
     }
 ];
 

@@ -354,10 +354,34 @@ var Bll = {
                             return false;
                         }
                     }
+                    //推手推荐
+                    if(module.contentData.template_name == 'pusherGoodsRoll'){
+                        if(module.contentData.data.title == ''){
+                          common.util.__tip('标题不能为空!', 'warning');
+                          return false;
+                        }
+                        if(module.contentData.data.speed == '' || module.contentData.data.speed == 0){
+                          common.util.__tip('请设置轮播速度!', 'warning');
+                          return false;
+                        }
+                        var productSkns = module.contentData.data.productSkns;
+
+                        if (productSkns == ''){
+                            common.util.__tip('请设置优先skn', 'warning');
+                            return false;
+                        }
+                        module.contentData.data.productSkns = productSkns.replace('，',',');
+                        var n = (module.contentData.data.productSkns.split(',')).length;
+                        if(n > 15) {
+                          common.util.__tip('最多设置15个SKN', 'warning');
+                          return false;
+                        }
+                    }
+
                     var couponFlag = true;
                     //好店推荐切换radio，增加/删除校验
                     var shopRecommendFlag = false;
-                        if(module.contentData.template_name == 'shopRecommend') {
+                    if(module.contentData.template_name == 'shopRecommend') {
                         if(module.contentData.isShopRecommend=="N"||module.contentData.isShopRecommend==""){
                             $(".shopRecommendRequired").attr("required",true);
                             module.contentData.shopChannelId='';
@@ -2899,7 +2923,7 @@ BT.push({
     "buttonNames":['splitJointImg','splitJointImgBanner','twoPicture','newSingleImage','imageListFloor','divideImage','floorMark','focus','newUserFloor','imageListBanner',
         'guessLike','newProductListFloor','headChannelSwitch','category',
         'popularListFloor','newProductListMerge','singleColumnProduct','findGoodsListFloor','recommendContentFive','limitSaleListFloor','editorTalk',
-        'shopActivityListFloor','shopFloor','tabFloor','textNav','tfGoodsList','recommendGoodsGroup','guangRqFloor','guangShowOrderFloor','timeImage', 'verticalCarousel']
+        'shopActivityListFloor','shopFloor','tabFloor','textNav','tfGoodsList','recommendGoodsGroup','guangRqFloor','guangShowOrderFloor','timeImage', 'verticalCarousel', 'pusherGoodsRoll']
 });
 BT.push({
     "channel":"pc",
@@ -2911,7 +2935,7 @@ BT.push({
 });
 BT.push({
     "channel":"miniapp",
-    "buttonNames":['focus','recommendContentFive','imageListFloor','newSingleImage','newProductListFloor','popularListFloor','splitJointImg','splitJointImgBanner']
+    "buttonNames":['focus','recommendContentFive','imageListFloor','newSingleImage','newProductListFloor','popularListFloor','splitJointImg','splitJointImgBanner', 'pusherGoodsRoll']
 });
 BT.push({
     "channel":"blk",