Parcourir la source

商品详情增加商品资质显示

zhengjinyi il y a 3 ans
Parent
commit
5fb2e1edaf

+ 2 - 2
src/main/resources/static/css/base/base.pc.css

@@ -15,9 +15,9 @@ iframe{width:320px !important;height: 280px !important}
 .impowerBox .status_icon {display: none;}
 .impowerBox .status {text-align: center;}
 /*定义滚动条样式*/
-::-webkit-scrollbar{width:10px;height:10px;background-color:#F6F6F6}
+::-webkit-scrollbar{width:4px;height:4px;background-color:#F6F6F6}
 ::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,0.1);border-radius:2px;background-color:#F6F6F6}
-::-webkit-scrollbar-thumb{border-radius:2px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.1);background-color:#93979F}
+::-webkit-scrollbar-thumb{border-radius:8px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.1);background-color:rgba(0,0,0,0.2)}
 /* 自定义下拉框 */
 .jqSelect{position:relative;width:100px;height:32px;line-height:32px;border:1px solid #666;border-radius:2px;cursor:pointer}
 .jqSelect:before{content:'\276F';font-weight: normal;position: absolute;right: 10px;top: 0;transform: rotate(90deg);}

+ 7 - 1
src/main/resources/static/css/base/floor.css

@@ -4,7 +4,7 @@
  */
 @media screen and (min-width:768px) {
 .section_page{width:100%;height:auto;float:left}
-.section_page.hot{width:100%;height:432px;background: url("/img/hot/icon-hot-bg.png");background-size: cover;}
+.section_page.hot{width:884px;height:432px;background: url("/img/hot/icon-hot-bg.png");background-size: cover;}
 .swiper-container-floor.hotList{padding: 0 12px;}
 .section_page.hot .section_page_title{width:100%;height:103px;box-sizing:border-box;padding:31px 16px 16px 16px;position: relative;}
 .section_page.hot .section_page_title h1{font-size:24px;line-height:31px;text-align:left;color:#FFFFFF}
@@ -96,9 +96,14 @@
  */
 @media screen and (max-width:768px) {
 .section_page{width:100%;height:auto;position: relative;}
+.section_page.hot{width:100%;height:auto;background: url("/img/hot/icon-hot-bg@h5.png");background-size: cover;}
 .section_page .section_page_title{padding:2.4vw 0 2.4vw 3.2vw;position:relative}
 .section_page .section_page_title h1{font-weight:bold;color:#4a4f58;font-size:4.8vw;line-height:9.7vw}
 .section_page .section_page_title p{font-weight:normal;color:#93979f;font-size:3.4vw;line-height:4.3vw}
+.section_page.hot .section_page_title h1{color:#FFFFFF}
+.section_page.hot .section_page_title p{color:#FFFFFF;}
+.swiper-container-floor.hotList{padding: 0 1vw;}
+.section_page.hot .section_page_btn{display: block;width:15.4vw;height: 5.9vw;background: url("/img/hot/icon-hot-btn@h5.png");background-size: cover;position: absolute;right:3.3vw;top: 6.8vw;}
 .section_page .page_main_item{width:45.6vw !important;height:68vw;overflow:hidden;margin:0 1.3vw 2.6vw 1.3vw;background:#fff;text-align:left}
 .section_page .page_main_image{width:45.6vw;height:45.6vw}
 .section_page .page_main_type{width: 8.8vw;height: 8.8vw;text-align: justify;box-sizing: border-box;padding: 1vw;border-radius: 0 0 2vw 2vw;background-color: #33CCBF;font-size: 2.6vw;color: #FFFFFF;line-height: 3.4vw;position: absolute;top: 0;right: 2vw;}
@@ -171,6 +176,7 @@
 #recommendBox .swiper-pagination{width:100%;height:2.6vw;z-index:1;text-align:center;font-size:0;position:absolute;bottom:2.6vw;left:0}
 #recommendBox .swiper-pagination .swiper-pagination-bullet{display:block;width:2vw;border-width:1vw 1px;border-color:transparent;cursor:pointer;background:none;font-size:0;opacity:.2}
 #recommendBox .swiper-pagination .swiper-pagination-bullet:before{content:"";display:block;width:100%;height:.6vw;background:#E15616;border-radius:.3vw}
+#recommendBox .swiper-pagination.hot .swiper-pagination-bullet:before{content:"";display:block;width:100%;height:.6vw;background:#FFFFFF;border-radius:.3vw}
 #recommendBox .swiper-pagination .swiper-pagination-bullet.swiper-pagination-bullet-active{width:3.8vw;opacity:1}
 #recommendBox .swiper-wrapper{height:inherit}
 }

+ 1 - 1
src/main/resources/static/css/index/index_new.pc.css

@@ -32,7 +32,7 @@ li{list-style:none;}
 /* 楼层 */
 .section_container{width:100%;height:auto;float:left}
 .section_container .inner{width:1184px;margin:0 auto}
-.section_left{width:884px;float:left;padding-top:40px;}
+.section_left{width:900px;float:left;padding-top:40px;}
 /*右边区域*/
 .section_right{width:284px;float:right;box-sizing:border-box;padding-top:40px}
 .section_right .section_right_item{width:284px;height:auto;background-color:#FFFFFF;float:left;margin-bottom:16px;padding:16px;box-sizing:border-box;border-radius:2px}

+ 9 - 8
src/main/resources/static/css/product/product-hot.css

@@ -4,7 +4,7 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-    .product-banner{width: 100%;height: 683px;position: relative;}
+    .product-banner{width: 100%;height: 660px;position: relative;}
     .product-banner .product-banner-top{width: 100%;height: 510px;background: url("/img/hot/icon-hottop-bg.png");background-size: cover;}
     .product-banner .product-banner-top .title{width: 100%;height: 140px;line-height: 140px;font-size: 56px;font-weight: bold;text-align: center;color: #FFFFFF;}
     .product-banner-bot{width: 100%;height: auto;position: absolute;top: 140px;left: 0;}
@@ -20,7 +20,7 @@ li{list-style:none}
     #productHotBanner .swiper-wrapper .swiper-slide-info .swiper-slide-btn {width: 100%;height: 44px;}
     #productHotBanner .swiper-wrapper .swiper-slide-info .swiper-slide-btn .slide-btn{width: 204px;height: 44px;margin: 0 auto;display:block;background: #F94B4B;line-height: 44px;text-align: center;font-size: 16px;color: #FFFFFF;}
     #productHotBanner .swiper-button-prev:hover,#productHotBanner .swiper-button-next:hover{background:rgba(255,230,220,.6)}
-    #productHotBanner .swiper-pagination{width:100%;height:14px;position:absolute;left:0;bottom:-44px;z-index:1;text-align:center;font-size:0}
+    #productHotBanner .swiper-pagination{width:100%;height:14px;position:absolute;left:0;bottom:-35px;z-index:1;text-align:center;font-size:0}
     #productHotBanner .swiper-pagination span{display:inline-block;border:5px solid transparent;cursor:pointer}
     #productHotBanner .swiper-pagination span:before{content:"";display:inline-block;width:14px;height:4px;background: rgba(255, 180, 150, 0.39);border-radius:2px}
     #productHotBanner .swiper-pagination span.on:before{width:28px;background:#E15616}
@@ -28,7 +28,7 @@ li{list-style:none}
     .search-text-brand{float: left;position: relative; height: 24px;padding: 0 24px 0 12px;line-height: 24px;box-sizing: border-box;border: 1px solid #DDDDDD;border-radius: 2px;text-align: center;font-size: 14px;color: #4A4F58;}
     .search-text-brand a{color: #E15621;}
     .search-text-brand .icon:before{background-position: -120px -657px;width: 24px;height: 24px;right: 0;position: absolute;cursor: pointer;}
-    .product-brand{width:1184px;margin:16px auto;box-sizing:border-box;min-height: 88px;padding:24px 12px 12px 12px;font-size:0;text-align:center;background:#FFF;position: relative;}
+    .product-brand{width:1184px;margin:16px auto;box-sizing:border-box;min-height: 80px;padding:24px 12px 12px 12px;font-size:0;text-align:center;background:#FFF;position: relative;}
     .product-brand .product-brand-name{width: 116px;float: left;border-right: 1px solid #F7F7F7;line-height: 44px;text-align: center;font-size: 16px;color: #4A4F58;}
     .product-brand .product-brand-name.show{line-height: 88px;}
     .product-brand-oper{width: 110px;height: 32px;position: absolute;right: 24px;top: 24px;}
@@ -115,13 +115,13 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
-    .product-banner{width: 100%;height: 71vw;position: relative;background: #FFFFFF;}
+    .product-banner{width: 100%;height: 72vw;position: relative;background: #FFFFFF;}
     .product-banner .product-banner-top{width: 100%;height: 57.3vw;background: url("/img/hot/icon-hottop-bg@h5.png");background-size: cover;}
     .product-banner .product-banner-top .title{width: 100%;height: 17.7vw;line-height: 17.7vw;font-size:6.5vw;font-weight: bold;text-align: center;color: #FFFFFF;}
     .product-banner-bot{width: 100%;height: auto;position: absolute;top: 17.7vw;left: 0;}
     .product-banner-bot .inner{width: 100%;height: auto;box-sizing: border-box;padding: 0 6.4vw;}
-    #productHotBanner{width:100%;height:48vw;background: url("/img/hot/icon-hotpor-bg@h5.png");position:relative;box-sizing: border-box;padding: 2.4vw;}
-    #productHotBanner .swiper-wrapper{position:relative;height:100%;z-index:0}
+    #productHotBanner{width:100%;height:50vw;background: url("/img/hot/icon-hotpor-bg@h5.png");position:relative;box-sizing: border-box;padding: 2.4vw;}
+    #productHotBanner .swiper-wrapper{position:relative;height:48vw;z-index:0}
     #productHotBanner .swiper-wrapper .swiper-slide{width:100%;height: 41.4vw;position:relative;zoom:1;vertical-align:middle;overflow:hidden;}
     #productHotBanner .swiper-wrapper .swiper-slide a{display: block;width: 100%;height: 100%;}
     #productHotBanner .swiper-wrapper .swiper-slide-image{width: 41.4vw;height: 41.4vw;float: left;}
@@ -132,8 +132,9 @@ li{list-style:none}
     #productHotBanner .swiper-wrapper .swiper-slide-info .swiper-slide-btn {width: 100%;height: 8vw;position: absolute;bottom: 0;left: 0;}
     #productHotBanner .swiper-wrapper .swiper-slide-info .swiper-slide-btn .slide-btn{width: 26.4vw;height: 8vw;margin: 0 auto;display:block;background: #F94B4B;line-height: 8vw;text-align: center;font-size: 16px;color: #FFFFFF;}
     #productHotBanner .swiper-pagination{width:100%;height:2.6vw;z-index:1;text-align:center;font-size:0;position:absolute;bottom:1.5vw;left:0}
-    #productHotBanner .swiper-pagination .swiper-pagination-bullet:before{content:"";display:block;width:100%;height:.6vw;background:rgba(255, 180, 150, 0.39);;border-radius:.3vw}
-    #productHotBanner .swiper-pagination .swiper-pagination-bullet.swiper-pagination-bullet-active{width:3.8vw;opacity:1;background: #E15621;}
+    .swiper-pagination-bullet{width:10px;height:4px;background: rgba(225, 86, 33, 0.39);border-radius:50%;}
+    #productHotBanner .swiper-pagination .swiper-pagination-bullet:before{content:"";display:block;width:10px;height:4px;background: rgba(225, 86, 33, 0.39);border-radius:2px;}
+    #productHotBanner .swiper-pagination .swiper-pagination-bullet.swiper-pagination-bullet-active{width:20px;height:4px;opacity:1;background: #E15621;border-radius: 2px;}
     #productList{position: relative;}
     .productList{margin: 3.2vw auto;width: 97vw;margin-top: 0;}
     .productList .productItem{width: 45.6vw;height: 70vw;overflow: hidden;margin: 0 1.3vw 2.6vw 1.3vw;background: #fff;text-align: left;position: relative;}

+ 2 - 2
src/main/resources/static/css/supplier-center/shop/goods.css

@@ -9,7 +9,7 @@ li{list-style: none}
      input::placeholder{color: #9aa5b5;font-size: 12px;}
      textarea::placeholder{color: #9aa5b5;}
      #newBtn div{height: 36px;border-radius: 2px;display: inline-block;text-align: center;cursor: pointer}
-      #newBtn{float: right;margin: 0}
+      #newBtn{float: left;margin: 0}
       .query-btn{background-color: #e15616;color: #fff;width: 88px;border: 1px solid #e15616}
       .goods-main{width: 100%; height: auto; float: left; margin:10px 0;background: #fff;}
       .goods-main-empty{width: 100%;height: 60px;line-height: 60px;text-align: center;float: left;margin-top: 20px;}
@@ -86,7 +86,7 @@ li{list-style: none}
    .good-price{line-height: 6.4vw;margin-top: 2.6vw}
    .good-status{overflow: hidden;line-height: 6.4vw;margin: 2.7vw 0}
    .good-status .good-left{float: left}
-   .good-status .good-right{float: right}
+   .good-status .good-right{float: right;margin-left: 5vw;}
    .good-status span{color: #9aa5b5;font-size: 3.2vw}
    .good-status  p{color: #22272e;font-size: 3.4vw}
    .good-handle a{width: 20vw;height: 9.5vw;line-height: 9.5vw;text-align: center;border-radius: 6.4vw;font-size: 3vw;

BIN
src/main/resources/static/img/hot/icon-hot-bg@h5.png


BIN
src/main/resources/static/img/hot/icon-hot-btn@h5.png


+ 1 - 1
src/main/resources/static/js/flea-market/form.js

@@ -23,7 +23,7 @@ var fleaMarketForm = new Vue({
         BrandList:[],
         isShow:false,
         includedTax:'',
-        GoodsImagesList:['https://img.caimei365.com/group1/M00/04/0A/rB-lGGJ0lfeAYI29AAFbP2cQhCY71.jpeg'],
+        GoodsImagesList:[],
         oldNum:0,
         secondType:0,
         vShow_GoodsImages:false,

+ 44 - 61
src/main/resources/static/js/product/product-hot.js

@@ -7,6 +7,7 @@ var productList = new Vue({
         noMore: false,
         topGoodList: [],
         listQuery: {
+            userId:0,
             brandID:'',
             pageNum:1,
             pageSize:10
@@ -23,17 +24,12 @@ var productList = new Vue({
         userIdentity: '',
         userToken: '',
         addhtml:'<span class="tag">美博会</span>',
-        brandParam: {
-            keyword: '',
-            id: '',
-            idType: '',
-            identity: 0
-        },
         hrefBrandId:null,
         brandLists: [],
         defaultBrandLists:[],
         checkedBrandList:[],
         checkedBrandLength:0,
+        choiceBrandIndex:100,
         isProductScreen:false,
         isActiviChecked:false,
         isNewsChecked:false,
@@ -95,14 +91,13 @@ var productList = new Vue({
                             });
                         } else {
                             var swiper = new Swiper('#productHotBanner', {
-                                loop : true,
+                                loop: true,
                                 autoplay: {
                                     delay: 2000,
                                     disableOnInteraction: false
                                 },
                                 pagination: {
-                                    el: '.swiper-pagination',
-                                    clickable :true
+                                    el: '.swiper-pagination'
                                 }
                             });
                         }
@@ -144,16 +139,40 @@ var productList = new Vue({
                         el.isChecked = false;
                         return el;
                     })
-                    // _self.brandLists = _self.defaultBrandLists.slice(0,7);
-                    _self.brandLists = _self.defaultBrandLists;
+                    _self.brandLists = _self.defaultBrandLists.slice(0,6);
                 }else {
                     console.log('查询品牌列表异常')
                 }
             });
         },
-        choiceBrandHref: function (brand, index) {// PC端跳转链接
-            if(this.isShowAllBrandsButton){// 如果多选的情况下
-                var _self = this;
+        choiceBrandSearchClass:function (brand,index) {
+            var _self = this;
+            if(_self.isShowAllBrandsButton){
+                if(brand.isChecked){
+                    return 'checked';
+                }else{
+                    return '';
+                }
+            }else{
+                if(_self.choiceBrandIndex === index){
+                    return 'checked';
+                }else{
+                    return '';
+                }
+            }
+        },
+        choiceBrandSearchIndex:function (brand, index) {//单选
+            var _self = this;
+            _self.choiceBrandIndex = index;
+            _self.isAllcheckedBrand = false;
+            _self.listQuery.brandID = brand.id;
+            _self.listQuery.pageNum = 1;
+            _self.listData = [];
+            _self.GetHomeNewFloorList();
+        },
+        choiceBrandSearch: function (brand,index) {// PC选择品牌 多选的情况下
+            var _self = this;
+            if(_self.isShowAllBrandsButton){
                 brand.isChecked = !brand.isChecked;
                 if (brand.isChecked) {
                     _self.checkedBrandList.push(brand.id);
@@ -167,18 +186,15 @@ var productList = new Vue({
                 }
                 _self.isAllcheckedBrand = false;
                 _self.checkedBrandLength = _self.checkedBrandList.length;
-                _self.params.brandIds = this.checkedBrandList.join(',');
+                _self.listQuery.brandID = this.checkedBrandList.join(',');
             }else{
-                window.location.href =  '/product/list.html?keyword=' + encodeURIComponent(this.params.keyword) +
-                    '&bpn=' + brand.id + '&pro=' + this.params.promotionFlag +
-                    '&newg='+ this.params.newFlag;
+                _self.choiceBrandIndex = index;
+                _self.listQuery.brandID = brand.id;
+                _self.listQuery.pageNum = 1;
+                _self.listData = [];
+                _self.GetHomeNewFloorList();
             }
         },
-        choiceBrandAllHref:function(){// PC全部品牌跳转链接
-            window.location.href =  '/product/list.html?keyword=' + encodeURIComponent(this.params.keyword) +
-                '&bpn=&pro=' + this.params.promotionFlag +
-                '&newg='+ this.params.newFlag;
-        },
         choiceBrand:function(brand,index){// 选择品牌
             var _self = this;
             brand.isChecked = !brand.isChecked;
@@ -204,6 +220,9 @@ var productList = new Vue({
             this.brandLists.forEach(function(el){
                 el.isChecked = false;
             });
+            this.listQuery.pageNum = 1;
+            this.listData = [];
+            this.GetHomeNewFloorList();
         },
         showMoreItem:function(){// 点击更多品牌
             this.isShowAllBrands = !this.isShowAllBrands;
@@ -221,42 +240,6 @@ var productList = new Vue({
         handleCancel:function () {//取消多选
             this.isShowAllBrandsButton = false
         },
-        handleConfirm:function () {// 确认查询多选
-            if(this.checkedBrandList.length == 0){return;}
-            window.location.href =  '/product/list.html?keyword=' + encodeURIComponent(this.params.keyword) +
-                '&bpn=' + this.listQuery.brandID + '&pro=' + this.params.promotionFlag +
-                '&newg='+ this.params.newFlag;
-        },
-        handleDeleteBrands:function () {// 删除选择的品牌
-            window.location.href =  '/product/list.html?keyword=' + encodeURIComponent(this.params.keyword)+ '&pro=' + this.params.promotionFlag +'&newg='+this.params.newFlag;
-        },
-        hanldCheckedActivi:function(){// 选择促销商品选项
-            this.isActiviChecked = !this.isActiviChecked;
-            if(this.isActiviChecked){
-                this.params.promotionFlag = 1
-            }else{
-                this.params.promotionFlag = 0
-            }
-        },
-        hanldCheckedNews:function(){// 选择新品选项
-            this.isNewsChecked = !this.isNewsChecked;
-            if(this.isNewsChecked){
-                this.params.newFlag = 1
-            }else{
-                this.params.newFlag = 0
-            }
-        },
-        hanldCheckedActiviHref(){// 选择促销商品选项跳转链接(PC专用)
-            var promotionFlag = this.isActiviChecked ? 0 : 1;
-            window.location.href = '/product/list.html?keyword='+encodeURIComponent(this.params.keyword)+
-                                   '&bpn='+this.hrefBrandId+ '&pro='+promotionFlag+'&newg='+ this.params.newFlag;
-        },
-        hanldCheckedNewsHref(){// 选择新品选项跳转链接(PC专用)
-            var newFlag = this.isNewsChecked ? 0 : 1;
-            window.location.href = '/product/list.html?keyword='+encodeURIComponent(this.params.keyword)+
-                                   '&bpn='+this.hrefBrandId+ '&pro=' + this.params.promotionFlag +
-                                   '&newg='+newFlag;
-        },
         showIsProductScreen:function(){//
             this.isProductScreen = true;
         },
@@ -264,14 +247,14 @@ var productList = new Vue({
             this.listQuery.pageNum = 1;
             this.listData = [];
             this.GetHomeNewFloorList();
-            this.isProductScreen = false;
+            this.isShowAllBrands = false;
         }
     },
     created: function () {
         var _self = this
         // this.searchFlag = (this.params.keyword !== "");
         if(globalUserData){
-            this.userId = globalUserData.userId;
+            this.userId = 	this.listQuery.userId = globalUserData.userId;
             this.userIdentity = globalUserData.identity;
             this.userToken = globalUserData.token;
         }

+ 18 - 0
src/main/resources/static/js/supplier-center/shop/goods.js

@@ -17,6 +17,7 @@ var myGoods = new Vue({
             pageSize:10,
             productCode:'',//货号
             name:'',//商品名称
+            newvalidFlag:'',// 新品展示状态
             validFlag:'',//状态
             featuredFlag:'',//是否主推
             commodityType:0,//商品属性
@@ -35,6 +36,19 @@ var myGoods = new Vue({
         noMore:false,
         check:false,
     },
+    filters: {
+        newvalidFlagFilters: function(value) {
+            //新品展示状态
+            const map = {
+                0: '参与',
+                1: '已展示',
+                2: '未参与',
+                3: '审核未通过',
+                4: '已下线'
+            }
+            return map[value]
+        }
+    },
     computed: {
         pageTotal: function () {
             var total = Math.ceil(this.listRecord / this.listQuery.pageSize);
@@ -123,6 +137,10 @@ var myGoods = new Vue({
             var _this = this;
             _this.listQuery.validFlag =event.target.value;
         },
+        SelectChangeNewvalidFlagFn: function(){//选择状态
+            var _this = this;
+            _this.listQuery.newvalidFlag =event.target.value;
+        },
         SelectChangeInsideFn: function(){//选择主推
             var _this = this;
             _this.listQuery.featuredFlag =event.target.value;

+ 2 - 2
src/main/resources/templates/index.html

@@ -142,7 +142,7 @@
                         <div class="swiper-container-floor hotList" id="recommendBox">
                             <div class="section_page_main type_08 swiper-wrapper recommendBox-wrapper clear mfw section_8 max">
                                 <!-- 商品/图片 列表 -->
-                                <a :href="pros.link" class="page_main_item hot ad_04 swiper-slide" target="_blank" v-for="pros in floor.newfloorlist">
+                                <a :href="pros.link" class="page_main_item hot ad_04 swiper-slide" target="_blank" v-for="pros in floor.floorImageList">
                                     <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.product.image" :alt="pros.name">
                                     <div class="page_main_type" v-if="pros && pros.product.productType && pros.product.productType === 2">医疗器械</div>
                                     <div class="page_main_text">
@@ -188,7 +188,7 @@
                                                         <em class="price_grade_club"><span>¥</span>会员可见</em>
                                                     </template>
                                                     <!--机构价仅医美机构可见-->
-                                                    <template v-else-if="pros.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
+                                                    <template v-else-if="pros.product.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
                                                         <em class="price_grade_club red"><span>¥</span>仅医美机构可见</em>
                                                     </template>
                                                     <!-- 资质机构 || (价格全部机构可见 && 普通机构) || (供应商 && 商品为供应商下的商品) || 超级会员用户 -->

+ 19 - 10
src/main/resources/templates/product/product-hot.html

@@ -52,13 +52,24 @@
           <div class="product-brand-name" :class="isShowAllBrands ? 'show' : ''">
             <p class="title">品牌</p>
           </div>
-          <div class="product-brand-list" :class="isShowAllBrands ? 'show' : ''">
-            <div class="brand-list" v-if="!isShowAllBrandsButton" @click="choiceBrandAllHref" :class="hrefBrandId ? '' : 'checked'"><a href="javascript:void(0)">全部</a></div>
-            <div class="brand-list" @click="choiceBrandHref(brand, index)" v-for="(brand,index) in brandLists"
-                 :key="index" :class="brand.isChecked ? 'checked' : ''">
-              <a href="javascript:void(0)" :title="brand.name" v-html="brand.name"></a>
+          <template v-if="!isShowAllBrands" :class="isShowAllBrands ? 'show' : ''">
+            <div class="product-brand-list" >
+              <div class="brand-list" v-if="!isShowAllBrandsButton" @click="choiceBrandAll" :class="isAllcheckedBrand ? 'checked' : ''"><a href="javascript:void(0)">全部</a></div>
+              <div class="brand-list" @click="choiceBrandSearchIndex(brand, index)" v-for="(brand,index) in brandLists"
+                   :key="index" :class="choiceBrandIndex === index ? 'checked' : ''">
+                <a href="javascript:void(0)" :title="brand.name" v-html="brand.name"></a>
+              </div>
             </div>
-          </div>
+          </template>
+          <template v-else>
+            <div class="product-brand-list" :class="isShowAllBrands ? 'show' : ''">
+              <div class="brand-list" v-if="!isShowAllBrandsButton" @click="choiceBrandAll" :class="isAllcheckedBrand ? 'checked' : ''"><a href="javascript:void(0)">全部</a></div>
+              <div class="brand-list" @click="choiceBrandSearch(brand, index)" v-for="(brand,index) in brandLists"
+                   :key="index" :class="choiceBrandSearchClass(brand,index)">
+                <a href="javascript:void(0)" :title="brand.name" v-html="brand.name"></a>
+              </div>
+            </div>
+          </template>
           <div class="product-brand-oper" v-if="!isShowAllBrandsButton">
             <div class="product-brand-more" v-if="defaultBrandLists.length>8" :class="isShowAllBrands ? 'show' : ''"
                  @click="showMoreItem">{{
@@ -79,8 +90,7 @@
             <div class="product-brand-name">品牌</div>
             <div class="product-brand-list" v-if="!isShowAllBrands">
               <div class="brand-list" @click="choiceBrandAll" :class="isAllcheckedBrand ? 'checked' : ''"><a href="javascript:void(0)">全部</a></div>
-              <div class="brand-list" v-for="(brand,index) in brandLists" :key="index"  v-if="index < 2"
-                   @click="choiceBrand(brand, index)" :class="brand.isChecked ? 'checked' : ''">
+              <div class="brand-list" v-for="(brand,index) in brandLists" :key="index"  v-if="index < 2" @click="showMoreItem">
                 <a href="javascript:void(0)" :title="brand.name" v-html="brand.name"></a>
               </div>
             </div>
@@ -91,7 +101,7 @@
           <div class="product-brand-fiexd" v-if="isShowAllBrands">
             <div class="product-brand-fiexdcontent">
               <div class="product-brand-scroll">
-                <div class="brand-list" @click="choiceBrandAll" :class="isAllcheckedBrand ? 'checked' : ''"><a href="javascript:void(0)">全部</a></div>
+<!--                <div class="brand-list" @click="choiceBrandAll" :class="isAllcheckedBrand ? 'checked' : ''"><a href="javascript:void(0)">全部</a></div>-->
                 <div class="brand-list" v-for="(brand,index) in brandLists" :key="index"
                      @click="choiceBrand(brand, index)" :class="brand.isChecked ? 'checked' : ''">
                   <a href="javascript:void(0)" :title="brand.name" v-html="brand.name"></a>
@@ -191,7 +201,6 @@
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
-<script charset="utf-8" src="/js/activity/beautyTopic/swiper.min.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/product/product-hot.js(v=${version})}"></script>
 </body>
 </html>

+ 9 - 2
src/main/resources/templates/supplier-center/shop/goods.html

@@ -82,11 +82,13 @@
                         </div>
                         <div class="form-row">
                             新品展示:
-                            <select name="" class="state small" @change="SelectChangeInsideFn($event)">
+                            <select name="" class="state small" @change="SelectChangeNewvalidFlagFn($event)">
                                 <option value="">全部</option>
+                                <option value="0">参与</option>
                                 <option value="1">已展示</option>
                                 <option value="2">未参与</option>
                                 <option value="3">审核未通过</option>
+                                <option value="4">已下线</option>
                             </select>
                         </div>
                         <div id="newBtn">
@@ -163,7 +165,7 @@
                                 </li>
                                 <li>
                                     <div class="good-classFly">
-                                        <p>{{product.typeName}}</p>
+                                        <p>{{ product.newvalidFlag | newvalidFlagFilters }}</p>
                                     </div>
                                 </li>
                                 <li>
@@ -232,6 +234,11 @@
                                         <span>分类:</span>
                                         <p class="good-classFly">{{product.typeName}}</p>
                                     </div>
+                                    <div class="good-right">
+                                        <span>新品展示:</span>
+                                        <p class="status" :style="{color: StatusColorFn(product.validFlag)}">
+                                            {{ product.newvalidFlag | newvalidFlagFilters }}</p>
+                                    </div>
                                     <div class="good-right">
                                         <span>状态:</span>
                                         <p class="status" :style="{color: StatusColorFn(product.validFlag)}">