Merge remote-tracking branch 'refs/remotes/origin/feature/magazine' into develop

@@ -15,7 +15,7 @@ class magazineModel extends global.yoho.BaseModel {
                 data = data.data;
                 data = data.data;
 
 
                 let totalPrice = '';
                 let totalPrice = '';
-                let prices = _.forEach(_.get(data, 'eBook.prices'), val => {
+                let prices = _.forEach(_.get(data, 'book.prices'), val => {
                     if (val.select === 'Y') {
                     if (val.select === 'Y') {
                         val.className = 'active';
                         val.className = 'active';
                         totalPrice = val.price;
                         totalPrice = val.price;
@@ -24,7 +24,7 @@ class magazineModel extends global.yoho.BaseModel {
 
 
                 return {
                 return {
                     goodsList: data.goods_list || [],
                     goodsList: data.goods_list || [],
-                    maxBuyNumber: _.get(data, 'eBook.maxBuyNumber'),
+                    maxBuyNumber: _.get(data, 'book.maxBuyNumber'),
                     prices,
                     prices,
                     totalPrice,
                     totalPrice,
                 };
                 };

@@ -3,12 +3,12 @@
     <div class="magazine-cover-container">
     <div class="magazine-cover-container">
         <div class="swiper-container cover-block">
         <div class="swiper-container cover-block">
             <div class="swiper-wrapper">
             <div class="swiper-wrapper">
-                {{# eBookPreviewPicBoList}}
+                {{# bookPreviewPicBoList}}
                 <div class="swiper-slide">
                 <div class="swiper-slide">
                     <div class="filter-bg" style="background-image: url('{{picUrl}}')"></div>
                     <div class="filter-bg" style="background-image: url('{{picUrl}}')"></div>
                     <img src="{{picUrl}}" class="cover-img" alt="">
                     <img src="{{picUrl}}" class="cover-img" alt="">
                 </div>
                 </div>
-                {{/ eBookPreviewPicBoList}}
+                {{/ bookPreviewPicBoList}}
             </div>
             </div>
             <div class="swiper-pagination"></div>
             <div class="swiper-pagination"></div>
             <div class="magazine-info-block">
             <div class="magazine-info-block">