Merge branch 'test5.4.1' into grey
Showing
1 changed file
with
10 additions
and
8 deletions
@@ -85,8 +85,8 @@ var t = new common.tab({ | @@ -85,8 +85,8 @@ var t = new common.tab({ | ||
85 | Bll.loadMain(); | 85 | Bll.loadMain(); |
86 | }, | 86 | }, |
87 | columns: [ | 87 | columns: [ |
88 | - {name: "all", display: '<img src="/static/assets/images/decorator/platform-pc-logo.png"><span class="platform-title">PC店铺装修</span>'}, | ||
89 | - {name: "1", display: '<img src="/static/assets/images/decorator/platform-app-logo.png"><span class="platform-title">移动店铺装修</span>'} | 88 | + {name: "1", display: '<img src="/static/assets/images/decorator/platform-pc-logo.png"><span class="platform-title">PC店铺装修</span>'}, |
89 | + {name: "all", display: '<img src="/static/assets/images/decorator/platform-app-logo.png"><span class="platform-title">移动店铺装修</span>'} | ||
90 | ], | 90 | ], |
91 | innerHtml: '<ul class="nav navbar-nav"></ul>', | 91 | innerHtml: '<ul class="nav navbar-nav"></ul>', |
92 | }).init({}); | 92 | }).init({}); |
@@ -116,9 +116,9 @@ var Bll = { | @@ -116,9 +116,9 @@ var Bll = { | ||
116 | 116 | ||
117 | // 重选渲染模板内容 | 117 | // 重选渲染模板内容 |
118 | if(+t.active) { | 118 | if(+t.active) { |
119 | - Bll.renderDecoratorAppTemplate(); | ||
120 | - } else { | ||
121 | Bll.renderDecoratorPCTemplate(); | 119 | Bll.renderDecoratorPCTemplate(); |
120 | + } else { | ||
121 | + Bll.renderDecoratorAppTemplate(); | ||
122 | } | 122 | } |
123 | Bll.addEditorIcon(); | 123 | Bll.addEditorIcon(); |
124 | 124 | ||
@@ -132,9 +132,9 @@ var Bll = { | @@ -132,9 +132,9 @@ var Bll = { | ||
132 | // index: 重载模板前,操作的模块在列表中的索引,用于调整滚动条至操作模块的位置 | 132 | // index: 重载模板前,操作的模块在列表中的索引,用于调整滚动条至操作模块的位置 |
133 | reloadMain: function(index) { | 133 | reloadMain: function(index) { |
134 | if(+t.active) { | 134 | if(+t.active) { |
135 | - Bll.renderDecoratorAppTemplate(); | ||
136 | - } else { | ||
137 | Bll.renderDecoratorPCTemplate(); | 135 | Bll.renderDecoratorPCTemplate(); |
136 | + } else { | ||
137 | + Bll.renderDecoratorAppTemplate(); | ||
138 | } | 138 | } |
139 | 139 | ||
140 | Bll.addEditorIcon(); | 140 | Bll.addEditorIcon(); |
@@ -143,6 +143,8 @@ var Bll = { | @@ -143,6 +143,8 @@ var Bll = { | ||
143 | var editor = $('.modular-editor').get(index - 1); | 143 | var editor = $('.modular-editor').get(index - 1); |
144 | var offset = $(editor).offset(); | 144 | var offset = $(editor).offset(); |
145 | if(+t.active) { | 145 | if(+t.active) { |
146 | + // 处理PC | ||
147 | + } else { | ||
146 | $('.app-template').animate({ | 148 | $('.app-template').animate({ |
147 | scrollTop: offset.top | 149 | scrollTop: offset.top |
148 | }, 0); | 150 | }, 0); |
@@ -182,7 +184,7 @@ var Bll = { | @@ -182,7 +184,7 @@ var Bll = { | ||
182 | url: '/shop/ModularDecoratorRest/findDecoratorTemplates', | 184 | url: '/shop/ModularDecoratorRest/findDecoratorTemplates', |
183 | data: { | 185 | data: { |
184 | shopId: Bll.shopId, | 186 | shopId: Bll.shopId, |
185 | - platform: +t.active ? 1 : 0, | 187 | + platform: +t.active ? 0 : 1, |
186 | appType: Bll.appType | 188 | appType: Bll.appType |
187 | }, | 189 | }, |
188 | async: false | 190 | async: false |
@@ -1205,7 +1207,7 @@ var saveTemplate = function(flag, name, cb) { | @@ -1205,7 +1207,7 @@ var saveTemplate = function(flag, name, cb) { | ||
1205 | url: '/shop/ModularDecoratorRest/saveDecoratorTemplate', | 1207 | url: '/shop/ModularDecoratorRest/saveDecoratorTemplate', |
1206 | data: { | 1208 | data: { |
1207 | shopId: Bll.shopId, | 1209 | shopId: Bll.shopId, |
1208 | - platform: +t.active ? 1 : 0, | 1210 | + platform: +t.active ? 0 : 1, |
1209 | appType: Bll.appType, | 1211 | appType: Bll.appType, |
1210 | templateName: name, | 1212 | templateName: name, |
1211 | modules: JSON.stringify(Bll.moduleDataList), | 1213 | modules: JSON.stringify(Bll.moduleDataList), |
-
Please register or login to post a comment