'精彩活动fix'

@@ -18,11 +18,14 @@ class TideModel extends global.yoho.BaseModel {
             this.crmRecommendSort(params)
         ]).then(res => {
             let tide = {
-                resource: [],
+                resource: _.get(res[0], 'data', []),
                 contents: []
             };
+            let sindex = _.findIndex(tide.resource, {template_name: 'image_list'});
 
-            tide.resource = _.get(res[0], 'data', []);
+            if (sindex > -1) {
+                tide.resource[sindex].title = '# 精彩活动 #';
+            }
 
             _.each(_.get(res[1], 'data', []), (item, index) => {
                 item.sortInfo = item.sortInfo || {};
@@ -99,13 +102,16 @@ class TideModel extends global.yoho.BaseModel {
             this.crmRecommendProduct(params)
         ]).then(res => {
             let tide = {
-                resource: [],
+                resource: _.get(res[0], 'data', []),
                 brands: [],
                 shopInfo: [],
                 contents: []
             };
+            let sindex = _.findIndex(tide.resource, {template_name: 'image_list'});
 
-            tide.resource = _.get(res[0], 'data', []);
+            if (sindex > -1) {
+                tide.resource[sindex].title = '# 精彩活动 #';
+            }
 
             let shopInfo = _.get(res[1], 'data.shopInfo', {});
 

 {{#resource}}
-    {{#isEqualOr template_name 'recommend_content_three'}}
-        <div class="tide-title"># 精彩活动 #</div>
+    {{#isEqualOr template_name 'image_list'}}
+        {{#if title}}<div class="tide-title">{{title}}</div>{{/if}}
         <div class="wonderful-container">
-            {{#each data.big_image}}
-                <div class="wonderful-big">
-                    <a href="{{url}}">
-                        <img class="lazy" data-original="{{image src 670 330 1}}" />
-                        <div class="see-block">点击查看<span class="iconfont arr">&#xe614;</span></div>
-                    </a>
-                </div>
-            {{/each}}
-            {{#each data.list}}
-                <div class="wonderful-small">
-                    <a href="{{url}}">
-                        <img class="lazy" data-original="{{image src 320 220 1}}" />
-                        <div class="see-block">点击查看<span class="iconfont arr">&#xe614;</span></div>
-                    </a>
-                </div>
-            {{/each}}
+            {{#isEqualOr data.title.column_num '1'}}
+                {{#each data.list}}
+                    <div class="wonderful-big">
+                        <a href="{{url}}">
+                            <img class="lazy" data-original="{{image src 670 330 1}}" />
+                            <div class="see-block">点击查看<span class="iconfont arr">&#xe614;</span></div>
+                        </a>
+                    </div>
+                {{/each}}
+            {{/isEqualOr}}
+            {{#isEqualOr data.title.column_num '2'}}
+                {{#each data.list}}
+                    <div class="wonderful-small">
+                        <a href="{{url}}">
+                            <img class="lazy" data-original="{{image src 320 220 1}}" />
+                            <div class="see-block">点击查看<span class="iconfont arr">&#xe614;</span></div>
+                        </a>
+                    </div>
+                {{/each}}
+            {{/isEqualOr}}
         </div>
     {{/isEqualOr}}
 

 .activity-tide-page {
-    margin-bottom: 40px;
-
     .ellipsis {
         display: -webkit-box !important;
         -webkit-box-orient: vertical;