merge

@@ -7,7 +7,8 @@
                     {{#ticket}}
                     {{#ticket}}
                         <div class="ticket">
                         <div class="ticket">
                             <div class="left">
                             <div class="left">
-                                <span>¥</span>{{couponAmount}}
+                                <span>¥</span>
+                                <div>{{couponAmount}}</div>
                             </div>
                             </div>
                             <div class="right">
                             <div class="right">
                                 <p class="first">{{couponName}}</p>
                                 <p class="first">{{couponName}}</p>

@@ -18,7 +18,7 @@
                         <div class="ticket-btn-c">
                         <div class="ticket-btn-c">
                             <div>
                             <div>
                                 {{#if isOverTime}}
                                 {{#if isOverTime}}
-                                    <a class="disable">已失效</a>
+                                    <a class="disable">已过期</a>
                                 {{else if isCollar}}
                                 {{else if isCollar}}
                                     <a class="disable">已领取</a>
                                     <a class="disable">已领取</a>
                                 {{else}}
                                 {{else}}

@@ -11,7 +11,7 @@ const isTest = process.env.NODE_ENV === 'test';
 
 
 module.exports = {
 module.exports = {
     app: 'h5',
     app: 'h5',
-    appVersion: '5.1.0', // 调用api的版本
+    appVersion: '5.3.0', // 调用api的版本
     port: 6001,
     port: 6001,
     siteUrl: '//m.yohobuy.com',
     siteUrl: '//m.yohobuy.com',
     assetUrl: '//localhost:5001',
     assetUrl: '//localhost:5001',

 'use strict';
 'use strict';
 
 
 const fs = require('fs');
 const fs = require('fs');
-let devHost = '172.16.6.134';
+let devHost = '127.0.0.1';
 
 
 fs.readFile('.devhost', (err, buf)=> {
 fs.readFile('.devhost', (err, buf)=> {
     if (!err) {
     if (!err) {

@@ -148,4 +148,6 @@ $page.on('touchstart', '.btn', function() {
             }
             }
         });
         });
     });
     });
+
+    $('.dialog-right-btn').css('color', '#000');
 });
 });

@@ -22,7 +22,7 @@ setTimeout(() => {
     var Swiper = require('yoho-swiper');
     var Swiper = require('yoho-swiper');
 
 
     // 顶部swiper
     // 顶部swiper
-    new Swiper('.banner-swiper', {
+    var swiper = new Swiper('.banner-swiper', {
         preloadImages: false,
         preloadImages: false,
         lazyLoading: true,
         lazyLoading: true,
         lazyLoadingInPrevNext: true,
         lazyLoadingInPrevNext: true,
@@ -33,6 +33,10 @@ setTimeout(() => {
         prevButton: '.my-swiper-button-prev',
         prevButton: '.my-swiper-button-prev',
         spaceBetween: 3
         spaceBetween: 3
     });
     });
+    $(".banner-swiper").click(function() {
+        $('.banner-top').toggleClass('hover');
+        swiper.onResize();
+    })
 }, 500);
 }, 500);
 
 
 
 
@@ -281,4 +285,26 @@ setTimeout(() => {
             window.rePosFooter && window.rePosFooter();
             window.rePosFooter && window.rePosFooter();
         });
         });
     }, 200);
     }, 200);
+    //加载详情页的返回顶部按钮并注册事件
+    
+    $(document).scroll(function() {
+        if($(document).scrollTop() >= $(document).height() - $(window).height() - 20) {
+            if (!$('.float-top').hasClass('animation')) {
+                var top = $('.back-to-top').offset().top - $('.float-top').offset().top + ($('.back-to-top').height()-$('.float-top').height())/2;
+                var left = $('.back-to-top').offset().left - $('.float-top').offset().left;
+                $('.float-top').addClass('animation').css({
+                    'transform': 'translate('+left+'px, '+top+'px) scale(0, 0)',
+                });
+            }
+        } else if ($('.product-detail').length && $(document).scrollTop() >= $('.product-detail').offset().top) {
+            if (!$('.float-top').hasClass('hover') || $('.float-top').hasClass('animation')) {
+                $('.float-top').addClass('hover').removeClass('animation').removeAttr('style');
+            }
+        } else {
+            if ($('.float-top').hasClass('hover')) {
+                $('.float-top').removeClass('hover');
+            }
+        } 
+    })
+    //加载详情页的返回顶部按钮并注册事件-end
 }(productSkn, productId, brandId));
 }(productSkn, productId, brandId));

@@ -81,8 +81,8 @@
             width: 8px;
             width: 8px;
             height: 8px;
             height: 8px;
             position: absolute;
             position: absolute;
-            left: 16px;
-            top: 40px;
+            left: 10px;
+            top: 24px;
             background: #f00;
             background: #f00;
             border-radius: 50%;
             border-radius: 50%;
         }
         }
@@ -194,8 +194,14 @@
                     overflow: hidden;
                     overflow: hidden;
 
 
                     span {
                     span {
+                        float: left;
+                        margin-left: 10px;
                         font-size: 50px;
                         font-size: 50px;
                     }
                     }
+
+                    div {
+                        overflow: hidden;
+                    }
                 }
                 }
 
 
                 .right {
                 .right {