From 202f69ff07a2840a9746cda72361f0f67a20a85a Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 30 十一月 2021 19:47:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
PAMapp/components/BackActionBar.vue | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue
index dd01052..a57cb21 100644
--- a/PAMapp/components/BackActionBar.vue
+++ b/PAMapp/components/BackActionBar.vue
@@ -1,24 +1,28 @@
<template>
<nav class="pam-back-action-bar fix-chrome-click--issue">
- <a @click="$router.push('/')">
+ <a @click="pushRouterByLoginRole">
<i class="icon-left "></i>{{ label }}
</a>
</nav>
</template>
<script lang="ts">
-import { Vue, Component } from 'vue-property-decorator';
+import { namespace } from 'nuxt-property-decorator';
+import { Vue, Component,} from 'vue-property-decorator';
+import { Role } from '~/assets/ts/models/enum/Role';
+import * as _ from 'lodash';
+const roleStorage = namespace('localStorage');
@Component
export default class UiCarousel extends Vue {
-
+ @roleStorage.Getter currentRole!:string;
get label(): string {
if (this.$route.name) {
const routeName = this.$route.name.split('-')[0];
let featureLabel = '';
switch(routeName) {
case 'login':
- featureLabel = '��';
+ featureLabel = '�� | 閮餃��';
break;
case 'recommendConsultant':
featureLabel = '������';
@@ -37,13 +41,28 @@
break;
case 'questionnaire':
featureLabel = '�脰����';
+ break;
+ case 'notification':
+ featureLabel = '�';
+ break;
+ case 'record':
+ featureLabel = '�������';
+ break;
+ case 'accountSetting':
+ featureLabel = '�犖撣唾�身摰�';
+ break;
+ case 'consultantAccountSetting':
+ featureLabel = '���董�����';
+ break;
}
return featureLabel;
} else {
return '�����';
}
}
-
+ pushRouterByLoginRole():void{
+ this.$router.go(-1);
+ }
}
</script>
@@ -54,7 +73,7 @@
display: flex;
align-items: center;
position: fixed;
- top: 0;
+ top: $MOB_NAV_BAR;
left: 0;
width: 100%;
background-color: $PRIMARY_WHITE;
@@ -70,4 +89,10 @@
padding: 20px;
}
}
+
+@include desktop {
+ .pam-back-action-bar {
+ top: $DESKTOP_NAV_BAR;
+ }
+}
</style>
--
Gitblit v1.8.0