Merge branch 'dev_5.2_首页翻转页面' into test5.2

leo
Commit 1a4222414f2fb86d633ff6f8358e298590c57f75 2 parents a3e97d5e 7488bd18
Showing 1 changed file with 8 additions and 1 deletions
code/static/js.jquery/module/resource/resourceManage/ContentManage.js
--- a/code/static/js.jquery/module/resource/resourceManage/ContentManage.js
View file @1a42224
+++ b/code/static/js.jquery/module/resource/resourceManage/ContentManage.js
View file @1a42224
@@ -367,6 +367,8 @@ for(var i = 0; i < resources.length; i++) {
             var scope = item.contentData.data.scope;
             if(scope == '1') {
                 item.contentData.data.channel = 'boy';
+            } else {
+                item.contentData.data.channel = 'general';
             }
             item.contentData.data.content = item.contentData.data[item.contentData.data.channel];
@@ -528,7 +530,12 @@ function convertModule(module) {
     // "首页翻转页面"编辑时，需要根据当前频道，重新组装表格渲染内容
     if(module.contentData.template_name == 'rollingOverSlider') {
-        module.contentData.data.channel = 'boy';
+        // module.contentData.data.channel = 'boy';
+        if(module.contentData.data.scope == '1') {
+            module.contentData.data.channel = 'boy';
+        } else {
+            module.contentData.data.channel = 'general';
+        }
         module.contentData.data.content = module.contentData.data[module.contentData.data.channel];
     }