Merge branch '20120518-daili' into dev

zhaoxiaoqiang

2021-05-17 af0d8cd16a8292959ee47f875b6fda4c71dcf62f

 src/store/index.js

@@ -294,15 +294,7 @@
                console.log(userPage)


                if (orgType == 1 || orgType == 3 || orgType == 2) {
                    footernav.unshift({
                        powerId: 100006,
                        icon: 'iconchanpin_h',
                        Aicon: 'iconchanpin',
                        label: '首页',
                        path: '/main/product'
                    })
                }

                footernav.push({
                    powerId: 200000,
                    icon: 'iconguanli_h',
@@ -329,9 +321,6 @@
                        path: '/user/register'
                    });
                }





                commit(SET_FOOTER_NAV, footernav);