Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -15,7 +15,7 @@
     "disallowSpaceBeforePostfixUnaryOperators": true,
     "disallowSpaceBeforeSemicolon": true,
     "disallowSpacesInCallExpression": true,
-    "disallowSpacesInFunctionDeclaration": {
+    "disallowSpacesInFunction": {
         "beforeOpeningRoundBrace": true
     },
     "disallowSpacesInsideArrayBrackets": true,

- Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
+ Subproject commit e9d066dd88a8e7e37103021c427a205a5cfcdcec

@@ -322,6 +322,25 @@ class UserData
 	}
 
 	/**
+	 * 意见靠谱，不靠谱接口
+	 *
+	 * @param int $uid 用户ID
+	 * @param string $udid 客户端唯一标识
+	 * @param int $suggest_id 意见id
+	 * @return array 接口返回的数据
+	 */
+	public static function upAndDown($uid, $udid, $suggest_id)
+	{
+		$param = Yohobuy::param();
+		$param['uid'] = $uid;
+		$param['udid'] = $udid;
+		$param['content'] = $suggest_id;
+		$param['client_secret'] = Sign::getSign($param);
+
+		return Yohobuy::get(Yohobuy::SERVICE_URL . 'suggest/api/v1/suggest/is_reliable', $param);
+	}
+
+	/**
 	 * 提交意见反馈接口
 	 *
 	 * @param int $uid 用户ID

@@ -13,9 +13,9 @@ var goodsSwiper,
     // winH = $(window).height(),
     sizeSwiper,
     refSwiper,
+    commentsNum,
     handleHelper;
 
-
 lazyLoad($('img.lazy'));
 
 goodsSwiper = new Swiper('.banner-swiper', {
@@ -24,26 +24,60 @@ goodsSwiper = new Swiper('.banner-swiper', {
     loop: true,
     paginationClickable: true,
     pagination: '.banner-top .pagination-inner',
-    nextButton: '.swiper-button-next',
-    prevButton: '.swiper-button-prev'
+    nextButton: '.my-swiper-button-next',
+    prevButton: '.my-swiper-button-prev'
 });
 
+//初始化tab
+(function() {
+    var consultsNum = $('#nav-tab .consults-num').html() - 0;
 
-$('#nav-tab li').on('click', function() {
-    var index = $(this).index();
 
+    commentsNum = $('#nav-tab .comments-num').html() - 0;
 
-    if (!$(this).hasClass('focus')) {
+    $('#nav-tab li').each(function() {
+        $(this).removeClass('focus');
+    });
+
+    $('#feedback-content .content').each(function() {
+        $(this).addClass('hide');
+    });
+    if (0 !== commentsNum) {
+        $('#nav-tab .comment-nav').addClass('focus');
+        $('#feedback-content .comment-content').removeClass('hide');
+
+    } else if (0 !== consultsNum) {
+        $('#nav-tab .consult-nav').addClass('focus');
+        $('#feedback-content .consult-content').removeClass('hide');
+    }
+})();
 
-        $('#nav-tab li').each(function() {
-            $(this).removeClass('focus');
-        });
-        $('#feedback-content .content').each(function() {
-            $(this).addClass('hide');
-        });
+$('#nav-tab li').on('click', function() {
+    var index = $(this).index();
+
+    if ($(this).hasClass('comment-nav') && 0 === commentsNum) {
+        alert('暂无商品评价');
+    } else {
+        if (!$(this).hasClass('focus')) {
+
+            $('#nav-tab li').each(function() {
+                $(this).removeClass('focus');
+            });
+            $('#feedback-content .content').each(function() {
+                $(this).addClass('hide');
+            });
+
+            $(this).addClass('focus');
+            $('#feedback-content .content:eq(' + index + ')').removeClass('hide');
+        }
+    }
+});
 
-        $(this).addClass('focus');
-        $('#feedback-content .content:eq(' + index + ')').removeClass('hide');
+$('.goodsDiscount .dropdown').on('click', function() {
+    if ($('.goodsDiscount .discount-folder').is(':hidden')) {
+        $('.goodsDiscount .discount-folder').slideDown();
+    } else {
+        $('.goodsDiscount .discount-folder').slideUp();
     }
 });
 

+/**
+ * 提取URL中的参数
+ * @author: xuqi<qi.xu@yoho.cn>
+ * @date: 2015/11/19
+ */
+
+var opt = {};
+
+var paramStr = window.location.search.split('?')[1];
+
+var keyVal = paramStr.split('&');
+
+var i, key, val;
+
+for (i = keyVal.length; i > 0; i--) {
+    key = keyVal[i - 1].split('=');
+
+    val = key[1];
+    key = key[0];
+
+    //初始化默认参数
+    switch (key) {
+        case 'gender':
+            opt.gender = val;
+            break;
+        case 'brand':
+            opt.brand = val;
+            break;
+        case 'sort':
+            opt.sort = val;
+            break;
+        case 'msort':
+            opt.msort = val;
+            break;
+        case 'misort':
+            opt.misort = val;
+            break;
+        case 'color':
+            opt.color = val;
+            break;
+        case 'size':
+            opt.size = val;
+            break;
+        case 'price':
+            opt.price = val;
+            break;
+        case 'discount':
+            opt.discount = val;
+            break;
+        case 'query':
+            opt.query = val;
+            break;
+        case 'style':
+            opt.style = val;
+            break;
+        case 'limit':
+            opt.limit = val;
+            break;
+        case 'channel':
+            opt.channel = val;
+            break;
+        case 'p_d':
+            opt.p_d = val;
+            break;
+        case 'dayLimit':
+            opt.dayLimit = val;
+            break;
+    }
+}
+
+module.exports = opt;
\ No newline at end of file

