From 5ad4abd1fbe2558473813d5e3b4fff5d4cc225c8 Mon Sep 17 00:00:00 2001
From: w-R <953969641@qq.com>
Date: Thu, 17 Mar 2022 11:12:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=B0=8F=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shopping/shopping_home/search_page.dart   | 27 ++++++++++---------
 pubspec.lock                                  | 10 +++----
 pubspec.yaml                                  |  8 +++---
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/lib/store/shopping/shopping_home/search_page.dart b/lib/store/shopping/shopping_home/search_page.dart
index 90974a92..ac874ba5 100644
--- a/lib/store/shopping/shopping_home/search_page.dart
+++ b/lib/store/shopping/shopping_home/search_page.dart
@@ -353,7 +353,7 @@ class _SearchPage extends State<SearchPage>  with AutomaticKeepAliveClientMixin,
                     child: SmartRefresher(
                       controller: refreshController,
                       enablePullDown: true,
-                      enablePullUp: true,
+                      enablePullUp: false,
                       header: MyHeader(),
                       physics: BouncingScrollPhysics(),
                       footer: CustomFooter(
@@ -756,10 +756,10 @@ class _SearchPage extends State<SearchPage>  with AutomaticKeepAliveClientMixin,
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    mainAxisAlignment: MainAxisAlignment.spaceAround,
                     crossAxisAlignment: CrossAxisAlignment.end,
                     children: [
-                      Container(
+                      Expanded(child:Container(
                         margin: EdgeInsets.only(top: 8, right: 8),
                         padding: EdgeInsets.only(left: 2, right: 2),
                         height: 17.h,
@@ -770,21 +770,24 @@ class _SearchPage extends State<SearchPage>  with AutomaticKeepAliveClientMixin,
                         ),
                         child: Text(
                           productListBeans.supplierName,
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
                           style: TextStyle(
                             fontSize: 10.sp,
                             fontWeight: MyFontWeight.regular,
                             color: Colors.white,
                           ),
                         ),
-                      ),
-                      Text(
-                        "已售${productListBeans?.sellCount ?? 0}件",
-                        style: TextStyle(
-                          fontSize: 12.sp,
-                          fontWeight: MyFontWeight.regular,
-                          color: Color(0xFF5D5D5D),
-                        ),
-                      ),
+                      ),),
+                      Expanded(child:
+                     Container(child:  Text(
+                       "已售${productListBeans?.sellCount ?? 0}件",
+                       style: TextStyle(
+                         fontSize: 12.sp,
+                         fontWeight: MyFontWeight.regular,
+                         color: Color(0xFF5D5D5D),
+                       ),
+                     ),alignment: Alignment.topRight,)),
                     ],
                   ),
                   Text(
diff --git a/pubspec.lock b/pubspec.lock
index a6086cf0..86ed9c52 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -701,12 +701,10 @@ packages:
   tpns_flutter_plugin:
     dependency: "direct main"
     description:
-      path: "."
-      ref: "V1.0.7"
-      resolved-ref: ab0c457ab52f36a34e2b90256929a9809e8d4f9b
-      url: "git://github.com/TencentCloud/TPNS-Flutter-Plugin"
-    source: git
-    version: "1.0.7"
+      name: tpns_flutter_plugin
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.1.0"
   transformer_page_view:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 383dc45c..dbb27aff 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -19,10 +19,10 @@ dependencies:
 
   keframe: ^2.0.2 #滑动组件卡顿优化
 
-  tpns_flutter_plugin:
-    git:
-      url: git://github.com/TencentCloud/TPNS-Flutter-Plugin
-      ref: V1.0.7
+  tpns_flutter_plugin: ^1.0.8
+#    git:
+#      url: git://github.com/TencentCloud/TPNS-Flutter-Plugin
+#      ref: V1.1.4
 
   like_button: ^2.0.2
   cupertino_icons: ^1.0.2