Merge branch 'release/4.5' of http://git.yoho.cn/fe/yohobuywap into release/4.5

@@ -22,3 +22,4 @@ require('./currency');
 require('./currency-new');
 require('./message');
 require('./message-detail');
+require('./address-modify');

@@ -36,26 +36,27 @@ function downCount(options) {
             _minute = _second * 60,
             _hour = _minute * 60,
             _day = _hour * 24,
-            days,
             hours,
             minutes,
             seconds;
 
         // calculate dates
-        days = Math.floor(difference / _day),
         hours = Math.floor((difference % _day) / _hour),
         minutes = Math.floor((difference % _hour) / _minute),
         seconds = Math.floor((difference % _minute) / _second);
 
         // fix dates so that it will show two digets
-        days = (String(days).length >= 2) ? days : '0' + days;
         hours = (String(hours).length >= 2) ? hours : '0' + hours;
         minutes = (String(minutes).length >= 2) ? minutes : '0' + minutes;
         seconds = (String(seconds).length >= 2) ? seconds : '0' + seconds;
 
         // set to DOM
         $countdownContainer.removeClass('hide');
-        $countDownHours.text('剩余' + hours + ':' + minutes + ':' + seconds);
+        if (hours === '00') {
+            $countDownHours.text('剩余' + minutes + ':' + seconds);
+        } else {
+            $countDownHours.text('剩余' + hours + ':' + minutes + ':' + seconds);
+        }
 
         difference -= 1000;
 
@@ -121,12 +122,10 @@ if ($ownerInfo.data('changeable') === true) {
 
 $(function() {
     reasonSwiper = new Swiper('.box-main', {
-        paginationClickable: true,
-        direction: 'vertical',
-        slidesPerView: 6,
-        height: 200,
+        initialSlide: 0,
         centeredSlides: true,
-        initialSlide: 3,
+        slidesPerView: 5,
+        direction: 'vertical',
         onSlideChangeStart: function(reasonSwiper) {
             var activeIndex = reasonSwiper.activeIndex,
                 slides = reasonSwiper.slides,

@@ -247,12 +247,10 @@ getOrders();
 
 $(function() {
     reasonSwiper = new Swiper('.box-main', {
-        paginationClickable: true,
         direction: 'vertical',
-        slidesPerView: 6,
-        height: 200,
+        slidesPerView: 5,
         centeredSlides: true,
-        initialSlide: 3,
+        initialSlide: 0,
         onSlideChangeStart: function(reasonSwiper) {
             var activeIndex = reasonSwiper.activeIndex,
                 slides = reasonSwiper.slides,

@@ -203,7 +203,7 @@
         left: 0;
         top: 0;
         background: rgba(0, 0, 0, .5);
-        z-index: 5;
+        z-index: 1;
         visibility: hidden;
 
         .reason-box {
@@ -235,6 +235,18 @@
                 background: #FFFFFF;
                 padding: 20px;
                 height:480px;
+
+                .active-mask {
+                    position: absolute;
+                    top: 50%;
+                    margin-top: -44px;
+                    height: 88px;
+                    z-index: 8;
+                    width: 500px;
+                    background: rgba(255, 255, 255, 0.1);
+                    border-bottom: 1px solid rgb(223,224,224);
+                    border-top: 1px solid rgb(223,224,224);
+                }
             }
 
             li {
@@ -247,17 +259,12 @@
             .swiper-slide-active {
                 padding-top: 0;
                 font-style: normal;
-                border-top: 1px solid rgb(223,224,224);
-                border-bottom: 1px solid rgb(223,224,224);
                 font-size: 38px;
                 color: rgb(0,0,0);
-                height: 78px !important;
                 line-height: 78px;
             }
 
-            .swiper-slide {
-                line-height: 70px;
-            }
+
         }
     }
 }

@@ -40,6 +40,18 @@
                 background: #FFFFFF;
                 padding: 20px;
                 height:480px;
+
+                .active-mask {
+                    position: absolute;
+                    top: 50%;
+                    margin-top: -44px;
+                    height: 88px;
+                    z-index: 8;
+                    width: 500px;
+                    background: rgba(255, 255, 255, 0.1);
+                    border-bottom: 1px solid rgb(223,224,224);
+                    border-top: 1px solid rgb(223,224,224);
+                }
             }
 
             li {
@@ -52,17 +64,10 @@
             .swiper-slide-active {
                 padding-top: 0;
                 font-style: normal;
-                border-top: 1px solid rgb(223,224,224);
-                border-bottom: 1px solid rgb(223,224,224);
                 font-size: 38px;
                 color: rgb(0,0,0);
-                height: 78px !important;
                 line-height: 78px;
             }
-
-            .swiper-slide {
-                line-height: 70px;
-            }
         }
     }
 

@@ -128,12 +128,12 @@
         <div class="reason-box" >
             <div class="box-head"><span class="box-cmp">完成</span></div>
             <div class="swiper-container box-main">
-
                 <ul class="swiper-wrapper">
                     {{#cancelReason}}
                     <li class="swiper-slide" data-reason-id="{{id}}"><span >{{reason}}</span></li>
                     {{/cancelReason}}
                 </ul>
+                <div class="active-mask"></div>
             </div>
         </div>
     </div>

@@ -25,6 +25,7 @@
                         <li class="swiper-slide" data-reason-id="{{id}}"><span >{{reason}}</span></li>
                         {{/cancelReason}}
                     </ul>
+                    <div class="active-mask"></div>
                 </div>
             </div>
         </div>