@@ -31,19 +31,7 @@ var $input = $('#search-input input'),
     $clear = $('#search-input .clear-input');
 
 //默认筛选条件
-var defaultOpt = {
-    gender: $('#gender').val(),
-    brand: $('#brand').val(),
-    sort: $('#sort').val(),
-    msort: $('#msort').val(),
-    misort: $('#misort').val(),
-    color: $('#color').val(),
-    size: $('#size').val(),
-    price: $('#price').val(),
-    discount: $('#discount').val(),
-    query: $('#query').val(),
-    style: $('#style').val()
-};
+var defaultOpt = require('./extract-url');
 
 var $listNav = $('#list-nav'),
 

@@ -25,18 +25,7 @@ var winH = $(window).height(),
     noResult = '<p class="no-result">未找到相关搜索结果</p>';
 
 //默认筛选条件
-var defaultOpt = {
-    gender: $('#gender').val(),
-    brand: $('#brand').val(),
-    sort: $('#sort').val(),
-    msort: $('#msort').val(),
-    misort: $('#misort').val(),
-    color: $('#color').val(),
-    size: $('#size').val(),
-    price: $('#price').val(),
-    discount: $('#discount').val(),
-    style: $('#style').val()
-};
+var defaultOpt = require('../extract-url');
 
 var $listNav = $('#list-nav'),
 

@@ -28,22 +28,7 @@ var winH = $(window).height(),
     noResult = '<p class="no-result">未找到相关搜索结果</p>';
 
 //默认筛选条件
-var defaultOpt = {
-    gender: $('#gender').val(),
-    brand: $('#brand').val(),
-    sort: $('#sort').val(),
-    msort: $('#msort').val(),
-    misort: $('#misort').val(),
-    color: $('#color').val(),
-    size: $('#size').val(),
-    price: $('#price').val(),
-    discount: $('#discount').val(),
-    limit: $('#limit').val(),
-    channel: $('#channel').val(),
-    p_d: $('#p_d').val(),
-    dayLimit: 1,
-    style: $('#style').val()
-};
+var defaultOpt = require('../extract-url');
 
 var storeOpt = $.extend({}, defaultOpt); //存储默认筛选条件以便重置
 

@@ -4,54 +4,28 @@ $borderC:#e0e0e0;
 $tableCellC:#eee;
 $basicBtnC:#eb0313;
 
