Merge branch '20120518-daili' into dev

zhaoxiaoqiang

2021-05-17 af0d8cd16a8292959ee47f875b6fda4c71dcf62f

 src/store/index.js

@@ -323,9 +323,6 @@
                }





                commit(SET_FOOTER_NAV, footernav);
                commit(SET_USER_PAGE, userPage);
                commit(SET_USER_INFO, data.body);