Merge branch 'feature/activityTpl' into release/6.7.9

@@ -128,7 +128,7 @@ class featureModel extends global.yoho.BaseModel {
     /**
     /**
      * 拼团商品列表
      * 拼团商品列表
      */
      */
-    _getCollageProductList(collageInfo, ctx) {
+    _getCollageProductList(collageInfo, ctx) { // eslint-disable-line
         let activityId = collageInfo.collageActivityId;
         let activityId = collageInfo.collageActivityId;
 
 
         if (!activityId) {
         if (!activityId) {
@@ -154,15 +154,15 @@ class featureModel extends global.yoho.BaseModel {
             let productUrl = `//m.yohobuy.com/product/${replaceKey}.html?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":"${replaceKey}","activity_id":"${activityId}","activity_type":"groupPurchase"}}`; // eslint-disable-line
             let productUrl = `//m.yohobuy.com/product/${replaceKey}.html?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":"${replaceKey}","activity_id":"${activityId}","activity_type":"groupPurchase"}}`; // eslint-disable-line
             let defaultPros = _.get(result, 'data.collageProductVoList', []);
             let defaultPros = _.get(result, 'data.collageProductVoList', []);
 
 
-            if (!ctx.req.yoho.isApp) {
-                productUrl = 'javascript:;'; // eslint-disable-line
-            }
+            // if (!ctx.req.yoho.isApp) {
+            //     productUrl = 'javascript:;'; // eslint-disable-line
+            // }
 
 
             defaultPros.forEach(val => {
             defaultPros.forEach(val => {
                 val.producturl = productUrl.replace(replaceReg, val.productSkn);
                 val.producturl = productUrl.replace(replaceReg, val.productSkn);
             });
             });
 
 
-            collageInfo.defaultPros = result.data;
+            collageInfo.defaultPros = defaultPros;
         });
         });
     }
     }
 
 

@@ -2,7 +2,7 @@
     <div class="side-swiper-content">
     <div class="side-swiper-content">
         <ul>
         <ul>
             {{#defaultPros}}
             {{#defaultPros}}
-                <li class="side-swiper-item" data-skn="{{product_skn}}">
+                <li class="side-swiper-item" data-skn="{{productSkn}}">
                     <a href="{{producturl}}">
                     <a href="{{producturl}}">
                         <div class="img-box">
                         <div class="img-box">
                             {{#if lefTopImg}}
                             {{#if lefTopImg}}
@@ -17,8 +17,8 @@
                             <div class="info-middle">
                             <div class="info-middle">
                                 <div class="pro-price" style="{{#if ../priceFontColor}}color:{{../priceFontColor}};{{/if}}">
                                 <div class="pro-price" style="{{#if ../priceFontColor}}color:{{../priceFontColor}};{{/if}}">
                                     <span class="sale-price"{{#if ../fontColor}} style="color:{{../fontColor}};" {{/if}}>¥{{collagePrice}}</span>
                                     <span class="sale-price"{{#if ../fontColor}} style="color:{{../fontColor}};" {{/if}}>¥{{collagePrice}}</span>
-                                    {{#if marketprice}}
-                                        <span class="market-price" {{#if ../fontColor}} style="color:{{../fontColor}};"{{/if}}>¥{{marketprice}}</span>
+                                    {{#if marketPrice}}
+                                        <span class="market-price" {{#if ../fontColor}} style="color:{{../fontColor}};"{{/if}}>¥{{marketPrice}}</span>
                                     {{/if}}
                                     {{/if}}
                                 </div>
                                 </div>