品牌详情介绍展示不全;商品详情规格切换数量未改变

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;

assets/css/style.less

@@ -857,9 +857,7 @@ page {
   color: #3A3A3C;
   line-height: 54rpx;
   margin-right: 20rpx;
-
+  margin-bottom: 16rpx;
-  // border: 1px solid #bbb;
-  // margin: 0.14 * 100rpx 0 0 0.14 * 100rpx;
 }
 
 .product-window .productWinList .item .listn .itemn.on {

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)

pages/shop/brands/brandDetail/index.vue

@@ -26,9 +26,11 @@
 							<view class="tip">甄选品牌</view>
 						</view>
 					</view>
-					<view class="tips">{{''||'1314款商品 | 5w+人已购'}}</view>
+					<view class="tips">{{''}}</view>
+					<!-- <view class="tips">{{''||'1314款商品 | 5w+人已购'}}</view> -->
 				</view>
-				<view class="info line2">{{brandInfo.brandDescription}}</view>
+				<view class="info">{{brandInfo.brandDescription}}</view>
+				<!-- <view class="info line2">{{brandInfo.brandDescription}}</view> -->
 			</view>
 		</view>
 		
@@ -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;
 			}
 		}
 	}

pages/shop/brands/index.vue

@@ -115,6 +115,7 @@
 				  news: '1',
 				  priceOrder: '',
 				  salesOrder: '',
+					isIntegral: 0
 				},
 				newList: [],
 				loaded: false,