From 24d6a192b1c39a92824b061eb8a26a40b0cadc8e Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 12 Sep 2024 08:53:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=202.=E6=94=B9=E7=89=88=E5=B9=B6=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E6=96=B0=E7=89=88=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |   4 +-
 src/api/home.js                               | 162 ++--
 src/assets/images/data_home_bg1.png           | Bin 0 -> 30072 bytes
 src/assets/images/data_home_item1.png         | Bin 0 -> 1977 bytes
 src/assets/images/data_home_item1_icon.png    | Bin 0 -> 1268 bytes
 src/assets/images/data_home_item2.png         | Bin 0 -> 2054 bytes
 src/assets/images/data_home_item2_icon.png    | Bin 0 -> 919 bytes
 src/assets/images/data_home_item3.png         | Bin 0 -> 2091 bytes
 src/assets/images/data_home_item3_icon.png    | Bin 0 -> 1154 bytes
 src/assets/images/data_home_item4.png         | Bin 0 -> 2210 bytes
 src/assets/images/data_home_item4_icon.png    | Bin 0 -> 1473 bytes
 src/assets/images/default_logo.png            | Bin 0 -> 5146 bytes
 src/assets/styles/element-variables.scss      |   6 +-
 src/assets/styles/index.css                   |   2 +-
 src/assets/styles/sidebar.scss                |   2 +-
 src/assets/styles/variables.scss              |  12 +-
 src/layout/components/AppMain.vue             |   4 +-
 src/layout/components/Navbar.vue              |  10 +-
 src/layout/components/Sidebar/Logo.vue        |  49 +-
 src/layout/index.vue                          | 362 ++++++-
 src/utils/index.js                            |   2 +-
 src/views/home/home.vue                       | 525 +++++++++-
 src/views/home/home_old.vue                   | 899 ++++++++++++++++++
 .../table/components/downloadTableCode.vue    |   2 +-
 24 files changed, 1837 insertions(+), 204 deletions(-)
 create mode 100644 src/assets/images/data_home_bg1.png
 create mode 100644 src/assets/images/data_home_item1.png
 create mode 100644 src/assets/images/data_home_item1_icon.png
 create mode 100644 src/assets/images/data_home_item2.png
 create mode 100644 src/assets/images/data_home_item2_icon.png
 create mode 100644 src/assets/images/data_home_item3.png
 create mode 100644 src/assets/images/data_home_item3_icon.png
 create mode 100644 src/assets/images/data_home_item4.png
 create mode 100644 src/assets/images/data_home_item4_icon.png
 create mode 100644 src/assets/images/default_logo.png
 create mode 100644 src/views/home/home_old.vue

diff --git a/.env.production b/.env.production
index 2a4f841..7f079f7 100644
--- a/.env.production
+++ b/.env.production
@@ -3,10 +3,10 @@ ENV = 'production'
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
 # 测试
-VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
+# VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
 
 # 生产
-# VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
+VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
 
 # 预发布接口
 # VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
diff --git a/src/api/home.js b/src/api/home.js
index fa865d5..23f222d 100644
--- a/src/api/home.js
+++ b/src/api/home.js
@@ -1,17 +1,17 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 /**
  * 汇总数据
  * @returns
  */
 export function summaryGet() {
-    return request({
-        url: '/api/summary',
-        method: 'get',
-        params: {
-            shopId: localStorage.getItem('shopId')
-        }
-    })
+  return request({
+    url: "/api/summary",
+    method: "get",
+    params: {
+      shopId: localStorage.getItem("shopId")
+    }
+  });
 }
 
 /**
@@ -19,13 +19,13 @@ export function summaryGet() {
  * @returns
  */
 export function summaryTodayGet() {
-    return request({
-        url: '/api/summary/today',
-        method: 'get',
-        params: {
-            shopId: localStorage.getItem('shopId')
-        }
-    })
+  return request({
+    url: "/api/summary/today",
+    method: "get",
+    params: {
+      shopId: localStorage.getItem("shopId")
+    }
+  });
 }
 
 /**
@@ -33,14 +33,14 @@ export function summaryTodayGet() {
  * @returns
  */
 export function summaryDateGet(day) {
-    return request({
-        url: '/api/summary/date',
-        method: 'get',
-        params: {
-            shopId: localStorage.getItem('shopId'),
-            day: day
-        }
-    })
+  return request({
+    url: "/api/summary/date",
+    method: "get",
+    params: {
+      shopId: localStorage.getItem("shopId"),
+      day: day
+    }
+  });
 }
 
 /**
@@ -48,14 +48,14 @@ export function summaryDateGet(day) {
  * @returns
  */
 export function dateAmount(day) {
-    return request({
-        url: '/api/summary/dateAmount',
-        method: 'get',
-        params: {
-            shopId: localStorage.getItem('shopId'),
-            day: day
-        }
-    })
+  return request({
+    url: "/api/summary/dateAmount",
+    method: "get",
+    params: {
+      shopId: localStorage.getItem("shopId"),
+      day: day
+    }
+  });
 }
 
 /**
@@ -63,16 +63,16 @@ export function dateAmount(day) {
  * @returns
  */
 export function dateProduct(day, page, size) {
-    return request({
-        url: '/api/summary/dateProduct',
-        method: 'get',
-        params: {
-            shopId: localStorage.getItem('shopId'),
-            day: day,
-            page: page,
-            size: size
-        }
-    })
+  return request({
+    url: "/api/summary/dateProduct",
+    method: "get",
+    params: {
+      shopId: localStorage.getItem("shopId"),
+      day: day,
+      page: page,
+      size: size
+    }
+  });
 }
 
 /**
@@ -80,14 +80,14 @@ export function dateProduct(day, page, size) {
  * @returns
  */
 export function datePayType(day) {
-    return request({
-        url: '/api/summary/datePayType',
-        method: 'get',
-        params: {
-            shopId: localStorage.getItem('shopId'),
-            day: day
-        }
-    })
+  return request({
+    url: "/api/summary/datePayType",
+    method: "get",
+    params: {
+      shopId: localStorage.getItem("shopId"),
+      day: day
+    }
+  });
 }
 
 /**
@@ -95,15 +95,15 @@ export function datePayType(day) {
  * @returns
  */
 export function daydownload(data) {
-    return request({
-        url: '/api/summary/day/download',
-        method: 'post',
-        data: {
-            shopId: localStorage.getItem('shopId'),
-            ...data
-        },
-        responseType: 'blob'
-    })
+  return request({
+    url: "/api/summary/day/download",
+    method: "post",
+    data: {
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    },
+    responseType: "blob"
+  });
 }
 
 /**
@@ -111,14 +111,14 @@ export function daydownload(data) {
  * @returns
  */
 export function daycount(params) {
-    return request({
-        url: '/api/summary/day/count',
-        method: 'get',
-        params: {
-            shopId: localStorage.getItem('shopId'),
-            ...params
-        }
-    })
+  return request({
+    url: "/api/summary/day/count",
+    method: "get",
+    params: {
+      shopId: localStorage.getItem("shopId"),
+      ...params
+    }
+  });
 }
 
 /**
@@ -126,13 +126,27 @@ export function daycount(params) {
  * @returns
  */
 export function summaryday(params) {
-    return request({
-        url: '/api/summary/day',
-        method: 'get',
-        params: {
-            shopId: localStorage.getItem('shopId'),
-            ...params
-        }
-    })
+  return request({
+    url: "/api/summary/day",
+    method: "get",
+    params: {
+      shopId: localStorage.getItem("shopId"),
+      ...params
+    }
+  });
 }
 
