供应商

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

@@ -0,0 +1,124 @@
+li{list-style: none}
+ @media screen and (min-width:768px) {
+  .crumbs{color: #22272e;font-size: 16px;}
+  .head-top>form{overflow: hidden;background: #fff;padding:17px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)}
+  form>div {float: left; height: 40px;font-size: 12px;color: #627386;line-height: 40px;margin-right: 10px;margin-bottom: 10px}
+  .Buyer {width: 210px; height: 34px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;padding-left: 10px;cursor: pointer;}
+  .state {width: 168px;height: 36px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;padding-left: 10px;
+  color: #627386;cursor: pointer; margin-right: 10px}
+  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}
+  .query-btn{background-color: #e15616;color: #fff;width: 88px;border: 1px solid #e15616}
+  .goods-main{width: 100%; height: auto; float: left; margin-top: 10px;background: #fff;}
+  .goods-main-empty{width: 100%;height: 60px;line-height: 60px;text-align: center;float: left;margin-top: 20px;}
+  .goods-main-empty p{font-size: 14px;color: #333;}
+  .goods-main-empty p a{color: #e15616;text-decoration: underline;margin: 0 3px;}
+  .goods-title{ height: 56px;line-height: 56px;border-bottom: solid 1px #e2e7ef;padding: 0 20px}
+  .goods-main .goods-table ul li{float:left;width: 10%;text-align: center}
+  .goods-main .goods-table ul li:nth-child(2){ width: 25%;}
+  .goods-main .goods-table ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(4){width: 16%}
+  .goods-main .goods-table ul li:last-child{width: 23%;position: relative}
+  .tbody ul li{height: 96px;font-size: 12px;}
+  .tbody ul{overflow: hidden;padding: 0 20px}
+  .tbodyle ul li:nth-child(2){width: 25%;}
+  .tbody ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(3){ width: 16%}
+  .tbody ul li:last-child{width: 20%}
+  .goods-main .checkbox { height: 90px;overflow: hidden; cursor: pointer;line-height: 90px}
+  .tbody .checkbox .box{ display: inline-block; width: 20px;height: 90px;margin-top: 2px;float: left;}
+  .goods-main  .tbody .checkbox span{ display: inline-block;float: left;margin-left: 6px;}
+  .checkbox .icon-weigouxuan:before{ width: 16px;height: 16px; background-position: -332px -32px;}
+  .checkbox .icon-gouxuan:before{width: 16px; height: 16px;background-position: -210px 0px}
+  .goods-main  .tbody .good-info{display: inline-block}
+  .goods-main  .tbody .good-info img{
+    width: 80px;
+    height: 80px;
+    margin-top: 8px
+}
+.tbody ul li .good-classFly,.tbody ul li .good-price,.tbody ul li .status{
+    line-height: 90px ;
+}
+ .goods-main  .tbody .good-name{
+    margin-left: 8px;
+    vertical-align: middle;
+    word-break: break-all;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-inline-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    width: 112px
+}
+ .goods-main  .tbody .good-handle{
+   padding: 0 7px;
+    line-height: 40px;
+    position: absolute;
+    width: 180px;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    margin: auto;
+    height: fit-content
+}
+.goods-main  .tbody .btn{
+    width: 52px;
+    height: 24px;
+    background-color: #ffe6dc;
+    border-radius: 2px;
+    border: solid 1px #e15616;
+    display: inline-block;
+    line-height: 24px;
+    color: #e15616;
+}
+.goods-main .tbody .success,.goods-main .tbody .danger{width: 88px}
+.goods-main .tbody .primary{width: 62px}
+.goods-container .good-footer{
+    width: 100%;
+    height: 56px;
+    float: left;
+    padding: 10px 0;
+}
+.goods-container .good-footer .footer-left{
+    float: left;
+    margin-left: 20px
+}
+.goods-container .good-footer .checkbox {
+       line-height: 36px;
+}
+.goods-container .good-footer .checkbox .box{
+    line-height: 40px;
+    float: left;
+}
+.goods-container .good-footer .checkbox span{
+    display: inline-block;
+    float: left;
+    margin-left: 10px;
+}
+
+.goods-container .good-footer .footer-right{
+    float: right;
+}
+.goods-container .good-footer .footer-right .btn{
+    width: 90px;
+    height: 36px;
+    display: block;
+    line-height: 36px;
+    text-align: center;
+    font-size: 14px;
+    border-radius: 2px;
+    margin-right: 30px;
+    color: #FFF;
+
+}
+.goods-container .good-footer .footer-right .btn.icon-weigouxuan{
+    border: solid 1px #9aa5b5;
+    color: #22272e;
+    opacity: .5;
+}
+.goods-container .good-footer .footer-right .btn.icon-gouxuan{
+    background-color: #e15616;
+}
+.bg-gouxuan{background-color: #f0f3f7;}
+  }

src/main/resources/static/js/supplier-center/shop/brand.js

@@ -62,12 +62,11 @@ var Brandgoods =new Vue({
        var _this = this;
         SupplierApi.brandList(_this.params,function (res) {
             if(res.code==0){
-                 if(res.data.results && res.data.results.length>0){
+                 if(res.data.results.length>0){
                      _this.brandlist=res.data.results;
-                     console.log(_this.brandlist)
                      _this.listRecord = res.data.totalRecord;
                  }else{
-                     _this.results = res.data.results;
+                     _this.brandlist = [];
                      _this.listRecord = res.data.totalRecord;
                  }
             }

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

@@ -1,38 +1,45 @@
 jqMultipleShow("click", ".navList", ".tab", ".con");
-var Brandgoods =new Vue({
-    el:'#Brandgoods',
-    data:{
-      params:{
-             userID: '',
-             pageNum :1,
-             pageSize:10,
-             name:'',
-             status:''
-        },
-        brandobj:{
-            userID:'',
-            name:'',
-            logo:'',
-            description:''
-        },
-        title:'',
-        formData:new FormData(),
-        brandlist:[],
-        pageInput: '1',
+var myGoods = new Vue({
+    el:"#myGoods",
+    data: {
+        userId:0,
+        shopId:'',
+        userIdentity:'',
+        isSelectActive:0,
+        isRequest:false,
         listRecord: 0,
-        bgflag:false,
-        logoShow:false,
-        iconflag:true
+        pageInput: '',
+        tabIndex:1,
+        featuredNum:'',//主图商品标志
+        listQuery:{
+            shopID:'',
+            pageNum:1,
+            pageSize:10,
+            productCode:'',//货号
+            name:'',//商品名称
+            validFlag:'',//状态
+            featuredFlag:'',//是否主推
+            bigTypeID:0,//一级
+            smallTypeID:0,//二级
+            tinyTypeID:0//三级
+        },
+        classFlyInfoArr:[{name:'全部',value:''}],
+        classificationFirstList:[],
+        classificationTwoList:[],
+        classificationThreeList:[],
+        productsList:[],
+        checkList:[],
+        isCheckedAll:false
     },
-     computed: {
+    computed: {
         pageTotal: function () {
-            var total = Math.ceil(this.listRecord / this.params.pageSize);
+            var total = Math.ceil(this.listRecord / this.listQuery.pageSize);
             return total > 0 ? total : 1;
         },
         showPageBtn: function () {
-            var total = Math.ceil(this.listRecord / this.params.pageSize);
+            var total = Math.ceil(this.listRecord / this.listQuery.pageSize);
             total = total > 0 ? total : 1;
-            var index = this.params.pageNum, arr = [];
+            var index = this.listQuery.pageNum, arr = [];
             if (total <= 6) {
                 for (var i = 1; i <= total; i++) {
                     arr.push(i);
@@ -44,118 +51,327 @@ var Brandgoods =new Vue({
             return [1, 0, index - 2, index - 1, index, index + 1, index + 2, 0, total];
         }
     },
-    methods:{
-        toPagination: function (pageNum) {
+    methods: {
+        GetMyproductDataInfo: function(){//我的商品数据初始化
+            var _this = this;
+            // _this.returnedTarget();
+            console.log(_this.listQuery)
+            SupplierApi.GetMyProductList(_this.listQuery,function(response){
+                if(response.code == 0){
+                    _this.isRequest = true;
+                    _this.featuredNum = response.data.featuredNum;
+                    var data = response.data.productPage;
+                    if(data.results && data.results.length>0){
+                        _this.productsList = data.results;
+                        _this.listRecord = data.totalRecord;
+                        var NewProduct = [],isAddFeatured=false;
+                        _this.productsList.map(function(el){
+                            if(_this.featuredNum<4){
+                                if(el.validFlag == 2 && el.featuredFlag ==0 ){
+                                    isAddFeatured = true;
+                                }else{
+                                    isAddFeatured = false;
+                                }
+                            }
+                            if(el.validFlag == 2 && el.featuredFlag == 1 ){
+                                isDelFeatured = true;
+                            }else{
+                                isDelFeatured = false;
+                            }
+                            _this.returnedTarget();
+                            NewProduct.push(Object.assign({},el,{isAddFeatured:isAddFeatured,isDelFeatured:isDelFeatured}))
+                        });
+                        _this.productsList = NewProduct;
+                    }else{
+                        _this.productsList = data.results;
+                    }
+                }else{
+                    CAIMEI.Alert(response.msg, '确定');
+                }
+            })
+        },
+        touchmoveFn: function(){
+            this.isSelectActive=0;
+        },
+        SelectChangeStateFn: function(){//选择状态
+            var _this = this;
+            _this.listQuery.validFlag =event.target.value;
+        },
+        SelectChangeInsideFn: function(){//选择主推
+            var _this = this;
+            _this.listQuery.featuredFlag =event.target.value;
+        },
+        GetFistClassFn: function(){//获取一级分类菜单
+            var _this = this;
+            PublicApi.GetFirstClassFication({},function (response) {
+            console.log(response)
+                if(response.data.length>0){
+                     _this.classificationFirstList = response.data;
+                }else {
+                      _this.classificationFirstList = [];
+                }
+            })
+        },
+        GetTwoClassFn: function(value){//获取二级分类菜单
+            var _this = this;
+            PublicApi.GetTwoClassFication({bigTypeId:value},function (response) {
+                if(response.code==0){
+                    if(response.data.length>0){
+                        _this.classificationTwoList = response.data;
+                     }else {
+                         _this.classificationTwoList = [];
+                     }
+                }
+            })
+        },
+        GetThreeClassFn: function(value){//获取三级分类菜单
+            var _this = this;
+            PublicApi.GetThreeClassFication({smallTypeId:value},function (response) {
+            console.log(response,'三级分类')
+                if(response.code==0){
+                  if(response.data.length>0){
+                        _this.classificationThreeList = response.data;
+                  }else {
+                     _this.classificationThreeList = [];
+                  }
+                }
+            })
+        },
+        ChangeClassificationFirst: function(){//选择一级分类
+            var _this = this;
+            _this.listQuery.bigTypeID = event.target.value;
+            if(_this.listQuery.bigTypeID == ''){
+                _this.listQuery.bigTypeID = '';
+            }else{
+                _this.GetTwoClassFn(_this.listQuery.bigTypeID);
+            }
+        },
+        ChangeClassificationTwo: function(){//选择二级分类
+            var _this = this;
+             _this.listQuery.smallTypeID = event.target.value;
+                console.log(event.target.value)
+            if(_this.listQuery.smallTypeID == ''){
+                _this.listQuery.smallTypeID = '';
+
+            }else{
+                _this.GetThreeClassFn(_this.listQuery.smallTypeID);
+                 console.log(2222)
+            }
+        },
+        ChangeClassificationThree: function(){//选择三级分类
+            var _this = this;
+             _this.listQuery.tinyTypeID = event.target.value;
+            if(_this.listQuery.tinyTypeID == ''){
+                _this.listQuery.tinyTypeID = '';
+            }else{
+            }
+        },
+        SearchQueryListFn: function(){//搜索
+            var _this = this;
+            _this.GetMyproductDataInfo();
+        },
+        checkNum : function() {
+            var _this = this;
+            if (_this.pageInput > _this.pageTotal) {
+                _this.pageInput = _this.pageTotal;
+            } else if (_this.pageInput < 1) {
+                _this.pageInput = 1;
+            }
+        },
+        toPagination : function(pageNum) {
+            var _this = this;
+            _this.productsList = [];
             if (pageNum <= this.pageTotal) {
-                this.params.pageNum = pageNum;
-                this.BrandList(this.params);
+                _this.listQuery.pageNum = pageNum;
+                _this.GetMyproductDataInfo()
             }
         },
-     checkNum: function () {
-        if (this.pageInput > this.pageTotal) {
-            this.pageInput = this.pageTotal;
-        } else if (this.pageInput < 1) {
-            this.pageInput = 1;
-        }
-    },
-      BrandList:function () {
-       var _this = this;
-        SupplierApi.brandList(_this.params,function (res) {
-            if(res.code==0){
-                 if(res.data.results && res.data.results.length>0){
-                     _this.brandlist=res.data.results;
-                     console.log(_this.brandlist)
-                     _this.listRecord = res.data.totalRecord;
-                 }else{
-                     _this.results = res.data.results;
-                     _this.listRecord = res.data.totalRecord;
-                 }
+        ItemDownshelfAll: function(){//批量下架
+            var _this = this;
+            var isValidFlag = false;
+            if(_this.isCheckedAll){
+                _this.productsList.map(function(el){
+                    if(el.validFlag != 2){ isValidFlag = true; }
+                });
+                if(isValidFlag){
+                    CAIMEI.Alert('部分选中的商品暂未上架，不能进行下架操作','确定');
+                    return;
+                }else{
+                    CAIMEI.Modal('确定下架选中的商品吗？','取消','确定',function () {
+                          var shelProductsList='';
+                        _this.productsList.map(function(el){
+                            if(el.validFlag == 2){
+                                shelProductsList += el.productID+','
+                            }
+                        });
+                        SupplierApi.SupplierSoldOut({productIds:shelProductsList,},function (response) {
+                            if (response.code == 0){
+                                CAIMEI.dialog('下架成功！');
+                                _this.productsList = [];
+                                _this.GetMyproductDataInfo();
+                            }else{
+                                 CAIMEI.Alert(response.msg,'确定');
+                            }
+                        })
+                    })
+                }
             }
-        })
-      },
-      getstatus:function () { //状态
-        var _this = this;
-         _this.params.status=event.target.value;
-    },
-      queryBrand:function () { //查询
-        var _this = this;
-        _this.BrandList()
-      },
-    newBrand:function(){
-        var _this = this;
-        _this.bgflag = true;
-        _this.title = '添加新品牌'
-        },
-     submit:function(){ //确认提交新品牌
-          var _this = this;
-          console.log(_this.brandobj)
-          if(_this.brandobj.name ==''){
-            CAIMEI.dialog('请输入品牌名称')
-         }else {
-             SupplierApi.addBrand(_this.brandobj,function (res) {
-                 if (res.code==0){
-                  CAIMEI.Alert('提交成功，我们将会在1-2个工作日内审核','确定',true,function () {
-                      location.reload()
-                  });
-                   _this.closebg();
-                 } else if(res.code == -1){
-                     var errmsg = res.msg;
-                    if(errmsg.indexOf('请先登录') > -1) {
-                        CAIMEI.dialog('请先登录');
-                    } else if (errmsg.indexOf('已存在') > -1) {
-                        CAIMEI.dialog('有相同品牌存在，无需重复提交，详情请致电0755-22907771');
-                    } else {
-                        CAIMEI.dialog('网络错误，请稍后再试');
+        },
+        ItemDownshelf: function(pros){//下架商品
+            var _this = this;
+            CAIMEI.Modal('确定下架该商品吗？','取消','确定',function () {
+                 SupplierApi.SupplierSoldOut({productIds:pros.productID,},function (response) {
+                    if (response.code == 0){
+                        CAIMEI.dialog('下架成功~');
+                        _this.productsList = [];
+                        _this.GetMyproductDataInfo();
+                    }else{
+                        CAIMEI.Alert(response.msg,'确定');
                     }
-                 }
-               })
-             }
-        },
-    editBrand:function(item){
-         var _this = this;
-         _this.bgflag = true;
-          _this.title = '编辑新品牌';
-         _this.brandobj.name = item.name;
-         _this.brandobj.description=item.description;
-         if(item.logo !=''&& item.logo!=null){
-            _this.brandobj.logo=item.logo;
-            _this.logoShow = true;
-            _this.iconflag = false;
-         }else {
-            _this.logoShow = false;
-            _this.iconflag = true;
-         }
-          _this.brandobj.id=item.id;
-        },
-    closebg:function () {
-         var _this = this;
-            _this.bgflag = false;
-            _this.brandobj.name='';
-            _this.brandobj.description='';
-            _this.brandobj.logo='';
-            _this.logoShow = false;
-            _this.iconflag = true;
+                })
+            })
+        },
+        AddPushHotFn: function(pros){//添加主页推荐
+            var _this = this;
+            var num = 4-this.featuredNum;
+            CAIMEI.Modal('总共能添加4个主推商品，您还能添加'+num+'个确定将该商品添加为主推商品吗？','取消','确定',function () {
+                 SupplierApi.SwitchFeatured({productId:pros.productID,featuredFlag:1},function (response) {
+                    if (response.code == 0){
+                        CAIMEI.dialog('添加成功~');
+                        _this.productsList = [];
+                        _this.GetMyproductDataInfo();
+                    }else{
+                         CAIMEI.Alert(response.msg,'确定');
+                    }
+                })
+            })
+        },
+        DeletePushHotFn: function(pros){//删除主页推荐
+            var _this = this;
+             CAIMEI.Modal('是否把该商品从主推商品中删除？','取消','确定',function () {
+                  SupplierApi.SwitchFeatured({productId:pros.productID,featuredFlag:0},function (response) {
+                    if (response.code == 0){
+                        CAIMEI.dialog('删除成功~');
+                        _this.productsList = [];
+                        _this.GetMyproductDataInfo();
+                    }else{
+                         CAIMEI.Alert(response.msg,'确定');
+                    }
+                })
+             })
+        },
+        pageLinkDetils: function(pros){//预览商品
+            window.open('/product-'+pros.productID+'.html');
+        },
+        editGoodFn: function(pros){//编辑商品
+            location.href ='/supplier/release.html?productID='+pros.productID+'&type=edit';
+        },
+        ischeck: function(pros){//为未选中的时候改变为true，反之为true
+            pros.productsChecked = !pros.productsChecked;
+            this.updateCheckAllBtn();
+        },
+        updateCheckAllBtn: function() {// 全选勾选判断
+            var _this = this;
+            var goodsCheckedLength = 0,
+                productsList = _this.productsList;
+            productsList.forEach(function(el){
+                if(el.productsChecked) { goodsCheckedLength++; }
+            });
+            _this.isCheckedAll = goodsCheckedLength === productsList.length;
+        },
+        updateBothCheckBtn: function() {
+            var _this = this;
+            _this.productsList.forEach(function(el){
+                el.productsChecked = _this.isCheckedAll ;
+            })
 
         },
-    uploadlogo:function () { //上传品牌图片
+        checkedAll: function() {
             var _this = this;
-            var inputDOM = _this.$refs.goodslogo;
-            var file = inputDOM.files;
-            _this.formData.append('file', file[0]);
-            SupplierApi.uploadimg(_this.formData,function(response){
-               _this.brandobj.logo = response.data;
-               _this.logoShow = true;
-               _this.iconflag = false;
-                event.target.value = '';
+            _this.isCheckedAll = !_this.isCheckedAll;
+            _this.updateBothCheckBtn();
+        },
+        toFixedFn: function(text){
+            return Number(text).toFixed(2);
+        },
+        StatusColorFn: function(state){
+            var stateColor = '',
+                stateColorObject={
+                    '2':'#1890f9',
+                    '1':'#f9a94b',
+                    '0':'#FFB12A',
+                    '3':'#627386',
+                    '8':'#FF2A2A',
+                    '9':'#f94b4b'
+                };
+            Object.keys(stateColorObject).forEach(function(key){
+                if(key == state){
+                    stateColor = stateColorObject[key]
+                }
+            });
+            return stateColor;
+        },
+        StatusTextFn: function(state){
+            var stateText = '',
+                stateTextObject={
+                    '2':'已上架',
+                    '3':'已下架',
+                    '1':'待审核',
+                    '8':'审核未通过',
+                    '9':'已冻结',
+                    '0':'已删除'
+                };
+            Object.keys(stateTextObject).forEach(function(key) {
+                if(key == state){
+                    stateText = stateTextObject[key]
+                }
             });
+            return stateText;
+        },
+        StatusButtonFn: function(state){
+            var _this = this;
+            var btnState = false;
+            _this.mapStateArr.forEach(function(el){
+                el.val.forEach(function(value){
+                    if(state === value){
+                        btnState = el.status;
+                    }
+                })
+            });
+            return btnState
+        },
+        returnedTarget:function(){//对象合并 IE 兼容方法
+            if (typeof Object.assign != 'function') {
+                Object.assign = function(target) {
+                    'use strict';
+                    if (target == null) {
+                        throw new TypeError('Cannot convert undefined or null to object');
+                    }
+                    target = Object(target);
+                    for (var index = 1; index < arguments.length; index++) {
+                        var source = arguments[index];
+                        if (source != null) {
+                            for (var key in source) {
+                                if (Object.prototype.hasOwnProperty.call(source, key)) {
+                                    target[key] = source[key];
+                                }
+                            }
+                        }
+                    }
+                    return target;
+                };
+            }
         }
     },
-    mounted:function () {
-        var _self = this;
+    mounted: function () {
+        var _this = this;
         if(globalUserData){
-              _self.params.userID = globalUserData.userId;
-              _self.brandobj.userID = globalUserData.userId;
-            }
-        _self.BrandList()
+            _this.userId = globalUserData.userId;
+            _this.listQuery.shopID = globalUserData.shopId;
+            _this.shopId =globalUserData.shopId;
+        }
+        _this.GetMyproductDataInfo();
+        _this.GetFistClassFn();
     }
-})
+});
+

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

@@ -12,12 +12,12 @@
 <template th:replace="components/header"></template>
     <h1></h1>
 <!-- 我的采美 -->
-<div id="Brandgoods">
-    <div class="navLayout" >
+<div id="myGoods">
+    <div class="navLayout goods-container"  v-show="isRequest" :class="isRequest ? 'active' : ''">
         <div class="crumbs">
             <span>我的店铺</span>
             <span>&gt;</span>
-            <span>品牌管理</span>
+            <span>我的商品</span>
         </div>
         <div class="wrap clear">
             <!--左侧面包屑-->
@@ -25,105 +25,122 @@
             <div class="right">
                 <div class="head-top">
                     <form action="">
-                        <div class='order-border'><span>品牌名称：</span><input type="text" id="name-buyer" v-model="params.name" class="Buyer" placeholder="请输入买家名称"> </div>
-                        <div>
-                            状态：
-                            <select name="" id="settlement-status" class="state" @change="getstatus($event)">
-                                <option value="">全部</option>
-                                <option value="0">待审核</option>
-                                <option value="1">审核通过</option>
-                                <option value="2">审核未通过</option>
-                            </select>
-                            </div>
-                            <div id="newBtn">
-                                <div class="query-btn" @click="queryBrand">搜索</div>
-                                <div class="addBrand" @click="newBrand">提交新品牌</div>
+                            <div class='form-row'>
+                                <span>商品货号：</span>
+                                <input type="text" id="name-buyer" v-model="listQuery.productCode" class="Buyer" placeholder="请输入商品货号" maxlength="20">
                             </div>
+                             <div class="form-row">
+                                <span>商品名称:</span>
+                                <input class="Buyer" v-model="listQuery.name" type="text" maxlength="25" placeholder="请输入商品名称">
+                             </div>
+                            <div class="form-row">
+                                状态：
+                                    <select name="" id="settlement-status" class="state" @change="SelectChangeStateFn($event)">
+                                        <option value="">全部</option>
+                                        <option value="1">待审核</option>
+                                        <option value="8">审核未通过</option>
+                                        <option value="2">已上架</option>
+                                        <option value="3">已下架</option>
+                                        <option value="9">已冻结</option>
+                                        <option value="0">已删除</option>
+                                    </select>
+                                </div>
+                                <div class="form-row">
+                                    主推商品：
+                                        <select name=""  class="state" @change="SelectChangeInsideFn($event)">
+                                            <option value="">请选择</option>
+                                            <option value="1">是</option>
+                                            <option value="0">否</option>
+                                        </select>
+                                 </div>
+                                 <div class="form-row">
+                                    分类：
+                                        <select name=""  class="state" @change="ChangeClassificationFirst($event)">
+                                            <option value="">全部</option>
+                                            <option v-for="x in classificationFirstList" :value="x.bigTypeID">{{x.name}}</option>
+                                        </select>
+                                        <select name=""  class="state" @change="ChangeClassificationTwo($event)">
+                                            <option value="">请选择二级分类</option>
+                                            <option v-for="x in classificationTwoList" :value="x.smallTypeID">{{x.name}}</option>
+                                        </select>
+                                        <select name=""  class="state" @change="ChangeClassificationThree($event)">
+                                            <option value="">请选择三级分类</option>
+                                            <option v-for="x in classificationThreeList" :value="x.tinyTypeID" >{{x.name}}</option>
+                                        </select>
+                                 </div>
+                                <div id="newBtn">
+                                    <div class="query-btn" @click="SearchQueryListFn">搜索</div>
+                                </div>
                     </form>
                 </div>
-                <div class="brand-list">
-                    <ul class="brand-title">
-                        <li>品牌名称</li>
-                        <li>品牌logo</li>
-                        <li>状态</li>
-                        <li>品牌描述</li>
-                        <li>提交时间</li>
-                        <li>操作</li>
-                    </ul>
-                    <div class="tbody">
-                        <ul v-for="item in brandlist">
-                            <li class="brand-name"><h3>{{item.name}}</h3></li>
-                            <li class="brand-logo">
-                                <img :src="item.logo" v-if="item.logo!=''&&item.logo!=null">
-                                <span v-else>暂无</span>
-                            </li>
-                            <li class="brand-status">
-                                <span class="font-red"  v-if="item.status ==0">待审核</span>
-                                <span class="font-blue" v-if="item.status ==1">审核通过</span>
-                                <span class="font-red" v-if="item.status ==2">审核未通过 <br>原因：{{item.auditNote}}</span>
-                            </li>
-                            <li class="brand-description">
-                                <span v-if="item.description ==''|| item.description==null">暂无</span>
-                                <span v-else>{{item.description}}</span>
-
-                            </li>
-                            <li class="brand-time">{{item.createDate}}</li>
-                            <li class="brand-edit" >
-                                <span v-if="item.status != 1" @click="editBrand(item)">编辑</span>
-                                <span v-else>无</span>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-                     <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
-                     <div class="pageWrap clear" v-if="isPC && pageTotal>1">
-                            <a v-if="params.pageNum>1" class="prev" @click="toPagination(params.pageNum*1-1)" href="javascript:void(0);"></a>
-                            <template v-for="n in showPageBtn">
-                                <a v-if="n" :class="{'on':(n==params.pageNum)}" @click="toPagination(n)" href="javascript:void(0);" v-text="n"></a>
-                                <span v-else>···</span>
-                            </template>
-                            <a v-if="params.pageNum<pageTotal" class="next" @click="toPagination(params.pageNum*1+1)" href="javascript:void(0);"></a>
-                            <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>
-                            <span>跳至</span>
-                            <input v-model="pageInput" @blur="checkNum()"/>
-                            <span>页</span>&nbsp;
-                            <a class="btn" href="javascript:void(0);" @click="toPagination(pageInput)">点击跳转</a>
-                     </div>
-            </div>
-        </div>
-         <div class="bg-brand" v-show="bgflag">
-             <div class="add-brand-box">
-                    <div class="modal-header">
-                        <span class="shou-address">{{title}}</span>
-                        <span class="close-modalForm" @click="closebg">x</span>
+                  <div class="goods-main" v-if="productsList.length>0">
+                    <div class="goods-table" width="100%" >
+                            <ul class="goods-title">
+                                <li>编号</li>
+                                <li>商品主图</li>
+                                <li>分类</li>
+                                <li>市场价/售价</li>
+                                <li>状态</li>
+                                <li>操作</li>
+                            </ul>
+                            <div class="tbody">
+                                <ul v-for="(product, index) in productsList" :key="index" :class="[product.productsChecked ?'bg-gouxuan':'']">
+                                    <li>
+                                        <div class="checkbox" @click='ischeck(product)'>
+                                            <div class="box icon" :class="[product.productsChecked ?'icon-gouxuan':'icon-weigouxuan']"></div>
+                                            <span> {{product.productID}}</span>
+                                        </div>
+                                    </li>
+                                    <li>
+                                        <div class="good-info">
+                                            <img :src="product.mainImage" :alt="product.name">
+                                            <p class="good-name">{{product.name}}</p>
+                                        </div>
+                                   </li>
+                                   <li>
+                                        <div class="good-classFly">
+                                            <p>{{product.typeName}}</p>
+                                        </div>
+                                    </li>
+                                    <li >
+                                        <div class="good-price">
+                                            <p>￥{{toFixedFn(product.normalPrice)}}</p>
+                                            <p>/</p>
+                                            <p>￥{{toFixedFn(product.price1)}}</p>
+                                        </div>
+                                    </li>
+                                    <li >
+                                        <p class="status" :style="{color: StatusColorFn(product.validFlag)}">{{StatusTextFn(product.validFlag)}}</p>
+                                    </li>
+                                    <li>
+                                        <div class="good-handle">
+                                            <a class="btn " href="javascript: void(0);" v-if="['0','1','2','3','8','9'].indexOf(product.validFlag)!=-1" @click="editGoodFn(product)">编辑</a>
+                                            <a class="btn " href="javascript: void(0);" v-if="['2'].indexOf(product.validFlag)!=-1" @click="ItemDownshelf(product)">下架</a>
+                                            <a class="btn success" href="javascript: void(0);" v-if="product.isAddFeatured" @click="AddPushHotFn(product)">添加主页推荐</a>
+                                            <a class="btn danger" href="javascript: void(0);" v-if="product.isDelFeatured" @click="DeletePushHotFn(product)">删除主页推荐</a>
+                                            <a class="btn primary" href="javascript: void(0);" v-if="['1','2'].indexOf(product.validFlag)!=-1" @click="pageLinkDetils(product)">预览商品</a>
+                                        </div>
+                                    </li>
+                                </ul>
+                            </div>
                     </div>
-                    <div class="brand-content">
-                        <div class="brand-name">
-                            <span class="label"><em class="required">*</em> 品牌名称：</span>
-                            <input type="text" v-model="brandobj.name" placeholder="请输入品牌名称"/>
+                    <div class="good-footer">
+                        <div class="footer-left">
+                            <div class="checkbox" @click='checkedAll'>
+                                <div class="box icon" :class="[isCheckedAll ? 'icon-gouxuan' : 'icon-weigouxuan']"></div>
+                                <span>全选</span>
+                            </div>
                         </div>
-                        <div class="brand-img">
-                            <span class="label">品牌logo：</span>
-                            <div class="img-box upimg">
-                                <img class="center" :src="brandobj.logo" v-if="logoShow">
-                                <i class="icon mIcon add" v-if="iconflag"></i>
-                                <input type="file" ref="goodslogo" class="add-pic"  id="uploadfile" accept="image/*" @change="uploadlogo"/>
-                              </div>
-                            <p class="tishiyu">请上传<span class="font-color">jpg/png</span>格式的图片，大小不超过<span>5M</span> </p>
-                         </div>
-                        <div class="brand-description">
-                            <span class="label">品牌描述：</span>
-                             <textarea rows="" cols="" class="miaoshu" v-model="brandobj.description" placeholder="请描述品牌信息，不超过200字" maxlength="200" ></textarea>
+                        <div class="footer-right">
+                            <a href="javascript:void(0);" class="btn batch" :class="[isCheckedAll ? 'icon-gouxuan' : 'icon-weigouxuan']" @click="ItemDownshelfAll">批量下架</a>
                         </div>
                     </div>
-                     <div class="box-btn">
-                         <div class="btn-submit" @click="submit">提交</div>
-                          <div class="btn-cancel" @click="closebg">取消</div>
-                     </div>
                 </div>
-             </div>
-         </div>
-
+                 <div v-else class="goods-main-empty">
+                    <p>您还未发布任何商品,快去 <a href="/supplier/product/toRelease.html">发布</a>吧</p>
+                 </div>
+            </div>
+        </div>
     </div>
 </div>