|
|
@@ -11,7 +11,7 @@
|
|
|
<li v-for="(item,index) in goodsTypeList" :class="item.selected ? 'selected' : ''"@click="debouncedClickType(item)" @mouseenter="showIcon(item,index)"@mouseleave="hideIcon(item,index)">
|
|
|
<span class="store_name">{{item.goodsTypeName}}
|
|
|
<span class="goods-count">{{item.goodsCounts || 0}}</span>
|
|
|
- <span v-if="item.newFlag">上新</span>
|
|
|
+ <span class="new-flag" v-if="item.newFlag">上新</span>
|
|
|
</span>
|
|
|
<i class="el-icon-top" v-show="item.showIcon" @click="debouncedChangOrderKey(item.goodsTypeId,1)"></i>
|
|
|
<i class="el-icon-edit" v-show="item.showIcon" @click="updateType(item)"></i>
|
|
|
@@ -19,11 +19,9 @@
|
|
|
<i class="el-icon-upload2" v-show="item.showIcon" @click="debouncedChangOrderKey(item.goodsTypeId,2)"></i>
|
|
|
</li>
|
|
|
</ul>
|
|
|
- <ul>
|
|
|
- <li class="mr-t-10" style="display: flex;">
|
|
|
- <div class="newkind" style="width: 70px;color: #666" @click="addType">新建分类</div>
|
|
|
- </li>
|
|
|
- </ul>
|
|
|
+ <div class="leftbox-footer">
|
|
|
+ <div class="newkind" @click="addType">新建分类</div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
|
|
|
<div class="topbox">
|
|
|
@@ -95,7 +93,7 @@
|
|
|
<div class="popover-modal">
|
|
|
<img :src="scope.row.pictureUrl" alt class="width-150">
|
|
|
<div>
|
|
|
- <div class="text-align width-150 mr-t-10">
|
|
|
+ <div class="text-align width-150" style="margin-top: 6px;">
|
|
|
<el-upload
|
|
|
class="upload-demo"
|
|
|
:action="updatePicUrl"
|
|
|
@@ -106,7 +104,7 @@
|
|
|
:before-upload="beforeUpload"
|
|
|
:on-success="successUpload"
|
|
|
:data="uploadData">
|
|
|
- <el-button size="small" type="primary" @click="changePic(scope.row.goodsId)">更换</el-button>
|
|
|
+ <el-button size="mini" type="primary" @click="changePic(scope.row.goodsId)">更换</el-button>
|
|
|
</el-upload>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1423,10 +1421,24 @@ this.$axios.post(this.setNewFlagUrl, querystring.stringify({
|
|
|
grid-row: 1 / 3;
|
|
|
box-shadow: 0 12px 20px -8px rgba(22, 50, 62, 0.3);
|
|
|
border-radius: 10px;
|
|
|
- overflow-y: auto;
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+ overflow: hidden;
|
|
|
padding-top: 10px;
|
|
|
padding-left: 10px;
|
|
|
}
|
|
|
+.leftbox .storelist{
|
|
|
+ flex: 1;
|
|
|
+ overflow-y: auto;
|
|
|
+ padding-right: 4px;
|
|
|
+}
|
|
|
+.leftbox-footer{
|
|
|
+ flex-shrink: 0;
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
+ padding: 10px 10px 12px 10px;
|
|
|
+ border-top: 1px solid #409EFF;
|
|
|
+}
|
|
|
.rightbox{
|
|
|
background: white;
|
|
|
grid-column: 2;
|
|
|
@@ -1504,6 +1516,17 @@ this.$axios.post(this.setNewFlagUrl, querystring.stringify({
|
|
|
color: #2c3e50;
|
|
|
font-weight: 700;
|
|
|
}
|
|
|
+.new-flag {
|
|
|
+ display: inline-block;
|
|
|
+ margin-left: 6px;
|
|
|
+ padding: 1px 5px;
|
|
|
+ font-size: 10px;
|
|
|
+ color: #fff;
|
|
|
+ background: linear-gradient(135deg, #ff6b6b, #ee5a24);
|
|
|
+ border-radius: 3px;
|
|
|
+ vertical-align: middle;
|
|
|
+ line-height: 1.4;
|
|
|
+}
|
|
|
.goods-count {
|
|
|
display: inline-flex;
|
|
|
align-items: center;
|
