Former-commit-id: 9aa2487c1a5dd2a6b347268355d27d60937b1a15 [formerly 9aa2487c1a5dd2a6b347268355d27d60937b1a15 [formerly 9aa2487c1a5dd2a6b347268355d27d60937b1a15 [formerly 9aa2487c1a5dd2a6b347268355d27d60937b1a15 [formerly 4fa88c73d67fe113cdb9d5038baa61b9a2c50ac7 [formerly c1e1986deb2c50ecfff8f94c7e0af65b83777426]]]]]
Former-commit-id: 9ebe6124d8e9c0c91b8bbe32aff66f3c1892ba25
Former-commit-id: b32951098db0ae68c5b37e50bf7aedcc7c27c66e
Former-commit-id: f1577d9b650588c3a9d3083568face8219d867a3 [formerly e0a70087dcc7303505a1a21579dcbc313e953e22]
Former-commit-id: 1066bacc4e3b7211be367b7514994cbba041459f
Former-commit-id: c29f02c0c65173cf9b260c9c4e73a65e99a692ab
Former-commit-id: 9d2a3a8f99dfb8bdff9b665c45de5f0d2de9a7db
Former-commit-id: 41ac0283e997d7e392459d8d86544c822f5ac148
Former-commit-id: c59d4019d3b1f5454394cae4587d6653b616a978
This commit is contained in:
liyang 2018-07-20 18:24:47 +08:00
parent 1b62022beb
commit 5d15b31f48
10 changed files with 44 additions and 46 deletions

27
dev/deploy/preview-dev.sh Executable file
View File

@ -0,0 +1,27 @@
#!/usr/bin/env sh
# 确保脚本抛出遇到的错误
set -e
# 生成静态文件
npm run build
# 进入生成的文件夹
cd dist
# 如果是发布到自定义域名
# echo 'www.example.com' > CNAME
git init
git add -A
git commit -m 'deploy'
# 如果发布到 https://<USERNAME>.github.io
# git push -f git@github.com:<USERNAME>/<USERNAME>.github.io.git master
# 如果发布到 https://<USERNAME>.github.io/<REPO>
git push -f git@gitee.com:fairyever/d2-admin-preview-dev.git master
cd -
echo "publish to https://fairyever.gitee.io/d2-admin-preview-dev/#/index"

View File

@ -34,7 +34,7 @@
<!-- 主体 -->
<div class="d2-theme-container-main">
<div class="d2-theme-container-main-header">
<d2-multiple-page-control/>
<d2-tabs/>
</div>
<div class="d2-theme-container-main-body">
<transition name="fade-transverse">
@ -54,7 +54,7 @@ import { mapState, mapGetters } from 'vuex'
import menuSide from './components/menu-side'
import menuHeader from './components/menu-header'
import multiplePageControl from './components/multiple-page-control'
import tabs from './components/tabs'
import headerFullscreen from './components/header-fullscreen'
import headerTheme from './components/header-theme'
import headerUser from './components/header-user'
@ -65,7 +65,7 @@ export default {
components: {
'd2-menu-side': menuSide,
'd2-menu-header': menuHeader,
'd2-multiple-page-control': multiplePageControl,
'd2-tabs': tabs,
'd2-header-fullscreen': headerFullscreen,
'd2-header-theme': headerTheme,
'd2-header-user': headerUser,
@ -89,7 +89,7 @@ export default {
'themeActiveSetting'
]),
/**
* @description 返回现在需要缓存的页面 name
* @description 返回现在需要缓存的页面 name 数组
*/
keepAliveList () {
return this.pageOpenedList.filter(item => !(item.meta && item.meta.notCache)).map(e => e.name)

View File

@ -1 +0,0 @@
468b5c0e8223d984392890b8854d37acc8a5af38

View File

@ -1,3 +0,0 @@
import page from './page'
export default page

View File

@ -1,28 +0,0 @@
<template>
<div class="page">
<img src="./image/icon@2x.png" class="icon">
<p class="title">您的 IE 浏览器版本过低</p>
<p class="sub-title">请使用 IE 11+</p>
</div>
</template>
<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.page {
@extend %full;
@extend %flex-center-col;
background-color: #EDF4FA;
.icon {
width: 42px;
}
.title {
font-size: 14px;
color: #35495E;
}
.sub-title {
font-size: 12px;
color: #35495E;
margin: 0px;
}
}
</style>

View File

@ -5,9 +5,9 @@
sub-title="追求简约美感的后台管理系统集成方案">
<img src="./image/icon.png">
<div slot="footer" class="index-btn-group">
<a href="https://github.com/d2-projects/d2-admin" target="blank">主页</a> |
<a href="http://d2admin.fairyever.com/zh/" target="blank">文档</a> |
<a href="https://github.com/d2-projects/d2-admin/issues" target="blank">issue</a> |
<a href="https://github.com/d2-projects/d2-admin" target="blank">主页</a> |
<a href="http://d2admin.fairyever.com/zh/" target="blank">文档</a> |
<a href="https://github.com/d2-projects/d2-admin/issues" target="blank">issue</a> |
<a href="https://github.com/d2-projects/d2-admin/issues/new" target="blank">提问</a>
</div>
</d2-page-cover>
@ -26,4 +26,3 @@
}
}
</style>

View File

@ -16,13 +16,14 @@ let router = new VueRouter({ routes })
* 权限验证
*/
router.beforeEach((to, from, next) => {
const isMobile = util.isMobile()
// 禁止手机访问
if (to.name !== 'is-mobile' && util.isMobile()) {
if (to.name !== 'is-mobile' && isMobile) {
next({ name: 'is-mobile' })
return
}
// 如果是电脑访问 is-mobile 页面的话 -> 跳转到首页
if (to.name === 'is-mobile' && !util.isMobile()) {
// 如果是电脑访问手机提示页面的话 -> 跳转到首页
if (to.name === 'is-mobile' && !isMobile) {
next({ name: 'index' })
return
}

View File

@ -1 +1 @@
bf5a89a4f0f25ee326691f3c72601d638bb047cf
97be3f2fd593b87cf9c7a68081ce40feb76f9c1b

View File

@ -5,11 +5,14 @@ function resolve (dir) {
return path.join(__dirname, dir)
}
// 基础路径 注意发布之前要先修改这里
const baseUrl = '/d2-admin-preview-dev/'
module.exports = {
baseUrl: '/d2-admin-preview/', // 根据你的实际情况更改这里
baseUrl: baseUrl, // 根据你的实际情况更改这里
lintOnSave: true,
devServer: {
publicPath: '/d2-admin-preview/' // 和 baseUrl 保持一致
publicPath: baseUrl // 和 baseUrl 保持一致
},
// webpack 设置
// 默认设置: https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-service/lib/config/base.js