活动模版修改

@@ -110,8 +110,8 @@ class featureModel extends global.yoho.BaseModel {
                         f.component[0].type === 'productGroup' && f.component[0].defaultSkns) {
                         sknsArr.push(self._getProductBySkns(f.component[0], self.ctx));
 
-                        f.component[0].newStyle = _.get(f, 'component[0].newStyle') === '1';
                         f.component[0].isStyle2 = _.get(f, 'component[0].newStyle') === '2' && _.get(f, 'component[0].numOfOneRow') === '2';// eslint-disable-line
+                        f.component[0].newStyle = _.get(f, 'component[0].newStyle') === '1';
                     }
 
                     if (f.component && f.component[0] &&
@@ -121,8 +121,8 @@ class featureModel extends global.yoho.BaseModel {
                             limit: '60'
                         }, f.component[0].searchCondition || {});
 
-                        f.component[0].newStyle = _.get(f, 'component[0].newStyle') === '1';
                         f.component[0].isStyle2 = _.get(f, 'component[0].newStyle') === '2' && _.get(f, 'component[0].numOfOneRow') === '2';// eslint-disable-line
+                        f.component[0].newStyle = _.get(f, 'component[0].newStyle') === '1';
                     }
 
                     // 新增店铺组

@@ -27,13 +27,20 @@
                                     {{#if marketprice}}
                                         <span class="market-price"{{#if ../fontColor}} style="color:{{../fontColor}};" {{/if}}>¥{{marketprice}}</span>
                                     {{/if}}
+                                    {{#isEqualOr ../showVipPrice '1'}}
+                                        {{#if ../isStyle2}}
+                                            <span class="vip"></span>
+                                        {{/if}}
+                                    {{/isEqualOr}}
                                 </div>
                             {{/isEqualOr}}
                             {{#isEqualOr ../showVipPrice '1'}}
-                                <div class="vipprice" style="{{#if ../vipFontColor}}color:{{../vipFontColor}};{{/if}}{{#if ../vipBgColor}}background:{{../vipBgColor}};{{/if}}">
-                                    <span class="vip-price-text">VIP价</span>
-                                    <span class="vip-price-val">¥{{vipprice}}</span>
-                                </div>
+                                {{#unless ../isStyle2}}
+                                    <div class="vipprice" style="{{#if ../vipFontColor}}color:{{../vipFontColor}};{{/if}}{{#if ../vipBgColor}}background:{{../vipBgColor}};{{/if}}">
+                                        <span class="vip-price-text">VIP价</span>
+                                        <span class="vip-price-val">¥{{vipprice}}</span>
+                                    </div>
+                                {{/unless}}
                             {{/isEqualOr}}
                         </div>
                     </a>

@@ -273,17 +273,28 @@
 
         .price {
             text-align: left;
-            font-size: 26px;
             letter-spacing: 0;
             margin-top: 10px;
         }
 
         .sale-price {
             color: #d0021b;
+            font-size: 26px;
         }
 
         .market-price {
             color: #b0b0b0;
+            font-size: 26px;
+        }
+
+        .vip {
+            background: resolve("activity/vip@2x.png") no-repeat;
+            background-size: cover;
+            width: 60px;
+            height: 40px;
+            display: inline-block;
+            vertical-align: top;
+            margin-left: 3px;
         }
     }
 }