diff --git a/src/css/popup.less b/src/css/popup.less index cee0500..7c4800a 100644 --- a/src/css/popup.less +++ b/src/css/popup.less @@ -93,7 +93,7 @@ body { border: 1px solid #FF8549; line-height: 30px; text-align: center; - transition: .2s; + transition: .3s; border-radius: 4px; cursor: pointer; box-sizing: border-box; diff --git a/src/js/default-config.js b/src/js/default-config.js new file mode 100644 index 0000000..3c98ee5 --- /dev/null +++ b/src/js/default-config.js @@ -0,0 +1,12 @@ +export default { + rsshubDomain: 'https://rsshub.app', + notice: { + badge: true, + }, + submitto: { + ttrss: false, + ttrssDomain: '', + feedly: false, + inoreader: false, + } +} \ No newline at end of file diff --git a/src/js/options/App.vue b/src/js/options/App.vue index 37b8a20..183e198 100644 --- a/src/js/options/App.vue +++ b/src/js/options/App.vue @@ -13,11 +13,15 @@ 设置 + + + 支持列表 + 关于 - @DIYgod + 版本 v{{ version }}
© 2019 DIYgod
@@ -36,6 +40,9 @@ export default { components: { HelloWorld }, + data: () => ({ + version: VERSION, + }), methods: { handleSelect(key, keyPath) { this.$router.push(key); @@ -88,6 +95,28 @@ body { line-height: 60px; text-align: center; font-size: 14px; - color: @color-primary; + color: #999; + line-height: 25px; + + a { + color: @color-primary; + text-decoration: none; + } +} + +.el-menu-item { + i, + span { + transition: color .3s; + } + + &.is-active { + color: #303133; + + i, + span { + color: #f5712c; + } + } } diff --git a/src/js/options/index.js b/src/js/options/index.js index 1deea99..161aa8c 100644 --- a/src/js/options/index.js +++ b/src/js/options/index.js @@ -1,10 +1,11 @@ +import '../../css/options.scss' import Vue from 'vue'; import VueRouter from 'vue-router'; import App from './App.vue'; import Setting from './views/Setting.vue'; +import List from './views/List.vue'; import About from './views/About.vue'; -import { Container, Menu, MenuItem, Aside, Header, Main, Footer } from 'element-ui'; -import '../../css/options.scss' +import { Container, Menu, MenuItem, Aside, Header, Main, Footer, Input, Checkbox, Message, Loading } from 'element-ui'; Vue.use(VueRouter); Vue.use(Container); @@ -14,11 +15,18 @@ Vue.use(Aside); Vue.use(Header); Vue.use(Main); Vue.use(Footer); +Vue.use(Input); +Vue.use(Checkbox); +Vue.use(Loading.directive); + +Vue.prototype.$loading = Loading.service; +Vue.prototype.$message = Message; Vue.config.productionTip = false; const routes = [ { path: '/', redirect: '/setting' }, { path: '/setting', component: Setting }, + { path: '/list', component: List }, { path: '/about', component: About }, ]; const router = new VueRouter({ diff --git a/src/js/options/views/About.vue b/src/js/options/views/About.vue index 487b23e..53d639f 100644 --- a/src/js/options/views/About.vue +++ b/src/js/options/views/About.vue @@ -1,5 +1,40 @@ \ No newline at end of file +
+ +
关于
+
+ 未完成的功能 +
+
+
+ + + + + diff --git a/src/js/options/views/List.vue b/src/js/options/views/List.vue new file mode 100644 index 0000000..dc1777e --- /dev/null +++ b/src/js/options/views/List.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/src/js/options/views/Setting.vue b/src/js/options/views/Setting.vue index 1ec65cc..fb11d28 100644 --- a/src/js/options/views/Setting.vue +++ b/src/js/options/views/Setting.vue @@ -1,21 +1,112 @@ - diff --git a/webpack.config.js b/webpack.config.js index f3f6470..0137830 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,3 +1,4 @@ +const webpack = require('webpack'); const path = require('path'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const CopyPlugin = require('copy-webpack-plugin'); @@ -166,6 +167,9 @@ module.exports = { }, ]), new VueLoaderPlugin(), + new webpack.DefinePlugin({ + VERSION: JSON.stringify(require('./src/assets/manifest.json').version) + }), ], node: {