From 35de0c031d6f2575e9fa0db3e0f62e6f862248af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E8=89=AFking?= <2244255345@qq.com>
Date: Fri, 31 Dec 2021 18:22:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=8A=A0=20=E8=99=9A?=
=?UTF-8?q?=E6=8B=9F=E5=AE=9E=E7=89=A9=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
buyer/src/assets/styles/goodsList.scss | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/buyer/src/assets/styles/goodsList.scss b/buyer/src/assets/styles/goodsList.scss
index 767c58b6..81e4d3a1 100644
--- a/buyer/src/assets/styles/goodsList.scss
+++ b/buyer/src/assets/styles/goodsList.scss
@@ -38,6 +38,10 @@
display:-webkit-box;
-webkit-line-clamp:2;
-webkit-box-orient:vertical;
+ color:#808080;
+}
+.goods-show-detail :hover{
+ color:#E23A3A;
}
.goods-show-num {
font-size: 12px;
From fada0a735faec9f54015731dc14ac9e46d417471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E8=89=AFking?= <2244255345@qq.com>
Date: Fri, 31 Dec 2021 18:22:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=20?=
=?UTF-8?q?=E5=92=8C=E6=9F=A5=E7=9C=8B=E8=99=9A=E6=8B=9F=E5=AE=9E=E7=89=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/goodsDetail/ShowGoods.vue | 2 +
buyer/src/components/nav/CateNav.vue | 16 ++++--
buyer/src/components/nav/GoodsClassNav.vue | 47 ++++++++--------
buyer/src/pages/GoodsList.vue | 54 ++++++++++++++++---
manager/src/styles/common.scss | 2 +-
5 files changed, 86 insertions(+), 35 deletions(-)
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;
}