update

@@ -30,7 +30,6 @@ $basicBtnC:#eb0313;
   left: pxToRem(30px);
   right: auto;
 }
-<<<<<<< HEAD
 
 .good-detail-page {
   overflow: hidden;
@@ -109,168 +108,10 @@ $basicBtnC:#eb0313;
                   bottom: pxToRem(40px);
                   .swiper-pagination-bullet {
                     margin-right: 2px;
-=======
-.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);
->>>>>>> 94393aa29a7f2704e60f85d3aa6ac8b379aa612d
                 }
                 .swiper-pagination-bullet-active {
                    background-color: #000;
                 }
-<<<<<<< HEAD
-=======
-            }
-        }
-        &.no-item{
-            font-size: pxToRem(28px);
-            text-align: center;
-            height: pxToRem(200px);
-            line-height: pxToRem(200px);
-            color: $subFontC;
-            span{
-                font-size: inherit;
-            }
-        }
-    }
->>>>>>> 94393aa29a7f2704e60f85d3aa6ac8b379aa612d
 
           }