From 1cb477b28b8dd4170cfde5d1c14b6c9b7afb1d4e Mon Sep 17 00:00:00 2001
From: laiiihz <laiiihz@outlook.com>
Date: Sat, 17 Oct 2020 12:06:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=82=E7=9C=8B=E7=9B=B4=E6=92=AD=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../live/live_stream/show_goods_list.dart     | 53 ++++++++++++++++---
 1 file changed, 46 insertions(+), 7 deletions(-)

diff --git a/lib/pages/live/live_stream/show_goods_list.dart b/lib/pages/live/live_stream/show_goods_list.dart
index fb96615..5733e5a 100644
--- a/lib/pages/live/live_stream/show_goods_list.dart
+++ b/lib/pages/live/live_stream/show_goods_list.dart
@@ -5,6 +5,7 @@ import 'package:recook/manager/http_manager.dart';
 import 'package:recook/manager/user_manager.dart';
 import 'package:recook/models/goods_detail_model.dart';
 import 'package:recook/pages/goods/small_coupon_widget.dart';
+import 'package:recook/pages/home/classify/brandgoods_list_page.dart';
 import 'package:recook/pages/home/classify/commodity_detail_page.dart';
 import 'package:recook/pages/home/classify/mvp/goods_detail_model_impl.dart';
 import 'package:recook/pages/home/classify/order_preview_page.dart';
@@ -105,18 +106,21 @@ class _GoodsListDialogState extends State<GoodsListDialog> {
   _buildGoodsCard(GoodsLists model, int index) {
     return Container(
       padding: EdgeInsets.all(rSize(15)),
-      height: rSize(104 + 15 + 15.0),
       child: Row(
+        crossAxisAlignment: CrossAxisAlignment.center,
         children: [
           ClipRRect(
             borderRadius: BorderRadius.circular(rSize(4)),
             child: Stack(
               children: [
-                FadeInImage.assetNetwork(
-                  placeholder: R.ASSETS_PLACEHOLDER_NEW_1X1_A_PNG,
-                  image: Api.getImgUrl(model.mainPhotoUrl),
-                  height: rSize(104),
-                  width: rSize(104),
+                Container(
+                  color: AppColor.frenchColor,
+                  child: FadeInImage.assetNetwork(
+                    placeholder: R.ASSETS_PLACEHOLDER_NEW_1X1_A_PNG,
+                    image: Api.getImgUrl(model.mainPhotoUrl),
+                    height: rSize(104),
+                    width: rSize(104),
+                  ),
                 ),
                 Positioned(
                   left: 0,
@@ -162,9 +166,11 @@ class _GoodsListDialogState extends State<GoodsListDialog> {
               ],
             ),
           ),
+          rWBox(10),
           Expanded(
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
               children: [
                 Text(
                   model.goodsName,
@@ -175,7 +181,40 @@ class _GoodsListDialogState extends State<GoodsListDialog> {
                     fontSize: rSP(14),
                   ),
                 ),
-                Spacer(),
+                Text(
+                  model.description,
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  style: AppTextStyle.generate(ScreenAdapterUtils.setSp(14),
+                      color: Colors.black54, fontWeight: FontWeight.w300),
+                ),
+                InkWell(
+                  onTap: () {
+                    AppRouter.push(context, RouteName.BRANDGOODS_LIST_PAGE,
+                        arguments: BrandGoodsListPage.setArguments(
+                          model.brandId,
+                          model.brandName,
+                        ));
+                  },
+                  child: Row(
+                    children: [
+                      FadeInImage.assetNetwork(
+                        placeholder: R.ASSETS_PLACEHOLDER_NEW_1X1_A_PNG,
+                        image: Api.getImgUrl(model.brandImg),
+                        width: rSize(13),
+                        height: rSize(13),
+                      ),
+                      rWBox(4),
+                      Text(
+                        model.brandName,
+                        style: TextStyle(
+                          color: Color(0xffc70404),
+                          fontSize: ScreenAdapterUtils.setSp(12),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
                 Row(
                   children: [
                     SmallCouponWidget(number: num.parse(model.coupon)),