From 0980aa66dc46c2009fda9a51ff1bd43ad127bb2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=AB=A0=E6=96=87=E8=BD=A9?= <12812285557@qq.com>
Date: Fri, 12 Nov 2021 16:16:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/icons/shop_car.png            | Bin 1613 -> 1948 bytes
 assets/icons/shop_laba.png           | Bin 2092 -> 3448 bytes
 assets/icons/shop_location.png       | Bin 2369 -> 3310 bytes
 assets/icons/shop_order.png          | Bin 1189 -> 1246 bytes
 lib/ui/market/market_page.dart       | 161 +++++++++++++++++++++++----
 lib/utils/websocket/fire_dialog.dart |   1 +
 6 files changed, 140 insertions(+), 22 deletions(-)

diff --git a/assets/icons/shop_car.png b/assets/icons/shop_car.png
index 89a8b6c2b6cf86ef30bf607bd6c0253aacc8eaef..447b71d8c07ab8b897b195634eeeb729cdc4f600 100644
GIT binary patch
literal 1948
zcmeH{`#Tc~7{}*wn7fg=>zK=N87Fhespw!Aa~Ye>{j%JR6gG{J7BWMlsB}`!#4M>W
zA(vc+I8(~pg>;m48;)~oM|Ji;oL~Ds&-?v8&->%&eV;GgAA?d+)Kdfi04iutI8Ktm
zlEDLIByL9s<Vr#+1BY@4v`iXo0szuTe;+(Tvi$a4-wFIb0`uWJ8<I~NB;zmv04Zr1
z*&pQOfeMOB$||aA>L3kGEwHwZp1y&h(T~Ou6H_yD3rj0&sEzFbJD9zLqth>k4j*wn
z`m39}2ONP!p}o9)eEqOELSRsENN8AiBr!TRE<PcVl$>%r^~A}v^bB(5DQZ^s>73lW
zGx=v}1%*ZDi|Hkd((((;%8Qq(sxR04R(s=S-S4dWTMdm(oZHQJTJGMv-`dXYc+l1T
zu&1}L|IxtU&@gXgbnNl?#2@_0CsWU-1v9gA^NY(Xt81@?SAoKI06^9W4R^!q=<)^>
z!tilAa;u|mmiy#QhkO#JmJn_GJnErg?NGj#iTReH4$j2Pj@zC-ftwyK1N%-u`NSoS
zjijBuw!XC<hm82ioOQF&?h{1#m!?m3+UlJTFTj#qXdOi@y1==lZddpt+bK#CkVc`A
zU^H&EP(?P`NbnjsBhn{-2`nJKZ{#5F1!8&X%}w~IGN30&T$mU4G&__*Oi2)73Z$TG
zhW=_q=*Rq>0~kB%?6IDSRmuQ6PBb%M@gZ(i$Rsm`Z#sJZe#e~~m0~gReuAPL#o1zn
zCP7>5+bA~rj4$Dvb0}|u)Elz_Sx0Q0{%sPjiVH}(+rdz$Wjt#&n@-Yx=MK7`*dV0o
zp(t?{&EvdyO+l!#vxlQnAfeJ&JpZ#x!UB(y&ry|e@<$N4o;@|T&gj#(q7D))<)*Q@
z3b(6XQsy>KwfUCn2+(`hOQ@hI9q_TOlCPVc<@71ct}0G7z(s*Uf5{bKSLkW^Bq<yO
zuYU|{9eKT6sKL6%*=K3rG&vaEMUBXu#(?P9>+qVoAhs1VppMF2B8MN0fjq+qXyn69
z)sRN7t%Xf?r;a?ERFSGHXdFu_r{=z8n?(Qhw93M*+lxb$N)LfXDxi*QRm5{NMdGt0
zxpW|6IOZJdt454HL8)hft;h7}qUNr#Gos1<{PVN!9FMU&ub#=nq#MQXb+Xx@$jbMr
zAWZoTW7tIefE9|UzbbTwQE)c-{Z%jTKgRY(r!<rp2bd77a|(IM4_SR+);W?ZjNfob
zB}$W*%wlC0dpcl(Af-M-Ex2X1qe`Y8OPi-6Byj9v7k#<1dDY%UGb@Jc7c%W!Z<ZJ@
zrgIEMX_sT^hJAC(U6GZC*d*qAV@|DlE1?AO7c7EaAxf(y>9z7f3@|4~^c=Hm-f9D4
z*x>o19c6-iYrzXJ;~d`ak)N)h3^azf1y4<oceRFQ(>Qvu91Vt!0Q-r7yMt;-;6*DD
z?Dt%dl(k-;{U2MMy&cuQD&9@=7nf8F8L4{xlpZqRmgH`$>1?sXeE!6s;6?PS=`puY
zz^<yCp~cKJ1L*id%T`DDw|ePJj}MmpD*qIT&RFG<zqZ$PIu4DN?GGysgKdA&H$5Gx
zV%%S%%}dNlb=bZpHi?k;W}?{0=^Cq7_IptI6b~bACCo6ZInGO^+31o(S=>E6aKgB4
zu#M(AceASPEsv@fSml$U>SPw(Y$2<js$NkfJ$Gc#;WE)avJ~xEV~x~J@w&R<EV+W6
z9QxvLr&=KD$}`}#^SmpxdXgP-fD})Y$x|FMhmO2O0LCGZ?Lc6rFP=`C>xGVR<~28v
z!&Jr3(BAQS`!*)3us$S$)-&St&b58L3i66zV|fvD(>Mcur<O)6%gW;x!@<>%lZAh3
dv6MtBpXD2O<*i*6^rIww2tXq+@D_I>?LU~DuDJjJ

literal 1613
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
LNkvXXu0mjf6<c!H

diff --git a/assets/icons/shop_laba.png b/assets/icons/shop_laba.png
index 46f9cfecb54c67efc7d0c27a1b88b966f1996fd2..1a63a3690b7eaac4ed8e8bc6b5f4cead2a832bcf 100644
GIT binary patch
literal 3448
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
aR{K92KR4<Jo8wmi0000<MNUMnLSTZjSaR|J

literal 2092
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
Wp>#b0oxn=~0000<MNUMnLSTYkzy7WO

diff --git a/assets/icons/shop_location.png b/assets/icons/shop_location.png
index 633b9bdb5fadb46266604178a35d489cc3198bff..dea46d719165d4fa026139ef0bbc443a2f574844 100644
GIT binary patch
literal 3310
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

literal 2369
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

diff --git a/assets/icons/shop_order.png b/assets/icons/shop_order.png
index d445eca3c2112dc769646b47c6881f8eb55f208f..ba9766cfac58db1dd8c827d005d3480a5dec471b 100644
GIT binary patch
literal 1246
zcmeAS@N?(olHy`uVBq!ia0vp^0YDtW!3-po;v71G6k~CayA#8@b22Z1?5P1hA+A8d
z|D#}#g}?*%E;(Stw3h_=1v4-*F|)9-b8vF;@Cpfwh>D3z%g8FIXz3Z4SXkRTI5~Ux
z1%^jNMaLy2r=(@(<QA8dl~-0(*VffHG&Q$%_4M{lnL2I8tl4wtEnKp6+49wE)~(;P
zdCT@4J9q8byKn!2gNKfvID78=g^QOiU%7hi`i+~nZr{0k|Iy<oPoKSb`ReuC_a8og
z`TFhWZ~GEQO$G+06i*k&kch)?XZ{Yp>>zM_veKu3Cz=@>Ph4K0;I=wx>ooVu=52cf
zT?4tgF0r*VB|T9rs5d_x#}%AmzTGqJ%FLSj+q3iScE;p=Py42#=_|M1-e~_KLDAW-
za<wKJoitw;d3F1Nt=v0K%g&P3{c-N&Iv3MwuRETPpYmjsP4$?aJUcCZ<0Ip^k3#al
zSA@h&>d^Yq#*_3R=fZjSL*c64tA4WdANTfmzjx?>%es`n?LS+lgv6YDtaWme72}2Z
z|C$V6+pLu0FkZPq@X!R_1VI6@;D@ms%w`RhH5X$Z{AXSBBKnZ`!QEmrna<2LTCc~&
z`a)DAJaBpA#Qncc_Wc(z4~|*DEy8?n$M*+&ZoT4O!~8zo=fO>-)dx1YJe&04jMjze
zOONgOm7ezEhm_U->36RbH|kwrWir@Vy<zT^&Dqv=*Mn7ga{ksHk@&rM_KWK&J0${s
zo}9rEa6LSmrJ<-@Z{6A1%N#5h1#g*<&-Uh0W|ldl+47!^6Q}!Mc~d1Z=gGeF76$eQ
zbMGHswX$dH&Q_*)iS@bRtY1X;=t^AJeD1mWk>L9cmK}_*f3Q@yRJ>w0us_zYHz88w
zvF%-^a%Q$U?5DF0A6WRmGUD06GjD>x`Txvk0!wb^eA=tU^5pd5aBDUh*7q{=PEYZl
z$Cj_ox8%<h&JW)nJDl1k$?|?vkIChvCB1*=R7X!NyKkcVHSECdLfKr8psvFL-_KQT
zn5Mb3#y0Bly~HgmwWAXJMa<UJX55}x#`5OC&mHZi$1>YR*f;$RT~g|A<;JUE9dley
ze2RtSiN0+cUia@gASHU@249t<^7XR)|0k(1-h6nhReMQtjr1DEmI<k0z%0Pv>FVdQ
I&MBb@0B8aoTmS$7

literal 1189
zcmV;W1X}xvP)<h;3K|Lk000e1NJLTq001xm001xu0{{R3VB86{00001b5ch_0Itp)
z=>Px$dQePMMa51(#ZW@VPCv#^K*mr)#!*7XQbWg6M8{M`$5uzkRYu5GNXb`8$yiFs
zT1?4YPRd<R%3xB<T~NzjQOjUb&S+cCXk5-|UCwG<&TL@MY+%rBVbE}6&~RkXa%a(U
zX3=zL(sO6hbZF9aY0`FT(|B#vdvDf+dDw`4*@=JIih$XTgW8US+>?sjm5kk$jNO)w
z-I$NwnUUX}mEWG0-=CM?pqSvIo8Y6I;;5kHtEA+ursS@u<*%sau&L&=tmd<==eDrt
zxU%TEv*^3E>Abe-ytnDSx9PpO>c6_`z`E<hzU#!l?8Lw9#lY>z!|uz+?###T%*gJ|
z$?wj}@6pZh(arJI(ec*O@z&Gw*wymc*7Mre^V`_--P-ir+VtJp^xxd{;NA7$-Syz!
z_2J+3;@|e;;r8U>_vYmH=jHe5==kgD`RwcY?d<vP?D_8P`S0!d@9z5W?)vcW`tk7l
z^z-}m^!)bq{Py<z_xAn!`u+R+{`~xTgd1`I00P-bL_t(Y$E{XpW79AYy_{Modz4Me
zXc=X;kg!+Tlrl;fVYWaSN`V69fHLymk?u~GlGx<~$cgRe==7v__vC;vh-mmg189sp
z3ChRduO0zMAhuu(7#Kr%4u(60bBf!42MEK4(Gv_Q2F1z4p2M{%ThN}54e~-DOx=Ll
zbkEM)F0T+8qY=yM_Al)!iWs`^lh!`oy_6>^0vQa-xXbF{*VgV4Y*@v`FRk67+2E&P
zt^psi_9o9=g<flIJ(EO}2|5Mvc$HhZ$>`CPt-YnWMhruzxZAD5V_=04eSiwj7-clU
z{>BG@F4{j729u2MCzjxnXD~|P!kB?4KJvCz%~wO5uPz_J>6S72e1N}Q)1iNz*?fSC
zz`VlX2RPTpFg4`YBn<9%(0Uh!dHlc(i5~((OZ}&QC}k>1z4wVqo%Jszf`;>u_`x&e
z)_=e(D@s!QFlA9mav!QM#iCO5L&$@{{ntjX^D%mHyRRZ%se$g02d$bc550+^HH?Cl
zBo6>ufLcoi7d(gor!e}Xi&bLG#oVW|8eFn<pnqHcfctDVi663BQlVKTgE2Ae1BiYo
zN#g#OA0Y7q{F5J`#SfrHj$0{2ocIA+{1BIIT5#eAUS0Xq&mXgtwwZ|&3w6Ub(BX%5
z6LWLlsl7c~ROE*Z)0EpT75U*Q(U<YlM=RB8rQ$yBTdf|uP4r<oK%O5Cy8a`+BX^e@
zcX6~k^Zjs_Xq<<wq(MjC6K%=&Lxbpy5>%zTKQ0hW_h7CcJ`x=d49eq94~fpIUvx^D
zA3Q_WFI=k6i1rou!L8v=CCr7T^4I%BSE3)>c0Z|giK0>*UqUM9i9YXAKLENH%8lrU
zkcUiFrg}lt*eFZr9e!i&-sp#dOn+@Qf4xgyiiscAKPd=k{+<c1-Ics220y@oT4OdZ
zpxON9dQXlG27eUQfA}{6?HIFHGKBvZ(1CSB^#p$a;?^k6xIJIy00000NkvXXu0mjf
DCO?k+

diff --git a/lib/ui/market/market_page.dart b/lib/ui/market/market_page.dart
index 64e0c6a6..6df0829b 100644
--- a/lib/ui/market/market_page.dart
+++ b/lib/ui/market/market_page.dart
@@ -346,28 +346,28 @@ class _MarketPageState extends State<MarketPage>
   Widget _buildTitle() {
     final appProvider = Provider.of<AppProvider>(context);
     double iconSize = 18.w;
-    MaterialButton ges = MaterialButton(
-        materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-        height: 74.w,
-        shape: StadiumBorder(),
-        elevation: 0,
-        minWidth: double.infinity,
-        color: Colors.white,
-        onPressed: () {
-          Get.to(() => BeeSearch());
-        },
-        child: Row(
-          children: [
-            Icon(
-              Icons.search,
-              size: 32.w,
-              color: Color(0xFF666666),
-            ),
-            10.wb,
-            '请输入关键字'.text.size(28.sp).color(ktextSubColor).make().expand(),
-          ],
-        ),
-      );
+    // MaterialButton ges = MaterialButton(
+    //     materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+    //     height: 74.w,
+    //     shape: StadiumBorder(),
+    //     elevation: 0,
+    //     minWidth: double.infinity,
+    //     color: Colors.white,
+    //     onPressed: () {
+    //       Get.to(() => BeeSearch());
+    //     },
+    //     child: Row(
+    //       children: [
+    //         Icon(
+    //           Icons.search,
+    //           size: 32.w,
+    //           color: Color(0xFF666666),
+    //         ),
+    //         10.wb,
+    //         '请输入关键字'.text.size(28.sp).color(ktextSubColor).make().expand(),
+    //       ],
+    //     ),
+    //   );
 
     return Container(
       height: kToolbarHeight,
@@ -437,6 +437,12 @@ class _MarketPageState extends State<MarketPage>
               ),
               Column(
                 children: <Widget>[
+                  Container(
+                    height: ScreenUtil().statusBarHeight +kToolbarHeight,
+                  ),
+                  geSearch(),
+                  20.hb,
+                  getNum()
                   // Container(
                   //   color: Colors.blue,
                   //   width: 300,
@@ -470,6 +476,117 @@ class _MarketPageState extends State<MarketPage>
   }
 
 
+  geSearch(){
+   return  Container(
+     margin: EdgeInsets.symmetric(horizontal: 24.w),
+     child: MaterialButton(
+
+        materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+        height: 74.w,
+        shape: StadiumBorder(),
+        elevation: 0,
+        minWidth: double.infinity,
+        color: Color(0xFFF3F3F3),
+        onPressed: () {
+          Get.to(() => SearchGoodsPage());
+        },
+        child: Row(
+          children: [
+            Icon(
+              Icons.search,
+              size: 32.w,
+              color: Color(0xFF666666),
+            ),
+            10.wb,
+            '请输入关键字'.text.size(28.sp).color(ktextSubColor).make().expand(),
+          ],
+        ),
+      ),
+   );
+  }
+
+  getNum(){
+    return Container(
+      margin: EdgeInsets.only(left: 18.w,right: 18.w),
+      padding: EdgeInsets.only(right:8.w ),
+      height: 76.w,
+      width: double.infinity,
+      alignment: Alignment.center,
+
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.horizontal(right: Radius.circular(12),left:Radius.circular(12), ),
+        gradient: LinearGradient(
+            begin: FractionalOffset.centerRight,
+            end: FractionalOffset.centerLeft,
+          colors: <Color>[Color(0xFFAD2222), Color(0xFFCD392B)],
+        ),
+      ),
+      child: Stack(
+        children: [
+          Positioned(
+            bottom: 5,
+              right: 0,
+              top: 5,
+              child: Container(
+                padding: EdgeInsets.only(top: 5.w,bottom: 5.w),
+                alignment: Alignment.center,
+                height: 61.w,
+                width: 694.w,
+                decoration: BoxDecoration(
+                  color: Color(0xFFFDEEBF),
+                  borderRadius: BorderRadius.horizontal(right: Radius.circular(12),left:Radius.circular(12) ),
+
+                ),
+                child: Container(
+
+                  width: 682.w,
+                  decoration: BoxDecoration(
+                    //color: Color(0x99F5AF16),
+                    borderRadius: BorderRadius.horizontal(right: Radius.circular(12),left:Radius.circular(12)),
+                    border: Border.all(width: 1.w,color: Color(0x99F5AF16)),
+
+                  ),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+
+                    ],
+                  ),
+                ),
+              )
+
+          ),
+          Positioned(
+              left: 0,
+              top: 0,
+              child: Container(
+                padding: EdgeInsets.only(left: 10.w),
+                height: 76.w,
+                width: 258.w,
+                decoration: BoxDecoration(
+                  gradient: LinearGradient(
+                    begin: FractionalOffset.centerLeft,
+                    end: FractionalOffset.centerRight,
+                    colors: <Color>[Color(0xFFAD2222), Color(0xFFCD392B)],
+                  ),
+                  borderRadius: BorderRadius.horizontal(right: Radius.circular(50),left: Radius.circular(24))
+                ),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text('SKU总数：237809',style: TextStyle(color: Colors.white,fontSize: 24.sp),),
+                    Text('入驻品牌数：237809',style: TextStyle(color: Colors.white,fontSize: 24.sp),)
+                  ],
+                ),
+          )),
+
+
+
+        ],
+      ),
+    );
+  }
+
 
 
 
diff --git a/lib/utils/websocket/fire_dialog.dart b/lib/utils/websocket/fire_dialog.dart
index efae20a7..f0eb3d35 100644
--- a/lib/utils/websocket/fire_dialog.dart
+++ b/lib/utils/websocket/fire_dialog.dart
@@ -15,6 +15,7 @@ import 'AlarmModel.dart';
 
 class FireDialog {
   static fireAlarm(String content) async {
+
     var json = jsonDecode(content);
     AlarmModel alarmModel = AlarmModel.fromJson(json);