From 1f6b91bc9bc5f6a29728a4c691bf94510fe9f054 Mon Sep 17 00:00:00 2001 From: "DESKTOP-369JRHT\\12997" <9> Date: Sat, 6 Jul 2024 14:43:55 +0800 Subject: [PATCH] no message --- .../src/assets/images/cut/组 4677@2x.png | Bin 0 -> 1062 bytes .../src/assets/images/cut/组 5017@2x.png | Bin 0 -> 1079 bytes fuintAdmin/src/views/member/index.vue | 2 +- fuintAdmin/src/views/order/order_Added.vue | 2 +- fuintAdmin/src/views/order/order_Cashier.vue | 5 +- fuintAdmin/src/views/order/order_Goods.vue | 2 +- fuintAdmin/src/views/order/order_Vip.vue | 2 +- .../src/assets/images/cut/组 4677@2x.png | Bin 0 -> 1062 bytes .../src/assets/images/cut/组 5017@2x.png | Bin 0 -> 1079 bytes .../src/assets/images/cut/组 4677@2x.png | Bin 0 -> 1062 bytes .../src/assets/images/cut/组 5017@2x.png | Bin 0 -> 1079 bytes .../cashier/NewComponents/HandoverDetails.vue | 10 +- .../src/views/cashier/NewComponents/Vip.vue | 2 +- .../views/cashier/NewComponents/credit.vue | 133 +++++++--- .../integralOrder/pointsCashier.vue | 147 ++++++++--- .../integralComponents/pointsCashier.vue | 137 +++++++--- .../cashier/orderComponents/order_Added.vue | 152 +++++++++--- .../cashier/orderComponents/order_Cashier.vue | 40 ++- .../cashier/orderComponents/order_Goods.vue | 166 ++++++++++--- .../cashier/orderComponents/order_Oil.vue | 211 +++++++++++----- .../cashier/orderComponents/order_Vip.vue | 154 +++++++++--- .../cashier/vipComponents/balanceList.vue | 167 ++++++++++--- .../views/cashier/vipComponents/imgs/hy-1.png | Bin 0 -> 5441 bytes .../views/cashier/vipComponents/imgs/hy-2.png | Bin 0 -> 6336 bytes .../views/cashier/vipComponents/imgs/hy-3.png | Bin 0 -> 7238 bytes .../views/cashier/vipComponents/imgs/hy-4.png | Bin 0 -> 3281 bytes .../views/cashier/vipComponents/imgs/hy-5.png | Bin 0 -> 3582 bytes .../views/cashier/vipComponents/vipList.vue | 233 ++++++++++++------ 28 files changed, 1168 insertions(+), 397 deletions(-) create mode 100644 fuintAdmin/src/assets/images/cut/组 4677@2x.png create mode 100644 fuintAdmin/src/assets/images/cut/组 5017@2x.png create mode 100644 fuintAdmin_zt/src/assets/images/cut/组 4677@2x.png create mode 100644 fuintAdmin_zt/src/assets/images/cut/组 5017@2x.png create mode 100644 fuintCashierWeb/src/assets/images/cut/组 4677@2x.png create mode 100644 fuintCashierWeb/src/assets/images/cut/组 5017@2x.png create mode 100644 fuintCashierWeb/src/views/cashier/vipComponents/imgs/hy-1.png create mode 100644 fuintCashierWeb/src/views/cashier/vipComponents/imgs/hy-2.png create mode 100644 fuintCashierWeb/src/views/cashier/vipComponents/imgs/hy-3.png create mode 100644 fuintCashierWeb/src/views/cashier/vipComponents/imgs/hy-4.png create mode 100644 fuintCashierWeb/src/views/cashier/vipComponents/imgs/hy-5.png diff --git a/fuintAdmin/src/assets/images/cut/组 4677@2x.png b/fuintAdmin/src/assets/images/cut/组 4677@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d57c8c272a0439a443ee77a140853c20197546f3 GIT binary patch literal 1062 zcmV+>1ljwEP)Px&;7LS5R9Hvtn9pw;MHI(BZ+2}eAtg61IBM0Nh~Zq4ra~YsLIv0wyf~w%zOL@U{K*1>GPVb+|e6q z`Ti`yr>qIr z1Ca`mHQcu`dj*~yPAvv+LTV2#(LKpKX_}Ht6JU{VXZ9S zF?Mum-VMm0Gz8!oXHC%#^`ra!0{xoVFo9=CfpdBruobiJsfYaE=VZV$bzH$dhMB zfsU{n^_ADB_Izq!5Z_y6Ch0gZmk)=+O^?LQ_xx~?>;#%9YbUgcC{fxLw!N}`(#wcT zO5>CU>eKW*nd)>r)#dn}{5_vWPry>FME^NbL){2-COMXPF4mpOJV}I}HAD!z$CJ^u z+txDgA(2CCe(+hyY-Y*U13Fgds-ZjKMPdM8s0XkpHZ6MYB;B}sAbeO#%xB;a#$7(# zMItRYN+iO*3Qwud&`nMjv-dTHg{-j6kBVQK1iTa*{(5vv9;WbaEPtxkD^)JV@OJ>`W^DsjIYbGK g@Z;Al`N8r13*`U0HCr&Hz5oCK07*qoM6N<$f-n5{i2wiq literal 0 HcmV?d00001 diff --git a/fuintAdmin/src/assets/images/cut/组 5017@2x.png b/fuintAdmin/src/assets/images/cut/组 5017@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..2d8460d29a33257a814b03dff74540d1d8c60df4 GIT binary patch literal 1079 zcmV-71jze|P)Px&@kvBMR9Hvtn7?mRR}{y;=e}n<5|SeosS+ZQDwvAfnFcZNOC%NIM;J0P(7;qt z75)Gads^`$VjyJc)QB=vv~n`QhN%#0h44r_1Q=MVM52oAch9NLbsU_;_Pe%UoJ8VE zk>&W^b3XU{zK;Mvt{v*buIx!Hh5azmJHVv$|66QX5IzO-8@lxCZ^}jveCH?UQK~#b zh8DLN@OqpI?L|8HjJ|#F6Um)3V|Z_0Yzy$(QA)uc1W1$II6Dp#{l4Wbz6ww>kn}N< z$iu+uzkAi;9REi184w* zFT6uf@De}~kRnVpi-=!)?_GJYUHH%pfP-FYUu`YT2R_ia4yO~s@)u*5K5rdD zKJZ#S#N7ASn$VMpz`OA+H4S65vh-##{{X2>bRRZOf@DFND=;*^q4a`95Kq8XrsDPZ zgiXB^EtNLZiZcR31MvzxpI~_nBX?oTGs%}qN{_+V1z0<~f}>5!)q8h{9EftBs5(>? z0GS6#5oGhLnpBV)2Xg^pi`|EfLYi={8a?s^;Je_c`n}Q81aGt~FE$5qePkFgS6uVc zde7y3-NQF3mDOfa0Pw`M`L<^kh0Q430RTfF($Ce4D*IcH4PG&?iu(QlA=}at)dSVJ znzZHX%%b7+VQ(YQwSq;|AjiA6yh?EK9ZV;hq|L}QA9(3}eBydpzNSU82-0IkTa*Rl z!|N1-1(4>2onM!Xu7^;6e2J`y_l9@X;hw7sE-@(&Z~?{^I=e_L1Go!~*#|f;j#SGr zeg-dHODN`DwV7*r`KVqb^snZTHC1QD5zAiDrY3rk(Z<%_Fuq0d;PN-!SDVcmi4&>w z^&Qr)3?%cEE$!~!@+!fke+1E3GE^Q?SiX-hncfKtK*NWF>l;$zS6Yd_O^~aIDmr?^ ztajjQqIAN9j3jnB(HS0+hmjdS=(bB`6C=20g#*>Gm~{!TVY~<7q7&=ID^VA6h z!2;O+y%`)G=`{EXHuVp=L2h#N9GG4KmA3$uIuh86O=|IwzeGg;(svIYJ9u}1TcbxH xW-q}1A)vlqu(YKk;xbGaLgX*H^vj>R_kVhk3E;$w4Lbk;002ovPDHLkV1neV0Pz3- literal 0 HcmV?d00001 diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue index 701351069..236ebe6d6 100644 --- a/fuintAdmin/src/views/member/index.vue +++ b/fuintAdmin/src/views/member/index.vue @@ -64,7 +64,7 @@ -
+
搜索 重置 新增 diff --git a/fuintAdmin/src/views/order/order_Added.vue b/fuintAdmin/src/views/order/order_Added.vue index de5f705ff..d1292792f 100644 --- a/fuintAdmin/src/views/order/order_Added.vue +++ b/fuintAdmin/src/views/order/order_Added.vue @@ -144,7 +144,7 @@
-
挂账订单列表
+
导出订单 diff --git a/fuintAdmin/src/views/order/order_Cashier.vue b/fuintAdmin/src/views/order/order_Cashier.vue index fa1ef279a..8dad533d2 100644 --- a/fuintAdmin/src/views/order/order_Cashier.vue +++ b/fuintAdmin/src/views/order/order_Cashier.vue @@ -51,7 +51,7 @@
- 收银台订单统计 +
@@ -122,7 +122,8 @@
-
收银台订单列表
+ +
导出订单
diff --git a/fuintAdmin/src/views/order/order_Goods.vue b/fuintAdmin/src/views/order/order_Goods.vue index 513378eed..3af3778fc 100644 --- a/fuintAdmin/src/views/order/order_Goods.vue +++ b/fuintAdmin/src/views/order/order_Goods.vue @@ -81,7 +81,7 @@
- 商品交易统计 +
diff --git a/fuintAdmin/src/views/order/order_Vip.vue b/fuintAdmin/src/views/order/order_Vip.vue index 5adef63be..08f519ba3 100644 --- a/fuintAdmin/src/views/order/order_Vip.vue +++ b/fuintAdmin/src/views/order/order_Vip.vue @@ -77,7 +77,7 @@
- 会员充值统计 +
diff --git a/fuintAdmin_zt/src/assets/images/cut/组 4677@2x.png b/fuintAdmin_zt/src/assets/images/cut/组 4677@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d57c8c272a0439a443ee77a140853c20197546f3 GIT binary patch literal 1062 zcmV+>1ljwEP)Px&;7LS5R9Hvtn9pw;MHI(BZ+2}eAtg61IBM0Nh~Zq4ra~YsLIv0wyf~w%zOL@U{K*1>GPVb+|e6q z`Ti`yr>qIr z1Ca`mHQcu`dj*~yPAvv+LTV2#(LKpKX_}Ht6JU{VXZ9S zF?Mum-VMm0Gz8!oXHC%#^`ra!0{xoVFo9=CfpdBruobiJsfYaE=VZV$bzH$dhMB zfsU{n^_ADB_Izq!5Z_y6Ch0gZmk)=+O^?LQ_xx~?>;#%9YbUgcC{fxLw!N}`(#wcT zO5>CU>eKW*nd)>r)#dn}{5_vWPry>FME^NbL){2-COMXPF4mpOJV}I}HAD!z$CJ^u z+txDgA(2CCe(+hyY-Y*U13Fgds-ZjKMPdM8s0XkpHZ6MYB;B}sAbeO#%xB;a#$7(# zMItRYN+iO*3Qwud&`nMjv-dTHg{-j6kBVQK1iTa*{(5vv9;WbaEPtxkD^)JV@OJ>`W^DsjIYbGK g@Z;Al`N8r13*`U0HCr&Hz5oCK07*qoM6N<$f-n5{i2wiq literal 0 HcmV?d00001 diff --git a/fuintAdmin_zt/src/assets/images/cut/组 5017@2x.png b/fuintAdmin_zt/src/assets/images/cut/组 5017@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..2d8460d29a33257a814b03dff74540d1d8c60df4 GIT binary patch literal 1079 zcmV-71jze|P)Px&@kvBMR9Hvtn7?mRR}{y;=e}n<5|SeosS+ZQDwvAfnFcZNOC%NIM;J0P(7;qt z75)Gads^`$VjyJc)QB=vv~n`QhN%#0h44r_1Q=MVM52oAch9NLbsU_;_Pe%UoJ8VE zk>&W^b3XU{zK;Mvt{v*buIx!Hh5azmJHVv$|66QX5IzO-8@lxCZ^}jveCH?UQK~#b zh8DLN@OqpI?L|8HjJ|#F6Um)3V|Z_0Yzy$(QA)uc1W1$II6Dp#{l4Wbz6ww>kn}N< z$iu+uzkAi;9REi184w* zFT6uf@De}~kRnVpi-=!)?_GJYUHH%pfP-FYUu`YT2R_ia4yO~s@)u*5K5rdD zKJZ#S#N7ASn$VMpz`OA+H4S65vh-##{{X2>bRRZOf@DFND=;*^q4a`95Kq8XrsDPZ zgiXB^EtNLZiZcR31MvzxpI~_nBX?oTGs%}qN{_+V1z0<~f}>5!)q8h{9EftBs5(>? z0GS6#5oGhLnpBV)2Xg^pi`|EfLYi={8a?s^;Je_c`n}Q81aGt~FE$5qePkFgS6uVc zde7y3-NQF3mDOfa0Pw`M`L<^kh0Q430RTfF($Ce4D*IcH4PG&?iu(QlA=}at)dSVJ znzZHX%%b7+VQ(YQwSq;|AjiA6yh?EK9ZV;hq|L}QA9(3}eBydpzNSU82-0IkTa*Rl z!|N1-1(4>2onM!Xu7^;6e2J`y_l9@X;hw7sE-@(&Z~?{^I=e_L1Go!~*#|f;j#SGr zeg-dHODN`DwV7*r`KVqb^snZTHC1QD5zAiDrY3rk(Z<%_Fuq0d;PN-!SDVcmi4&>w z^&Qr)3?%cEE$!~!@+!fke+1E3GE^Q?SiX-hncfKtK*NWF>l;$zS6Yd_O^~aIDmr?^ ztajjQqIAN9j3jnB(HS0+hmjdS=(bB`6C=20g#*>Gm~{!TVY~<7q7&=ID^VA6h z!2;O+y%`)G=`{EXHuVp=L2h#N9GG4KmA3$uIuh86O=|IwzeGg;(svIYJ9u}1TcbxH xW-q}1A)vlqu(YKk;xbGaLgX*H^vj>R_kVhk3E;$w4Lbk;002ovPDHLkV1neV0Pz3- literal 0 HcmV?d00001 diff --git a/fuintCashierWeb/src/assets/images/cut/组 4677@2x.png b/fuintCashierWeb/src/assets/images/cut/组 4677@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d57c8c272a0439a443ee77a140853c20197546f3 GIT binary patch literal 1062 zcmV+>1ljwEP)Px&;7LS5R9Hvtn9pw;MHI(BZ+2}eAtg61IBM0Nh~Zq4ra~YsLIv0wyf~w%zOL@U{K*1>GPVb+|e6q z`Ti`yr>qIr z1Ca`mHQcu`dj*~yPAvv+LTV2#(LKpKX_}Ht6JU{VXZ9S zF?Mum-VMm0Gz8!oXHC%#^`ra!0{xoVFo9=CfpdBruobiJsfYaE=VZV$bzH$dhMB zfsU{n^_ADB_Izq!5Z_y6Ch0gZmk)=+O^?LQ_xx~?>;#%9YbUgcC{fxLw!N}`(#wcT zO5>CU>eKW*nd)>r)#dn}{5_vWPry>FME^NbL){2-COMXPF4mpOJV}I}HAD!z$CJ^u z+txDgA(2CCe(+hyY-Y*U13Fgds-ZjKMPdM8s0XkpHZ6MYB;B}sAbeO#%xB;a#$7(# zMItRYN+iO*3Qwud&`nMjv-dTHg{-j6kBVQK1iTa*{(5vv9;WbaEPtxkD^)JV@OJ>`W^DsjIYbGK g@Z;Al`N8r13*`U0HCr&Hz5oCK07*qoM6N<$f-n5{i2wiq literal 0 HcmV?d00001 diff --git a/fuintCashierWeb/src/assets/images/cut/组 5017@2x.png b/fuintCashierWeb/src/assets/images/cut/组 5017@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..2d8460d29a33257a814b03dff74540d1d8c60df4 GIT binary patch literal 1079 zcmV-71jze|P)Px&@kvBMR9Hvtn7?mRR}{y;=e}n<5|SeosS+ZQDwvAfnFcZNOC%NIM;J0P(7;qt z75)Gads^`$VjyJc)QB=vv~n`QhN%#0h44r_1Q=MVM52oAch9NLbsU_;_Pe%UoJ8VE zk>&W^b3XU{zK;Mvt{v*buIx!Hh5azmJHVv$|66QX5IzO-8@lxCZ^}jveCH?UQK~#b zh8DLN@OqpI?L|8HjJ|#F6Um)3V|Z_0Yzy$(QA)uc1W1$II6Dp#{l4Wbz6ww>kn}N< z$iu+uzkAi;9REi184w* zFT6uf@De}~kRnVpi-=!)?_GJYUHH%pfP-FYUu`YT2R_ia4yO~s@)u*5K5rdD zKJZ#S#N7ASn$VMpz`OA+H4S65vh-##{{X2>bRRZOf@DFND=;*^q4a`95Kq8XrsDPZ zgiXB^EtNLZiZcR31MvzxpI~_nBX?oTGs%}qN{_+V1z0<~f}>5!)q8h{9EftBs5(>? z0GS6#5oGhLnpBV)2Xg^pi`|EfLYi={8a?s^;Je_c`n}Q81aGt~FE$5qePkFgS6uVc zde7y3-NQF3mDOfa0Pw`M`L<^kh0Q430RTfF($Ce4D*IcH4PG&?iu(QlA=}at)dSVJ znzZHX%%b7+VQ(YQwSq;|AjiA6yh?EK9ZV;hq|L}QA9(3}eBydpzNSU82-0IkTa*Rl z!|N1-1(4>2onM!Xu7^;6e2J`y_l9@X;hw7sE-@(&Z~?{^I=e_L1Go!~*#|f;j#SGr zeg-dHODN`DwV7*r`KVqb^snZTHC1QD5zAiDrY3rk(Z<%_Fuq0d;PN-!SDVcmi4&>w z^&Qr)3?%cEE$!~!@+!fke+1E3GE^Q?SiX-hncfKtK*NWF>l;$zS6Yd_O^~aIDmr?^ ztajjQqIAN9j3jnB(HS0+hmjdS=(bB`6C=20g#*>Gm~{!TVY~<7q7&=ID^VA6h z!2;O+y%`)G=`{EXHuVp=L2h#N9GG4KmA3$uIuh86O=|IwzeGg;(svIYJ9u}1TcbxH xW-q}1A)vlqu(YKk;xbGaLgX*H^vj>R_kVhk3E;$w4Lbk;002ovPDHLkV1neV0Pz3- literal 0 HcmV?d00001 diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverDetails.vue b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverDetails.vue index d96543104..1849280b1 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverDetails.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverDetails.vue @@ -7,13 +7,13 @@ 交班详情
- + 统一交班 个人交班 - + - + 交班 未交班 - + @@ -56,7 +56,7 @@ - + 搜索 重置 diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Vip.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Vip.vue index 5ac3a932e..450fca281 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/Vip.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/Vip.vue @@ -1,4 +1,4 @@ - +