Showing
1 changed file
with
3 additions
and
1 deletions
@@ -100,10 +100,11 @@ var Bll = { | @@ -100,10 +100,11 @@ var Bll = { | ||
100 | contentDatas: [], | 100 | contentDatas: [], |
101 | module: null, | 101 | module: null, |
102 | toast: function (index, module) { | 102 | toast: function (index, module) { |
103 | - if (!module.contentData.dialog) { | 103 | + if (!module.contentData.dialog||!module.contentData.template_intro) { |
104 | Button.forEach(function (item, index) { | 104 | Button.forEach(function (item, index) { |
105 | if (module.contentData.template_name == item.template_name) { | 105 | if (module.contentData.template_name == item.template_name) { |
106 | module.contentData.dialog = item.dialog; | 106 | module.contentData.dialog = item.dialog; |
107 | + module.contentData.template_intro=item.template_intro; | ||
107 | return; | 108 | return; |
108 | } | 109 | } |
109 | }); | 110 | }); |
@@ -199,6 +200,7 @@ if (ViewModel.articleContent) { | @@ -199,6 +200,7 @@ if (ViewModel.articleContent) { | ||
199 | ViewModel.articleContent.forEach(function (item, index) { | 200 | ViewModel.articleContent.forEach(function (item, index) { |
200 | item.contentData = item.contentData.replace(/(gif|png|jpg|jpeg)\?[^"]*/g, '$1'); | 201 | item.contentData = item.contentData.replace(/(gif|png|jpg|jpeg)\?[^"]*/g, '$1'); |
201 | item.contentData = common.util.__ObjToArray(JSON.parse(item.contentData)); | 202 | item.contentData = common.util.__ObjToArray(JSON.parse(item.contentData)); |
203 | + console.log(item); | ||
202 | Bll.contentDatas.push(item); | 204 | Bll.contentDatas.push(item); |
203 | }); | 205 | }); |
204 | } | 206 | } |
-
Please register or login to post a comment