联合丽格V1.0.2

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

@@ -1,26 +1,27 @@
 li{list-style: none}
  @media screen and (min-width:768px) {
-   .crumbs{color: #22272e;font-size: 16px;}
-   .head-top{overflow: hidden;background: #fff;padding:17px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)}
-   .head-top>div {float: left; height: 40px;font-size: 12px;color: #627386;line-height: 40px;margin-right: 10px;margin-bottom: 10px}
-   .state {width: 158px !important;}
-   .state.small{width: 170px;margin: 0 0;}
-   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: left;margin: 0}
-   .goods-main{width: 100%; height: auto; float: left; margin:10px 0;background: #fff;}
-   .goods-tips{width: 100%;box-sizing: border-box;margin-top: 14px;}
-   .goods-tips .end-tips{width:100%;height: 32px;background: #FFF3F3;border-radius: 2px;line-height: 32px;color: #F94B4B;font-size: 12px;box-sizing: border-box;padding: 0 10px;}
-   .goods-tips .end-tips .tips{display:inline-block;width:32px;height:32px;line-height:32px;box-sizing:border-box;position:relative;color:#333;font-size:14px;text-align:center;white-space:nowrap}
-   .goods-tips .end-tips .tips:before{display:inline-block;width:20px;height:20px;vertical-align:middle;background-position:-24px 1px;margin-right:2px;}
-   .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: #FF5B00;text-decoration: underline;margin: 0 3px;}
-   .empty{background: #fff;margin-top: 10px;}
-   .navLayout{min-height: auto;}
-   ::-webkit-scrollbar{ height: 6px;}
-   .pagination{width: 100%;margin-top: 10px;float: left; background: #FFFFFF;padding: 8px 20px;box-sizing: border-box;}
+    .crumbs{color: #22272e;font-size: 16px;}
+    .head-top{overflow: hidden;background: #fff;padding:17px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)}
+    .head-top>div {float: left; height: 40px;font-size: 12px;color: #627386;line-height: 40px;margin-right: 10px;margin-bottom: 10px}
+    .state {width: 158px !important;}
+    .state.small{width: 170px;margin: 0 0;}
+    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: left;margin: 0}
+    .goods-main{width: 100%; height: auto; float: left; margin:10px 0;background: #fff;}
+    .goods-tips{width: 100%;box-sizing: border-box;margin-top: 14px;}
+    .goods-tips .end-tips{width:100%;height: 32px;background: #FFF3F3;border-radius: 2px;line-height: 32px;color: #F94B4B;font-size: 12px;box-sizing: border-box;padding: 0 10px;}
+    .goods-tips .end-tips .tips{display:inline-block;width:32px;height:32px;line-height:32px;box-sizing:border-box;position:relative;color:#333;font-size:14px;text-align:center;white-space:nowrap}
+    .goods-tips .end-tips .tips:before{display:inline-block;width:20px;height:20px;vertical-align:middle;background-position:-24px 1px;margin-right:2px;}
+    .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: #FF5B00;text-decoration: underline;margin: 0 3px;}
+    .empty{background: #fff;margin-top: 10px;}
+    .navLayout{min-height: auto;}
+    ::-webkit-scrollbar{ height: 6px;}
+    .pagination{width: 100%;margin-top: 10px;float: left; background: #FFFFFF;padding: 8px 20px;box-sizing: border-box;}
+    .el-button--primary.is-plain{background:#FFE6DC !important;color: #FF5B00 !important;border-color: #FF5B00 !important;}
  }
 
 /*移动*/
@@ -38,4 +39,5 @@ li{list-style: none}
     .empty a{color:#FF5B00;}
     footer{display: none;}
     .pagination{width: 100%;min-height: 2vw;position: fixed;bottom: 0;left: 0;background: #FFFFFF;z-index: 99;padding: 2vw;box-sizing: border-box;}
+    .el-button--primary.is-plain{background:#FFE6DC !important;color: #FF5B00 !important;border-color: #FF5B00 !important;}
  }

src/main/resources/static/js/supplier-center/shop/mixins/checkeMixins.js

@@ -221,13 +221,13 @@ var checkeMixins = function () {
                     _this.releaseParams.tags = TagString.substring(0, TagString.lastIndexOf(','));
                 }
                 //搜索关键词
-                if(_this.searchKeyList!=''){
+                if(_this.searchKeyList!==''){
                     _this.searchKeyList.forEach(function(el){
                         KeyString+=el.value+',';
                     });
                     _this.releaseParams.searchKey = KeyString.substring(0, KeyString.lastIndexOf(','));
                 }
-                if( _this.paramKeyList[0].paramsName == ''){
+                if( _this.paramKeyList[0].paramsName === ''){
                     _this.params.param = [];
                 }else{
                     _this.params.param = _this.paramKeyList;

src/main/resources/static/js/supplier-center/shop/mixins/releaseMixins.js

@@ -27,7 +27,7 @@ var releaseMixins = function () {
         },
         mounted: function() {
             this.skuParams.push(defaultSku())
-            this.mallSkusParams.push(defaultSku())
+            // this.mallSkusParams.push(defaultSku())
         },
         methods: {
             //选择平台
@@ -35,18 +35,18 @@ var releaseMixins = function () {
                 item.isChecked = !item.isChecked
                 if(index === 0){
                     this.platformsFlag = item.isChecked
-                    // if(item.isChecked){
-                    //     this.skuParams.push(defaultSku())
-                    // }else{
-                    //     this.mallSkusParams =[]
-                    // }
+                    if(item.isChecked){
+                        this.skuParams.push(defaultSku())
+                    }else{
+                        this.skuParams =[]
+                    }
                 }else{
                     this.platformsMallFlag = item.isChecked
-                    // if(item.isChecked){
-                    //     this.mallSkusParams.push(defaultSku())
-                    // }else{
-                    //     this.mallSkusParams =[]
-                    // }
+                    if(item.isChecked){
+                        this.mallSkusParams.push(defaultSku())
+                    }else{
+                        this.mallSkusParams =[]
+                    }
                 }
                 if(this.platformsFlag && this.platformsMallFlag){
                     this.releaseParams.groundMall = '0,4'

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

@@ -153,6 +153,7 @@
                             highlight-current-row
                             :header-cell-style="{background:'#E1E1E1',color:'#606266'}"
                             @selection-change="handleSelectionChange"
+                            style="min-height: 400px;"
                     >
                         <el-table-column
                                 type="selection"
@@ -183,40 +184,40 @@
                             <template slot-scope="{row}">
                                 <template v-if="row.groundMall === '0'">
                                     <P>
-                                        【采美平台】
-                                        <el-tag v-if="row.validFlag===0" type="danger" size="small">已删除</el-tag>
-                                        <el-tag v-if="row.validFlag===1" type="warning" size="small">待审核</el-tag>
-                                        <el-tag v-if="row.validFlag===2" type="success" size="small">已上架</el-tag>
-                                        <el-tag v-if="row.validFlag===3" type="danger" size="small">已下架</el-tag>
-                                        <el-tag v-if="row.validFlag===8" type="danger" size="small">审核未通过</el-tag>
-                                        <el-tag v-if="row.validFlag===9" type="danger" size="small">已隐身</el-tag>
-                                        <el-tag v-if="row.validFlag===10" type="danger" size="small">已冻结</el-tag>
+                                        <span style="float: left;">【采美平台】</span>
+                                        <el-tag v-if="row.validFlag===0" type="danger" size="small" style="float: right;">已删除</el-tag>
+                                        <el-tag v-if="row.validFlag===1" type="warning" size="small" style="float: right;">待审核</el-tag>
+                                        <el-tag v-if="row.validFlag===2" type="success" size="small" style="float: right;">已上架</el-tag>
+                                        <el-tag v-if="row.validFlag===3" type="danger" size="small" style="float: right;">已下架</el-tag>
+                                        <el-tag v-if="row.validFlag===8" type="danger" size="small" style="float: right;">审核未通过</el-tag>
+                                        <el-tag v-if="row.validFlag===9" type="danger" size="small" style="float: right;">已隐身</el-tag>
+                                        <el-tag v-if="row.validFlag===10" type="danger" size="small" style="float: right;">已冻结</el-tag>
                                     </P>
                                 </template>
                                 <template v-else-if="row.groundMall === '4'">
                                     <P>
-                                        【丽格集采联盟平台】
-                                        <el-tag v-if="row.mallValidFlag===1" type="warning" size="small">待审核</el-tag>
-                                        <el-tag v-if="row.mallValidFlag===2" type="success" size="small">已上架</el-tag>
-                                        <el-tag v-if="row.mallValidFlag===3" type="danger" size="small">已下架</el-tag>
+                                        <span style="float: left;">【丽格集采联盟平台】</span>
+                                        <el-tag v-if="row.mallValidFlag===1" type="warning" size="small" style="float: right;">待审核</el-tag>
+                                        <el-tag v-if="row.mallValidFlag===2" type="success" size="small" style="float: right;">已上架</el-tag>
+                                        <el-tag v-if="row.mallValidFlag===3" type="danger" size="small" style="float: right;">已下架</el-tag>
                                     </P>
                                 </template>
                                 <template v-else>
                                     <P>
-                                        【采美平台】
-                                        <el-tag v-if="row.validFlag===0" type="danger" size="small">已删除</el-tag>
-                                        <el-tag v-if="row.validFlag===1" type="warning" size="small">待审核</el-tag>
-                                        <el-tag v-if="row.validFlag===2" type="success" size="small">已上架</el-tag>
-                                        <el-tag v-if="row.validFlag===3" type="danger" size="small">已下架</el-tag>
-                                        <el-tag v-if="row.validFlag===8" type="danger" size="small">审核未通过</el-tag>
-                                        <el-tag v-if="row.validFlag===9" type="danger" size="small">已隐身</el-tag>
-                                        <el-tag v-if="row.validFlag===10" type="danger" size="small">已冻结</el-tag>
+                                        <span style="float: left;">【采美平台】</span>
+                                        <el-tag v-if="row.validFlag===0" type="danger" size="small" style="float: right;">已删除</el-tag>
+                                        <el-tag v-if="row.validFlag===1" type="warning" size="small" style="float: right;">待审核</el-tag>
+                                        <el-tag v-if="row.validFlag===2" type="success" size="small" style="float: right;">已上架</el-tag>
+                                        <el-tag v-if="row.validFlag===3" type="danger" size="small" style="float: right;">已下架</el-tag>
+                                        <el-tag v-if="row.validFlag===8" type="danger" size="small" style="float: right;">审核未通过</el-tag>
+                                        <el-tag v-if="row.validFlag===9" type="danger" size="small" style="float: right;">已隐身</el-tag>
+                                        <el-tag v-if="row.validFlag===10" type="danger" size="small" style="float: right;">已冻结</el-tag>
                                     </P>
                                     <P>
-                                        【丽格集采联盟平台】
-                                        <el-tag v-if="row.mallValidFlag===1" type="warning" size="small">待审核</el-tag>
-                                        <el-tag v-if="row.mallValidFlag===2" type="success" size="small">已上架</el-tag>
-                                        <el-tag v-if="row.mallValidFlag===3" type="danger" size="small">已下架</el-tag>
+                                        <span style="float: left;">【丽格集采联盟平台】</span>
+                                        <el-tag v-if="row.mallValidFlag===1" type="warning" size="small" style="float: right;">待审核</el-tag>
+                                        <el-tag v-if="row.mallValidFlag===2" type="success" size="small" style="float: right;">已上架</el-tag>
+                                        <el-tag v-if="row.mallValidFlag===3" type="danger" size="small" style="float: right;">已下架</el-tag>
                                     </P>
                                 </template>
                             </template>
@@ -233,14 +234,14 @@
                         </el-table-column>
                         <el-table-column label="操作" align="center" width="250">
                             <template slot-scope="{row}">
-                                <el-button type="success" style="margin: 5px;" v-if="[0,1,2,3,8,9].indexOf(row.validFlag)!=-1" :disabled="isForbid" size="mini" @click="handleEdit(row)">编辑</el-button>
+                                <el-button type="primary" style="margin: 5px;" v-if="[0,1,2,3,8,9].indexOf(row.validFlag)!=-1" :disabled="isForbid" size="mini" plain @click="handleEdit(row)">编辑</el-button>
                                 <template  v-if="[2].indexOf(row.validFlag)!=-1 || [2].indexOf(row.mallValidFlag)!=-1">
-                                    <el-button type="warning" style="margin: 5px;" :disabled="isForbid" size="mini" @click="handleDownshelf(row)">下架</el-button>
+                                    <el-button type="primary" style="margin: 5px;" :disabled="isForbid" size="mini" plain @click="handleDownshelf(row)">下架</el-button>
                                 </template>
                                 <template v-if="row.groundMall === '0'">
-                                    <el-button type="primary" style="margin: 5px;" v-if="[2].indexOf(row.validFlag)!=-1" :disabled="isForbid" size="mini" @click="handlePreview(row)">查看</el-button>
-                                    <el-button type="primary" style="margin: 5px;" v-if="row.isDelFeatured" :disabled="isForbid" size="mini" @click="handleDeleteHot(row)">删除主页推荐</el-button>
-                                    <el-button type="primary" style="margin: 5px;" v-if="row.isAddFeatured" :disabled="isForbid" size="mini" @click="handlePushHot(row)">添加主页推荐</el-button>
+                                    <el-button type="primary" style="margin: 5px;" v-if="[2].indexOf(row.validFlag)!=-1" :disabled="isForbid" size="mini" plain @click="handlePreview(row)">查看</el-button>
+                                    <el-button type="primary" style="margin: 5px;" v-if="row.isDelFeatured" :disabled="isForbid" size="mini" plain @click="handleDeleteHot(row)">删除主页推荐</el-button>
+                                    <el-button type="primary" style="margin: 5px;" v-if="row.isAddFeatured" :disabled="isForbid" size="mini" plain @click="handlePushHot(row)">添加主页推荐</el-button>
                                 </template>
                             </template>
                         </el-table-column>