Merge remote-tracking branch 'origin/dev_20230526_Mobile'
# Conflicts: # jero-web/src/common/lang/en-us.js # jero-web/src/common/lang/zh-cn.js # jero-web/src/components/tools/UserMenu.vue
This commit is contained in:
@@ -31,18 +31,11 @@
|
||||
<!-- <a-icon type="question-circle-o"></a-icon>-->
|
||||
<!-- </a>-->
|
||||
<!-- </span>-->
|
||||
<!-- <div class="action" @click="Jumpflybook">-->
|
||||
<!-- <span class="header-notice">-->
|
||||
<!-- <a-tooltip placement="bottomRight" :title="$t('userManual')" overlayClassName="tooltipColor">-->
|
||||
<!-- <a-icon style="font-size: 16px; padding: 4px; color: #000000A6" type="question-circle"/>-->
|
||||
<!-- </a-tooltip>-->
|
||||
<!-- </span>-->
|
||||
<!-- </div>-->
|
||||
<a-dropdown>
|
||||
<span class="action action-full ant-dropdown-link user-dropdown-menu">
|
||||
<!-- <a-avatar class="avatar" size="small" :src="getAvatar()"/>-->
|
||||
<!-- <span v-if="isDesktop()">welcome,{{ userInfo().username }}</span>-->
|
||||
<a-icon style="font-size: 16px; padding: 4px; color: #000000A6" type="question-circle"/>
|
||||
<div class="action" @click="Jumpflybook">
|
||||
<span class="header-notice">
|
||||
<a-tooltip placement="bottomRight" :title="$t('userManual')" overlayClassName="tooltipColor">
|
||||
<a-icon style="font-size: 16px; padding: 4px; color: #000000A6" type="question-circle"/>
|
||||
</a-tooltip>
|
||||
</span>
|
||||
<a-menu slot="overlay" class="user-dropdown-menu-wrapper">
|
||||
<a-menu-item key="5" @click="Jumpflybook">
|
||||
@@ -231,8 +224,8 @@
|
||||
hiddenClick() {
|
||||
this.shows = false
|
||||
},
|
||||
Jumpflybook(){
|
||||
window.open('https://eicgyqr5mc.feishu.cn/docx/doxcnY2GbQfMSMqLP0eIFzFlEcd', '_blank');
|
||||
Jumpflybook() {
|
||||
window.open('https://eicgyqr5mc.feishu.cn/docx/doxcnY2GbQfMSMqLP0eIFzFlEcd', '_blank')
|
||||
},
|
||||
Jumpoperationguide(){
|
||||
window.open('https://eicgyqr5mc.feishu.cn/docx/ZyhWdIz7EoMZ68xhI2bckcWWnMg', '_blank');
|
||||
@@ -401,6 +394,7 @@
|
||||
|
||||
.action {
|
||||
color: rgba(0, 0, 0, 0.65) !important;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.action .avatar {
|
||||
|
||||
Reference in New Issue
Block a user