merge

2021-09-25 15:55:29 +08:00
parent 847f573ff3 1a2ecf43c7
commit ce16270b75
63 changed files with 4979 additions and 41 deletions
--- a/static/icons/logs-null.png
+++ b/static/icons/logs-null.png
--- a/static/imgs/cart_empty.png
+++ b/static/imgs/cart_empty.png
--- a/static/imgs/news_1.png
+++ b/static/imgs/news_1.png
--- a/static/imgs/news_2.png
+++ b/static/imgs/news_2.png
--- a/static/imgs/news_2_1.png
+++ b/static/imgs/news_2_1.png
--- a/static/imgs/news_3.png
+++ b/static/imgs/news_3.png
--- a/static/imgs/news_3_1.png
+++ b/static/imgs/news_3_1.png
--- a/static/user/order-cancelPay.png
+++ b/static/user/order-cancelPay.png
--- a/static/user/user-customer-close.png
+++ b/static/user/user-customer-close.png
--- a/static/user/user-portrait.png
+++ b/static/user/user-portrait.png
--- a/static/user/user-top-00.png
+++ b/static/user/user-top-00.png
--- a/static/user/user-top-01.png
+++ b/static/user/user-top-01.png
--- a/static/user/userAssets_tips.png
+++ b/static/user/userAssets_tips.png
--- a/static/user/userNew_icon.png
+++ b/static/user/userNew_icon.png
--- a/static/user/userRightst_icon_00.png
+++ b/static/user/userRightst_icon_00.png
--- a/static/user/userRightst_icon_01.png
+++ b/static/user/userRightst_icon_01.png
--- a/static/user/userRightst_icon_02.png
+++ b/static/user/userRightst_icon_02.png
--- a/static/user/userRightst_icon_03.png
+++ b/static/user/userRightst_icon_03.png
--- a/static/user/userServe-00.png
+++ b/static/user/userServe-00.png
--- a/static/user/userServe-01.png
+++ b/static/user/userServe-01.png
--- a/static/user/userServe-02.png
+++ b/static/user/userServe-02.png
--- a/static/user/userServe-03.png
+++ b/static/user/userServe-03.png
--- a/static/user/userTool-00.png
+++ b/static/user/userTool-00.png
--- a/static/user/userTool-01.png
+++ b/static/user/userTool-01.png
--- a/static/user/userTool-02.png
+++ b/static/user/userTool-02.png
--- a/static/user/userTool-03.png
+++ b/static/user/userTool-03.png
--- a/static/user/userTool-04.png
+++ b/static/user/userTool-04.png
--- a/static/user/userTool-05.png
+++ b/static/user/userTool-05.png
--- a/static/user/userVip_arrow.png
+++ b/static/user/userVip_arrow.png
--- a/static/user/userVip_more_arrow.png
+++ b/static/user/userVip_more_arrow.png