改版套餐详情页支持多套餐

@@ -14,6 +14,9 @@ const bundleModel = require(`${mRoot}/bundle`);
  */
  */
 exports.detail = (req, res, next) => {
 exports.detail = (req, res, next) => {
     bundleModel.detail(req.query).then(result => {
     bundleModel.detail(req.query).then(result => {
+        if (result.bundleDatas.length <= 3) {
+            result.any = true;
+        }
         res.render('bundle/detail', Object.assign({
         res.render('bundle/detail', Object.assign({
             module: 'product',
             module: 'product',
             page: 'bundle',
             page: 'bundle',

@@ -5,6 +5,7 @@
 const utils = '../../../utils';
 const utils = '../../../utils';
 const _ = require('lodash');
 const _ = require('lodash');
 const api = global.yoho.API;
 const api = global.yoho.API;
+const helpers = global.yoho.helpers;
 const productProcess = require(`${utils}/product-process`);
 const productProcess = require(`${utils}/product-process`);
 
 
 /**
 /**
@@ -35,6 +36,13 @@ const detail = (params) => {
     return getBundleBySkn(params.skn).then(result => {
     return getBundleBySkn(params.skn).then(result => {
         if (_.has(result, `data[${bundleIndex}]`)) {
         if (_.has(result, `data[${bundleIndex}]`)) {
             return {
             return {
+                bundleDatas: _.map(result.data, (bundle, index) => {
+                    return {
+                        selected: index === bundleIndex,
+                        title: _.get(bundle, 'bundleInfo.bundleName') || '优惠套装',
+                        href: helpers.urlFormat('/product/bundle/detail', {skn: params.skn, index: ++index}),
+                    };
+                }),
                 bundleInfo: _.get(result, `data[${bundleIndex}].bundleInfo`, {}),
                 bundleInfo: _.get(result, `data[${bundleIndex}].bundleInfo`, {}),
                 productList: productProcess.processProductList(_.get(result, `data[${bundleIndex}].productList`, []))
                 productList: productProcess.processProductList(_.get(result, `data[${bundleIndex}].productList`, []))
             };
             };

 <div class="yoho-page bundle-body">
 <div class="yoho-page bundle-body">
+    <div class="bundle-tabs{{#if any}} any{{/if}}">
+        <div class="swiper-wrapper">
+            {{# bundleDatas}}
+            <div class="swiper-slide{{#if selected}} selected{{/if}}" data-index="{{@index}}" data-href="{{href}}">
+                <div class="line"></div>
+                <div class="title">
+                    <span>{{title}}</span>
+                </div>
+            </div>
+            {{/ bundleDatas}}
+        </div>
+    </div>
     {{# productList}}
     {{# productList}}
         <div class="bundle-detail-goods">
         <div class="bundle-detail-goods">
             <div class="goods-img"><a href="{{url}}"><img src="{{image default_images 155 206}}" alt=""></a></div>
             <div class="goods-img"><a href="{{url}}"><img src="{{image default_images 155 206}}" alt=""></a></div>

@@ -741,7 +741,7 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
             });
             });
             confirming = false;
             confirming = false;
             hide();
             hide();
-            return;
+            return false;
         }
         }
 
 
         // 针对是否处于编辑模式设置不同的url和需要post的数据
         // 针对是否处于编辑模式设置不同的url和需要post的数据

@@ -4,7 +4,8 @@
 require('product/bundle/detail.page.css');
 require('product/bundle/detail.page.css');
 
 
 let $ = require('yoho-jquery'),
 let $ = require('yoho-jquery'),
-    tip = require('plugin/tip');
+    tip = require('plugin/tip'),
+    Swiper = require('yoho-swiper');
 
 
 require('common');
 require('common');
 let share = require('common/share');
 let share = require('common/share');
@@ -28,6 +29,13 @@ $(function() {
         link: window.location.href,
         link: window.location.href,
         desc: '超高性价比，开启省钱大作战!'
         desc: '超高性价比，开启省钱大作战!'
     });
     });
+    if ($('.bundle-tabs').find('.swiper-slide').length > 3) {
+        new Swiper('.bundle-tabs', {
+            freeMode: true,
+            slidesPerView: 'auto',
+            lazyLoading: true
+        });
+    }
 });
 });
 
 
 /**
 /**
@@ -69,6 +77,17 @@ $('.goods-img').on('touchend', function() {
 
 
 });
 });
 
 
+$('.bundle-tabs').on('click', '.swiper-slide', (e) => {
+    let $tab = $(e.currentTarget);
+
+    if ($tab.hasClass('selected')) {
+        return;
+    }
+    let href = $tab.data('href');
+
+    window.location.href = href;
+});
+
 /**
 /**
  * 立即购买
  * 立即购买
  */
  */

@@ -3,6 +3,69 @@
     min-height: 1000px;
     min-height: 1000px;
 }
 }
 
 
+.bundle-tabs {
+    padding-left: 23px;
+    padding-right: 23px;
+    height: 76px;
+    border-bottom: solid 1PX #ddd;
+    overflow: hidden;
+    background-color: #fff;
+
+    &.any {
+        padding: 0;
+
+        .swiper-slide {
+            width: auto;
+            flex: 1;
+        }
+    }
+
+    .swiper-slide {
+        width: 168px;
+        text-align: center;
+        position: relative;
+        display: flex;
+
+        &:first-child {
+            .line {
+                display: none;
+            }
+        }
+
+        &.selected {
+            span {
+                color: #454545;
+                border-bottom: solid 2PX #454545;
+            }
+        }
+
+        .line {
+            width: 1px;
+            height: 28px;
+            margin-top: 24px;
+            float: left;
+            border-left: solid 1PX #ddd;
+        }
+
+        .title {
+            width: 100%;
+            flex: 1;
+
+            span {
+                display: inline-block;
+                min-width: 103px;
+                max-width: 100%;
+                color: #b2b2b2;
+                line-height: 76px;
+                height: 76px;
+                font-size: 28px;
+                text-overflow: ellipsis;
+                overflow: hidden;
+                white-space: nowrap;
+            }
+        }
+    }
+}
 .bundle-detail-goods {
 .bundle-detail-goods {
     width: 100%;
     width: 100%;
     height: 248px;
     height: 248px;

+
+@import "layout/swiper";
 @import "detail";
 @import "detail";
 @import "cart/chose-panel";
 @import "cart/chose-panel";