diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue index 0ed88ba3..f18569af 100644 --- a/buyer/src/components/goodsDetail/ShowGoods.vue +++ b/buyer/src/components/goodsDetail/ShowGoods.vue @@ -7,6 +7,8 @@
+
实物商品
+
虚拟商品
全部商品分类
-
+ +
@@ -155,6 +156,10 @@ export default { diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue index 85959d4a..25dd3c0d 100644 --- a/buyer/src/pages/GoodsList.vue +++ b/buyer/src/pages/GoodsList.vue @@ -68,8 +68,14 @@ 已有{{ item.content.commentNum || 0 }}人评价
-
- 自营{{ item.content.storeName }} +
+ 自营 + +
+
虚拟
+
实物
+
+ {{ item.content.storeName }}
@@ -112,6 +118,7 @@ export default { ], goodsList: [], // 商品列表 loading: false, // 加载状态 + goodsListType:"", total: 0, // 列表总数 params: { // 请求参数 pageNumber: 0, @@ -178,6 +185,9 @@ export default { if (res.success) { this.goodsList = res.result.content; this.total = res.result.totalElements; + for(var i = 0;i { this.loading = false; @@ -210,16 +220,24 @@ export default { .goods-show-info>.goods-show-seller>.goods-show-buyer{ height:16px;width:30px; white-space: nowrap; - line-height:16px; + line-height:17px; + text-align: center; padding:0 3px; background-color:#E23A3A; } +.goods-show-seller{ + // padding:3px 0; + vertical-align: middle; +} .container { margin: 15px auto; width: 1200px; min-width: 1000px; position: relative; } +.price-sort:hover{ + color:#E23A3A; +} .goods-box { display: flex; } @@ -228,10 +246,32 @@ export default { width: 200px; border: 1px solid #ccc; } +.goods-show-right{ + width:35px; + height:17px; + // vertical-align:middle; + overflow: hidden; + margin-top:1.5px; + margin-right: 5px; + line-height: 16px; + background:white; + border-radius:4px; + margin-bottom:5px; + float:left; + text-align:center; + border:1px solid rgba(112, 123, 187, 0.8); + color:rgba(112, 123, 187, 0.8); +} +.goods-show-middle:hover{ + color:rgba(2, 15, 88, 0.6); + border:0.2px solid rgba(0, 13, 87, 0.6); + border-radius:4px; + line-height: 18px; +} .item-as-title { width: 100%; height: 36px; - color: $theme_color; + color: #e4393c; line-height: 36px; font-size: 18px; } @@ -242,7 +282,7 @@ export default { float: right; margin-right: 15px; font-size: 10px; - color: #ccc; + color: rgb(204, 204, 204); } .item-as { width: 160px; @@ -332,7 +372,7 @@ export default { background-color: #fff; } .goods-list-tool span:hover { - border-color: $theme_color; + border-color: #e4393c; position: relative; text-decoration: none; z-index: 1; @@ -344,7 +384,7 @@ export default { .goods-list-tool-active { color: #fff; border-left: 1px solid #ccc; - background-color: $theme_color !important; + background-color: #e4393c !important; } /* ---------------商品栏结束------------------- */ diff --git a/manager/src/styles/common.scss b/manager/src/styles/common.scss index b0b7b0eb..860a28dd 100644 --- a/manager/src/styles/common.scss +++ b/manager/src/styles/common.scss @@ -93,7 +93,7 @@ ul,li{ $success_color: #68cabe; $warning_color: #fa6419; $error_color: #ff3c2a; -$theme_color: #FF5C58; +$theme_color: #FF5C58; .theme_color { color: $theme_color !important; }