Merge branch 'dev_blk改版' into test6.4

@@ -2043,6 +2043,9 @@
 <script type="text/template" id="noEdit-template">
 <script type="text/template" id="noEdit-template">
     <div>固定内容，暂时无法编辑!</div>
     <div>固定内容，暂时无法编辑!</div>
 </script>
 </script>
+<script type="text/template" id="blkCategory-template">
+    <div>固定内容，暂时无法编辑!</div>
+</script>
 
 
 <script type="text/template" id="template-batchAddImage">
 <script type="text/template" id="template-batchAddImage">
     <div class="rows" id="moduleimgs">
     <div class="rows" id="moduleimgs">

@@ -103,6 +103,12 @@
         <span>潮人搭配</span>
         <span>潮人搭配</span>
     </div>
     </div>
 </div>
 </div>
+    [[else if module.contentData.template_name=='blkCategory']]
+    <div class="big-pic">
+        <div class="wordText">
+            <span>blk分类</span>
+        </div>
+    </div>
 [[else if module.contentData.template_name=='trendgoodsTopic']]
 [[else if module.contentData.template_name=='trendgoodsTopic']]
 <div class="big-pic">
 <div class="big-pic">
     <div class="wordText">
     <div class="wordText">

@@ -1839,7 +1839,15 @@ var Button = [
             "guangShowType":"1"
             "guangShowType":"1"
         },
         },
         "isNewFloor":"1"
         "isNewFloor":"1"
-    }
+    },
+    {
+        button_name: "blk分类",
+        template_intro: "blk分类",
+        template_name: "blkCategory",
+        dialog: "blkCategory-template",
+        data: {},
+        "isNewFloor":"1"
+    },
 ];
 ];
 
 
 module.exports = Button;
 module.exports = Button;