Merge branch 'feature/activityTpl' into release/6.7.9

@@ -137,8 +137,9 @@ class featureModel extends global.yoho.BaseModel {
 
 
         return this.get({
         return this.get({
             data: {
             data: {
-                method: 'app.collage.productList',
-                activityId: activityId
+                method: 'app.collage.productList.page',
+                activityId: activityId,
+                limit: 10
             },
             },
             param: {
             param: {
                 cache: true
                 cache: true
@@ -161,7 +162,6 @@ class featureModel extends global.yoho.BaseModel {
                 val.producturl = productUrl.replace(replaceReg, val.productSkn);
                 val.producturl = productUrl.replace(replaceReg, val.productSkn);
             });
             });
 
 
-
             collageInfo.defaultPros = result.data;
             collageInfo.defaultPros = result.data;
         });
         });
     }
     }

@@ -29,7 +29,7 @@
                                 {{/isEqualOr}}
                                 {{/isEqualOr}}
 
 
                                 <div class="join-num">
                                 <div class="join-num">
-                                    {{peopleNum}}人已拼
+                                    {{joinPeopleNum}}人已拼
                                 </div>
                                 </div>
                             </div>
                             </div>
                         </div>
                         </div>