Merge branch 'master' into release-20170915

components/default/Header.vue

@@ -83,8 +83,8 @@
             if (ens[i].current) {
               return ens[i]
             }
-            return {enName: '个人账户'}
           }
+          return {enName: '个人账户'}
 //          return ens.find(item => item.current) || {enName: '个人账户'}
         } else {
           return {enName: '个人账户'}