Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -5,7 +5,7 @@
         {{ logoName[0] && logoName[0].DNAME }}
         {{ logoName[0] && logoName[0].DNAME }}
       </div>
       </div>
       <div class="user">
       <div class="user">
-        欢迎进入系统 {{ userInfo.name }}
+        欢迎进入系统 {{ userName }}
         <span @click="onCancel">
         <span @click="onCancel">
           <svg-icon icon-class="close" class="closeStyle" />退出系统</span>
           <svg-icon icon-class="close" class="closeStyle" />退出系统</span>
       </div>
       </div>
@@ -29,11 +29,14 @@ export default {
     sidebarRight,
     sidebarRight,
   },
   },
   computed: {
   computed: {
-    ...mapGetters(["sidebar", "dicData", "userInfo"]),
-    logoName: function () {
+    ...mapGetters(["sidebar", "dicData"]),
+    logoName() {
       return this.dicData['sysCode'] && this.dicData['sysCode'].filter(item =>
       return this.dicData['sysCode'] && this.dicData['sysCode'].filter(item =>
         item.DCODE == "systemTitle"
         item.DCODE == "systemTitle"
       )
       )
+    },
+    userName(){
+      return this.$store.state.userInfo ? this.$store.state.userInfo.name : ""
     }
     }
   },
   },
   methods: {
   methods: {

@@ -128,11 +128,6 @@ export default {
       });
       });
     },
     },
   },
   },
-  computed: {
-    productName() {
-      return this.$store.state.products.products.name;
-    },
-  },
   components: {},
   components: {},
 };
 };
 </script>
 </script>