sheng/mes-ui-d2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'hotfix/add_doc_url2' into develop

Browse Source 
Former-commit-id: bbef5b39912f154725f4ee9754384366ea9d6f6e [formerly bbef5b39912f154725f4ee9754384366ea9d6f6e [formerly bbef5b39912f154725f4ee9754384366ea9d6f6e [formerly bbef5b39912f154725f4ee9754384366ea9d6f6e [formerly af886a37469f70a85a2b2dee0a59a07704236d17 [formerly c606e9d64277bdebf7e87633fe9688ba06ccaf15]]]]]
Former-commit-id: e8606facd9dbd24ce82d8027a4654b7b7180633c
Former-commit-id: d1df7b87b188ee4bda8a13ad10dd1819df07297f
Former-commit-id: d6404fd94e9e48a967bebc70a3e1cf7140f34e4b [formerly 44eae1905dde1bc491fff12d47f70892a1bd0a1b]
Former-commit-id: 58bd9910b74b1c0da00d68b7ff2d843916d16b2f
Former-commit-id: ff92261fdf13fe7c6da74a2d27e3828a7db4a9b0
Former-commit-id: 5999ea7f9e5fbba5cc44863140867d5da99ced6c
Former-commit-id: c361073f8a8987a4bf175977c607f735e896a08e
Former-commit-id: 697908a9e6609d26b5e7aeeab8a87c648bb63f4a
This commit is contained in:
liyang
2018-08-23 08:38:05 +08:00
parent 732a71c149 ad42e63596
commit 5df0073b02
15 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -18,3 +18,4 @@ yarn-error.log*
# d2admin
dev/design
docs/.vuepress/dist

7
README.md
View File

@@ -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
<img src="https://raw.githubusercontent.com/FairyEver/d2-admin/master/dev/github/reward-me@2x.png"/>
更多介绍和使用方法见 [文档](http://d2admin.fairyever.com/zh/)
更多介绍和使用方法见 [文档](http://app.d3collection.cn/d2-admin-doc/lastest/zh/)
## 友情链接

2
dev/deploy/doc.sh
View File

@@ -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/"
# echo "publish to http://app.d3collection.cn/d2-admin-doc/lastest/zh/"

2
dev/snippets/vue-html.json
View File

@@ -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",
" -->",
" <template slot=\"header\">header</template>",
" <span class=\"${1:page-name}_title\">this is [ {{name}} ]</span>",

2
dev/snippets/vue.json
View File

@@ -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",
" -->",
" <template slot=\"header\">header</template>",
" <span class=\"${1:page-name}_title\">this is [ {{name}} ]</span>",

2
docs/.vuepress/config.js
View File

@@ -1,5 +1,5 @@
module.exports = {
// base: '/d2-admin-doc/lastest/',
base: '/d2-admin-doc/lastest/',
locales: {
'/': {
lang: 'en-US',

2
docs/zh/article/cookbook/combinable-questionnaire.md.REMOVED.git-id
View File

@@ -1 +1 @@
7016ea14567961c24eb1fdee492e0c996099f752
050ae20fc14e789a5b567859da6853b56186211e

2
docs/zh/article/update/1.1.4.md
View File

@@ -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) | 完整版 码云镜像仓库 |

2
docs/zh/article/update/1.1.5.md.REMOVED.git-id
View File

@@ -1 +1 @@
05ccbdf3de53a90253dd94be5732f56d8b7235e9
f5a74f62746a51eb1e6f38c31635814d45397a86

2
docs/zh/article/update/1.2.0.md.REMOVED.git-id
View File

@@ -1 +1 @@
0a7f2e68d1f7b2c236189780aa8e141ba0c9de85
e8468130f6ca9e774e1cfae2472b5b259b1e060c

4
docs/zh/article/update/ice-1.1.2.md
View File

@@ -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 一致更新，如果你看到完
<img src="http://fairyever.qiniudn.com/20180801111123.jpg" style="width: 200px;"/>
[本文在项目文档中收录位置](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** 作为你对这个项目的认可与支持，谢谢。

2
public/index.html
View File

@@ -171,7 +171,7 @@
<div class="d2-app-loading-sub-info">如果很久很久都没有加载成功，请清空缓存重新加载页面</div>
<div style="margin-top: 10px;">
<a class="d2-app-loading-btn" href="https://github.com/d2-projects/d2-admin" target="blank">Github仓库</a>
<a class="d2-app-loading-btn" href="http://d2admin.fairyever.com/zh/" target="blank">中文文档</a>
<a class="d2-app-loading-btn" href="http://app.d3collection.cn/d2-admin-doc/lastest/zh/" target="blank">中文文档</a>
</div>
</div>
</div>

2
src/pages/index/components/d2-help-btn/index.vue
View File

@@ -15,7 +15,7 @@
<d2-icon name="github" class="d2-mr-5"/>
主页
</el-button>
<el-button @click="$open('http://d2admin.fairyever.com/zh/')">
<el-button @click="$open('http://app.d3collection.cn/d2-admin-doc/lastest/zh/')">
<d2-icon name="book" class="d2-mr-5"/>
中文文档
</el-button>

2
src/pages/index/page.vue
View File

@@ -7,7 +7,7 @@
<template slot="footer">
<div class="page__btn-group">
<span @click="$open('https://github.com/d2-projects')">项目组</span> |
<span @click="$open('http://d2admin.fairyever.com/zh/')">使用文档</span> |
<span @click="$open('http://app.d3collection.cn/d2-admin-doc/lastest/zh/')">使用文档</span> |
<span @click="$open('https://github.com/d2-projects/d2-admin-start-kit')">简化版脚手架</span> |
<span @click="$open('https://alibaba.github.io/ice/scaffold?type=vue')">飞冰物料</span> |
<span @click="$open('https://juejin.im/user/57a48b632e958a006691b946/posts')">掘金专栏</span> |

2
src/store/modules/d2admin/modules/releases.js
View File

@@ -43,7 +43,7 @@ export default {
versionShow (state) {
util.log.capsule('D2Admin', `v${state.version}`)
console.log('Github https://github.com/d2-projects/d2-admin')
console.log('Doc http://d2admin.fairyever.com/zh/')
console.log('Doc http://app.d3collection.cn/d2-admin-doc/lastest/zh/')
},
/**
* @description 设置是否有新的 D2Admin 版本