-.good-detail-page {
-overflow: hidden;
-/* basic component */
-.page-block{
-    box-sizing:border-box;
-    width: 100%;
-    border-bottom: 2px solid $borderC;
-    border-top: 1px solid $borderC;
-    padding: 0  pxToRem(28px);
-    >.title{
-        line-height: pxToRem(88px);
-        color: $mainFontC;
-        font-size : pxToRem(28px);           
-        border-bottom: 1px solid $borderC;
-        
-        span{
-            color:#a0a0a0;
-            font-size:pxToRem(18px);
-            }
-        }
-        .detail{
-            margin-top: pxToRem(20px);
-            margin-bottom: pxToRem(20px);
-            font-size: pxToRem(24px);
-            line-height: pxToRem(36px);
-
-            &.table{
-                display: table;
-                width: 100%;
-                .row{
-                    display: table-row;
-                    .column{
-                       display: table-cell;
-                       padding: 0.4em 0.8em;
-                       border:1px solid #fff;
-                       font-size: pxToRem(24px);
-                       background-color: $tableCellC;
-                   }
-               }
-           }
-    }
+.my-swiper-button-prev,
+.my-swiper-button-next {
+  position: absolute;
+  top: 50%;
+  width: pxToRem(48px);
+  height: pxToRem(48px);
+  margin-top: pxToRem(-44px);
+  cursor: pointer;
+  -moz-background-size: pxToRem(48px) pxToRem(48px);
+  -webkit-background-size: pxToRem(48px) pxToRem(48px);
+  background-size: pxToRem(48px) pxToRem(48px);
+  background-position: center;
+  background-repeat: no-repeat;
 }
 
-.gap-block{
-    min-height: 30rem/$pxConvertRem;
-    background-color: #f0f0f0;
+.next-grey {
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23f0f0f0'%2F%3E%3C%2Fsvg%3E");
+  right: pxToRem(30px);
+  left: auto;
 }
 
+<<<<<<< HEAD
 .banner-container{
     position: relative;
         // overflow: hidden;
@@ -225,15 +199,15 @@ overflow: hidden;
     }
 }
 .goodsDiscount{
-    min-height: pxToRem(88px);
-    padding-left:pxToRem(28px);
-    padding-right:pxToRem(28px);
+   
     font-size: pxToRem(28px);
     color: $mainFontC;
-    line-height: pxToRem(88px);
-
     border-bottom: 1px solid $borderC;
-
+    h1{
+        padding : pxToRem(30px) pxToRem(28px);
+        line-height: pxToRem(36px);
+        // line-height: pxToRem(88px);
+    }
     .iconfont{
         display: inline-block;
         width: pxToRem(35px);
@@ -242,196 +216,386 @@ overflow: hidden;
         color:#e0e0e0;
         // padding-left:pxToRem(50px);
     }
+    .discount-folder{
+        .folder-item{
+            border-top: 1px solid $borderC;
+        }
+        display: none;
+    }
+    
 }
 .goodsSubtitle,
 .goodsDiscount{
     text-indent: pxToRem(-14px);
+=======
+.prev-grey {
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23f0f0f0'%2F%3E%3C%2Fsvg%3E");
+  left: pxToRem(30px);
+  right: auto;
+>>>>>>> e70906be965a981051214ab24fd534fcb709337e
 }
-.feedback-list {
-    padding-top: pxToRem(30px);
-    background-color: #f0f0f0;
-
-    .nodata{
-        height: pxToRem(88px);
-        background-color: #fff;
-        padding:0 pxToRem(28px);
-        span,a{
-            line-height: pxToRem(88px);
-            font-size: pxToRem(28px);
-        }
-        span{
-            color:$mainFontC;
-        }
-        a{
-            float: right;
-            color: $subFontC;
-            span.iconfont{
-                color:inherit;
-            }
-        }
-    }
-    .nav-tab{
-        width: 100%;
-    }
-
-    .nav-tab {
-        height: pxToRem(60px);
-        padding: pxToRem(10px) 0;
-        background-color: #fff;
-        border-top: 1px solid $borderC;
-        border-bottom: 1px solid $borderC;
-    }
 
-    .comment-nav, .consult-nav {
-        box-sizing: border-box;
-        float: left;
-        width: 50%;
-        height: pxToRem(60px);
-        line-height: pxToRem(60px);
-        font-size: pxToRem(28px);
-        text-align: center;
-        color: #ccc;
-
-        &.focus {
-            color: #000;
-        }
-    }
-    .comment-nav {
-        border-right: 1px solid #ccc;
-    }
-    .content{
-       .content-main{
-        background-color: #fff;
-        border-bottom: 1px solid $borderC;
-        &.comment-content-main{
-            .user-name{
-                font-size: pxToRem(24px);
-                line-height: pxToRem(62px);
-                color:$mainFontC;
-                padding-left: pxToRem(28px);
-                padding-right: pxToRem(18px);
-            }
-            .goods-spec,
-            .comment-time{
-                font-size: pxToRem(24px);
-                line-height: pxToRem(62px);
-            }
-            .detail-content{
-                // font-size: pxToRem(28px);
-                // line-height: pxToRem(36px);
-                font-size: pxToRem(24px);
-                line-height: pxToRem(62px);
-                color:$mainFontC;
-                padding-left: pxToRem(28px);
-                padding-right: pxToRem(18px);
-            }
-            .goods-spec,
-            .comment-time{
-                font-size: pxToRem(24px);
-                line-height: pxToRem(62px);
-            }
-            .detail-content{
-                font-size: pxToRem(28px);
-                line-height: pxToRem(36px);
-            }
-            .goods-spec,
-            .detail-content{
-                color:$mainFontC;
-            }
-            .detail-content,
-            .comment-time{
-                padding-left: pxToRem(28px);
-
-            }
-            .detail-content{
-                padding-right: pxToRem(28px);
-                padding-left: pxToRem(28px);
-            }
-            .detail-content{
-                padding-right: pxToRem(28px);
-            }
-            .comment-time{
-                color:#c1c1c1;
-            }
-        }
-        &.consult-content-main{
-             padding-right: pxToRem(28px);
-             padding-left: pxToRem(28px);
-             padding-top: pxToRem(20px);
-             padding-bottom: pxToRem(20px);
-            .question{
-                font-size: pxToRem(24px);
-                color:$mainFontC;
-                span{
-                    display: block;
-                    float: left;
-                    font-size: inherit;
-                    padding-right: pxToRem(15px);
-                }
-                p{
-                    overflow: hidden;
-                }
-            }
-            .time{
-                font-size: pxToRem(22px);
-                color:$subFontC;
-            }
-            .answer{
-                font-size: pxToRem(24px);
-                line-height: pxToRem(36px);
-                color:$subFontC;
-                margin-top: pxToRem(14px);
-                span{
-                    display: block;
-                    float: left;
-                    font-size: inherit;
-                    color:$mainFontC;
-                    padding-right: pxToRem(15px);
+.good-detail-page {
+  overflow: hidden;
+
+  .page-block{
+      box-sizing:border-box;
+      width: 100%;
+      border-bottom: 2px solid $borderC;
+      border-top: 1px solid $borderC;
+      padding: 0  pxToRem(28px);
+      >.title{
+          line-height: pxToRem(88px);
+          color: $mainFontC;
+          font-size : pxToRem(28px);
+          border-bottom: 1px solid $borderC;
+
+          span{
+              color:#a0a0a0;
+              font-size:pxToRem(18px);
+              }
+          }
+          .detail{
+              margin-top: pxToRem(20px);
+              margin-bottom: pxToRem(20px);
+              font-size: pxToRem(24px);
+              line-height: pxToRem(36px);
+
+              &.table{
+                  display: table;
+                  width: 100%;
+                  .row{
+                      display: table-row;
+                      .column{
+                         display: table-cell;
+                         padding: 0.4em 0.8em;
+                         border:1px solid #fff;
+                         font-size: pxToRem(24px);
+                         background-color: $tableCellC;
+                     }
+                 }
+             }
+      }
+  }
+
+  .gap-block{
+      min-height: 30rem/$pxConvertRem;
+      background-color: #f0f0f0;
+  }
+
+  .banner-container{
+      position: relative;
+          // overflow: hidden;
+          .is-new-lable{
+              position: absolute;
+              left: pxToRem(108px);
+              top:pxToRem(40px);
+              height: pxToRem(35px);
+              width:pxToRem(70px);
+
+              color:#fff;
+              text-align: center;
+              font-size: pxToRem(20px);
+              line-height: pxToRem(35px);
+              background-color: #7cd881;
+              // z-index: 16;
+          }
+      }
+      .banner-top{
+               // width: 100%;
+               min-height: 660rem / $pxConvertRem;
+               overflow: hidden;
+               position: relative;
+
+               .swiper-pagination{
+                  position:absolute;
+                  bottom: pxToRem(40px);
+                  .swiper-pagination-bullet {
+                    margin-right: 2px;
                 }
-                p{
-                    overflow: hidden;
+                .swiper-pagination-bullet-active {
+                   background-color: #000;
                 }
-            }
-        }
-        &.no-item{
-            font-size: pxToRem(28px);
-            text-align: center;
-            height: pxToRem(200px);
-            line-height: pxToRem(200px);
-            color: $subFontC;
-            span{
-                font-size: inherit;
-            }
-        }
-    }
 
+          }
+
+      }
+
+      .banner-swiper {
+          min-height: pxToRem(600px);
+          min-width: pxToRem(448px);
+          margin: pxToRem(30px)  pxToRem(96px);
+          // position: relative;
+          overflow: hidden;
+          ul {
+              position: relative;
+              height: 100%;
+              li {
+                  float: left;
+                  height: 100%;
+              }
+          }
+
+      }
+
+
+      .goodsName {
+          min-height: pxToRem(83px);
+          font-size: pxToRem(28px);
+          color: #fff;
+          padding-left: pxToRem(25px);
+          padding-right: pxToRem(25px);
+          line-height: pxToRem(36px);
+          background-color: #515150;
+      }
+
+      .goodsSubtitle{
+          min-height: pxToRem(87px);
+          font-size: pxToRem(24px);
+          line-height: pxToRem(36px);
+          color:$subFontC;
+          padding-left:pxToRem(28px);
+          padding-right:pxToRem(28px);
+          border-bottom:1px solid $borderC;
+          background-color: #f4f4f4;
+      }
+
+      .price-date{
+         // width: 100%;
+         color:$subFontC;
+         min-height: pxToRem(88px);
+         padding-left:pxToRem(28px);
+         padding-right:pxToRem(28px);
+         border-bottom: 1px solid $borderC;
+     }
+     .goodsPrice{
+      float: left;
+      font-size: pxToRem(34.59px);
+      h1{
+          display: inline-block;
+          line-height: pxToRem(88px);
+      }
+      .currentPrice{
+          color:red;
+          margin-right: pxToRem(10px);
+      }
+      .previousPrice{
+          text-decoration:line-through;
+      }
+  }
+  .periodOfMarket{
+       font-size: pxToRem(24px);
+       float: right;
+       h1{
+          display: inline-block;
+          line-height: pxToRem(88px);
+      }
+  }
+  .goodsName,
+  .goodsSubtitle{
+          // width: 100%;
+          display:table;
+          span{
+             display: table-cell;
+             vertical-align: middle;
+         }
+   }
+     .vipLevel {
+      width: 100%;
+      box-sizing:border-box;
+      display: table;
+      min-height: pxToRem(88px);
+      padding-left:pxToRem(28px);
+      padding-right:pxToRem(28px);
+      font-size: pxToRem(22px);
+      color: #999999;
+
+      border-bottom: 1px solid $borderC;
+      span{
+          display: table-cell;
+          vertical-align: middle;
+      }
+      .vip-img{
+          padding-right: pxToRem(22px);
+          img{
+              width: pxToRem(52px);
+              height: pxToRem(32px);
+          }
+      }
+      .vip-price{
+          padding-right: pxToRem(55px);
+      }
+      .vip-price:last-child{
+          padding-right: 0;
+      }
+  }
+  .goodsDiscount{
+      min-height: pxToRem(88px);
+      padding-left:pxToRem(28px);
+      padding-right:pxToRem(28px);
+      font-size: pxToRem(28px);
+      color: $mainFontC;
+      line-height: pxToRem(88px);
+
+      border-bottom: 1px solid $borderC;
+
+      .iconfont{
+          display: inline-block;
+          width: pxToRem(35px);
+          font-size: pxToRem(45px);
+          float: right;
+          color:#e0e0e0;
+          // padding-left:pxToRem(50px);
+      }
+  }
+  .goodsSubtitle,
+  .goodsDiscount{
+      text-indent: pxToRem(-14px);
+  }
+  .feedback-list-page {
+      padding-top: pxToRem(30px);
+      background-color: #f0f0f0;
+
+      .nav-tab{
+          width: 100%;
+      }
+
+      .nav-tab {
+          height: pxToRem(60px);
+          padding: pxToRem(10px) 0;
+          background-color: #fff;
+          border-top: 1px solid $borderC;
+          border-bottom: 1px solid $borderC;
+      }
+
+      .comment-nav, .consult-nav {
+          box-sizing: border-box;
+          float: left;
+          width: 50%;
+          height: pxToRem(60px);
+          line-height: pxToRem(60px);
+          font-size: pxToRem(28px);
+          text-align: center;
+          color: #ccc;
+
+          &.focus {
+              color: #000;
+          }
+      }
+      .comment-nav {
+          border-right: 1px solid #ccc;
+      }
+      .content{
+         .content-main{
+          background-color: #fff;
+          border-bottom: 1px solid $borderC;
+          &.comment-content-main{
+              .user-name{
+                  font-size: pxToRem(24px);
+                  line-height: pxToRem(62px);
+                  color:$mainFontC;
+                  padding-left: pxToRem(28px);
+                  padding-right: pxToRem(18px);
+              }
+              .goods-spec,
+              .comment-time{
+                  font-size: pxToRem(24px);
+                  line-height: pxToRem(62px);
+              }
+              .detail-content{
+                  // font-size: pxToRem(28px);
+                  // line-height: pxToRem(36px);
+                  font-size: pxToRem(24px);
+                  line-height: pxToRem(62px);
+                  color:$mainFontC;
+                  padding-left: pxToRem(28px);
+                  padding-right: pxToRem(18px);
+              }
+              .goods-spec,
+              .comment-time{
+                  font-size: pxToRem(24px);
+                  line-height: pxToRem(62px);
+              }
+              .detail-content{
+                  font-size: pxToRem(28px);
+                  line-height: pxToRem(36px);
+              }
+              .goods-spec,
+              .detail-content{
+                  color:$mainFontC;
+              }
+              .detail-content,
+              .comment-time{
+                  padding-left: pxToRem(28px);
 
-}
-.comment-content-footer,
-.consult-content-footer{
+              }
+              .detail-content{
+                  padding-right: pxToRem(28px);
+                  padding-left: pxToRem(28px);
+              }
+              .detail-content{
+                  padding-right: pxToRem(28px);
+              }
+              .comment-time{
+                  color:#c1c1c1;
+              }
+          }
+          &.consult-content-main{
+               padding-right: pxToRem(28px);
+               padding-left: pxToRem(28px);
+               padding-top: pxToRem(20px);
+               padding-bottom: pxToRem(20px);
+              .question{
+                  font-size: pxToRem(24px);
+                  color:$mainFontC;
+                  span{
+                      display: block;
+                      float: left;
+                      font-size: inherit;
+                      padding-right: pxToRem(15px);
+                  }
+                  p{
+                      overflow: hidden;
+                  }
+              }
+              .time{
+                  font-size: pxToRem(22px);
+                  color:$subFontC;
+              }
+              .answer{
+                  font-size: pxToRem(24px);
+                  line-height: pxToRem(36px);
+                  color:$subFontC;
+                  margin-top: pxToRem(14px);
+                  span{
+                      display: block;
+                      float: left;
+                      font-size: inherit;
+                      color:$mainFontC;
+                      padding-right: pxToRem(15px);
+                  }
+                  p{
+                      overflow: hidden;
+                  }
+              }
+          }
 
-     min-height: pxToRem(88px);
-     text-align: center;
-     background-color: #fff;
+      }
 
-     border-bottom: 1px solid $borderC;
-     line-height: pxToRem(88px);
-     font-size: pxToRem(28px);
 
-     a{
-         color: #e0e0e0;
-         .iconfont{
-           font-size: inherit;
-       }
-   }  
+  }
+  .comment-content-footer,
+  .consult-content-footer{
 
-}
+       min-height: pxToRem(88px);
+       text-align: center;
+       background-color: #fff;
 
-.content.hide {
-    display: none;
-}
-}
+       border-bottom: 1px solid $borderC;
+       line-height: pxToRem(88px);
+       font-size: pxToRem(28px);
 
+<<<<<<< HEAD
 .enter-store{
     min-height: pxToRem(100px);
     display: table;
@@ -511,6 +675,8 @@ overflow: hidden;
 
     .detail-swiper{
         .swiper-wrapper{
+            height: pxToRem(200px);
+            overflow: hidden;
             .swiper-slide{
                 width: pxToRem(114px);
                 div{
@@ -527,7 +693,6 @@ overflow: hidden;
     }
 
     #reference-swiper-container{
-
         .first-group{
             width: pxToRem(70px);
             margin-top: pxToRem(66px);
@@ -584,55 +749,223 @@ overflow: hidden;
                  margin-right: pxToRem(12px);
                  vertical-align: text-bottom;
              }
+=======
+       a{
+           color: #e0e0e0;
+           .iconfont{
+             font-size: inherit;
+>>>>>>> e70906be965a981051214ab24fd534fcb709337e
          }
      }
- }
- clear:both;
-}
-}
-.cart-bar{ 
-    position: relative;
-    box-sizing:border-box;
-    width: 100%;
-    height: pxToRem(120px);
-    position:fixed;
-    bottom: 0;
-    background-color: #fff;
-    z-index:2;
-    padding:pxToRem(20px) pxToRem(28px);
-    text-align: center;
-    a{
-        display: inline-block;
-        &.num-incart{
-            font-size: pxToRem(47px);
-            color:#444;
-        }
-        &.favorite{
-            font-size: pxToRem(34px);
-            color:$basicBtnC;
-        }
-        &.addto-cart{
-            height: pxToRem(80px);
-            width: pxToRem(260px);
-            margin:0  pxToRem(100px) 0 pxToRem(115px);
-            color: #fff;
-            background-color: $basicBtnC;  
-            font-size: pxToRem(40px);
-            line-height: pxToRem(80px);
-            text-align: center;
-        }
-    }
-    .num-tag{
-        position: absolute;
-        left:pxToRem(66px);
-        height: pxToRem(20px);
-        display: block;
-        width: pxToRem(36px);
-        height: pxToRem(36px);
-        background-color: $basicBtnC;
-        border-radius: 50%;
-        color:#fff;
-        font-size: pxToRem(24px);
-    }
-}
+
+  }
+
+  .content.hide {
+      display: none;
+  }
+  }
+
+  .enter-store{
+      min-height: pxToRem(100px);
+      display: table;
+      a{
+          display: table-cell;
+          vertical-align: middle;
+          text-align: left;
+      }
+      .store-logo{
+         // padding-right: 35rem/$pxConvertRem;
+         img{
+          width: pxToRem(109px);
+          height: pxToRem(68px);
+          margin-left: 0;
+          margin-right: pxToRem(-25px);
+      }
+  }
+  .store-name{
+      font-size: pxToRem(34px);
+      color:$mainFontC;
+  }
+  .store-link{
+      font-size:pxToRem(28px) ;
+      color:$subFontC;
+      text-align: right;
+      span{
+          font-size: inherit;
+      }
+  }
+  }
+  .goods-desc{
+      .service{
+          width: pxToRem(489px);
+          height: pxToRem(28px);
+          margin-top: pxToRem(22px);
+      }
+  }
+  .tips{
+      color:$subFontC;
+      font-size: pxToRem(18px);
+      margin-top: pxToRem(20px);
+  }
+  .materials{
+      .detail{
+          img{
+              display: block;
+              overflow: hidden;
+              width: pxToRem(90px);
+              height: pxToRem(120px);
+              padding-right: pxToRem(20px);
+              float: left;
+          }
+          .material-desc{
+                  font-size: pxToRem(24px);
+                  overflow: hidden;
+
+              }
+          }
+          .material-type{
+              width: pxToRem(581px);
+              height: pxToRem(99px);
+              border-top: 1px solid $borderC;
+              padding: pxToRem(17px) 0;
+          }
+      }
+
+      .product-detail{
+          .detail{
+              img{
+                  margin-top: pxToRem(20px);
+                  width: pxToRem(581px);
+                  height: pxToRem(772px);
+              }
+          }
+          margin-bottom: pxToRem(120px);
+      }
+
+      .detail-swiper{
+          .swiper-wrapper{
+              .swiper-slide{
+                  width: pxToRem(114px);
+                  div{
+                      text-align: center;
+                      &.cell{
+                          font-size: pxToRem(24px);
+                          background-color: $tableCellC;
+                          padding:pxToRem(15px) 0;
+                          border: 1px solid #fff;
+                      }
+                  }
+              }
+          }
+      }
+
+      #reference-swiper-container{
+
+          .first-group{
+              width: pxToRem(70px);
+              margin-top: pxToRem(66px);
+              .avatar{
+                          line-height: pxToRem(40px);
+                          width: pxToRem(40px);
+                          height: pxToRem(40px);
+                          margin: pxToRem(18px) 0;
+              }
+          }
+      }
+
+      .measurement-method{
+          .detail{
+              width: 100%;
+              // height: pxToRem(300px);
+              img{
+               float:left;
+               width: pxToRem(270px);
+               height: pxToRem(239px);
+               margin-top: pxToRem(18px);
+               margin-right: pxToRem(28px);
+           }
+           .right-part{
+              overflow: hidden;
+              .title{
+                 >h1{
+                  margin-top: pxToRem(10px);
+                  display: inline-block;
+                  padding-right: pxToRem(10px);
+                  border-right: 1px solid $borderC;
+                  line-height: 100%;
+              }
+              >span{
+                  font-size: pxToRem(12px);
+              }
+          }
+          ul.items{
+              margin-top: pxToRem(20px);
+              padding: 0;
+              line-height: pxToRem(30px);
+              font-size: pxToRem(13px);
+              li{
+                  span{
+                   display: inline-block;
+                   width: pxToRem(15px);
+                   height: pxToRem(15px);
+                   background-color: $basicBtnC;
+                   border-radius: 50%;
+                   color:#fff;
+                   text-align: center;
+                   line-height: pxToRem(15px);
+                   font-size: pxToRem(13px);
+                   margin-right: pxToRem(12px);
+                   vertical-align: text-bottom;
+               }
+           }
+       }
+   }
+   clear:both;
+  }
+  }
+  .cart-bar{
+      position: relative;
+      box-sizing:border-box;
+      width: 100%;
+      height: pxToRem(120px);
+      position:fixed;
+      bottom: 0;
+      background-color: #fff;
+      z-index:2;
+      padding:pxToRem(20px) pxToRem(28px);
+      text-align: center;
+      a{
+          display: inline-block;
+          &.num-incart{
+              font-size: pxToRem(47px);
+              color:#444;
+          }
+          &.favorite{
+              font-size: pxToRem(34px);
+              color:$basicBtnC;
+          }
+          &.addto-cart{
+              height: pxToRem(80px);
+              width: pxToRem(260px);
+              margin:0  pxToRem(100px) 0 pxToRem(115px);
+              color: #fff;
+              background-color: $basicBtnC;
+              font-size: pxToRem(40px);
+              line-height: pxToRem(80px);
+              text-align: center;
+          }
+      }
+      .num-tag{
+          position: absolute;
+          left:pxToRem(66px);
+          height: pxToRem(20px);
+          display: block;
+          width: pxToRem(36px);
+          height: pxToRem(36px);
+          background-color: $basicBtnC;
+          border-radius: 50%;
+          color:#fff;
+          font-size: pxToRem(24px);
+      }
+  }
 }

@@ -43,7 +43,15 @@
 
 {{#goodsDiscount}}
 <div class="goodsDiscount">
-    <h1>{{.}}<span class="iconfont">&#xe609;</span></h1>
+    {{#each list}}
+        {{#if @first}}
+            <h1>{{this}}<span class="iconfont dropdown">&#xe609;</span></h1>
+            <div class="discount-folder">
+            {{else}}
+            <h1 class="folder-item">{{this}}</h1>
+        {{/if}}
+    {{/list}}
+    </div>
 </div>
 {{/goodsDiscount}}
 
@@ -57,8 +65,8 @@
         {{else}}
     
     <ul id="nav-tab" class="nav-tab clearfix">
-        <li class="comment-nav focus">{{commentName}}({{commentsNum}})</li>
-        <li class="consult-nav">{{consultName}}({{consultsNum}})</li>
+        <li class="comment-nav">{{commentName}}(<span class="comments-num">{{commentsNum}}</span>)</li>
+        <li class="consult-nav">{{consultName}}(<span class="consults-num">{{consultsNum}}</span>)</li>
     </ul>
     <div id="feedback-content" >
        
@@ -189,7 +197,7 @@
   <div class="swiper-container detail-swiper" id="size-swiper-container">
     <div class="swiper-wrapper">
         {{#list}}
-        <div class="swiper-slide blue-slide" >
+        <div class="swiper-slide " >
             <div class="size-name cell">{{name}}</div>
             <div class="size-m cell">{{sizem}}</div>
             <div class="size-xl cell">{{sizexl}}</div>

@@ -37,59 +37,6 @@
         <div class="container hide clearfix"></div>
         {{> filter}}
     </div>
- 
-    {{#if brand}}
-        <input id="brand" type="hidden" value={{brand}}>
-    {{/if}}
-
-    {{#if gender}}
-        <input id="gender" type="hidden" value={{gender}}>
-    {{/if}}
-
-    {{#if sort}}
-        <input id="sort" type="hidden" value={{sort}}>
-    {{/if}}
-
-    {{#if msort}}
-        <input id="msort" type="hidden" value={{msort}}>
-    {{/if}}
-
-    {{#if misort}}
-        <input id="misort" type="hidden" value={{misort}}>
-    {{/if}}
-
-    {{#if color}}
-        <input id="color" type="hidden" value={{color}}>
-    {{/if}}
-
-    {{#if size}}
-        <input id="size" type="hidden" value={{size}}>
-    {{/if}}
-
-    {{#if price}}
-        <input id="price" type="hidden" value={{price}}>
-    {{/if}}
-
-    {{#if p_d}}
-        <input id="p_d" type="hidden" value={{p_d}}>
-    {{/if}}
-
-    {{#if channel}}
-        <input id="channel" type="hidden" value={{channel}}>
-    {{/if}}
-
-    {{#if dayLimit}}
-        <input id="dayLimit" type="hidden" value={{dayLimit}}>
-    {{/if}}
-
-    {{#if limit}}
-        <input id="limit" type="hidden" value={{limit}}>
-    {{/if}}
-    
-    {{#if style}}
-        <input id="style" type="hidden" value={{style}}>
-    {{/if}}
-
     {{> product/suspend-cart}}
 </div>
 {{> layout/footer}}
\ No newline at end of file

@@ -48,59 +48,6 @@
 
         {{> filter}}
     </div>
- 
-    {{#if brand}}
-        <input id="brand" type="hidden" value={{brand}}>
-    {{/if}}
-
-    {{#if gender}}
-        <input id="gender" type="hidden" value={{gender}}>
-    {{/if}}
-
-    {{#if sort}}
-        <input id="sort" type="hidden" value={{sort}}>
-    {{/if}}
-
-    {{#if msort}}
-        <input id="msort" type="hidden" value={{msort}}>
-    {{/if}}
-
-    {{#if misort}}
-        <input id="misort" type="hidden" value={{misort}}>
-    {{/if}}
-
-    {{#if color}}
-        <input id="color" type="hidden" value={{color}}>
-    {{/if}}
-
-    {{#if size}}
-        <input id="size" type="hidden" value={{size}}>
-    {{/if}}
-
-    {{#if price}}
-        <input id="price" type="hidden" value={{price}}>
-    {{/if}}
-
-    {{#if p_d}}
-        <input id="p_d" type="hidden" value={{p_d}}>
-    {{/if}}
-
-    {{#if channel}}
-        <input id="channel" type="hidden" value={{channel}}>
-    {{/if}}
-
-    {{#if limit}}
-        <input id="limit" type="hidden" value={{limit}}>
-    {{/if}}
-
-    {{#if discount}}
-        <input id="discount" type="hidden" value={{discount}}>
-    {{/if}}
-
-    {{#if style}}
-        <input id="style" type="hidden" value={{style}}>
-    {{/if}}
-
     {{> product/suspend-cart}}
 </div>
 {{> layout/footer}}
\ No newline at end of file

@@ -16,6 +16,6 @@
     </div>
     
     <!-- 如果需要导航按钮 -->
-    <div class="swiper-button-prev swiper-button-grey"></div>
-    <div class="swiper-button-next swiper-button-grey"></div>
+    <div class="swiper-button-prev prev-grey"></div>
+    <div class="swiper-button-next next-grey"></div>
 </div>
\ No newline at end of file

@@ -89,50 +89,5 @@
 
         {{> filter}}
     </div>
-
-    {{#if brand}}
-        <input id="brand" type="hidden" value={{brand}}>
-    {{/if}}
-
-    {{#if gender}}
-        <input id="gender" type="hidden" value={{gender}}>
-    {{/if}}
-
-    {{#if sort}}
-        <input id="sort" type="hidden" value={{sort}}>
-    {{/if}}
-
-    {{#if msort}}
-        <input id="msort" type="hidden" value={{msort}}>
-    {{/if}}
-
-    {{#if misort}}
-        <input id="misort" type="hidden" value={{misort}}>
-    {{/if}}
-
-    {{#if color}}
-        <input id="color" type="hidden" value={{color}}>
-    {{/if}}
-
-    {{#if size}}
-        <input id="size" type="hidden" value={{size}}>
-    {{/if}}
-
-    {{#if price}}
-        <input id="price" type="hidden" value={{price}}>
-    {{/if}}
-
-    {{#if discount}}
-        <input id="discount" type="hidden" value={{discount}}>
-    {{/if}}
-
-    {{#if query}}
-        <input id="query" type="hidden" value={{query}}>
-    {{/if}}
-
-    {{#if style}}
-        <input id="style" type="hidden" value={{style}}>
-    {{/if}}
-
     {{> product/suspend-cart}}
 {{/ goodList}}
\ No newline at end of file

@@ -48,7 +48,6 @@ class HomeController extends AbstractAction
 		    'myIndexPage' => true,
 		    'pageFooter' => true
 	    );
-	    // echo $this->getRequest()->getActionName();
         $uid = $this->getUid();
 	    if ($uid) {
 		    $data['isLogin'] = true;
@@ -430,6 +429,22 @@ class HomeController extends AbstractAction
     }
 
     /**
+     * 异步点击靠谱或者不靠谱
+     */
+    public function upAndDownAction()
+    {
+        if ($this->isAjax())
+        {
+	        $uid = $this->getUid();
+	        $udid = $this->getUdid();
+	        $suggest_id = $this->post('suggest_id', 0);
+	        $result = \Index\UserModel::upAndDown($uid, $udid, $suggest_id);
+
+            $this->echoJson($result);
+        }
+    }
+
+    /**
      * 会员等级展示页
      */
     public function gradeAction()

@@ -423,13 +423,13 @@ class UserModel
 
 		// 调用接口获取地址数据
 		$suggest = UserData::suggestData($udid, $page, $limit);
-		//print_r($suggest);
 
 		// 处理意见反馈数据
 		if (isset($suggest['data']) && !empty($suggest['data'])) {
 			$one = array();
 			foreach ($suggest['data']['list'] as $val) {
 				$one = array();
+				$one['suggest_id'] = $val['id'];
 				$one['imgUrl'] = Helpers::getImageUrl($val['cover_image'], 640, 240);
 				$one['title'] = $val['filter_content'];
 				$one['content'] = $val['reply_content'];
@@ -486,6 +486,34 @@ class UserModel
 	}
 
 	/**
+	 * 处理意见靠谱，不靠谱接口返回结果
+	 *
+	 * @param int $uid 用户ID
+	 * @param string $udid 客户端唯一标识
+	 * @param int $suggest_id 意见id
+	 * @return array|mixed 处理之后的数据
+	 */
+	public static function upAndDown($uid, $udid, $suggest_id)
+	{
+		$result = array('code' => 400, 'message' => '出错啦');
+
+		if (empty($suggest_id)) {
+			$result['code'] = 401;
+			$result['message'] = '指定意见不存在';
+		} else {
+			// 调用接口
+			$save = UserData::upAndDown($uid, $udid, $suggest_id);
+
+			if (isset($save['code']) && $save['code'] == 200) {
+				$result['code'] = 200;
+				$result['message'] = '操作成功';
+			}
+		}
+
+		return $result;
+	}
+
+	/**
 	 * 处理我的消息数据
 	 *
 	 * @param int $uid 用户ID

@@ -68,10 +68,18 @@ SHOE BQT KEN BLOCK',
                     )
                 )
             ),
-            'goodsDiscount'=>'【summer final sale】满¥499立享6.8折',
+            'goodsDiscount'=>array(
+                    'list'=>array(
+                           '【summer final sale】满¥499立享6.8折',
+                           '【BACK TO SCHOOL】满￥499赠送Paul 
+  Franke帽子一个，多买多送！',
+                            '【BACK TO SCHOOL】满￥499赠送Paul 
+  Franke帽子一个，多买多送！'
+                        )
+                ),
             'feedbacks'=>array(
                 'commentsNum'=>0,
-                'consultsNum'=>0,
+                'consultsNum'=>1,
                 'nodata' =>0,
                 'commentName'=>'商品评价',
                 'consultName' =>'购买咨询',