From 5d15b31f4852ce54ad7e611fcdde6d6f168d0288 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 20 Jul 2018 18:24:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- dev/deploy/preview-dev.sh | 27 ++++++++++++++++++ .../{multiple-page-control => tabs}/index.vue | 0 src/layout/header-aside/layout.vue | 8 +++--- .../image/icon@2x.png.REMOVED.git-id | 1 - src/pages/error-page-is-low-ie/index.js | 3 -- src/pages/error-page-is-low-ie/page.vue | 28 ------------------- src/pages/index/page.vue | 7 ++--- src/router/index.js | 7 +++-- src/router/routes.js.REMOVED.git-id | 2 +- vue.config.js | 7 +++-- 10 files changed, 44 insertions(+), 46 deletions(-) create mode 100755 dev/deploy/preview-dev.sh rename src/layout/header-aside/components/{multiple-page-control => tabs}/index.vue (100%) delete mode 100644 src/pages/error-page-is-low-ie/image/icon@2x.png.REMOVED.git-id delete mode 100644 src/pages/error-page-is-low-ie/index.js delete mode 100644 src/pages/error-page-is-low-ie/page.vue diff --git a/dev/deploy/preview-dev.sh b/dev/deploy/preview-dev.sh new file mode 100755 index 00000000..76a83f58 --- /dev/null +++ b/dev/deploy/preview-dev.sh @@ -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://.github.io +# git push -f git@github.com:/.github.io.git master + +# 如果发布到 https://.github.io/ +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" \ No newline at end of file diff --git a/src/layout/header-aside/components/multiple-page-control/index.vue b/src/layout/header-aside/components/tabs/index.vue similarity index 100% rename from src/layout/header-aside/components/multiple-page-control/index.vue rename to src/layout/header-aside/components/tabs/index.vue diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue index debbcb19..6016f900 100644 --- a/src/layout/header-aside/layout.vue +++ b/src/layout/header-aside/layout.vue @@ -34,7 +34,7 @@
- +
@@ -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) diff --git a/src/pages/error-page-is-low-ie/image/icon@2x.png.REMOVED.git-id b/src/pages/error-page-is-low-ie/image/icon@2x.png.REMOVED.git-id deleted file mode 100644 index 28d01f25..00000000 --- a/src/pages/error-page-is-low-ie/image/icon@2x.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -468b5c0e8223d984392890b8854d37acc8a5af38 \ No newline at end of file diff --git a/src/pages/error-page-is-low-ie/index.js b/src/pages/error-page-is-low-ie/index.js deleted file mode 100644 index ddb7de83..00000000 --- a/src/pages/error-page-is-low-ie/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import page from './page' - -export default page diff --git a/src/pages/error-page-is-low-ie/page.vue b/src/pages/error-page-is-low-ie/page.vue deleted file mode 100644 index 2cfbf5c1..00000000 --- a/src/pages/error-page-is-low-ie/page.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - diff --git a/src/pages/index/page.vue b/src/pages/index/page.vue index 3ae51881..3bef9e43 100644 --- a/src/pages/index/page.vue +++ b/src/pages/index/page.vue @@ -5,9 +5,9 @@ sub-title="追求简约美感的后台管理系统集成方案">
- 主页 | - 文档 | - issue | + 主页 | + 文档 | + issue | 提问
@@ -26,4 +26,3 @@ } } - diff --git a/src/router/index.js b/src/router/index.js index 5794024c..73057b59 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -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 } diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index f7873df8..5fadce59 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -bf5a89a4f0f25ee326691f3c72601d638bb047cf \ No newline at end of file +97be3f2fd593b87cf9c7a68081ce40feb76f9c1b \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index 76a03967..1751aa1e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -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