diff --git a/src/components/HeadNav/HeadNav.vue b/src/components/HeadNav/HeadNav.vue
index 8188a54..0130091 100644
--- a/src/components/HeadNav/HeadNav.vue
+++ b/src/components/HeadNav/HeadNav.vue
@@ -192,16 +192,20 @@ export default {
computed: {
...mapState('user', ['anyringToken', 'user']),
+
nickName() {
- const anyringToken = sessionStorage.getItem('anyringToken');
- const user = JSON.parse(sessionStorage.getItem('user'));
+ const anyringToken = sessionStorage.getItem('anyringToken') || this.anyringToken;
+ const user = sessionStorage.getItem('user') && JSON.parse(sessionStorage.getItem('user'));
if (anyringToken) {
- if (user.wxInfo && user.wxInfo.nickname) {
+ if (user.wxInfo.nickname) {
return user.wxInfo.nickname;
+ } else {
+ const account = this.user.account || user.account;
+ return account;
}
- return user.account;
+ } else {
+ return '';
}
- return '';
},
},
diff --git a/src/views/IncubationPlatform/Children/Services.vue b/src/views/IncubationPlatform/Children/Services.vue
index 2f2ca8b..82f4996 100644
--- a/src/views/IncubationPlatform/Children/Services.vue
+++ b/src/views/IncubationPlatform/Children/Services.vue
@@ -42,36 +42,94 @@
v-show="total > 8"
/>
-
+