Merge branch 'feature/singleDayAm' into 'master'

Feature/single day am



See merge request !482

@@ -13,8 +13,13 @@ const _ = require('lodash');
 const resourcesProcess = require(`${utils}/resources-process`);
 const resourcesProcess = require(`${utils}/resources-process`);
 
 
 const getResourceData = (contCode) => {
 const getResourceData = (contCode) => {
+
+    if (_.isEmpty(contCode)) {
+        return Promise.resolve([]);
+    }
+
     return serviceAPI.get('operations/api/v5/resource/get', {
     return serviceAPI.get('operations/api/v5/resource/get', {
-        content_code: contCode || 'c0acf0296a3c329678fb45da958d9951',
+        content_code: contCode,
         platform: 'iphone'
         platform: 'iphone'
     }, {
     }, {
         cache: true
         cache: true

@@ -16,6 +16,13 @@ const domains = {
     api: 'http://api.yoho.cn/',
     api: 'http://api.yoho.cn/',
     service: 'http://service.yoho.cn/',
     service: 'http://service.yoho.cn/',
 
 
+
+    // api: 'http://api-test3.yohops.com:9999/',
+    //     service: 'http://service-test3.yohops.com:9999/',
+    //     liveApi: 'http://testapi.live.yohops.com:9999/',
+    //     singleApi: 'http://api-test3.yohops.com:9999/',
+
+
     // liveApi: 'http://api.live.yoho.cn/',
     // liveApi: 'http://api.live.yoho.cn/',
     // singleApi: 'http://single.yoho.cn/',
     // singleApi: 'http://single.yoho.cn/',
 
 

@@ -9,9 +9,6 @@
                 {{/salesPhrase}}
                 {{/salesPhrase}}
                 <p class="price">
                 <p class="price">
                     <span class="sale-price {{^marketPrice}}no-price{{/marketPrice}}">¥{{salesPrice}}</span>
                     <span class="sale-price {{^marketPrice}}no-price{{/marketPrice}}">¥{{salesPrice}}</span>
-                    {{#marketPrice}}
-                        <span class="market-price">¥{{.}}</span>
-                    {{/marketPrice}}
                 </p>
                 </p>
                 <p class="info-txt">{{productDesc}}</p>
                 <p class="info-txt">{{productDesc}}</p>
             </div>
             </div>

@@ -57,16 +57,6 @@ let singleDay = {
             self.previousScrollTop = curScrollTop;
             self.previousScrollTop = curScrollTop;
         };
         };
 
 
-        $(window).on('scroll touchmove touchstart touchend', function() {
-            if ($(window).scrollTop() > self.swiperOTop) {
-                self.$swiper.addClass('fixer');
-            } else {
-                self.$swiper.removeClass('fixer');
-            }
-
-            window.requestAnimationFrame(_scrollHandler.bind(self));
-        });
-
         $.ajax({
         $.ajax({
             type: 'GET',
             type: 'GET',
             url: '/activity/single-day/getSingleData',
             url: '/activity/single-day/getSingleData',
@@ -78,7 +68,7 @@ let singleDay = {
                 let i = 0, $swiperTab;
                 let i = 0, $swiperTab;
                 let tabNum = window.queryString.tabNum ? window.queryString.tabNum - 1 : 0;
                 let tabNum = window.queryString.tabNum ? window.queryString.tabNum - 1 : 0;
 
 
-                if (data[0]) {
+                if (data[0] && data[0].length !== 0) {
                     $('.banner').append(banner(data[0][0]));
                     $('.banner').append(banner(data[0][0]));
 
 
                     if ($('.banner-swiper').find('li').size() > 1) {
                     if ($('.banner-swiper').find('li').size() > 1) {
@@ -145,6 +135,16 @@ let singleDay = {
                     });
                     });
                 }
                 }
 
 
+                $(window).on('scroll touchmove touchstart touchend', function() {
+                    if ($(window).scrollTop() > $('.tab-area').offset().top) {
+                        self.$swiper.addClass('fixer');
+                    } else {
+                        self.$swiper.removeClass('fixer');
+                    }
+
+                    window.requestAnimationFrame(_scrollHandler.bind(self));
+                });
+
                 loading.hideLoadingMask();
                 loading.hideLoadingMask();
             },
             },
             error: function() {
             error: function() {

@@ -3,7 +3,6 @@
 
 
     .banner {
     .banner {
         width: 100%;
         width: 100%;
-        height: 234px;
 
 
         .swiper-slide {
         .swiper-slide {
             height: 234px;
             height: 234px;
@@ -26,10 +25,9 @@
 
 
     .swiper-tab {
     .swiper-tab {
         width: 100%;
         width: 100%;
-        height: 80px;
-        //border-bottom: 1px solid #e0e0e0;
-        //border-top: 1px solid #e0e0e0;
-        //background: #fff;
+        border-bottom: 1px solid #e0e0e0;
+        border-top: 1px solid #e0e0e0;
+        background: #fff;
 
 
         li {
         li {
             float: left;
             float: left;
@@ -111,7 +109,7 @@
         }
         }
 
 
         h3 {
         h3 {
-            margin-top: 50px;
+            margin-top: 20px;
             font-size: 28px;
             font-size: 28px;
             display: -webkit-box;
             display: -webkit-box;
             -webkit-box-orient: vertical;
             -webkit-box-orient: vertical;
@@ -121,9 +119,9 @@
         }
         }
 
 
         .prompt-info {
         .prompt-info {
-            font-size: 22px;
-            margin-top: 29px;
-            color: #d11226;
+            font-size: 24px;
+            margin-top: 25px;
+            color: #d0021b;
             width: 100%;
             width: 100%;
             overflow: hidden;
             overflow: hidden;
             white-space: nowrap;
             white-space: nowrap;
@@ -131,12 +129,12 @@
         }
         }
 
 
         .price {
         .price {
-            margin-top: 29px;
+            margin-top: 36px;
         }
         }
 
 
         .sale-price {
         .sale-price {
             font-size: 34px;
             font-size: 34px;
-            color: #cf031e;
+            color: #d62927;
         }
         }
 
 
         .no-price {
         .no-price {
@@ -152,13 +150,13 @@
 
 
         .info-txt {
         .info-txt {
             position: absolute;
             position: absolute;
-            bottom: 62px;
-            font-size: 26px;
+            bottom: 45px;
+            font-size: 24px;
             display: -webkit-box;
             display: -webkit-box;
             -webkit-box-orient: vertical;
             -webkit-box-orient: vertical;
-            -webkit-line-clamp: 2;
+            -webkit-line-clamp: 4;
             overflow: hidden;
             overflow: hidden;
-            color: #454545;
+            color: #b0b0b0;
         }
         }
     }
     }
 }
 }