Skip to content

F
ferry_web
Commit 81de7c85 by yuzhenWang
Options

Merge branch 'feature-0530wyz-完成工单需求' into 'dev' 

解决嵌入iframe问题

See merge request !1
parents 64956f8c 9ca75b12
Showing with 107 additions and 79 deletions
.env.development
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
ENV = 'development' ENV = 'development'
# base api # base api
VUE_APP_BASE_API = 'http://139.224.145.34:8002' VUE_APP_BASE_API = 'https://mdev.zuihuibi.cn/ferry'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
# to control whether the babel-plugin-dynamic-import-node plugin is enabled. # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
......
.env.staging
...@@ -4,5 +4,4 @@ NODE_ENV = production ...@@ -4,5 +4,4 @@ NODE_ENV = production
ENV = 'staging' ENV = 'staging'
# base api # base api
VUE_APP_BASE_API = '' VUE_APP_BASE_API = 'https://mdev.zuihuibi.cn/ferry'
package.json
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
"dev": "vue-cli-service serve", "dev": "vue-cli-service serve",
"build:prod": "vue-cli-service build", "build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging", "build:stage": "vue-cli-service build --mode staging",
"build:dev": "vue-cli-service build --mode development",
"preview": "node build/index.js --preview", "preview": "node build/index.js --preview",
"lint": "eslint --ext .js,.vue src", "lint": "eslint --ext .js,.vue src",
"test:unit": "jest --clearCache && vue-cli-service test:unit", "test:unit": "jest --clearCache && vue-cli-service test:unit",
......
src/layout/components/Navbar.vue
<template> <template>
<!-- v-if="!hiddenSidler" --> <div class="navbar">
<div v-if="!hiddenSidler" class="navbar"> <hamburger
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> id="hamburger-container"
:is-active="sidebar.opened"
class="hamburger-container"
@toggleClick="toggleSideBar"
/>
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" /> <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
<div class="right-menu"> <div class="right-menu">
<template v-if="device!=='mobile'"> <template v-if="device !== 'mobile'">
<search id="header-search" class="right-menu-item" /> <search id="header-search" class="right-menu-item" />
<screenfull id="screenfull" class="right-menu-item hover-effect" /> <screenfull id="screenfull" class="right-menu-item hover-effect" />
</template> </template>
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click"> <el-dropdown
class="avatar-container right-menu-item hover-effect"
trigger="click"
>
<div class="avatar-wrapper"> <div class="avatar-wrapper">
<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar" alt=""> <img
<span style="font-size: 14px; position: relative; bottom: 15px">{{ name }}</span> :src="avatar + '?imageView2/1/w/80/h/80'"
<i class="el-icon-caret-bottom" style="position: absolute; top: 13px" /> class="user-avatar"
alt=""
>
<span style="font-size: 14px; position: relative; bottom: 15px">{{
name
}}</span>
<i
class="el-icon-caret-bottom"
style="position: absolute; top: 13px"
/>
</div> </div>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<router-link to="/profile/index"> <router-link to="/profile/index">
<el-dropdown-item>个人中心</el-dropdown-item> <el-dropdown-item>个人中心</el-dropdown-item>
</router-link> </router-link>
<el-dropdown-item divided> <el-dropdown-item divided>
<span style="display:block;" @click="logout">退出登录</span> <span style="display: block" @click="logout">退出登录</span>
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
...@@ -47,19 +62,9 @@ export default { ...@@ -47,19 +62,9 @@ export default {
Search Search
}, },
computed: { computed: {
...mapGetters([ ...mapGetters(['sidebar', 'avatar', 'device', 'name'])
'sidebar',
'avatar',
'device',
'name'
]),
hiddenSidler() {
return this.$store.state.user.hiddenSidler
}
},
mounted() {
console.log(this.hiddenSidler) // 获取 hiddenSidler 的值
}, },
mounted() {},
methods: { methods: {
toggleSideBar() { toggleSideBar() {
this.$store.dispatch('app/toggleSideBar') this.$store.dispatch('app/toggleSideBar')
...@@ -76,7 +81,6 @@ export default { ...@@ -76,7 +81,6 @@ export default {
}) })
} }
} }
} }
</script> </script>
...@@ -86,18 +90,18 @@ export default { ...@@ -86,18 +90,18 @@ export default {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
background: #fff; background: #fff;
box-shadow: 0 1px 4px rgba(0,21,41,.08); box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
.hamburger-container { .hamburger-container {
line-height: 46px; line-height: 46px;
height: 100%; height: 100%;
float: left; float: left;
cursor: pointer; cursor: pointer;
transition: background .3s; transition: background 0.3s;
-webkit-tap-highlight-color:transparent; -webkit-tap-highlight-color: transparent;
&:hover { &:hover {
background: rgba(0, 0, 0, .025) background: rgba(0, 0, 0, 0.025);
} }
} }
...@@ -129,10 +133,10 @@ export default { ...@@ -129,10 +133,10 @@ export default {
&.hover-effect { &.hover-effect {
cursor: pointer; cursor: pointer;
transition: background .3s; transition: background 0.3s;
&:hover { &:hover {
background: rgba(0, 0, 0, .025) background: rgba(0, 0, 0, 0.025);
} }
} }
} }
......
src/layout/components/Sidebar/SidebarItem.vue
<template> <template>
<div v-if="!item.hidden" class="menu-wrapper"> <div class="menu-wrapper">
<template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow"> <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
<app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)"> <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
<el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}"> <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
......
src/layout/index.vue
<template> <template>
<div :class="classObj" class="app-wrapper"> <div :class="classObj" class="app-wrapper">
<div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" /> <div
<sidebar class="sidebar-container" /> v-if="device === 'mobile' && sidebar.opened"
<div :class="{hasTagsView:needTagsView}" class="main-container"> class="drawer-bg"
<div :class="{'fixed-header':fixedHeader}"> @click="handleClickOutside"
/>
<sidebar v-if="!hiddenSidler" class="sidebar-container" />
<!-- <div :class="{ hasTagsView: needTagsView }" class="main-container"> -->
<div :class="mainContainerClass">
<div v-if="!hiddenSidler" :class="{ 'fixed-header': fixedHeader }">
<navbar /> <navbar />
<tags-view v-if="needTagsView" /> <tags-view v-if="needTagsView" />
</div> </div>
...@@ -34,11 +40,11 @@ export default { ...@@ -34,11 +40,11 @@ export default {
mixins: [ResizeMixin], mixins: [ResizeMixin],
computed: { computed: {
...mapState({ ...mapState({
sidebar: state => state.app.sidebar, sidebar: (state) => state.app.sidebar,
device: state => state.app.device, device: (state) => state.app.device,
showSettings: state => state.settings.showSettings, showSettings: (state) => state.settings.showSettings,
needTagsView: state => state.settings.tagsView, needTagsView: (state) => state.settings.tagsView,
fixedHeader: state => state.settings.fixedHeader fixedHeader: (state) => state.settings.fixedHeader
}), }),
classObj() { classObj() {
return { return {
...@@ -47,10 +53,21 @@ export default { ...@@ -47,10 +53,21 @@ export default {
withoutAnimation: this.sidebar.withoutAnimation, withoutAnimation: this.sidebar.withoutAnimation,
mobile: this.device === 'mobile' mobile: this.device === 'mobile'
} }
},
hiddenSidler() {
return this.$store.state.user.hiddenSidler
},
mainContainerClass() {
return {
'main-container': !this.hiddenSidler,
hasTagsView: this.needTagsView
}
} }
}, },
created() { created() {
console.log('\u611f\u8c22\u60a8\u4f7f\u7528\u672c\u7cfb\u7edf\uff0c\u5982\u679c\u53ef\u4ee5\u8bf7\u60a8\u5728github\u4e0a\u70b9\u4e0a\u4e00\u4e2a\u5c0f\u5c0f\u7684star\uff0c\u60a8\u7684\u652f\u6301\uff0c\u6211\u7684\u52a8\u529b\u3002\nhttps://github.com/lanyulei/ferry\n\u6709\u4efb\u4f55\u95ee\u9898\u6b22\u8fce\u52a0\u7fa4\u8be2\u95ee\uff1a1127401830') console.log(
'\u611f\u8c22\u60a8\u4f7f\u7528\u672c\u7cfb\u7edf\uff0c\u5982\u679c\u53ef\u4ee5\u8bf7\u60a8\u5728github\u4e0a\u70b9\u4e0a\u4e00\u4e2a\u5c0f\u5c0f\u7684star\uff0c\u60a8\u7684\u652f\u6301\uff0c\u6211\u7684\u52a8\u529b\u3002\nhttps://github.com/lanyulei/ferry\n\u6709\u4efb\u4f55\u95ee\u9898\u6b22\u8fce\u52a0\u7fa4\u8be2\u95ee\uff1a1127401830'
)
}, },
methods: { methods: {
handleClickOutside() { handleClickOutside() {
...@@ -61,45 +78,45 @@ export default { ...@@ -61,45 +78,45 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "~@/styles/mixin.scss"; @import "~@/styles/mixin.scss";
@import "~@/styles/variables.scss"; @import "~@/styles/variables.scss";
.app-wrapper { .app-wrapper {
@include clearfix; @include clearfix;
position: relative; position: relative;
height: 100%; height: 100%;
width: 100%; width: 100%;
&.mobile.openSidebar {
position: fixed;
top: 0;
}
}
.drawer-bg {
background: #000;
opacity: 0.3;
width: 100%;
top: 0;
height: 100%;
position: absolute;
z-index: 999;
}
.fixed-header { &.mobile.openSidebar {
position: fixed; position: fixed;
top: 0; top: 0;
right: 0;
z-index: 9;
width: calc(100% - #{$sideBarWidth});
transition: width 0.28s;
} }
}
.hideSidebar .fixed-header { .drawer-bg {
width: calc(100% - 54px) background: #000;
} opacity: 0.3;
width: 100%;
top: 0;
height: 100%;
position: absolute;
z-index: 999;
}
.mobile .fixed-header { .fixed-header {
width: 100%; position: fixed;
} top: 0;
right: 0;
z-index: 9;
width: calc(100% - #{$sideBarWidth});
transition: width 0.28s;
}
.hideSidebar .fixed-header {
width: calc(100% - 54px);
}
.mobile .fixed-header {
width: 100%;
}
</style> </style>
src/utils/auth.js
...@@ -6,10 +6,17 @@ export function getToken() { ...@@ -6,10 +6,17 @@ export function getToken() {
return Cookies.get(TokenKey) return Cookies.get(TokenKey)
} }
// export function setToken(token) {
// return Cookies.set(TokenKey, token)
// }
export function setToken(token) { export function setToken(token) {
return Cookies.set(TokenKey, token) // 修改这里，添加 SameSite 和 Secure 属性
return Cookies.set(TokenKey, token, {
sameSite: 'None',
secure: true,
expires: 7 // 7天过期，根据你的需求调整
})
} }
export function removeToken() { export function removeToken() {
return Cookies.remove(TokenKey) return Cookies.remove(TokenKey)
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment