Merge branch 'test5.4.1' into grey

@@ -85,8 +85,8 @@ var t = new common.tab({
         Bll.loadMain();
     },
     columns: [
-        {name: "all", display: '<img src="/static/assets/images/decorator/platform-pc-logo.png"><span class="platform-title">PC店铺装修</span>'},
-        {name: "1", display: '<img src="/static/assets/images/decorator/platform-app-logo.png"><span class="platform-title">移动店铺装修</span>'}
+        {name: "1", display: '<img src="/static/assets/images/decorator/platform-pc-logo.png"><span class="platform-title">PC店铺装修</span>'},
+        {name: "all", display: '<img src="/static/assets/images/decorator/platform-app-logo.png"><span class="platform-title">移动店铺装修</span>'}
     ],
     innerHtml: '<ul class="nav navbar-nav"></ul>',
 }).init({});
@@ -116,9 +116,9 @@ var Bll = {
 
         // 重选渲染模板内容
         if(+t.active) {
-            Bll.renderDecoratorAppTemplate();
-        } else {
             Bll.renderDecoratorPCTemplate();
+        } else {
+            Bll.renderDecoratorAppTemplate();
         }
         Bll.addEditorIcon();
 
@@ -132,9 +132,9 @@ var Bll = {
     // index: 重载模板前，操作的模块在列表中的索引，用于调整滚动条至操作模块的位置
     reloadMain: function(index) {
         if(+t.active) {
-            Bll.renderDecoratorAppTemplate();
-        } else {
             Bll.renderDecoratorPCTemplate();
+        } else {
+            Bll.renderDecoratorAppTemplate();
         }
 
         Bll.addEditorIcon();
@@ -143,6 +143,8 @@ var Bll = {
         var editor = $('.modular-editor').get(index - 1);
         var offset = $(editor).offset();
         if(+t.active) {
+            // 处理PC
+        } else {
             $('.app-template').animate({
                 scrollTop: offset.top
             }, 0);
@@ -182,7 +184,7 @@ var Bll = {
             url: '/shop/ModularDecoratorRest/findDecoratorTemplates',
             data: {
                 shopId: Bll.shopId,
-                platform: +t.active ? 1 : 0,
+                platform: +t.active ? 0 : 1,
                 appType: Bll.appType
             },
             async: false
@@ -1205,7 +1207,7 @@ var saveTemplate = function(flag, name, cb) {
             url: '/shop/ModularDecoratorRest/saveDecoratorTemplate',
             data: {
                 shopId: Bll.shopId,
-                platform: +t.active ? 1 : 0,
+                platform: +t.active ? 0 : 1,
                 appType: Bll.appType,
                 templateName: name,
                 modules: JSON.stringify(Bll.moduleDataList),