+/**
+ * 营业板块
+ * @returns
+ */
+export function summarytrade(data) {
+  return request({
+    url: "/api/summary/trade",
+    method: "post",
+    data: {
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
+}
diff --git a/src/assets/images/data_home_bg1.png b/src/assets/images/data_home_bg1.png
new file mode 100644
index 0000000000000000000000000000000000000000..3034319f0b7670017818462e85a7b8ab970480fd
GIT binary patch
literal 30072
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/data_home_item1.png b/src/assets/images/data_home_item1.png
new file mode 100644
index 0000000000000000000000000000000000000000..082564d7f0e21dd6722363e575e9b1abe882d597
GIT binary patch
literal 1977
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
LNkvXXu0mjflA)Ph

literal 0
HcmV?d00001

diff --git a/src/assets/images/data_home_item1_icon.png b/src/assets/images/data_home_item1_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..493c506ebd5dbf9349cf10ea54e5f74e01f45f4a
GIT binary patch
literal 1268
zcmV<Q1Pl9#P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px(u1Q2eR9HvNm|aX<MHI*X=icR`)s{AGn$j(VYGol}DpCwodFWF?sibPs8XsEJ
z#J17MLw)bNJ`iIx@j)=sSW}HQRsl^zQcy63mJcKAx(Kp`1xqQU6_$lNN9MAZk7e1J
zMM<2u&7L{)oAWW}oJ&Y>)%Q+kk(pdUKoJ8u0I~pVlWLeTMuZUtc?sOYR`_yR?xul6
zjvyW3^G)n3&cMsUvfdz~gF1U083wl*hFLvq;&SCa3aR!gfg1YwSy-YPz<!l7#s6Nw
zI9HlY-^P<$6R4)2Q`2X~hX79fOOWX8wZSCg%v#op33N5U?r_NZnm94{Bmmwire}^m
zb71qW=sl}|B+TrTXaU*5x^as!AVM=G(NHUZB5rC0@c71&ENN!u_K{?>WV!oR05$lm
znnYqIcn|R2A&gG}NhXk)#>m?RxQv9ZQ(KyCRysQtfg;&-MMsrjputb*8eJWNX(@~f
z55v7xM^i+`G|EdKUdTRMW5iWAvGC9-*Y|ydj^NraMvBRJHJ_1|s#N6&_}hkz-1CQN
z&eq!K=i@BIMV;-Ve*+)iRQu$yU5xT<)=_E85F4kCc<2)wsNOf%N}wX0-9HWzt_>>R
zQ<wytJ0xJJMeSo{fR}k(g%qhx{W>sG=8BKd^OxQ!Z$2sTV6v`efUWR8YVcWa%@;>m
z8no6Ae-PS-^?=?!BofWIDysL1O9XyViw1yy9JutWI)?UaVVpdmA48E0yC^Nx10YWq
zNT&R!-Gt$L@vZbiu7H1>aC-{&Gq6oB<2tF{XWb@Xr!J6`n+yRLdI*y<v7rjm*#?nv
za)mA6`CLY3n(~whX`#gI8qs+_EL}$!xxWM@GwZ1gM%O6pH%MAWzS>`T34uw%a~^>l
z#nlrAx;qWD-XeI%2s2jf8|Um`6lE}40}HT)ZbsM0LUz8CCy-_Lm$8=wy6d!{DuZ?m
z16TVE#Ixy^WZ?8cfe)^eZ6*18U;;Q>$f)Zkcy<CMnX#S1z?cM*B|}-=n+FLk8V_Px
z3UJgTP}gnXbb-M3O~5-p890_BaP3dRBRkdx0`Q9r>dy!`5zjg|f<R-RI@P5P3G_<7
zz<WO%aBpQikOcVd5MD13__8-X5QDx@K8zC~;G>TCZd!gB33Rqlpnn337L|ei&~{k^
zl@_W}mJU^AkG8A>6wBf&AiH$PjrG6HU5_>1%n6{n&A_Zsh5OR~>jjeIQdzdE*l9mb
zvJkb=#|9>Wx*omQarUkkhzve)WWVck8>p#?T{CXc8$Em72of6m^a`m1B-8x0Ct{m4
zPTG5eLq>k(VG6}<VH3$NU8f#@RM-K&av9~$0I6*9oqD8uU_3cF2y9MTDZxN(S*#{s
ziq$l6>h8T(^9Bxx(Y&3(A){Ej%K2kefPDA+)LuiRH2*IKMTgRc;*@W6O3Hd%$;9nE
z6+WglN;?Ng_oci4`;QGWW=4jLGt1qy{8GxCjtr3R>dtI&Ear!4R5=6Tn(c><$)&aS
zWLOnKph|aKa`eja#xU`IYrwo92SL?&N()6Ra6aiV=xGAyFk?5-VhcPm|7~DkzI*U8
e(6*jWdj9|-J^j8WG8&8k0000<MNUMnLSTYw6;a>-

literal 0
HcmV?d00001

diff --git a/src/assets/images/data_home_item2.png b/src/assets/images/data_home_item2.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b9a5535a5ad4f3b950ef367712f357a6c640801
GIT binary patch
literal 2054
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/data_home_item2_icon.png b/src/assets/images/data_home_item2_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f0cb4e359c2b34afdb773527f377fa96ac9902e
GIT binary patch
literal 919
zcmV;I18Dq-P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px&QAtEWR9HvNnBR+xQ5eTR&#ZQ5DL-~)iI_#A6w1%y!X1M)r6>x?g(7<)7joeb
za6u`TyDo$%HfC2!3bB5a5oML^7TfN!v$MvJ-5F~iz3-TL&5!qe=jS%3=H@-mIp;Ia
z^PK0L?-BBB+IQ23x4H?H^`J`uAIS9hG&+dVk4L&dA2S+jlQ}zk@>xQ1G1doXCb4qe
zUdHt(!s=YcByE&V;2e>GHfcOK>NeIDNQdrjgYk2~Vz<d0`&GM;suNPTCE#Rd3#8pG
zUZ&2vh{%DWK+*@Rwi5Yr#Lin;f%Mn?xr{__<sF{f$%806q~8BIeMkn72{Rgf98cD=
zwjPvC=};*^W|*cmJOx&k6(upb@{-8FrvJm23KR;olssqL{+Vj4)NebOFiQgc+f8?}
zj_<z%k)YKz*$4CXxh<7Pzh`@5_nAQdcGN3Gj6#>$dauLJ_ty8C23T-7j|E*#Kk)kb
zGTD4)EDjWE-;Hq9c3Am=Fj7TkY`v5KdWx{VWI!Xm5Po7!=c$DTKZwWPRmw}L_pcG{
z>+n&d-HuMp*F)jw@bzBml#5P4mDf3T(P*P+IB*;l<7lvN69pvNEE;aVj<TyDpx+UQ
z_E|%#YN2*M6zU<kDmoN+1G2mzpwL4we#z#6C8vr33K~FPL1vZ)2v~Bu2p}C69cowC
zDq)vH86GMY2r3aM5Vo$MHolrL59y$hL$5%bPxpxfdTWI23b3all3KV?TwyGAQk#X*
zkTo?mg&iFw2Z}Z(4%Zis_viE+^3H+zhvG#sr7${d`^6{0Q|*))ol@uD5C;l(?8i_8
zb}cptv5?g}X&QKE!`KfP?X|v3HB4!QKfhq)Q|5Ok9A%Hx`>(};3?aB;?Ypen>t{D;
z%(ZsrWRN)P(v1zx7WuNuxLdnlVLzUSvF|yp=W1klcHyxsW@%U0goRepCEpC4sa6{v
zl~Ew3dnd@Zfep4Y$b<^D&qH`r5kk=loe6cjY=Y4ch_Ev!DV>C>q{oK;18oXO{d3k<
zv$<}qq`?R9G#C6FlL8e__9ld8aF9#c;EeEi<O0EGmklB4#_#%Il~KdO9X=Ru0@;X~
tPkOVhE3gg&Js@3(c0#O8X5{yz_ZPOH$gDCY+J*oC002ovPDHLkV1m{AuSx&_

literal 0
HcmV?d00001

diff --git a/src/assets/images/data_home_item3.png b/src/assets/images/data_home_item3.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2f257b20094f8b536fe7021767d39de724609f9
GIT binary patch
literal 2091
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
Vk1WWz@Sy+z002ovPDHLkV1kE&<^li!

literal 0
HcmV?d00001

diff --git a/src/assets/images/data_home_item3_icon.png b/src/assets/images/data_home_item3_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cc6781a8d478c84d772502b95601241e39f3e88
GIT binary patch
literal 1154
zcmV-|1bzF7P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px(JV``BR9HvFm|bXGMHGO)bMM`B+kiDmu>ng>jSop|sG<HOkRb6vp=#6Gq6NXW
z;Ddr-9uyQ20)kIIR1o`SH;C9$wOOO02=*a?1iCh<wwu%z8=*+jhNM-*CVTge&fU$D
z-R%9_x;U`x!<;$u-8pB@&j=BRnmW~lGWvi{6fHm#!ku|F^PpxCnMN_nl9QB<y)#j^
zkTAmP^ngWU$MYy&0UivqW|ho17)O|!PfG9MTS03BfmAyABya?{FG!j1ykZ*RHEHYn
z+E30CNS!_w=dQY=h#a~tkkZ9UCAhZuve#*q1yUD>?<VUERbZZw>}rxs_G#I%?`r9S
zH9&coQP)|kJ7&n(J*7}ZK(3iK*NuTZP+gXS_7rmqJ*&-E40K`W*njRbL0_g+Lhj#l
zctxxLl)p`11+6bPpZ#r&?DRJv2C|_ZSziaWn~)6+i2ko_K;kQ*s_YI=t=v8rD0idk
zClEK#MH<;FBV^NG2Cgx-c4D>f^OC#F+(fJN4%j)M^zd`w91ql5A`l2;SfHHT4~RYX
z7P8*sq=ZA#+BcX7N{+dyAi@ZOk%nfhod>~QA~W_O{Jn_P`4UD$v)3-Ef6exgsEJce
ztTV1eU?B)b>oVJRV{Yql)!OGy;9N~%w(rN>`iS>d;%pO@PQIE?4WXFI!5B^5$hteo
z{_<_XJhE{MmQH`me_{VP2upurH1}e)?DE^EU({6cB#QlEXv)Fpn-uGP!(E;kJBnKP
z)l-$x*p9XH1;4G1i%Jju46;24$kR+>VC{GoYHG1lgW%Yns`RPFy0t+($D}sdbzqa9
zR2ZKL`k>r3i&OLXJKmy-8yZOY!swuP{)=Lf_(oz6zX)bc`K8LiKKn81kKc>utvEGL
z_y7TcK+E5~4R%RgWyLXDb|Gf0ERb@tWG{UWw{8~Ao7<nkyr;|eFhyNRF0Lv;*9b5F
z@U9y}{IwXl>3jezCu_Fu#=JKd27Jc62GS|RGrK$Um$1)#<n646MeNbn!Hkg^eSgiV
z=*>gI=r202P4+2pzz^HGei1vBC=aFmsrOC9FkK*Zv$*C852GE3&q4=AKPY{jwS$+&
zphz&e6X}nXI($#6<cKSP0i8NrUrZ;@gsq>$Kve_-<I>jGl>?ee9z>A{x&kZneoz&{
zXo>^Uw&z5?KpU{w+%XlU_bLZfF^ulnt}S%v+WNLiSQqN2lWxtU17%Rq^RYm23A-Yw
z{*NMGR6<(I6#1?%xouGWNLU9C>vP_6YLdCdF3&c|g*x~77GmZINR=B!HA5!r-zXML
zmxCIvV#AmsWA6>sN*AE2_1GXP!ED6GhSfHA8%V`_mGo>SzH`}44V6B}6hY;B{yvcY
zsO=JvLim8$iBEJR7<3T=AFN6h6rS{iZj@>PX)Kh$iW>;}32z!0N1UXzMtjox2Oe3=
UV>=Ob>i_@%07*qoM6N<$f;TfRZvX%Q

literal 0
HcmV?d00001

diff --git a/src/assets/images/data_home_item4.png b/src/assets/images/data_home_item4.png
new file mode 100644
index 0000000000000000000000000000000000000000..097c19acb3e0e85f1e5a3d7ddb19e3ff4535df8f
GIT binary patch
literal 2210
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/data_home_item4_icon.png b/src/assets/images/data_home_item4_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..01920f3d836eb4685325e3662c41fb039dbe3a26
GIT binary patch
literal 1473
zcmV;y1wQ(TP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px)dr3q=R9HvNm~Bj3RT#(r=k~pfK?eeZZ9<Si_W~{%3c5v^iP14Fi*HLLaZ5~e
z(PVru%lu$A6F-@KSj-YXXxvP;xH*^6A!acuQ5FH|1{=tQy#Zs+c9fM3TS{r~(Q}|(
zxqZ2}oim=V_j#W4dtT1D&vOV;T&Fx@v0xxJfYyN03IN3*B%7O|a8tlZ2nGRiR+^#q
ztrqJ@Dq9dW!ux2OcAdZAbx3#@1nbr4M9Fjtpa<M8mwiV`onJ{;5y<YpR1Yb503eSj
z8B_Q^2to6n&A75PnOs7kL&I%GOJ2dJgkbx9f-F#{6o);xoI4XmD=ttA9V(KhrDh=I
z^r&K|puHi?zVMQ{>V{k)2527UEHBmvyGDWtY?MPS0Gdlveg`4s(L^jEDxvwxd2~6i
zq1;k{M(YzWXte2~J8rw28>7>=0I1n39*VA+*5Qk|GvmW6E32UsG+;1C#ZFvwk3|4V
z7U$y4wNIrD#cHY{!@47EFal)v57a{<-$uK7MEn)K<6}G$+gESEiA&u$e`_=*8utqY
zL9-=%`Zy3v)sp;z9sum3i>z5Ggu}m|#gNCzp=y_w;)vLRAeH`Ys4G1tr*$8x3v!?q
z-@t1U$gy~Z@Si~uVY|&#{v`*p`@{|aHF6+UGslO1LuKwVbo_ZW5~)UOExx|wKwnfX
zg>~;EeGZ%1T21EuO&E>`6E0w_AfU0LmP1{hbYV|*Jul+D9qg)#UFkwe1SQ1o8{7rZ
z19Gz`FFQCuc<BW#_B^&30KsCt5tB1MeALyF@VKW3MVg4+C!PTCvfT2X_7gG1yE>-`
zudb{{h*BIM>f$L(w$gw)Mw-21A0b#HH~d-O&x#wa$jm`d3gM=AGNN9Z^$_yRi*e31
zihvYEN>G&c61!I%2SKhJXeKm^&-;GC@LhMpAndKN!Kl?mu7<kh6?m?AEv5o~1VTaV
zKX(QarRt$5on$GaiFQ<iTARBZjn*2zDJ$^zt2g7Pu|ZrMAHxSVFXCYDj~JPENNuE&
z0x?h}C{|Z2O{cH*;+?8Z+&6&`WEsrZ?>Ga0Xcie-J-oqysz?#Lcfb>AK@)^Z2`a2+
zF=U{=q>`tR{bC9;vQcKqN6{h+TCZI|+l@gE^>$SqG(?Eqjl#`<dXVJr9@bKVGHP@v
z&CbJ`oFc5sDMW_Oz*X7hdj0MM*pE7#zTNAe=Y=m{l%k)d>?;7<lAhoBk8&uMnkNg(
zP?nvC@+C_nUQY)DxH>tG{)rn9CvNg|-HW0byQ??z?jg?lhS+@ry8se%F{&x_vg~}k
zRrxd*z3um+-~9(nIvsBL?!w_5!PM-+p59_GV`tSSEHP#zFi)DuDNj$aU@*q~I+8^!
z9I4T%37#VN^k4igdiLSfcxJ^ac>G=nM8L=0-$gE0Wf*|}I@rc`pV*yh{~WKTKCErP
z_oMwhQta4&((?nZPfb7#41i9X*;+dXG%daXio<H^C|X7iwX?DgdW{wmm5`}7@d#z=
zjS6X+vq&LqYcQ7|=Ro_~+O+E)&ll5~y`rJA^d^4nwStD9Dh8IkW+Ltl-gY_HvEDjq
z3#&F_@zSR<O><iabc@ZniVu)Un|!rEOpZZ)(cg}%cgB%t%H)lI;?s1`a>6E`iOl!b
z?Wq=cG&no*Ii^MNZ(^B;Y+&@bT(t?uASQp(cVU?Z`gZbw2So~ugp>xwumc>5>ROTw
zjH#qEj;teyz*beGbXfU+_1F;Y(fk0pUp}*?9wB-Kg0?B`=a}dXd9?BiZ3I$Nym3hZ
z&hbx2da%dnJjw<^B}Wt=tmFnxO^d|><xhGWC_x30P!MT>DV+qt2te4AUZ+H;eXA+8
bC%wM`=B%#{teWkN00000NkvXXu0mjf?BB3c

literal 0
HcmV?d00001

diff --git a/src/assets/images/default_logo.png b/src/assets/images/default_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..e79c15619162874d2c97c53c58f3b5d12a967e5f
GIT binary patch
literal 5146
zcmV+#6y@uQP)<h;3K|Lk000e1NJLTq004Uc0012b1^@s6ifR)$00001b5ch_0Itp)
z=>Px|)Ja4^RA@uhTYqd+)t>);&z+Vc_)-&rV#^AN?1L<1F-p{^u|!;kRU-;BcSbZV
z`*cO61*0!&)QAzIFZ#03q7Ng6_JPdYDF`oADLxF{s1XA%u!50YNx-$G(@L_9BK>vm
z`R;tr+;e+p=H3?k@14J9=A3)Zx#xSnzdqm3pwVz(B_Ko~q&Wa5p=rtA!ukt-Z#-~=
z0WeSh=GcQ@fGoGg1YC{;Q39BQ0961GA)qV*o+g5J={T+M&fVFdHL|-_-9!$|30vR5
z3%jSr+b)Fl_on~tpC!@)-A^b_UK4Ni-Y1br+$o4AbN^1u`imYHi^V1zhH>MiymvO6
z{k*fY(+(QT^OOm3C-+Gy?Q~n)NBlXFNYv`_*=+W3XJ_Z&rL0vvCKih=Fbt#8J9EeB
zZ)<Bi9yAvkjR&>^&_iJh5x_~=6rDfrMxOYnN*Ll8B31#=VE}vs0PX>RdKT`O&l3z1
z!ZWfd`gZZS?o8c2Amn)h8rlEz?e`NGtq(rvGnx9Ta-t&uSfd^$IzLRfa8|PAEPrJ|
zM1=Se04fOJaN4qN(TgNwvD-k1&&GXk0O;xMEz`oTt*x!7tgNiy=lc8mFHD;@?M4Cc
zr902rlx59Y8IRv85kGhL)HN_XTynns{r!Xb0{G`F-p|DH@<V{=U1k7SJuoz61qvG)
zKDom{**VrrInr4Oo9{k4))-@L#~vV9MnoH=5bc6!7XsuD`4Sreu9r<qUhxm_vg*D=
z!0Q4<4Ro@`Yz@7L-B#US0dTSREa9^1#5PZR6N!Y0MCpLJHxlAuU*9PZf-kRXNK{2c
z`uq8mWlixeiD|wE0FSuiq7Gu20NAJQntP#=ruiSayRdGoW03&MEZ5Q`eRE#oQI-xP
z>PP-nG<1B22!RKh-z2>yo0k4QY$4IG|FN7#Zy|!`41t}J=pX<n)97yma25eN2zX(f
z2Ly`&L21FLK;RyyIjT(Eq4l+qf1G>m000JB1_au5joBIt+E=$#|7=cUJpmEG#u~Hb
zDgW4HBC#FFvub;FpDpF%5h3mafGz4bqFt#>##_fU&6|DNdMagEbA7_z0|3kTyDjDQ
zWrlGB5p8va-JZ6rdy}Sl1^{N}r>0$i$Zm*T+|B+=;msM3w*le`_xmZnG?yrJ|D31u
z!d~0)G!ncOHUSGsetmd0bgnP;OHY1!tszEE0n#qVmcJJf<4A}`Z*hL=c?w!qjryk5
z`)7)B+>bEolZoK8Y>v+6y`0-wKZgwXHvGltt!lHi<PzpI`c@!3=v^eDqr(Gu`>a(h
z-r8&$r%#>Q1BjJCbUc;GTwibzO!I}D``O?MB#VfrMlU2)dZv@;^He5tyY5Sv=9gM%
zVq|27Q(nFjN3FnCLfnePZca62*7?JO@%XER_#%HsfR>$>waO>#&j9f@_u?Hy#CAz!
zXZ!lz4T}|u=j02bgbnNVR2p*P4?)_f7j!@@hNge{wBX?Dw^bOwsX7FJa~#{5D-7cW
zL|9WS90E8lo1z7W>5W-)V2*)w%%|b)&QCotz7#!~y1OM|d#JFH9;uGEzVGipv#q|e
z{0caxH3xt$3`?A^{j?riTU#5MGG)p<72J%BT!6B&^SW<vaIn9ky!>@UT<sokKOpw|
z)?ur4wfjAtvaF;h?0Eb;#Jt;KUp{^6)Hid_YLl%k&2#SfjVa4g)~3i*zmc-6=k=Tq
zJn%q`VHgz=AyNR44;qPhPl17$eva~c<alJgl=9QOumQkm=-39Rf~nv}(Bd>lz1zlv
zMB{;%5oo<K^S1n>VHjsh%yQmWtqBUgytNxU-XowWO7V=dd5ITXbXj#zBVee-krEco
zNVXKj8|SRLHUiJ&0U#!-<J$rQmSjABtSGoqTao|^1ON*p;qGyD%Cg?o`%U_^KIgx;
z?95~y_x1g(l!mB3mC0O{jK{YFq6&Z!U>)UswKCy?=(Z0snJ-*nd*+{ro=aykfA9+;
z5s$x#h|dHFhpm;eSVS}#an$7zK$h1|r_)MFJz>MTPi{4&%twd;Ew{;j`Ssx`o+)2@
z;3h*-CkvMYI3bLi5MXoQvqY<9^HT4yO2(|&HwPki7B=4R*B<D$>fQrD73>7H3(nA#
z-#(b~H1b?})nkN|_p|v+wxz~w@dV+YgSBNsS=rMBumAyc8gvSXwx%+fKPKaG&vfPv
zaDxOGwQ5p6iK9OB#gt{e#&avzFm2j^yY}g{Wz9~S=3fCo1&Ijo(8Zylk1EQ`*Sg=&
zrZSmUSJ>>XREkN6_oUNl6}NCp#N)i4K3jGt{#5j=AbQBj#|i6v!ahofv2;4EG7opX
z(IYS#_8$Sn@Z1t%g|jKT8|t@Jh~G^AHs@RThF)-*qE{M?``f^;Q3cYW&z-NoS`_H>
z!z9T*J6(T>&=W-ANTT!AiB>NP=6u=)d01N(0y;Tz5f}RXbkI_MEd_wBDa(4a`0&Tr
zB6oROpGYKTA`u5)tY*rWCrtAMy4Zt5bXO*mIjDalBHJOF8_DP4>XH&bXWFtB={4Ei
zTr+K&NkXU~)v)cu4r02<B5`mTWs|L+6Nrfq(&++=Hmcb?(b@yQ<C{Ik%e6aA(R)Q>
z$Da^D`7`a0$Gs>3?T#3DxLA9~I>>ITz9)AG48oK)qNCM`)`i@0W?Owl`4w~m+!QUB
z6%5jdJ%7f-J5G-^e<B`#6&VZAc`DIyK<u=od?_LX3r+cDBzjBww1yDZ3-+1({z4o~
zrBdJU=YlBRjo=fe+2aC9DmrJtBN>m^0b+}Le(jjod=}IoA<p${qhILLr%qkV{udGR
znGR7G5v^vRCb@k1959TO{}Ql^IoH?sl+M=+gw27PkQ2`!fQQHw9hR;9k1sbRf{n5{
z`jlwwIEDcJ<i6yba~sPdh-aMUB_E8VE$~eyHo1}}vHuH}HPDV4v-M%_>`vDg#T&Gy
z+H5TWX#5j}<=6z!lI`t%bo#VuBi?u+rjV5TywnIWAvo90o6f8b(2}uO6olCCUJ&KW
z6Y=<nHmw|;fAHalU97ED)26XyEJ$~Qd^OLNOeX({q}=MQPsDQAGB`B!(%!v$J=f>D
zk=Ok>JcD8c@Q`I$|5Ye#*6zj*4-^<rASxyMsb?-n&PHPg0|y~USK&--4FuA2_NJu=
z!q)iT)WbI#!Z<R<9@bZzEwA)gtLh|>(vs0eTdU1hWsbvI^4@!|rb&}HkV@%8WbKtw
zzVA3r<%F^_&Q3V!vD2AMS<*Bg^X1*2yY8-n5EE(FTo!07(FTX;?T8R;omBH9Z4V|A
zztj1*>Lfbe)7N)PF>D%(#i}Dh)aSseQLI6Tj&wTxRp`6LVs{Xt2gkC-;JuUx8`gX@
z-XZ7LAQ*H6*21PGYSBw@0i}B**z3r$b@29`-xqhDYpYvH5_g2X5CW|*2#(u;CyO%x
z4kkw~!mL@VS_%Tbpt+K!=><mGr!wB0164SEQ>HSN$;?ofW8%aff3&OpvYt1QNIdJy
zsaJz-|0hHu8Yd_~+6w%8-c>|*W-@`7KM{{V>!pEX-QbWuhv-p`6-tGz(y(y?H6`mJ
zXtVZEM9d#Lff!!22;2+%SD<yp(R#O4|8j2p`mlH748RZuTcKdr5s-ri&E@y05@5b%
zSttGG*blfQ<MI7~$bpd3ctX69&7&u5UwXtE4*<PLbja;5K-v<fxefDm16OyTCG7)J
z{Ch1Jo6oPk2s`9_*#CPGy9Bt!vMd)=DSBdDEhReYocQXNlIZ%0j_ZU$pXG}om)DAO
z@ouZ00R)}rmQ02~8wm1<Q}87k4dB9tu<!KyW?RbXZEbDY2TgM&0cfjoFlAYH@f?0r
zUR*d){l1)9LA8iA9vtgK+LE!@9Uw#jKHx^?GkE>t{rWGNKVt}cFVi&V34jycMM9j#
zL0_O|L&L{68z^+8rew}BvGUdXXBuV50h8Znj4ye13(nAdc;`M9L3d~BjsS(Ffz*}1
z2yW#lWOmm6e@Jc*E#Smrv8o`SnvBPv26Vw3#2u-0S_OhU-a!0;O*so^aCmr%KR_xH
zO7X4~(#AoQ8=NU%C6}JF(Dhk)h+2_mdk`#NB0sto^y=|=e6fMZ`MqjAy}c7T76>-u
zjr;2W@~J^!Lwv;9w4?y0EFQ<!fu!7UIa=<&MBP^1&j4<UQ8YOcbY7EaS=43Kolpgp
z&^C6U=GOp5o6?pw-PK@@XiFeXS9?8E4n*}D6yd&vX*MInlZdAU5f>~tVAU0{d~}{4
zqao$AE#*`C0&yT^OF64pyZwa|M&Wi^)~2zv$8VVk;6mE6uH^B7!WIn&UPYu(6N!=*
z*_)S+Sr%2B`S*QSiwR{fBfoHQbt`DM1f5QEbWzuil{M%_!+|eFw7ELb+AtoRI$oew
zqyZPWJj*bp-$ydY0YshIzP>-Ob`<BxT*V4I_(VMZCtqOoq6BD1qNA>5$T~!vcV~<I
zcZudEO_NbM4VZ96@#I*-hCGO)P`g~(rI5T(VULZ50XViZJ&airxQQn|S|B3Ec8w&3
zD<U0rnwKv8Ayr>11n9sfV0b={&KEuC$FLHpdT@+DtvJ`#T2o?<iT0*4nfrOVWy_XT
zR+N|j7-q`-n@##klL{9ns`mjno>hp&V%Hgn->OKTsDEI1c$Rh#yxznK6aH@;;f5cn
zkCYLt*^M0@#1}A2zta@G>arJC6|(8<NAjh*;HD6|VvM_ZD3QFkCh=!g4ePS%w&&<g
zp-da_A#KI;xYQ$Ey@G5u+r=eA<(mz|gB~5nIp5YcN_}Eny}Z0!<-OT#HXBAM^3UTq
z&S04j4cu8o9byCwg-~l=92q&Qg{=UXs;bK(f%xB(*VS$zB=zd}8L*UmpeEr+ym_gD
zDKERN**C`!Wuf(H0(?U@EqT7%s(TY4u)?F3l*9IH4Tbh(R^1_q#%0=!6{ubId;Fa~
zP%3PWrpqx8<_9+1;WRB#(P=?z_~Z^DWWC%}SOzT~W;Ax>;N9Tn5ZndL(Sw)EJL|UU
zzSFpP@XX^QYJaElyR2=O2s_fyv6v9Nu)TP;5-?@${@)s;%5N$la0nJabJPPG3Z8%B
zFV`873Eu_nkO)r6=BT3gTrThI*92;&Y2KIPn9b33V>kDW+EQA%B1j!vy!aYTn#5z~
z4Gayv!e({(^5t{NBaz4Sci!uRvDghHM5!AYeLkXV;ml-3qQ#s#xjB0QYnE#VzYGk#
zKlzF)UKqCRcX#jJt=KVKnUeq~H7CtY8K1SKe7mi!?X<gx6}FVG8Hjb7JmEX%L0+>&
z*rKuH$*{V#dRUh^`E#DE$kCyXBSwdvufMuIsGMo6?brqsLXdFh{WZL^UlXWtP!tj3
z1V|aR0scFJc!Y#lk5V#1wTl53ml;w^MC;R;%qw0%C&ZLgDqlxuh6you3{gkrEYP<=
zh}qycdq9Y@I!{lU=IacyDEQShf6kE&c$}(dBhh<6WZOi~E2vh=+f!|AieKQOe4BOM
zTvyk)ie?x_HAuNJm+B>Uwzd6D!M}({3E(9y>|cKQ<-)#w`_7jNyP=~wh+3o{bZqB(
zc<1gs9fqr9P6bDi#fVwEV>^#}5qrbOH3s7A5E@9)4yS3Uat*(pcQ!WS78Iy4?@J;s
z%av;xwPHTlqZ%bkSr)2;BVrcFOc)rLO_L^>e6U;?(dUsg%{@R=k;-J27F(=Do}$!V
zL_J#2)7yJHlN^}Lu+y?s1yFI<5Kn{Se8816Tgut2wLX;3tDCb`5&(O1w4=>Hv|`w{
z7k>ERhYU28Tnzu7f~sC)R<9iUrz_!|xJSx28atSU=`k~XliQr*<&A+V<%My_JDi_-
z?$<=b@pxwfuztF^O=*L_b+y&qi4xh$gtlTt%_SYOTRE>QPHZw6x@CYxYZMUO<^m=C
zxk?|WOf&Q%Do19{8Ifkp)DVEp9Q34VGAEsX&yy92m>6=Bgm|1u4!ZE-T8J~uG!=-)
z8LAx^8oG*IhllbJtw?1uyLqfvF(c{#0A{-0<D)lmOvLMXuqz?%NT<{92bl5wXAn?B
zc_nA+G)27^)t#>C-#G4{0SafciSP}1;>%b3CVxEt8^k-~X<hUG?d1k)%o<_HGHqE6
zN;C36NNrDV?|jD15%Cck8TkStkz<OXNmS`)qH-SWC-f`gAkmFIeSHh{^E=aNg*LMG
z3V>4%z`IOE)?@}(*aPe?1mYm&A<>EayNB}m%(`ON5Ixh=*EgkV>eLr_zbVUF6m&7d
zH9MaRGhrZD3tfaOP<7UQa;uPX^LPXXrc(n!yTcW&fI#kYd1wB;oXga`K!l3^8`Odj
zwPJsmG)*qRTs<^0vWjck4$=LYOlGf#auId-O}6WM74qf^jfsPk_46d<J^C*{F6^0>
z0AKJQ2Yh6PJa<iqdXRFC_Uk;KM)|Z^cP|Y?t{mviRiI0GIcHCgfa83lN~*q#5iV@*
zS+^&Qr2;TKV*5>a;E6VTe6v8~P6Rm*$o1u@*pFRYxNyk%6q^54`In%^43#T>nH2hW
zp|NVztlcxOomukd1phi`zdw7y|92r~k_aJIYwc4+Lm|%Ej`K$jlyrH}3+NDc>43{4
z80P6ry6niH(N;IA_nz0<n+w8TL?QZ_xPSodZ1UOX=jc$i65wX8Ya`?GhzdK%ktVB<
zsKzFmtAQPLA&F`<Up*0zzsw9Gl(NBP%J8#ZEuRoKGsE=%0a6Blc$8%&%K!iX07*qo
IM6N<$f<fH#+5i9m

literal 0
HcmV?d00001

diff --git a/src/assets/styles/element-variables.scss b/src/assets/styles/element-variables.scss
index a4f8c4a..9814b2a 100644
--- a/src/assets/styles/element-variables.scss
+++ b/src/assets/styles/element-variables.scss
@@ -6,7 +6,7 @@
 /* theme color */
 $--color-primary: #1890ff;
 $--color-success: #13ce66;
-$--color-warning: #FFBA00;
+$--color-warning: #ffba00;
 $--color-danger: #ff4949;
 // $--color-info: #1E1E1E;
 
@@ -17,10 +17,10 @@ $--button-font-weight: 400;
 $--border-color-light: #dfe4ed;
 $--border-color-lighter: #e6ebf5;
 
-$--table-border:1px solid#dfe6ec;
+$--table-border: 1px solid#dfe6ec;
 
 /* icon font path, required */
-$--font-path: '~element-ui/lib/theme-chalk/fonts';
+$--font-path: "~element-ui/lib/theme-chalk/fonts";
 
 @import "../../../node_modules/element-ui/packages/theme-chalk/src/index";
 
diff --git a/src/assets/styles/index.css b/src/assets/styles/index.css
index 1b84427..09133f8 100644
--- a/src/assets/styles/index.css
+++ b/src/assets/styles/index.css
@@ -139,7 +139,7 @@
   height: 100%;
   position: fixed;
   font-size: 0;
-  top: 0;
+  top: 60px;
   bottom: 0;
   left: 0;
   z-index: 1001;
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 17381fc..33fed06 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -14,7 +14,7 @@
     height: 100%;
     position: fixed;
     font-size: 0;
-    top: 0;
+    top: 60px;
     bottom: 0;
     left: 0;
     z-index: 1001;
diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss
index cab7c4c..32be479 100644
--- a/src/assets/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@@ -9,15 +9,15 @@ $yellow: #fec171;
 $panGreen: #30b08f;
 
 // sidebar
-$menuText: #bfcbd9;
+$menuText: #999;
 $menuActiveText: #409eff;
-$subMenuActiveText: #f4f4f5; // https://github.com/ElemeFE/element/issues/12951
+$subMenuActiveText: #555; // https://github.com/ElemeFE/element/issues/12951
 
-$menuBg: #333;
-$menuHover: #444;
+$menuBg: #fff;
+$menuHover: rgba(121, 145, 188, 0.18);
 
-$subMenuBg: #444;
-$subMenuHover: #555;
+$subMenuBg: #fff;
+$subMenuHover: rgba(121, 145, 188, 0.18);
 
 $sideBarWidth: 205px;
 
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 8ecebed..896a9b6 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -38,7 +38,7 @@ export default {
 }
 
 .fixed-header+.app-main {
-  padding-top: 50px;
+  padding-top: 140px;
 }
 
 .hasTagsView {
@@ -48,7 +48,7 @@ export default {
   }
 
   .fixed-header+.app-main {
-    padding-top: 84px;
+    padding-top: 140px;
   }
 }
 </style>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 9112d05..a97e293 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -16,18 +16,18 @@
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
       </template> -->
-      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
+      <!-- <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
         <div class="avatar-wrapper">
           <img :src="logo || Avatar" class="user-avatar">
-          <!-- <i class="el-icon-caret-bottom" /> -->
+          <i class="el-icon-caret-bottom" />
           <span class="shop_name">{{ shopName }}</span>
         </div>
         <el-dropdown-menu slot="dropdown">
-          <!-- <span style="display:block;" @click="show = true">
+          <span style="display:block;" @click="show = true">
             <el-dropdown-item>
               布局设置
             </el-dropdown-item>
-          </span> -->
+          </span>
           <router-link to="/shop/shop/shop_configuration">
             <el-dropdown-item>
               个人中心
@@ -44,7 +44,7 @@
             </el-dropdown-item>
           </span>
         </el-dropdown-menu>
-      </el-dropdown>
+      </el-dropdown> -->
     </div>
     <el-dialog title="修改密码" modal-append-to-body append-to-body :visible.sync="dialogVisible" width="400px">
       <el-form ref="form" :model="form" :rules="rules">
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 69ed635..0e7e2e5 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -1,20 +1,22 @@
 <template>
-  <div class="sidebar-logo-container" :class="{'collapse':collapse}">
+  <div class="sidebar-logo-container" :class="{ 'collapse': collapse }">
     <transition name="sidebarLogoFade">
-      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo">
-        <h1 v-else class="sidebar-title">{{ title }} </h1>
-      </router-link>
-      <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo">
-        <h1 class="sidebar-title">{{ title }} </h1>
-      </router-link>
+      <div v-if="collapse" key="collapse" class="sidebar-logo-link">
+        <img v-if="logo" :src="logo || Avatar" class="sidebar-logo">
+        <h1 v-else class="sidebar-title">{{ shopName }} </h1>
+        <i class="el-icon-arrow-down icon"></i>
+      </div>
+      <div v-else key="expand" class="sidebar-logo-link">
+        <img v-if="logo" :src="logo || Avatar" class="sidebar-logo">
+        <h1 class="sidebar-title">{{ shopName }} </h1>
+        <i class="el-icon-arrow-down icon"></i>
+      </div>
     </transition>
   </div>
 </template>
 
 <script>
-import Logo from '@/assets/images/logo.png'
+import Avatar from '@/assets/images/avatar.png'
 export default {
   name: 'SidebarLogo',
   props: {
@@ -25,8 +27,9 @@ export default {
   },
   data() {
     return {
-      title: '收银机管理端',
-      logo: Logo
+      shopName: localStorage.getItem('shopName'),
+      Avatar,
+      logo: localStorage.getItem('logo'),
     }
   }
 }
@@ -53,23 +56,25 @@ export default {
   & .sidebar-logo-link {
     height: 100%;
     width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .icon {
+      font-size: 14px;
+      margin-left: 6px;
+    }
 
     & .sidebar-logo {
-      width: 32px;
-      height: 32px;
-      vertical-align: middle;
+      width: 36px;
+      height: 36px;
+      border-radius: 50%;
       margin-right: 6px;
     }
 
     & .sidebar-title {
-      display: inline-block;
-      margin: 0;
-      color: #fff;
-      font-weight: 600;
-      line-height: 50px;
+      color: #333;
       font-size: 14px;
-      font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
-      vertical-align: middle;
     }
   }
 
diff --git a/src/layout/index.vue b/src/layout/index.vue
index df40e4d..ea85f60 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,19 +1,104 @@
 <template>
   <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
-    <sidebar class="sidebar-container" />
-    <div :class="{hasTagsView:needTagsView}" class="main-container">
-      <div :class="{'fixed-header':fixedHeader}">
-        <navbar />
-        <tags-view v-if="needTagsView" />
+    <div class="top_container">
+      <div class="content">
+        <div class="logo">
+          <img class="img" src="@/assets/images/default_logo.png" />
+        </div>
+        <div class="right-menu">
+          <template v-if="device !== 'mobile'">
+            <!-- <search id="header-search" class="right-menu-item" />
+          <el-tooltip content="项目文档" effect="dark" placement="bottom">
+            <Doc class="right-menu-item hover-effect" />
+          </el-tooltip>
+          <el-tooltip content="全屏缩放" effect="dark" placement="bottom">
+            <screenfull id="screenfull" class="right-menu-item hover-effect" />
+          </el-tooltip>
+          <el-tooltip content="布局设置" effect="dark" placement="bottom">
+            <size-select id="size-select" class="right-menu-item hover-effect" />
+          </el-tooltip> -->
+
+            <i class="left_icon el-icon-search" />
+            <i class="left_icon el-icon-warning-outline" />
+            <i class="left_icon el-icon-bell" />
+          </template>
+          <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
+            <div class="avatar-wrapper">
+              <img :src="logo || Avatar" class="user-avatar">
+              <span class="shop_name">{{ shopName }}</span>
+              <i class="el-icon-caret-bottom" />
+            </div>
+            <el-dropdown-menu slot="dropdown">
+              <!-- <span style="display:block;" @click="show = true">
+              <el-dropdown-item>
+                布局设置
+              </el-dropdown-item>
+            </span> -->
+              <router-link to="/shop/shop/shop_configuration">
+                <el-dropdown-item>
+                  个人中心
+                </el-dropdown-item>
+              </router-link>
+              <span @click="dialogVisible = true">
+                <el-dropdown-item>
+                  修改密码
+                </el-dropdown-item>
+              </span>
+              <span style="display:block;" @click="open">
+                <el-dropdown-item divided>
+                  退出登录
+                </el-dropdown-item>
+              </span>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
       </div>
-      <app-main />
-      <right-panel v-if="showSettings">
-        <settings />
-      </right-panel>
+      <el-dialog title="修改密码" modal-append-to-body append-to-body :visible.sync="dialogVisible" width="400px">
+        <el-form ref="form" :model="form" :rules="rules">
+          <el-form-item label="旧密码" prop="oldPass">
+            <el-input :type="ip1Type" v-model="form.oldPass" placeholder="请输入旧密码">
+              <i slot="suffix"
+                :class="`el-input__icon ${ip1Type == 'text' ? 'el-icon-view' : 'el-icon-remove-outline'}`"
+                @click.stop="changeInputType('ip1Type')"></i>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="新密码" prop="newPass">
+            <el-input :type="ip2Type" v-model="form.newPass" placeholder="请输入新密码">
+              <i slot="suffix"
+                :class="`el-input__icon ${ip2Type == 'text' ? 'el-icon-view' : 'el-icon-remove-outline'}`"
+                @click.stop="changeInputType('ip2Type')"></i>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="确认新密码" prop="rnewPass">
+            <el-input :type="ip3Type" v-model="form.rnewPass" placeholder="请再次输入新密码">
+              <i slot="suffix"
+                :class="`el-input__icon ${ip3Type == 'text' ? 'el-icon-view' : 'el-icon-remove-outline'}`"
+                @click.stop="changeInputType('ip3Type')"></i>
+            </el-input>
+          </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" :loading="formLoading" @click="submitHandle">确 定</el-button>
+        </span>
+      </el-dialog>
+    </div>
+    <div>
+      <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+      <sidebar class="sidebar-container" />
+      <div :class="{ hasTagsView: needTagsView }" class="main-container">
+        <div :class="{ 'fixed-header': fixedHeader }">
+          <navbar />
+          <tags-view v-if="needTagsView" />
+        </div>
+        <app-main />
+        <right-panel v-if="showSettings">
+          <settings />
+        </right-panel>
+      </div>
+      <!--  防止刷新后主题丢失  -->
+      <Theme v-show="false" ref="theme" />
     </div>
-    <!--  防止刷新后主题丢失  -->
-    <Theme v-show="false" ref="theme" />
   </div>
 </template>
 
@@ -21,9 +106,10 @@
 import RightPanel from '@/components/RightPanel'
 import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
-import { mapState } from 'vuex'
+import { mapState, mapGetters } from 'vuex'
 import Theme from '@/components/ThemePicker'
 import Cookies from 'js-cookie'
+import Avatar from '@/assets/images/avatar.png'
 export default {
   name: 'Layout',
   components: {
@@ -36,6 +122,64 @@ export default {
     Theme
   },
   mixins: [ResizeMixin],
+  data() {
+    const validateNewPass = (rule, value, callback) => {
+      if (!this.form.newPass) {
+        callback(new Error(' '))
+      } else if (this.form.newPass === this.form.oldPass) {
+        callback(new Error('请输入与旧密码不同的新密码'))
+      } else {
+        callback()
+      }
+    }
+    const validateRnewPass = (rule, value, callback) => {
+      if (!this.form.rnewPass) {
+        callback(new Error(' '))
+      } else if (this.form.rnewPass !== this.form.newPass) {
+        callback(new Error('两次密码输入不一致'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      dialogVisible: false,
+      Avatar: Avatar,
+      logo: localStorage.getItem('logo'),
+      shopName: localStorage.getItem('shopName'),
+      ip1Type: 'password',
+      ip2Type: 'password',
+      ip3Type: 'password',
+      formLoading: false,
+      form: {
+        oldPass: '',
+        newPass: '',
+        rnewPass: ''
+      },
+      rules: {
+        oldPass: [
+          {
+            required: true,
+            message: ' ',
+            trigger: 'blur'
+          }
+        ],
+        newPass: [
+          {
+            required: true,
+            validator: validateNewPass,
+            trigger: 'blur'
+          }
+        ],
+        rnewPass: [
+          {
+            required: true,
+            validator: validateRnewPass,
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
+  },
   computed: {
     ...mapState({
       sidebar: state => state.app.sidebar,
@@ -44,6 +188,12 @@ export default {
       needTagsView: state => state.settings.tagsView,
       fixedHeader: state => state.settings.fixedHeader
     }),
+    ...mapGetters([
+      'sidebar',
+      'device',
+      'user',
+      'baseApi'
+    ]),
     classObj() {
       return {
         hideSidebar: !this.sidebar.opened,
@@ -65,52 +215,178 @@ export default {
   methods: {
     handleClickOutside() {
       this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
+    },
+    // 提交修改密码
+    submitHandle() {
+      this.$refs.form.validate(async vaild => {
+        if (vaild) {
+          try {
+            this.formLoading = true
+            const res = await updatePass({
+              loginType: localStorage.getItem('loginType'),
+              oldPass: encrypt(this.form.oldPass),
+              newPass: this.form.newPass
+            })
+            this.$notify.success('修改成功，请重新登陆')
+            setTimeout(() => {
+              this.logout()
+            }, 1000)
+          } catch (error) {
+            this.formLoading = false
+            console.log(error);
+          }
+        }
+      })
+    },
+    open() {
+      this.$confirm('确定注销并退出系统吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        localStorage.setItem('logoutHandle', true)
+        this.logout()
+      })
+    },
+    logout() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.reload()
+      })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/assets/styles/mixin.scss";
-  @import "~@/assets/styles/variables.scss";
+@import "~@/assets/styles/mixin.scss";
+@import "~@/assets/styles/variables.scss";
+$top-c-h: 60px;
 
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
+.top_container {
+  height: $top-c-h;
+  width: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 10;
+  background-color: #F5F5F5;
+
+  .content {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
     width: 100%;
+    height: $top-c-h - 10px;
+    background-color: #fff;
+    padding: 0 20px;
 
-    &.mobile.openSidebar {
-      position: fixed;
-      top: 0;
+    .logo {
+      .img {
+        display: block;
+        width: 123px;
+        height: auto
+      }
+    }
+
+    .right-menu {
+      display: flex;
+      align-items: center;
+      .left_icon {
+        font-size: 18px;
+        margin-right: 30px;
+      }
+
+      &:focus {
+        outline: none;
+      }
+
+      .right-menu-item {
+        display: inline-block;
+        padding: 0 8px;
+        height: 100%;
+        font-size: 18px;
+        color: #5a5e66;
+        vertical-align: text-bottom;
+
+        &.hover-effect {
+          cursor: pointer;
+          transition: background .3s;
+
+          &:hover {
+            background: rgba(0, 0, 0, .025)
+          }
+        }
+      }
+
+      .avatar-container {
+        margin-right: 10px;
+        display: flex;
+        align-items: center;
+
+        .avatar-wrapper {
+          position: relative;
+          display: flex;
+          align-items: center;
+
+          .user-avatar {
+            cursor: pointer;
+            width: 40px;
+            height: 40px;
+            border-radius: 50%;
+          }
+
+          .el-icon-caret-bottom {
+            font-size: 12px;
+            margin-left: 6px;
+          }
+
+          .shop_name {
+            font-size: 16px;
+            margin-left: 10px;
+          }
+        }
+      }
     }
   }
+}
 
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
+.app-wrapper {
+  @include clearfix;
+  position: relative;
+  height: 100%;
+  width: 100%;
 
-  .fixed-header {
+  &.mobile.openSidebar {
     position: fixed;
     top: 0;
-    right: 0;
-    z-index: 9;
-    width: calc(100% - #{$sideBarWidth});
-    transition: width 0.28s;
-    padding: 0;
   }
+}
 
-  .hideSidebar .fixed-header {
-    width: calc(100% - 54px)
-  }
+.drawer-bg {
+  background: #000;
+  opacity: 0.3;
+  width: 100%;
+  top: 0;
+  height: 100%;
+  position: absolute;
+  z-index: 999;
+}
 
-  .mobile .fixed-header {
-    width: 100%;
-  }
+.fixed-header {
+  position: fixed;
+  top: $top-c-h;
+  right: 0;
+  z-index: 9;
+  width: calc(100% - #{$sideBarWidth});
+  transition: width 0.28s;
+  padding: 0;
+}
+
+.hideSidebar .fixed-header {
+  width: calc(100% - 54px)
+}
+
+.mobile .fixed-header {
+  width: 100%;
+}
 </style>
diff --git a/src/utils/index.js b/src/utils/index.js
index 759b913..abbf4b6 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -423,7 +423,7 @@ export function isPcBowser() {
  * decimal你保留的几位,默认保留小数后两位
  * isInt 是否保留0
  */
-export function formatDecimal(num, decimal = 2, isInt = false) {
+export function formatDecimal(num = 0, decimal = 2, isInt = false) {
   num = num.toFixed(3).toString();
   const index = num.indexOf(".");
   if (index !== -1) {
diff --git a/src/views/home/home.vue b/src/views/home/home.vue
index 6afe3e1..68d9e60 100644
--- a/src/views/home/home.vue
+++ b/src/views/home/home.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container" style="padding-bottom: 100px;">
-    <div class="card_wrap">
+    <!-- <div class="card_wrap">
       <div class="card">
         <div class="header">
           <div class="card_title">总销售额</div>
@@ -44,30 +44,143 @@
           <i class="icon el-icon-caret-top"></i>
         </div>
       </div>
+    </div> -->
+    <div class="h_card_wrap">
+      <div class="status_wrap">
+        <div class="left">
+          <div class="dot"></div>
+          <span>营业</span>
+        </div>
+        <div class="time_wrap">
+          <el-radio-group v-model="timeValue" @change="timeChange">
+            <el-radio-button label="0">今天</el-radio-button>
+            <el-radio-button label="-1">昨天</el-radio-button>
+            <el-radio-button label="-7">最近7天</el-radio-button>
+            <el-radio-button label="-30">最近30天</el-radio-button>
+            <el-radio-button label="week">本周</el-radio-button>
+            <el-radio-button label="month">本月</el-radio-button>
+            <el-radio-button label="custom">自定义</el-radio-button>
+          </el-radio-group>
+          <el-date-picker v-model="query.createdAt" type="daterange" range-separator="至" start-placeholder="开始日期"
+            end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd HH:mm:ss"
+            v-if="timeValue == 'custom'" @change="summarytrade">
+          </el-date-picker>
+        </div>
+      </div>
+      <div class="content" v-loading="tradeLoading">
+        <div class="top">
+          <div class="item earnings">
+            <div class="num_wrap">
+              <div class="num">{{ formatDecimal(tradeSale.incomeAmountAll || 0) }}</div>
+              <div class="tips">营业实收（元）<el-icon class="el-icon-question" /></div>
+            </div>
+            <div class="line_wrap">
+              <div class="line_item">
+                <div class="line_item_top">
+                  <div>销售金额（元）</div>
+                  <div class="t">{{ formatDecimal(tradeSale.totalSaleAmount || 0) }}</div>
+                </div>
+                <div class="line_gropress">
+                  <div class="gropress l"
+                    :style="{ width: `${tradeSale.incomeAmount / tradeSale.totalSaleAmount * 100}%` }"></div>
+                  <div class="gropress r"
+                    :style="{ width: `${tradeSale.refundAmount / tradeSale.totalSaleAmount * 100}%` }"></div>
+                </div>
+                <div class="line_btm">
+                  <el-icon class="icon el-icon-caret-right" />
+                  <div class="info">
+                    <span class="l_t">收：{{ formatDecimal(tradeSale.incomeAmount || 0) }}</span>
+                    <span class="l_r">退：{{ formatDecimal(tradeSale.refundAmount || 0) }}</span>
+                  </div>
+                </div>
+              </div>
+              <div class="line_item">
+                <div class="line_item_top">
+                  <div>充值金额（元）</div>
+                  <div class="t">{{ formatDecimal(tradeSale.totalVipAmount || 0) }}</div>
+                </div>
+                <div class="line_gropress">
+                  <div class="gropress l" :style="{ width: `${tradeSale.inAmount / tradeSale.totalVipAmount * 100}%` }">
+                  </div>
+                  <div class="gropress r"
+                    :style="{ width: `${tradeSale.outAmount / tradeSale.totalVipAmount * 100}%` }"></div>
+                </div>
+                <div class="line_btm">
+                  <el-icon class="icon el-icon-caret-right" />
+                  <div class="info">
+                    <span class="l_t">收：{{ formatDecimal(tradeSale.inAmount || 0) }}</span>
+                    <span class="l_r">退：{{ formatDecimal(tradeSale.outAmount || 0) }}</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="item data">
+            <div class="data_item">
+              <div class="num_wrap">
+                <div class="num">{{ formatDecimal(tradeVip.useAmount || 0) }}</div>
+                <div class="tips">会员消费（元）<el-icon class="el-icon-question" /></div>
+              </div>
+            </div>
+            <div class="data_item_right">
+              <div class="t"><span>新增会员数</span> <span class="n">{{ tradeVip.newFlow || 0 }}(人)</span></div>
+              <div class="t"><span>会员消费笔数</span> <span class="n">{{ tradeVip.useNum || 0 }}</span></div>
+            </div>
+          </div>
+        </div>
+        <div class="btm">
+          <div class="item item1">
+            <div class="title">客单价</div>
+            <div class="icon_wrap">
+              <img class="img" src="@/assets/images/data_home_item1_icon.png" />
+              <div class="t">{{ formatDecimal(tradeCount.unitPrice || 0) }}</div>
+            </div>
+          </div>
+          <div class="item item2">
+            <div class="title">翻台率 <el-icon class="icon el-icon-question" /> </div>
+            <div class="icon_wrap">
+              <img class="img" src="@/assets/images/data_home_item2_icon.png" />
+              <div class="t">{{ tradeCount.turnoverRate }}</div>
+            </div>
+          </div>
+          <div class="item item3">
+            <div class="title">优惠金额</div>
+            <div class="icon_wrap">
+              <img class="img" src="@/assets/images/data_home_item3_icon.png" />
+              <div class="t">{{ formatDecimal(tradeCount.saveAmount || 0) }}</div>
+            </div>
+          </div>
+          <div class="item item4">
+            <div class="title">优惠笔数 </div>
+            <div class="icon_wrap">
+              <img class="img" src="@/assets/images/data_home_item4_icon.png" />
+              <div class="t">{{ tradeCount.saveNum || 0 }}</div>
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
     <!-- 销售额 -->
-    <div class="chart_wrap">
+    <div class="chart_wrap" style="display: flex;">
       <div class="item">
         <div class="header">
           <div class="tab_wrap">
-            <div class="item active">销售额</div>
+            <div class="item" :class="{ active: lineChartType == 0 }" @click="lineChartTypeChange(0)">销售趋势</div>
+            <div class="item" :class="{ active: lineChartType == 1 }" @click="lineChartTypeChange(1)">支付占比</div>
           </div>
-          <el-radio-group v-model="saleActive" @change="dateAmount">
+          <el-radio-group v-model="saleActive" @change="lineChartTypeChange(lineChartType)">
             <el-radio-button label="7">近7天</el-radio-button>
             <el-radio-button label="30">30天</el-radio-button>
           </el-radio-group>
         </div>
-        <div
-          class="chart"
-          ref="saleChart"
-          v-loading="saleLoading"
-          style="height: 400px;"
-        ></div>
+        <div class="chart" ref="saleChart" v-loading="saleLoading" style="height: 400px;" v-show="lineChartType == 0">
+        </div>
+        <div class="chart" ref="payChart" v-loading="payChartLoading" style="height: 400px;"
+          v-show="lineChartType == 1">
+        </div>
       </div>
-    </div>
-    <div class="chart_wrap" style="display: flex;">
       <!-- 商品销售排行 -->
-      <div class="item">
+      <div class="item" style="margin-left: 20px;">
         <div class="header">
           <div class="tab_wrap">
             <div class="item active">商品销售排行</div>
@@ -97,28 +210,18 @@
         <div class="table">
           <el-table :data="saleTable" v-loading="saleTableLoading">
             <el-table-column label="排名" prop="productId"></el-table-column>
-            <el-table-column
-              label="商品名称"
-              prop="productName"
-            ></el-table-column>
+            <el-table-column label="商品名称" prop="productName"></el-table-column>
             <el-table-column label="数量" prop="productNum"></el-table-column>
             <el-table-column label="金额" prop="amount"></el-table-column>
           </el-table>
-          <div
-            class="head-container"
-            style="padding-top: 20px;display: flex;justify-content: flex-end;"
-          >
-            <el-pagination
-              :total="saleTableTotal"
-              :page-size="saleTableSize"
-              :current-page="saleTablePage"
-              @current-change="paginationChange"
-              layout="total, prev, pager, next, jumper"
-            ></el-pagination>
+          <div class="head-container" style="padding-top: 20px;display: flex;justify-content: flex-end;">
+            <el-pagination :total="saleTableTotal" :page-size="saleTableSize" :current-page="saleTablePage"
+              @current-change="paginationChange" layout="total, prev, pager, next, jumper"></el-pagination>
           </div>
         </div>
       </div>
-      <!-- 支付类型占比 -->
+    </div>
+    <!-- <div class="chart_wrap" style="display: flex;">
       <div class="item" style="margin-left: 20px;">
         <div class="header">
           <div class="tab_wrap">
@@ -129,13 +232,9 @@
             <el-radio-button label="30">30天</el-radio-button>
           </el-radio-group>
         </div>
-        <div
-          style="height: 400px;margin-top: 30px;"
-          ref="payChart"
-          v-loading="payChartLoading"
-        ></div>
+        <div style="height: 400px;margin-top: 30px;" ref="payChart" v-loading="payChartLoading"></div>
       </div>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -146,14 +245,17 @@ import {
   dateProduct,
   dateAmount,
   datePayType,
-  summaryDateGet
+  summaryDateGet,
+  summarytrade
 } from "@/api/home";
+import dayjs from 'dayjs'
 import echarts from "echarts";
-import { debounce } from "@/utils";
+import { debounce, formatDecimal } from "@/utils";
 export default {
   name: "home",
   data() {
     return {
+      formatDecimal,
       topData: "",
       saleTab: "sale",
       saleActive: "7",
@@ -176,15 +278,24 @@ export default {
       saleTableSize: 5,
       __resizeHandler: null,
       productCountChart: null,
-      productSumChart: null
+      productSumChart: null,
+      lineChartType: 0,
+      timeValue: "0",
+      query: {
+        createdAt: '',
+      },
+      tradeLoading: false,
+      tradeSale: '',
+      tradeVip: '',
+      tradeCount: '',
     };
   },
   mounted() {
-    this.summaryGet();
+    // this.summaryGet();
     this.dateAmount();
     this.dateProduct();
-    this.datePayType();
     this.summaryDateGet();
+    this.timeChange('0')
 
     this.__resizeHandler = debounce(() => {
       if (this.saleChart) {
@@ -207,9 +318,110 @@ export default {
       }
     }, 100);
     window.addEventListener("resize", this.__resizeHandler);
-    this.initCardUserChart();
+    // this.initCardUserChart();
   },
   methods: {
+    // 切换时间
+    timeChange(e) {
+      const format = ["YYYY-MM-DD 00:00:00", "YYYY-MM-DD 23:59:59"];
+      switch (e) {
+        case "":
+          // 全部
+          this.query.createdAt = [];
+          break;
+        case "0":
+          // 今天
+          this.query.createdAt = [
+            dayjs().format(format[0]),
+            dayjs().format(format[1])
+          ];
+          break;
+        case "-1":
+          // 昨天
+          this.query.createdAt = [
+            dayjs()
+              .add(-1, "d")
+              .format(format[0]),
+            dayjs()
+              .add(-1, "d")
+              .format(format[1])
+          ];
+          break;
+        case "-7":
+          // 最近7天
+          this.query.createdAt = [
+            dayjs()
+              .add(-7, "d")
+              .format(format[0]),
+            dayjs().format(format[1])
+          ];
+          break;
+        case "-30":
+          // 最近7天
+          this.query.createdAt = [
+            dayjs()
+              .add(-30, "d")
+              .format(format[0]),
+            dayjs().format(format[1])
+          ];
+          break;
+        case "week":
+          // 本周
+          this.query.createdAt = [
+            dayjs()
+              .startOf("week")
+              .format(format[0]),
+            dayjs()
+              .endOf("week")
+              .format(format[1])
+          ];
+          break;
+        case "month":
+          // 本周
+          this.query.createdAt = [
+            dayjs()
+              .startOf("month")
+              .format(format[0]),
+            dayjs()
+              .endOf("month")
+              .format(format[1])
+          ];
+          break;
+        case "custom":
+          // 自定义
+          this.query.createdAt = [];
+          break;
+        default:
+          break;
+      }
+      if (e != 'custom') {
+        this.summarytrade()
+      }
+    },
+    // 获取营业板块数据
+    async summarytrade() {
+      try {
+        this.tradeLoading = true
+        const res = await summarytrade({
+          startTime: this.query.createdAt[0],
+          endTime: this.query.createdAt[1]
+        })
+        this.tradeLoading = false
+        this.tradeSale = res.sale
+        this.tradeVip = res.vip
+        this.tradeCount = res.count
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    lineChartTypeChange(i) {
+      this.lineChartType = i
+      if (i == 0) {
+        this.dateAmount()
+      } else {
+        this.datePayType();
+      }
+    },
     // 初始化支付笔数柱状图
     initCardPayChart(time = [], data = []) {
       this.cardPayChart = echarts.init(this.$refs.cardPayChart);
@@ -537,7 +749,7 @@ export default {
     async datePayType() {
       try {
         this.payChartLoading = true;
-        const res = await datePayType(this.payChartDay);
+        const res = await datePayType(this.saleActive);
         const data = res.countPayType.map(item => {
           return {
             value: item.count,
@@ -752,6 +964,232 @@ export default {
   background-color: #f5f5f5;
 }
 
+.h_card_wrap {
+
+  .status_wrap {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    .left {
+      display: flex;
+      align-items: center;
+
+      .dot {
+        $size: 6px;
+        width: $size;
+        height: $size;
+        border-radius: 50%;
+        background-color: #1890ff;
+        margin-right: 10px;
+      }
+    }
+
+    .time {
+      display: flex;
+      align-items: center;
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    margin-top: 15px;
+    padding: 20px;
+
+    .top {
+      display: flex;
+
+      .item {
+        flex: 1;
+
+        &.earnings {
+          display: flex;
+        }
+
+        &.data {
+          margin-left: 40px;
+          background: url('../../assets/images/data_home_bg1.png') no-repeat center center / cover;
+          display: flex;
+          align-items: center;
+        }
+
+        .data_item {
+          flex: 1;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
+
+        .data_item_right {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+
+          .t {
+            width: 200px;
+            color: #333;
+            display: flex;
+            justify-content: space-between;
+
+            &:not(:first-child) {
+              margin-top: 20px;
+            }
+          }
+
+          .n {
+            color: #1890ff;
+            margin-left: 20px;
+          }
+        }
+
+        .num_wrap {
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+
+          .num {
+            font-size: 30px;
+            color: #1890ff;
+          }
+
+          .tips {
+            font-size: 12px;
+            margin-top: 10px;
+          }
+        }
+
+        .line_wrap {
+          flex: 1;
+          padding-left: 20px;
+
+          .line_item {
+            &:not(:first-child) {
+              margin-top: 20px;
+            }
+
+            .line_item_top {
+              display: flex;
+              justify-content: space-between;
+              font-size: 12px;
+
+              .t {
+                color: #999;
+              }
+            }
+
+            .line_gropress {
+              display: flex;
+              margin-top: 6px;
+              background-color: #F6F6F6;
+
+              .gropress {
+                height: 5px;
+
+                &.l {
+                  background-color: #1890ff;
+                }
+
+                &.r {
+                  background-color: #FF3F3F;
+                }
+              }
+            }
+
+            .line_btm {
+              display: flex;
+              justify-content: space-between;
+              margin-top: 5px;
+
+              .icon {
+                color: #A2A2A2;
+                position: relative;
+                left: -5px;
+                font-size: 12px;
+              }
+
+              .info {
+                font-size: 12px;
+
+                .l_t {
+                  color: #1890ff;
+                }
+
+                .l_r {
+                  color: #FF3F3F;
+                  margin-left: 10px;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+    .btm {
+      display: flex;
+      justify-content: space-between;
+      margin-top: 20px;
+
+      .item {
+        width: 200px;
+        height: 83px;
+        background-repeat: no-repeat;
+        background-position: center center;
+        background-size: 100% 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        padding-left: 18px;
+
+        &.item1 {
+          background-image: url('../../assets/images/data_home_item1.png');
+        }
+
+        &.item2 {
+          background-image: url('../../assets/images/data_home_item2.png');
+        }
+
+        &.item3 {
+          background-image: url('../../assets/images/data_home_item3.png');
+        }
+
+        &.item4 {
+          background-image: url('../../assets/images/data_home_item4.png');
+        }
+
+        .title {
+          display: flex;
+          align-items: center;
+          color: #333;
+
+          .icon {
+            font-size: 12px;
+            color: #999;
+            margin-left: 6px;
+          }
+        }
+
+        .icon_wrap {
+          display: flex;
+          align-items: center;
+          margin-top: 10px;
+
+          .img {
+            width: 36px;
+            height: 36px;
+          }
+
+          .t {
+            font-size: 24px;
+            margin-left: 10px;
+          }
+        }
+      }
+    }
+  }
+}
+
 .card_wrap {
   display: flex;
   flex-wrap: wrap;
@@ -868,10 +1306,11 @@ export default {
           align-items: center;
           justify-content: center;
           font-size: 14px;
-          color: $color;
+          margin-right: 20px;
 
           &.active {
             position: relative;
+            color: $color;
 
             &::after {
               content: "";
diff --git a/src/views/home/home_old.vue b/src/views/home/home_old.vue
new file mode 100644
index 0000000..6afe3e1
--- /dev/null
+++ b/src/views/home/home_old.vue
@@ -0,0 +1,899 @@
+<template>
+  <div class="app-container" style="padding-bottom: 100px;">
+    <div class="card_wrap">
+      <div class="card">
+        <div class="header">
+          <div class="card_title">总销售额</div>
+          <el-tooltip effect="dark" content="订单支付金额" placement="top">
+            <i class="icon el-icon-warning-outline"></i>
+          </el-tooltip>
+        </div>
+        <div class="number">{{ topData.totalSales || 0 }}</div>
+        <div class="row">平均每单{{ topData.averageSales || 0 }}</div>
+        <div class="row">今日销售额{{ topData.totalSalesToday || 0 }}</div>
+      </div>
+      <div class="card">
+        <div class="header">
+          <div class="card_title">支付笔数</div>
+        </div>
+        <div class="number">{{ topData.paymentsNumber }}</div>
+        <div class="row" ref="cardPayChart" style="padding-bottom: 2px;"></div>
+        <div class="row">
+          今日支付笔数{{ topData.paymentsNumberToday || 0 }}
+        </div>
+      </div>
+      <div class="card">
+        <div class="header">
+          <div class="card_title">访问量</div>
+        </div>
+        <div class="number">{{ topData.totalVisits }}</div>
+        <div class="row" ref="cardCountChart" style="padding-bottom: 2px;"></div>
+        <div class="row">
+          <div class="dot"></div>
+          今日访问 {{ topData.totalVisitsToday || 0 }}
+        </div>
+      </div>
+      <div class="card">
+        <div class="header">
+          <div class="card_title">用户数</div>
+        </div>
+        <div class="number">{{ topData.totalUser }}</div>
+        <div class="row" ref="cardUserChart" style="padding-bottom: 2px;"></div>
+        <div class="row">
+          今日新增 {{ topData.userToday || 0 }}
+          <i class="icon el-icon-caret-top"></i>
+        </div>
+      </div>
+    </div>
+    <!-- 销售额 -->
+    <div class="chart_wrap">
+      <div class="item">
+        <div class="header">
+          <div class="tab_wrap">
+            <div class="item active">销售额</div>
+          </div>
+          <el-radio-group v-model="saleActive" @change="dateAmount">
+            <el-radio-button label="7">近7天</el-radio-button>
+            <el-radio-button label="30">30天</el-radio-button>
+          </el-radio-group>
+        </div>
+        <div
+          class="chart"
+          ref="saleChart"
+          v-loading="saleLoading"
+          style="height: 400px;"
+        ></div>
+      </div>
+    </div>
+    <div class="chart_wrap" style="display: flex;">
+      <!-- 商品销售排行 -->
+      <div class="item">
+        <div class="header">
+          <div class="tab_wrap">
+            <div class="item active">商品销售排行</div>
+          </div>
+          <el-radio-group v-model="saleTableActive" @change="rankChange">
+            <el-radio-button label="1">今天</el-radio-button>
+            <el-radio-button label="7">近7天</el-radio-button>
+            <el-radio-button label="30">30天</el-radio-button>
+          </el-radio-group>
+        </div>
+        <div class="sale_data">
+          <div class="card">
+            <div class="sale_data_header">
+              <div class="card_title">销售数量</div>
+            </div>
+            <div class="number">{{ productCount }}</div>
+            <div class="product_chart_wrap" ref="productCountChart"></div>
+          </div>
+          <div class="card">
+            <div class="sale_data_header">
+              <div class="card_title">销售金额</div>
+            </div>
+            <div class="number">￥{{ productSum }}</div>
+            <div class="product_chart_wrap" ref="productSumChart"></div>
+          </div>
+        </div>
+        <div class="table">
+          <el-table :data="saleTable" v-loading="saleTableLoading">
+            <el-table-column label="排名" prop="productId"></el-table-column>
+            <el-table-column
+              label="商品名称"
+              prop="productName"
+            ></el-table-column>
+            <el-table-column label="数量" prop="productNum"></el-table-column>
+            <el-table-column label="金额" prop="amount"></el-table-column>
+          </el-table>
+          <div
+            class="head-container"
+            style="padding-top: 20px;display: flex;justify-content: flex-end;"
+          >
+            <el-pagination
+              :total="saleTableTotal"
+              :page-size="saleTableSize"
+              :current-page="saleTablePage"
+              @current-change="paginationChange"
+              layout="total, prev, pager, next, jumper"
+            ></el-pagination>
+          </div>
+        </div>
+      </div>
+      <!-- 支付类型占比 -->
+      <div class="item" style="margin-left: 20px;">
+        <div class="header">
+          <div class="tab_wrap">
+            <div class="item active">支付占比类型</div>
+          </div>
+          <el-radio-group v-model="payChartDay" @change="datePayType">
+            <el-radio-button label="7">近7天</el-radio-button>
+            <el-radio-button label="30">30天</el-radio-button>
+          </el-radio-group>
+        </div>
+        <div
+          style="height: 400px;margin-top: 30px;"
+          ref="payChart"
+          v-loading="payChartLoading"
+        ></div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  summaryGet,
+  summaryTodayGet,
+  dateProduct,
+  dateAmount,
+  datePayType,
+  summaryDateGet
+} from "@/api/home";
+import echarts from "echarts";
+import { debounce } from "@/utils";
+export default {
+  name: "home",
+  data() {
+    return {
+      topData: "",
+      saleTab: "sale",
+      saleActive: "7",
+      cardPayChart: null,
+      cardCountChart: null,
+      cardUserChart: null,
+      saleLoading: false,
+      saleChart: null,
+      payChartDay: "7",
+      payChartLoading: false,
+      payChart: null,
+      chartType: 1,
+      productCount: 0,
+      productSum: 0,
+      saleTableActive: "1",
+      saleTable: [],
+      saleTableLoading: false,
+      saleTablePage: 1,
+      saleTableTotal: 0,
+      saleTableSize: 5,
+      __resizeHandler: null,
+      productCountChart: null,
+      productSumChart: null
+    };
+  },
+  mounted() {
+    this.summaryGet();
+    this.dateAmount();
+    this.dateProduct();
+    this.datePayType();
+    this.summaryDateGet();
+
+    this.__resizeHandler = debounce(() => {
+      if (this.saleChart) {
+        this.saleChart.resize();
+      }
+      if (this.payChart) {
+        this.payChart.resize();
+      }
+      if (this.cardPayChart) {
+        this.cardPayChart.resize();
+      }
+      if (this.cardUserChart) {
+        this.cardUserChart.resize();
+      }
+      if (this.productCountChart) {
+        this.productCountChart.resize();
+      }
+      if (this.productSumChart) {
+        this.productSumChart.resize();
+      }
+    }, 100);
+    window.addEventListener("resize", this.__resizeHandler);
+    this.initCardUserChart();
+  },
+  methods: {
+    // 初始化支付笔数柱状图
+    initCardPayChart(time = [], data = []) {
+      this.cardPayChart = echarts.init(this.$refs.cardPayChart);
+      this.cardPayChart.setOption({
+        tooltip: {
+          trigger: "axis"
+        },
+        grid: {
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 0
+        },
+        xAxis: [
+          {
+            type: "category",
+            data: time,
+            show: false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
+            axisTick: {
+              show: false // 不显示坐标轴刻度线
+            },
+            axisLine: {
+              show: false // 不显示坐标轴线
+            },
+            axisLabel: {
+              show: false // 不显示坐标轴上的文字
+            },
+            splitLine: {
+              show: false // 不显示网格线
+            }
+          }
+        ],
+        color: "#409eff",
+        yAxis: [
+          {
+            type: "value",
+            show: false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
+            axisTick: {
+              show: false // 不显示坐标轴刻度线
+            },
+            axisLine: {
+              show: false // 不显示坐标轴线
+            },
+            axisLabel: {
+              show: false // 不显示坐标轴上的文字
+            },
+            splitLine: {
+              show: false // 不显示网格线
+            }
+          }
+        ],
+        series: [
+          {
+            data: data,
+            type: "bar",
+            barWidth: "30%"
+          }
+        ]
+      });
+    },
+    // 初始化访问量柱状图
+    initCardCountChart(time = [], data = []) {
+      this.cardCountChart = echarts.init(this.$refs.cardCountChart);
+      this.cardCountChart.setOption({
+        tooltip: {
+          trigger: "axis"
+        },
+        grid: {
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 0
+        },
+        xAxis: [
+          {
+            type: "category",
+            data: time,
+            show: false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
+            axisTick: {
+              show: false // 不显示坐标轴刻度线
+            },
+            axisLine: {
+              show: false // 不显示坐标轴线
+            },
+            axisLabel: {
+              show: false // 不显示坐标轴上的文字
+            },
+            splitLine: {
+              show: false // 不显示网格线
+            }
+          }
+        ],
+        color: "#409eff",
+        yAxis: [
+          {
+            type: "value",
+            show: false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
+            axisTick: {
+              show: false // 不显示坐标轴刻度线
+            },
+            axisLine: {
+              show: false // 不显示坐标轴线
+            },
+            axisLabel: {
+              show: false // 不显示坐标轴上的文字
+            },
+            splitLine: {
+              show: false // 不显示网格线
+            }
+          }
+        ],
+        series: [
+          {
+            data: data,
+            type: "bar",
+            barWidth: "30%"
+          }
+        ]
+      });
+    },
+    // 初始化用户数折线图
+    initCardUserChart(time = [], data = []) {
+      this.cardUserChart = echarts.init(this.$refs.cardUserChart);
+      this.cardUserChart.setOption({
+        tooltip: {
+          trigger: "axis"
+        },
+        grid: {
+          x: 0,
+          y: 10,
+          x2: 0,
+          y2: 2
+        },
+        xAxis: [
+          {
+            type: "category",
+            data: time,
+            show: false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
+            axisTick: {
+              show: false // 不显示坐标轴刻度线
+            },
+            axisLine: {
+              show: false // 不显示坐标轴线
+            },
+            axisLabel: {
+              show: false // 不显示坐标轴上的文字
+            },
+            splitLine: {
+              show: false // 不显示网格线
+            }
+          }
+        ],
+        color: "#409eff",
+        yAxis: [
+          {
+            type: "value",
+            show: false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
+            axisTick: {
+              show: false // 不显示坐标轴刻度线
+            },
+            axisLine: {
+              show: false // 不显示坐标轴线
+            },
+            axisLabel: {
+              show: false // 不显示坐标轴上的文字
+            },
+            splitLine: {
+              show: false // 不显示网格线
+            }
+          }
+        ],
+        series: [
+          {
+            data: data,
+            type: "line",
+            symbol: "none"
+          }
+        ]
+      });
+    },
+    // 初始化销售额图标
+    initSaleChart(time, data) {
+      this.saleChart = null;
+      this.saleChart = echarts.init(this.$refs.saleChart);
+      this.saleChart.setOption({
+        title: {
+          text: "销售趋势",
+          x: "center"
+        },
+        tooltip: {
+          trigger: "axis"
+        },
+        xAxis: [
+          {
+            type: "category",
+            data: time,
+            axisTick: {
+              alignWithLabel: true
+            },
+            axisLine: {
+              lineStyle: {
+                color: "#999"
+              }
+            },
+            axisLabel: {
+              rotate: time.length <= 7 ? 0 : 45,
+              interval: 0,
+              textStyle: {
+                fontSize: "9"
+              }
+            }
+          }
+        ],
+        color: "#409eff",
+        yAxis: [
+          {
+            type: "value",
+            axisLine: {
+              lineStyle: {
+                color: "#999"
+              }
+            },
+            splitLine: {
+              lineStyle: {
+                type: "dashed",
+                color: "#ececec"
+              }
+            }
+          }
+        ],
+        series: [
+          {
+            data: data,
+            type: "bar",
+            barWidth: time.length <= 7 ? "50%" : "30%"
+          }
+        ]
+      });
+    },
+    // 初始化销售额图表
+    initPayChart(data) {
+      this.payChart = echarts.init(this.$refs.payChart);
+      this.payChart.setOption({
+        tooltip: {
+          trigger: "item"
+        },
+        legend: {
+          top: "5%",
+          left: "center"
+        },
+        color: [
+          "#409eff",
+          "#91cc75",
+          "#fac858",
+          "#ee6666",
+          "#73c0de",
+          "#3ba272",
+          "#fc8452",
+          "#9a60b4",
+          "#ea7ccc"
+        ],
+        series: [
+          {
+            type: "pie",
+            radius: ["40%", "70%"],
+            avoidLabelOverlap: false,
+            label: {
+              show: false,
+              position: "center"
+            },
+            emphasis: {
+              label: {
+                show: true,
+                fontSize: 20
+              }
+            },
+            labelLine: {
+              show: false
+            },
+            data: data
+          }
+        ]
+      });
+    },
+    // 获取销售额柱状图数据
+    async dateAmount() {
+      try {
+        this.saleLoading = true;
+        const res = await dateAmount(this.saleActive);
+        const data = res.total.map(item => item.amount);
+        const time = res.total.map(item => item.tradeDay);
+        this.initSaleChart(time, data);
+        setTimeout(() => {
+          this.saleLoading = false;
+        }, 300);
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    paginationChange(e) {
+      this.saleTablePage = e;
+      this.dateProduct();
+    },
+    // 获取销售额排行表格数据
+    async dateProduct() {
+      try {
+        this.saleTableLoading = true;
+        const res = await dateProduct(
+          this.saleTableActive,
+          this.saleTablePage,
+          this.saleTableSize
+        );
+        this.saleTable = res.totalProduct;
+        this.saleTableTotal = res.total;
+        this.productCount = res.productCount;
+        this.productSum = res.productSum;
+        setTimeout(() => {
+          this.saleTableLoading = false;
+        }, 300);
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    // 支付类型占比 饼图
+    async datePayType() {
+      try {
+        this.payChartLoading = true;
+        const res = await datePayType(this.payChartDay);
+        const data = res.countPayType.map(item => {
+          return {
+            value: item.count,
+            name: item.payType
+          };
+        });
+        setTimeout(() => {
+          this.payChartLoading = false;
+        }, 300);
+        this.initPayChart(data);
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    // 汇总数据
+    async summaryGet() {
+      try {
+        const res1 = await summaryGet();
+        const res2 = await summaryTodayGet();
+        this.topData = {
+          ...res1,
+          ...res2
+        };
+        let payTime = res1.countDateList.map(item => item.tradeDay);
+        let payData = res1.countDateList.map(item => item.count);
+
+        let countTime = res1.visitsCountList.map(item => item.tradeDay);
+        let countData = res1.visitsCountList.map(item => item.count);
+
+        this.initCardPayChart(payTime, payData);
+        this.initCardCountChart(countTime, countData);
+        console.log(this.topData);
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    rankChange() {
+      this.dateProduct();
+      this.summaryDateGet();
+    },
+    // 初始化销售图标
+    initProduceChart(p1, p2) {
+      this.productCountChart = echarts.init(this.$refs.productCountChart);
+      this.productSumChart = echarts.init(this.$refs.productSumChart);
+
+      this.productCountChart.setOption({
+        tooltip: {
+          trigger: "axis"
+        },
+        grid: {
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 0
+        },
+        xAxis: [
+          {
+            boundaryGap: false,
+            type: "category",
+            data: p1[0],
+            show: false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
+            axisTick: {
+              show: false // 不显示坐标轴刻度线
+            },
+            axisLine: {
+              show: false // 不显示坐标轴线
+            },
+            axisLabel: {
+              show: false // 不显示坐标轴上的文字
+            },
+            splitLine: {
+              show: false // 不显示网格线
+            }
+          }
+        ],
+        color: "#409eff",
+        yAxis: [
+          {
+            type: "value",
+            show: false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
+            axisTick: {
+              show: false // 不显示坐标轴刻度线
+            },
+            axisLine: {
+              show: false // 不显示坐标轴线
+            },
+            axisLabel: {
+              show: false // 不显示坐标轴上的文字
+            },
+            splitLine: {
+              show: false // 不显示网格线
+            }
+          }
+        ],
+        series: [
+          {
+            data: p1[1],
+            type: "line",
+            symbol: "none",
+            smooth: true,
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                {
+                  offset: 0,
+                  color: "#409eff" // 渐变颜色
+                },
+                {
+                  offset: 1,
+                  color: "#409eff" // 渐变颜色
+                }
+              ])
+            }
+          }
+        ]
+      });
+
+      this.productSumChart.setOption({
+        tooltip: {
+          trigger: "axis"
+        },
+        grid: {
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 0
+        },
+        xAxis: [
+          {
+            boundaryGap: false,
+            type: "category",
+            data: p2[0],
+            show: false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
+            axisTick: {
+              show: false // 不显示坐标轴刻度线
+            },
+            axisLine: {
+              show: false // 不显示坐标轴线
+            },
+            axisLabel: {
+              show: false // 不显示坐标轴上的文字
+            },
+            splitLine: {
+              show: false // 不显示网格线
+            }
+          }
+        ],
+        color: "#409eff",
+        yAxis: [
+          {
+            type: "value",
+            show: false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
+            axisTick: {
+              show: false // 不显示坐标轴刻度线
+            },
+            axisLine: {
+              show: false // 不显示坐标轴线
+            },
+            axisLabel: {
+              show: false // 不显示坐标轴上的文字
+            },
+            splitLine: {
+              show: false // 不显示网格线
+            }
+          }
+        ],
+        series: [
+          {
+            data: p2[1],
+            type: "line",
+            symbol: "none",
+            smooth: true,
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                {
+                  offset: 0,
+                  color: "#409eff" // 渐变颜色
+                },
+                {
+                  offset: 1,
+                  color: "#409eff" // 渐变颜色
+                }
+              ])
+            }
+          }
+        ]
+      });
+    },
+    // 日期汇总数据
+    async summaryDateGet() {
+      try {
+        const res = await summaryDateGet(this.saleTableActive);
+        let p1 = [
+          res.numList.map(item => item.tradeDay),
+          res.numList.map(item => item.count)
+        ];
+        let p2 = [
+          res.amountList.map(item => item.tradeDay),
+          res.amountList.map(item => item.count)
+        ];
+        this.initProduceChart(p1, p2);
+      } catch (error) {
+        console.log(error);
+      }
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.app-container {
+  padding: 20px;
+  background-color: #f5f5f5;
+}
+
+.card_wrap {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20px;
+
+  .card {
+    flex: 1;
+    background-color: #fff;
+    border-radius: 2px;
+    padding: 0 20px;
+
+    .header {
+      display: flex;
+      justify-content: space-between;
+      color: #999;
+      padding-top: 20px;
+
+      .card_title {
+        font-size: 14px;
+        flex: 1;
+      }
+    }
+
+    .number {
+      padding: 20px 0 10px 0;
+      font-size: 24px;
+      height: 60px;
+    }
+
+    .row {
+      height: 50px;
+      color: #555;
+      font-size: 14px;
+      display: flex;
+      align-items: center;
+
+      &:not(:last-child) {
+        border-bottom: 1px solid #ececec;
+      }
+
+      .icon {
+        color: rgb(255, 85, 85);
+        margin-left: 4px;
+      }
+
+      .dot {
+        $size: 6px;
+        width: $size;
+        height: $size;
+        border-radius: 50%;
+        background-color: #1890ff;
+        margin-right: 6px;
+      }
+    }
+  }
+}
+
+.chart_wrap {
+  margin-top: 20px;
+
+  .sale_data {
+    display: flex;
+
+    .card {
+      flex: 1;
+      background-color: #fff;
+      border-radius: 2px;
+      padding: 0 20px;
+
+      .sale_data_header {
+        display: flex;
+        justify-content: space-between;
+        color: #999;
+        padding-top: 20px;
+
+        .card_title {
+          font-size: 14px;
+          flex: 1;
+        }
+      }
+
+      .number {
+        padding-top: 10px;
+        font-size: 24px;
+        height: 60px;
+      }
+
+      .product_chart_wrap {
+        height: 50px;
+      }
+    }
+  }
+
+  .item {
+    flex: 1;
+    background-color: #fff;
+    border-radius: 2px;
+
+    .header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      border-bottom: 1px solid #ececec;
+      padding: 0 20px;
+
+      .tab_wrap {
+        display: flex;
+        $color: #1890ff;
+
+        .item {
+          padding: 0 10px;
+          height: 60px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 14px;
+          color: $color;
+
+          &.active {
+            position: relative;
+
+            &::after {
+              content: "";
+              width: 100%;
+              border-bottom: 2px solid $color;
+              position: absolute;
+              bottom: 0;
+              left: 0;
+            }
+          }
+        }
+      }
+    }
+
+    .chart {
+      padding: 20px 0;
+      height: 300px;
+    }
+
+    .table {
+      padding: 20px;
+    }
+  }
+}
+</style>
diff --git a/src/views/table/components/downloadTableCode.vue b/src/views/table/components/downloadTableCode.vue
index 0d32964..92f0218 100644
--- a/src/views/table/components/downloadTableCode.vue
+++ b/src/views/table/components/downloadTableCode.vue
@@ -2,7 +2,7 @@
     <el-dialog title="下载桌码" width="400px" :visible.sync="dialogVisible" @open="reset">
         <el-form ref="form" :model="form" label-position="left">
             <el-form-item label="下载数量">
-                <el-input-number v-model="form.number" :min="1" :max="total * 2"></el-input-number>
+                <el-input-number v-model="form.number" :min="1" :max="500"></el-input-number>
             </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">

From d61c0cbb2237cf57b4d7811692e20f3064774f6c Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 13 Sep 2024 09:17:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=97=E9=93=BA=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/img_download_error.png      | Bin 0 -> 14486 bytes
 src/layout/index.vue                          |   4 +-
 .../shop/components/collectMoneyCode.vue      |  49 +++++++++++++
 src/views/shop/components/shopInfo.vue        |  16 +++-
 src/views/shop/components/shopMode.vue        |  69 ++++++++++++++++++
 src/views/shop/shop_configuration.vue         |  20 +++--
 6 files changed, 150 insertions(+), 8 deletions(-)
 create mode 100644 src/assets/images/img_download_error.png
 create mode 100644 src/views/shop/components/collectMoneyCode.vue
 create mode 100644 src/views/shop/components/shopMode.vue

diff --git a/src/assets/images/img_download_error.png b/src/assets/images/img_download_error.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bc9660b17ee1b9938626d28bd6af0d0a3291ed4
GIT binary patch
literal 14486
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
V0DsiD0lsJms48k=isj8h{tuG4YY6}V

literal 0
HcmV?d00001

diff --git a/src/layout/index.vue b/src/layout/index.vue
index ea85f60..3beb9a5 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -36,7 +36,7 @@
             </span> -->
               <router-link to="/shop/shop/shop_configuration">
                 <el-dropdown-item>
-                  个人中心
+                  店铺配置
                 </el-dropdown-item>
               </router-link>
               <span @click="dialogVisible = true">
@@ -291,6 +291,7 @@ $top-c-h: 60px;
     .right-menu {
       display: flex;
       align-items: center;
+
       .left_icon {
         font-size: 18px;
         margin-right: 30px;
@@ -319,7 +320,6 @@ $top-c-h: 60px;
       }
 
       .avatar-container {
-        margin-right: 10px;
         display: flex;
         align-items: center;
 
diff --git a/src/views/shop/components/collectMoneyCode.vue b/src/views/shop/components/collectMoneyCode.vue
new file mode 100644
index 0000000..4c4d8ff
--- /dev/null
+++ b/src/views/shop/components/collectMoneyCode.vue
@@ -0,0 +1,49 @@
+<template>
+    <div v-loading="pageLoading">
+        <el-form :model="form" label-position="top">
+            <el-form-item label="门店收款码">
+                <el-image :src="form.paymentQrcode || require('@/assets/images/img_download_error.png')" fit="contain"
+                    style="width: 227px;height: 227px;"></el-image>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="downloadImgHandle(form.paymentQrcode)">下载收款码</el-button>
+                <el-button type="primary" @click="downloadImgHandle(form.paymentQrcode)">下载收款码样式</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+import { tbShopInfo, tbShopInfoPut } from "@/api/user";
+export default {
+    data() {
+        return {
+            pageLoading: false,
+            form: {
+                paymentQrcode: ''
+            }
+        }
+    },
+    mounted() {
+        this.tbShopInfo();
+    },
+    methods: {
+        // 下载图片
+        downloadImgHandle(url) {
+            if (url) window.open(url, '_blank')
+        },
+        // 获取店铺详情
+        async tbShopInfo() {
+            try {
+                this.pageLoading = true
+                const shopId = localStorage.getItem("shopId");
+                const res = await tbShopInfo(shopId);
+                this.pageLoading = false
+                this.form.paymentQrcode = res.paymentQrcode;
+            } catch (error) {
+                console.log(error);
+            }
+        },
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/shop/components/shopInfo.vue b/src/views/shop/components/shopInfo.vue
index 0afb898..e516d9e 100644
--- a/src/views/shop/components/shopInfo.vue
+++ b/src/views/shop/components/shopInfo.vue
@@ -29,6 +29,10 @@
             uploadIndex = 3;
             "></el-image>
         </el-form-item>
+        <el-form-item label="店铺小程序码">
+          <el-image :src="form.smallQrcode || require('@/assets/images/img_download_error.png')" fit="contain"
+            style="width: 80px;height: 80px;" @click="downloadImgHandle(form.smallQrcode)"></el-image>
+        </el-form-item>
         <el-form-item label="联系电话" prop="phone">
           <el-input v-model="form.phone" placeholder="请输入联系电话" style="width: 500px;"></el-input>
         </el-form-item>
@@ -69,10 +73,16 @@
           }" format="HH:mm" value-format="HH:mm">
           </el-time-picker>
           <el-time-picker placeholder="结束时间" v-model="endTime" :picker-options="{
-            selectableRange:'00:00:00 - 23:59:59',
+            selectableRange: '00:00:00 - 23:59:59',
           }" format="HH:mm" value-format="HH:mm">
           </el-time-picker>
         </el-form-item>
+        <el-form-item label="桌位费/位/元">
+          <el-input-number v-model="form.tableFee" :min="0" />
+          <!-- <el-checkbox v-model="form.isTableFee" :label="1">免餐位费</el-checkbox> -->
+          <el-switch v-model="form.isTableFee" :active-value="1" :inactive-value="0" active-text="免餐位费">
+          </el-switch>
+        </el-form-item>
         <el-form-item label="是否开启8折活动">
           <el-switch v-model="form.isOpenYhq" active-value="true" inactive-value="false"></el-switch>
           <!-- <div style="color: #999;">是否允许用户在小程序端支付订单</div> -->
@@ -251,6 +261,10 @@ export default {
     this.tbShopInfo();
   },
   methods: {
+    // 下载图片
+    downloadImgHandle(url) {
+      if (url) window.open(url, '_blank')
+    },
     onSearchResult(res) {
       this.locationSearchList = res;
       this.amapOptions.center = [res[0].lng, res[0].lat];
diff --git a/src/views/shop/components/shopMode.vue b/src/views/shop/components/shopMode.vue
new file mode 100644
index 0000000..aac223a
--- /dev/null
+++ b/src/views/shop/components/shopMode.vue
@@ -0,0 +1,69 @@
+<template>
+    <div v-loading="pageLoading">
+        <el-form :model="form" label-position="top">
+            <el-form-item label="经营模式「单选」">
+                <el-radio-group v-model="form.registerType">
+                    <el-radio label="munchies">快餐版（先支付后下单）</el-radio>
+                    <el-radio label="restaurant">餐饮版（先下单后支付）</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="就餐模式「多选」">
+                <el-checkbox-group v-model="form.eatModel">
+                    <el-checkbox label="dine-in">堂食自取</el-checkbox>
+                    <el-checkbox label="take-out">允许打包</el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" :loading="loading" @click="submitHandle">保存</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+import { tbShopInfo, tbShopInfoPut } from "@/api/user";
+export default {
+    data() {
+        return {
+            pageLoading: false,
+            loading: false,
+            form: {
+                id: localStorage.getItem("shopId"),
+                registerType: 'munchies',
+                eatModel: ['dine-in']
+            }
+        }
+    },
+    mounted() {
+        this.tbShopInfo();
+    },
+    methods: {
+        // 提交修改
+        async submitHandle() {
+            try {
+                this.loading = true
+                const res = await tbShopInfoPut(this.form)
+                this.loading = false
+                this.$message.success('修改成功')
+                this.tbShopInfo()
+            } catch (error) {
+                this.loading = false
+                console.log(error);
+            }
+        },
+        // 获取店铺详情
+        async tbShopInfo() {
+            try {
+                this.pageLoading = true
+                const shopId = localStorage.getItem("shopId");
+                const res = await tbShopInfo(shopId);
+                this.form.registerType = res.registerType;
+                this.form.eatModel = res.eatModel;
+                this.pageLoading = false
+            } catch (error) {
+                console.log(error);
+            }
+        },
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/shop/shop_configuration.vue b/src/views/shop/shop_configuration.vue
index bee45ee..3476d7e 100644
--- a/src/views/shop/shop_configuration.vue
+++ b/src/views/shop/shop_configuration.vue
@@ -2,13 +2,14 @@
     <div class="app-container">
         <el-tabs v-model="activeName" type="card">
             <el-tab-pane label="店铺信息" name="1"></el-tab-pane>
+            <el-tab-pane label="经营模式" name="8"></el-tab-pane>
             <el-tab-pane label="基础配置" name="2"></el-tab-pane>
             <!-- <el-tab-pane label="通知配置" name="3"></el-tab-pane> -->
             <el-tab-pane label="安全设置" name="4"></el-tab-pane>
             <el-tab-pane label="店铺装修" name="5"></el-tab-pane>
-            <el-tab-pane label="跳转小程序" name="6" v-if="shopId==1"></el-tab-pane>
+            <el-tab-pane label="跳转小程序" name="6" v-if="shopId == 1"></el-tab-pane>
             <el-tab-pane label="通知中心" name="7"></el-tab-pane>
-            
+            <el-tab-pane label="店铺收款码" name="9"></el-tab-pane>
         </el-tabs>
         <shopInfo v-if="activeName == 1" />
         <shopSetting v-if="activeName == 2" />
@@ -17,7 +18,8 @@
         <extend v-if="activeName == 5" />
         <goxcx v-if="activeName == 6" />
         <notifications v-if="activeName == 7" />
-        
+        <ShopMode v-if="activeName == 8" />
+        <CollectMoneyCode v-if="activeName == 9" />
     </div>
 </template>
 
@@ -29,16 +31,24 @@ import securitySetting from './components/securitySetting'
 import extend from './components/extend'
 import goxcx from './components/goxcx'
 import notifications from './notifications/index.vue'
+import ShopMode from './components/shopMode.vue'
+import CollectMoneyCode from './components/collectMoneyCode.vue'
 export default {
     components: {
         shopInfo,
         shopSetting,
-        notice,securitySetting,extend,goxcx,notifications
+        notice,
+        securitySetting,
+        extend,
+        goxcx,
+        notifications,
+        ShopMode,
+        CollectMoneyCode
     },
     data() {
         return {
             activeName: '1',
-            shopId:localStorage.getItem('shopId')
+            shopId: localStorage.getItem('shopId')
         }
     }
 }