按钮的顺序

@@ -36,7 +36,7 @@ var Button = [
         imageHeight:"",
         imageHeight:"",
         imageWidth:"",
         imageWidth:"",
         "isDefault":"1",
         "isDefault":"1",
-        "divideColour" : "1"
+        "divideColour" : "2"
     },
     },
     {
     {
         template_intro: "均分图片",
         template_intro: "均分图片",

@@ -742,7 +742,7 @@ $(document).on("click", ".edit", function () {
     }else if(item.contentData.template_name =='divideImage'){
     }else if(item.contentData.template_name =='divideImage'){
         if (item.contentData.data.length!=0 && item.contentData.data[0].src!=''){
         if (item.contentData.data.length!=0 && item.contentData.data[0].src!=''){
             item.contentData.isDefault = '2';   //自定义
             item.contentData.isDefault = '2';   //自定义
-            item.contentData.divideColour = '1';  // 切换的时候默认灰色
+            item.contentData.divideColour = '2';  // 切换的时候默认灰色
         }
         }
         Bll.module = $.extend(true, {}, item);
         Bll.module = $.extend(true, {}, item);
         Bll.renderDialog("divideImage-template");
         Bll.renderDialog("divideImage-template");
@@ -2431,7 +2431,10 @@ var BT = [];
 
 
 BT.push({
 BT.push({
     "channel":"app",
     "channel":"app",
-    "buttonNames":['focus','newUserFloor','guessLike','splitJointImg','newSingleImage','twoPicture','newProductListFloor','popularListFloor','newProductListMerge','findGoodsListFloor','imageListFloor','recommendContentFive','limitSaleListFloor','editorTalk','shopActivityListFloor','shopFloor','tabFloor','textNav','tfGoodsList','recommendGoodsGroup','guangRqFloor','guangShowOrderFloor','timeImage']
+    "buttonNames":['splitJointImg','twoPicture','newSingleImage','imageListFloor','divideImage','focus','newUserFloor',
+        'guessLike','newProductListFloor',
+        'popularListFloor','newProductListMerge','findGoodsListFloor','recommendContentFive','limitSaleListFloor','editorTalk',
+        'shopActivityListFloor','shopFloor','tabFloor','textNav','tfGoodsList','recommendGoodsGroup','guangRqFloor','guangShowOrderFloor','timeImage']
 });
 });
 BT.push({
 BT.push({
     "channel":"pc",
     "channel":"pc",
@@ -2457,17 +2460,24 @@ $(document).on("click", ".button-type a", function() {
         Bll.__render(".contents", "template_content_btns", {btns: originButton});
         Bll.__render(".contents", "template_content_btns", {btns: originButton});
     }else{
     }else{
 
 
-    for(var i = 0; i < BT.length; i++) {
-        if(BT[i].channel==channel){
-            var buttonNames = BT[i].buttonNames;
-            for(var t=0;t<originButton.length;t++){
-                if(buttonNames.indexOf(originButton[t].template_name)>-1){
-                    Button_content.push(originButton[t]);
+        var buttonMap = {};
+        for(var t=0;t<originButton.length;t++){
+            buttonMap[originButton[t].template_name] = originButton[t];
+        }
+
+        for(var i = 0; i < BT.length; i++) {
+            if(BT[i].channel==channel){
+
+                var buttonNames = BT[i].buttonNames;
+                for(var j=0; j<buttonNames.length; j++){
+                    if (buttonMap[buttonNames[j]] != null){
+                        Button_content.push(buttonMap[buttonNames[j]]);
+                    }
                 }
                 }
+
             }
             }
         }
         }
-    }
-    Bll.__render(".contents", "template_content_btns", {btns: Button_content});
+        Bll.__render(".contents", "template_content_btns", {btns: Button_content});
     }
     }
     $(".button-type").removeClass("active");
     $(".button-type").removeClass("active");
     $(".button-type a").each(function(index) {
     $(".button-type a").each(function(index) {