bug fix for 1330/1328/1326/1323/1295

@@ -137,6 +137,7 @@ favTabHammer.on('tap', function(e) {
     index = $cur.index();
 
     if (index === 0) {
+        brandTab = false;
         if ($favProductList.find('li').length === 0 &&
             $favProductList.closest('.fav-type').find('.fav-null-box').hasClass('hide')) {
             loadData($favProductList, 'favProduct', 1);
@@ -202,6 +203,11 @@ favContentHammer.on('tap', function(e) {
         }).fail(function() {
 
             //TODO
+
+            diaLog.showDialog({
+                autoHide: true,
+                dialogText: '网络错误~'
+            });
         });
     });
 });

@@ -126,6 +126,11 @@ $likeBtn.bind('click', function() {
     }).fail(function(data) {
 
         //TODO
+
+        diaLog.showDialog({
+            autoHide: true,
+            dialogText: '网络错误~'
+        });
     });
 });
 
@@ -148,5 +153,10 @@ $disLikeBtn.bind('click', function() {
     }).fail(function(data) {
 
         //TODO
+
+        diaLog.showDialog({
+            autoHide: true,
+            dialogText: '网络错误~'
+        });
     });
 });
\ No newline at end of file

@@ -126,6 +126,7 @@
 
                     .price-underline {
                         text-decoration: line-through;
+                        margin-left: pxToRem(15px);
                     }
                 }
 
@@ -188,6 +189,11 @@
         }
         //品牌收藏
         .fav-brand-swiper {
+            border-bottom: 1px solid #ccc;
+
+            &.none-border-bottom {
+                border-bottom: none;
+            }
 
             .swiper-header {
                 height: pxToRem(100px);
@@ -239,17 +245,26 @@
                     }
                 }
                 .fav-more {
-                    $width: pxToRem(image_width(sprite-file($fav, fav-more)));
-                    $height: pxToRem(image_height(sprite-file($fav, fav-more)));
-
-                    @include rem-sprite($fav, fav-more);
-                    width: $width;
-                    height: $height;
-
+                    width: 2.5rem;
+                    height: 2.5rem;
                     position: absolute;
-                    top: 50%;
-                    right: pxToRem(30px);
-                    margin-top: -$height / 2;
+                    top: 0;
+                    right: 0;
+
+                    &:after {
+                        $width: pxToRem(image_width(sprite-file($fav, fav-more)));
+                        $height: pxToRem(image_height(sprite-file($fav, fav-more)));
+
+                        @include rem-sprite($fav, fav-more);
+                        width: $width;
+                        height: $height;
+
+                        position: absolute;
+                        top: 50%;
+                        right: pxToRem(30px);
+                        margin-top: -$height / 2;
+                        content: '';
+                    }
                 }
             }
             .swiper-container {

 {{# hasFavBrand}}
-<div class="fav-brand-swiper">
+<div class="fav-brand-swiper {{#if productList}}none-border-bottom{{/if}}">
 	<div class="swiper-header">
 		<div class="swiper-logo">
 			<img src="{{brandImg}}" alt=""/>
@@ -17,6 +17,7 @@
 		</div>
 		<a class="fav-more" href="{{link}}"></a>
 	</div>
+    {{#if productList}}
 	<div id="swiper-container-{{id}}" class="swiper-container" data-id="{{id}}">
 		<ul class="swiper-wrapper swiper-wrapper-{{id}}">
 			{{# productList}}
@@ -33,5 +34,6 @@
 			{{/ productList}}
 		</ul>
 	</div>
+    {{/if}}
 </div>
 {{/ hasFavBrand}}
\ No newline at end of file