From cecb9499a4c9303850f62058e71c7c13e2d7a357 Mon Sep 17 00:00:00 2001
From: whyneedname <542399163@qq.com>
Date: Wed, 26 Oct 2022 11:34:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=89=8C=E8=AF=A6=E6=83=85=E4=BB=8B?=
=?UTF-8?q?=E7=BB=8D=E5=B1=95=E7=A4=BA=E4=B8=8D=E5=85=A8;=E5=95=86?=
=?UTF-8?q?=E5=93=81=E8=AF=A6=E6=83=85=E8=A7=84=E6=A0=BC=E5=88=87=E6=8D=A2?=
=?UTF-8?q?=E6=95=B0=E9=87=8F=E6=9C=AA=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/css/style.css | 1 +
assets/css/style.less | 4 +---
pages/shop/GoodsCon/index.vue | 7 +++++++
pages/shop/brands/brandDetail/index.vue | 19 ++++++++++++++-----
pages/shop/brands/index.vue | 1 +
5 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/assets/css/style.css b/assets/css/style.css
index 191210a..dcbd933 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -575,6 +575,7 @@ page {
color: #3A3A3C;
line-height: 54rpx;
margin-right: 20rpx;
+ margin-bottom: 16rpx;
}
.product-window .productWinList .item .listn .itemn.on {
color: #fff;
diff --git a/assets/css/style.less b/assets/css/style.less
index ea1b4f6..7f194dd 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -857,9 +857,7 @@ page {
color: #3A3A3C;
line-height: 54rpx;
margin-right: 20rpx;
-
- // border: 1px solid #bbb;
- // margin: 0.14 * 100rpx 0 0 0.14 * 100rpx;
+ margin-bottom: 16rpx;
}
.product-window .productWinList .item .listn .itemn.on {
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index bb70b84..3956d2c 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -760,6 +760,13 @@
this.$set(this.attr.productSelect, 'cart_num', 1)
this.$set(this, 'attrValue', res.value)
this.$set(this, 'attrTxt', '已选择')
+ let stock = productSelect.stock || 0;
+ let num = this.attr.productSelect;
+ if (num.cart_num > stock) {
+ this.$set(this, 'cart_num', stock)
+ } else {
+ this.$set(this, 'cart_num', 1)
+ }
} else {
this.$set(this.attr.productSelect, 'image', this.storeInfo.image)
this.$set(this.attr.productSelect, 'price', this.storeInfo.price)
diff --git a/pages/shop/brands/brandDetail/index.vue b/pages/shop/brands/brandDetail/index.vue
index 2189603..4892d05 100644
--- a/pages/shop/brands/brandDetail/index.vue
+++ b/pages/shop/brands/brandDetail/index.vue
@@ -26,9 +26,11 @@
甄选品牌
- {{''||'1314款商品 | 5w+人已购'}}
+ {{''}}
+
- {{brandInfo.brandDescription}}
+ {{brandInfo.brandDescription}}
+
@@ -84,7 +86,7 @@
};
},
onLoad() {
- this.topHeight = this.CustomBar + 126;
+ this.topHeight = this.CustomBar + 132;
this.id = this._route.query.id;
this.where.bid = this.id;
this.getBrandInfo(this.id);
@@ -220,7 +222,7 @@
}
.info-box {
width: 686rpx;
- height: 158rpx;
+ // height: 158rpx;
background: #F5F6F8;
box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0,0,0,0.15);
border-radius: 16rpx;
@@ -257,13 +259,20 @@
}
}
.info {
- height: 56rpx;
+ // height: 56rpx;
+ min-height: 58rpx;
+ max-height: 124rpx;
padding-top: 14rpx;
font-size: 16rpx;
font-family: PingFang SC;
font-weight: 500;
color: #2DB5AE;
line-height: 22rpx;
+ word-break: break-all;
+ display: -webkit-box;
+ -webkit-line-clamp: 5;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
}
}
}
diff --git a/pages/shop/brands/index.vue b/pages/shop/brands/index.vue
index d1b1a06..ab06358 100644
--- a/pages/shop/brands/index.vue
+++ b/pages/shop/brands/index.vue
@@ -115,6 +115,7 @@
news: '1',
priceOrder: '',
salesOrder: '',
+ isIntegral: 0
},
newList: [],
loaded: false,