From ad42e6359615e69d19957421848f746f5de11c4b Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Thu, 23 Aug 2018 08:37:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 4137f480abbafb30b042aa6c22bdf65eb262076c [formerly 77bbdb1c240c6923e5068c4c9e61996b9550de05] [formerly 4137f480abbafb30b042aa6c22bdf65eb262076c [formerly 77bbdb1c240c6923e5068c4c9e61996b9550de05] [formerly 4137f480abbafb30b042aa6c22bdf65eb262076c [formerly 77bbdb1c240c6923e5068c4c9e61996b9550de05] [formerly 77bbdb1c240c6923e5068c4c9e61996b9550de05 [formerly 12daffb58a923498833c5fca09de792678b175b3 [formerly 5cb54b7121fc0a4c8c77aa38df2d1633adf9532c]]]]] Former-commit-id: a74369eb2392e1d6ea02a435b06d1bdd8304fa0d Former-commit-id: 77371d307e6cd49b4c18d1bab0943cd7e67047ea Former-commit-id: de489644e77e5948db9df9fea279ac1ba12b021c [formerly 204feb9ec86fb13ca6c7af4a2242f72ce7350d72] Former-commit-id: db5c30d31c859e4ab4ceaff9b146b2e67827b0c9 Former-commit-id: 3092dd0c1d6c449dcb150b1010c4452840d1d795 Former-commit-id: aaa367b2c8b26551fcb642677f96d2d9acb9f28d Former-commit-id: 3ba07266e1c2171c9c575d2e4de211d992ff609f Former-commit-id: dae3a815ec27a509186ee88225732ec7bcb35b87 --- .gitignore | 1 + README.md | 7 +++---- dev/deploy/doc.sh | 2 +- dev/snippets/vue-html.json | 2 +- dev/snippets/vue.json | 2 +- docs/.vuepress/config.js | 2 +- .../cookbook/combinable-questionnaire.md.REMOVED.git-id | 2 +- docs/zh/article/update/1.1.4.md | 2 +- docs/zh/article/update/1.1.5.md.REMOVED.git-id | 2 +- docs/zh/article/update/1.2.0.md.REMOVED.git-id | 2 +- docs/zh/article/update/ice-1.1.2.md | 4 ++-- public/index.html | 2 +- src/pages/index/components/d2-help-btn/index.vue | 2 +- src/pages/index/page.vue | 2 +- src/store/modules/d2admin/modules/releases.js | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 6cbe21cf..bd5987be 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ yarn-error.log* # d2admin dev/design +docs/.vuepress/dist diff --git a/README.md b/README.md index a2dbcfb3..fc8b524c 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,7 @@ D2Admin 是一个开源的管理系统前端集成方案，为了方便开发者 本项目仓库在 Github 和 Gitee 同步发布 -[中文文档](http://d2admin.fairyever.com/zh/) | -[中文文档 备用](http://app.d3collection.cn/d2-admin-doc/lastest/zh/) +[中文文档](http://app.d3collection.cn/d2-admin-doc/lastest/zh/) **完整版** @@ -100,7 +99,7 @@ D2Admin 是完全开源免费的管理系统集成方案，由 [FairyEver](https ## 使用 -详细用法见 [快速上手](http://d2admin.fairyever.com/zh/guide/getting-started.html) +详细用法见 [快速上手](http://app.d3collection.cn/d2-admin-doc/lastest/zh/guide/getting-started.html) ``` // 安装依赖 @@ -117,7 +116,7 @@ npm run build -更多介绍和使用方法见 [文档](http://d2admin.fairyever.com/zh/) +更多介绍和使用方法见 [文档](http://app.d3collection.cn/d2-admin-doc/lastest/zh/) ## 友情链接 diff --git a/dev/deploy/doc.sh b/dev/deploy/doc.sh index bf28e118..256bd91f 100755 --- a/dev/deploy/doc.sh +++ b/dev/deploy/doc.sh @@ -22,4 +22,4 @@ git push -f git@gitee.com:fairyever/d2-admin-doc.git master cd - -echo "publish to http://d2admin.fairyever.com/zh/" \ No newline at end of file +# echo "publish to http://app.d3collection.cn/d2-admin-doc/lastest/zh/" \ No newline at end of file diff --git a/dev/snippets/vue-html.json b/dev/snippets/vue-html.json index 540b0349..58de2cd1 100644 --- a/dev/snippets/vue-html.json +++ b/dev/snippets/vue-html.json @@ -9,7 +9,7 @@ " 可选 type = full(默认) | card | ghost", " 可选 better-scroll 属性", " 可选 better-scroll-option 属性", - " 文档 http://d2admin.fairyever.com/zh/components/container.html", + " 文档 http://app.d3collection.cn/d2-admin-doc/lastest/zh/components/container.html", " -->", " ", " this is [ {{name}} ]", diff --git a/dev/snippets/vue.json b/dev/snippets/vue.json index 540b0349..58de2cd1 100644 --- a/dev/snippets/vue.json +++ b/dev/snippets/vue.json @@ -9,7 +9,7 @@ " 可选 type = full(默认) | card | ghost", " 可选 better-scroll 属性", " 可选 better-scroll-option 属性", - " 文档 http://d2admin.fairyever.com/zh/components/container.html", + " 文档 http://app.d3collection.cn/d2-admin-doc/lastest/zh/components/container.html", " -->", " ", " this is [ {{name}} ]", diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index ebf8b9cd..0f8ce1c1 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -1,5 +1,5 @@ module.exports = { - // base: '/d2-admin-doc/lastest/', + base: '/d2-admin-doc/lastest/', locales: { '/': { lang: 'en-US', diff --git a/docs/zh/article/cookbook/combinable-questionnaire.md.REMOVED.git-id b/docs/zh/article/cookbook/combinable-questionnaire.md.REMOVED.git-id index c09f454c..66a67ba7 100644 --- a/docs/zh/article/cookbook/combinable-questionnaire.md.REMOVED.git-id +++ b/docs/zh/article/cookbook/combinable-questionnaire.md.REMOVED.git-id @@ -1 +1 @@ -7016ea14567961c24eb1fdee492e0c996099f752 \ No newline at end of file +050ae20fc14e789a5b567859da6853b56186211e \ No newline at end of file diff --git a/docs/zh/article/update/1.1.4.md b/docs/zh/article/update/1.1.4.md index 7cd6a38e..af177857 100644 --- a/docs/zh/article/update/1.1.4.md +++ b/docs/zh/article/update/1.1.4.md @@ -207,7 +207,7 @@ D2Admin 是一个 **注重外观表现** 的管理系统 **PC端** 集成方案 | 地址 | 描述 | | --- | --- | | [团队主页](https://github.com/d2-projects) | D2Admin 所属的团队主页 | -| [中文文档](http://d2admin.fairyever.com/zh/) | 中文文档 | +| [中文文档](http://app.d3collection.cn/d2-admin-doc/lastest/zh/) | 中文文档 | | [完整版 预览地址](https://fairyever.gitee.io/d2-admin-preview/#/index) | 完整版 预览地址 | | [完整版 github](https://github.com/d2-projects/d2-admin) | 完整版 Github 仓库 | | [完整版 码云](https://gitee.com/fairyever/d2-admin) | 完整版 码云镜像仓库 | diff --git a/docs/zh/article/update/1.1.5.md.REMOVED.git-id b/docs/zh/article/update/1.1.5.md.REMOVED.git-id index 2600a1c6..de098330 100644 --- a/docs/zh/article/update/1.1.5.md.REMOVED.git-id +++ b/docs/zh/article/update/1.1.5.md.REMOVED.git-id @@ -1 +1 @@ -05ccbdf3de53a90253dd94be5732f56d8b7235e9 \ No newline at end of file +f5a74f62746a51eb1e6f38c31635814d45397a86 \ No newline at end of file diff --git a/docs/zh/article/update/1.2.0.md.REMOVED.git-id b/docs/zh/article/update/1.2.0.md.REMOVED.git-id index 324b5623..0a500a98 100644 --- a/docs/zh/article/update/1.2.0.md.REMOVED.git-id +++ b/docs/zh/article/update/1.2.0.md.REMOVED.git-id @@ -1 +1 @@ -0a7f2e68d1f7b2c236189780aa8e141ba0c9de85 \ No newline at end of file +e8468130f6ca9e774e1cfae2472b5b259b1e060c \ No newline at end of file diff --git a/docs/zh/article/update/ice-1.1.2.md b/docs/zh/article/update/ice-1.1.2.md index 03427e20..70c5a369 100644 --- a/docs/zh/article/update/ice-1.1.2.md +++ b/docs/zh/article/update/ice-1.1.2.md @@ -209,7 +209,7 @@ D2Admin ICE 将会保持和 D2Admin Start Kit 一致更新，如果你看到完 | 地址 | 描述 | | --- | --- | | [团队主页](https://github.com/d2-projects) | D2Admin 所属的团队主页 | -| [中文文档](http://d2admin.fairyever.com/zh/) | 中文文档 | +| [中文文档](http://app.d3collection.cn/d2-admin-doc/lastest/zh/) | 中文文档 | | [D2Admin 完整版 预览地址](https://fairyever.gitee.io/d2-admin-preview/#/index) | 完整版 预览地址 | | [D2Admin 完整版 github](https://github.com/d2-projects/d2-admin) | 完整版 Github 仓库 | | [D2Admin 完整版 码云](https://gitee.com/fairyever/d2-admin) | 完整版 码云镜像仓库 | @@ -221,6 +221,6 @@ D2Admin ICE 将会保持和 D2Admin Start Kit 一致更新，如果你看到完 -[本文在项目文档中收录位置](http://d2admin.fairyever.com/zh/article/update/ice-1.1.2.html) +[本文在项目文档中收录位置](http://app.d3collection.cn/d2-admin-doc/lastest/zh/article/update/ice-1.1.2.html) 在最后，如果你看完了，并且觉得还不错，希望可以到 [项目主页](https://github.com/d2-projects/d2-admin) 上点一个 **star** 作为你对这个项目的认可与支持，谢谢。 \ No newline at end of file diff --git a/public/index.html b/public/index.html index 3c804e71..f1fcec95 100644 --- a/public/index.html +++ b/public/index.html @@ -171,7 +171,7 @@
如果很久很久都没有加载成功，请清空缓存重新加载页面
Github仓库 - 中文文档 + 中文文档
diff --git a/src/pages/index/components/d2-help-btn/index.vue b/src/pages/index/components/d2-help-btn/index.vue index ab11c134..cf3abceb 100644 --- a/src/pages/index/components/d2-help-btn/index.vue +++ b/src/pages/index/components/d2-help-btn/index.vue @@ -15,7 +15,7 @@ 主页 - + 中文文档 diff --git a/src/pages/index/page.vue b/src/pages/index/page.vue index 564801b7..b7748973 100644 --- a/src/pages/index/page.vue +++ b/src/pages/index/page.vue @@ -7,7 +7,7 @@