From ed7d83972a3e440b41b3aa1cb49fc88cc447bd9e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 28 Jan 2021 15:19:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
.eslintrc.js | 5 +++--
src/page/index/top/top-theme.vue | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.eslintrc.js b/.eslintrc.js
index 20034fd..968344a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -9,9 +9,10 @@
],
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
- 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
+ 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+ "no-unused-vars": 'off'
},
parserOptions: {
parser: 'babel-eslint'
}
-}
\ No newline at end of file
+}
diff --git a/src/page/index/top/top-theme.vue b/src/page/index/top/top-theme.vue
index d1c22c6..be64989 100644
--- a/src/page/index/top/top-theme.vue
+++ b/src/page/index/top/top-theme.vue
@@ -32,7 +32,7 @@
data () {
return {
box: false,
- text: "",
+ text: "白色主题",
list: [
{
name: "默认主题",
--
Gitblit v1.9.3