Skip to content

Feature/about #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ENV = 'development'

VUE_APP_BASE_URL = 'http://dev.lin.colorful3.com'
3 changes: 3 additions & 0 deletions .env.production
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@


VUE_APP_BASE_URL = 'http://dev.lin.colorful3.com'
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lin-cms",
"version": "0.1.0-beta.2",
"version": "0.1.0-beta.3",
"private": true,
"scripts": {
"serve": "node script/plugin-get-config.js && vue-cli-service serve",
Expand Down
24 changes: 18 additions & 6 deletions public/iconfont.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
height: 98px;
position: fixed;
left: 20%;
top: 43%;
}
.spinner {
position: relative;
Expand Down
Binary file added src/assets/img/about/avatar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/about/icon1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/about/icon2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/about/icon3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/about/icon4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/about/open-source.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/img/about/welcome.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions src/components/layout/ReuseTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<swiper-slide v-for="(item, index) in histories" :key="item.path">
<router-link
class="reuse-tab-item"
v-ripple
:class="item.path === $route.path ? 'active' : ''"
:to="item.path"
@contextmenu.prevent.native="onTags">
Expand All @@ -21,7 +20,6 @@
<script>
import { mapGetters } from 'vuex'
import { swiper, swiperSlide } from 'vue-awesome-swiper'
import ripple from 'lin/directives/ripple'

import "swiper/dist/css/swiper.css" // eslint-disable-line

Expand Down
2 changes: 1 addition & 1 deletion src/config/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const Config = {
baseUrl: 'http://dev.lin.colorful3.com',
baseUrl: process.env.VUE_APP_BASE_URL,
stagnateTime: 1 * 60 * 60 * 1000, // 无操作停滞时间 默认1小时
openAutoJumpOut: true, // 是否开启无操作跳出
notLoginRoute: ['login'], // 无需登录即可访问的路由 name,
Expand Down
1 change: 0 additions & 1 deletion src/lin/models/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {
post,
get,
put,
// } from '@/lin/utils/http'
} from '@/lin/plugins/axios'
import { saveTokens, saveAccessToken } from '../utils/cookie'

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/lin/plugins/axios.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ const config = {
// 创建请求实例
const _axios = axios.create(config)

_axios.interceptors.request.use((orignConfig) => {
const reqConfig = { ...orignConfig }
_axios.interceptors.request.use((originConfig) => {
const reqConfig = { ...originConfig }

// step1: 容错处理
if (!reqConfig.url) {
Expand Down
2 changes: 1 addition & 1 deletion src/lin/plugins/index.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
import './autoJump'
import './auto-jump'
import './axios'
77 changes: 0 additions & 77 deletions src/lin/utils/exception.js

This file was deleted.

120 changes: 0 additions & 120 deletions src/lin/utils/http.js

This file was deleted.

Empty file added src/models/.gitkeep
Empty file.
Loading