Merge branch 'lj'

# Conflicts: # manifest.json # pages/index/index.vue
2023-11-04 12:29:00 +08:00
parent 5011e5b22e fd08f42bf9
commit 0cb065122f
23 changed files with 603 additions and 242 deletions
--- a/static/publish/fb_icon_dpcz.png
+++ b/static/publish/fb_icon_dpcz.png
--- a/static/publish/fb_icon_dpzr.png
+++ b/static/publish/fb_icon_dpzr.png
--- a/static/publish/fb_icon_xmzs.png
+++ b/static/publish/fb_icon_xmzs.png
--- a/static/publish/fb_icon_zdxz.png
+++ b/static/publish/fb_icon_zdxz.png
--- a/static/tabbar/di_icon_dz.png
+++ b/static/tabbar/di_icon_dz.png
--- a/static/tabbar/di_icon_fb.png
+++ b/static/tabbar/di_icon_fb.png
--- a/static/tabbar/di_icon_fb@2x.png
+++ b/static/tabbar/di_icon_fb@2x.png
--- a/static/tabbar/di_icon_sy.png
+++ b/static/tabbar/di_icon_sy.png
--- a/static/tabbar/di_icon_wd.png
+++ b/static/tabbar/di_icon_wd.png
--- a/static/tabbar/di_icon_zr.png
+++ b/static/tabbar/di_icon_zr.png