feat: theme setting

vue-scaff · Jul 9, 2020 · 86512b7 · 86512b7
1 parent f034c66
commit 86512b7
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 19 deletions.
diff --git a/injection.json b/injection.json
@@ -1,5 +1,5 @@
 {
-  "publicPath": "{{ NODE_ENV }} === 'development' ? '/' : '/vue-scaff'",
+  "publicPath": "{{ NODE_ENV }} === 'development' ? '/' : '/vue-scaff-admin'",
 
   "version": "1.2.3.4",
 

diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
-    "@scaff/vue-cli-scaff": "^5.2.10",
+    "@scaff/vue-cli-scaff": "^5.2.12",
     "clipboard": "^2.0.6",
     "core-js": "^3.3.2",
     "deepmerge": "^4.2.2",

diff --git a/src/main.js b/src/main.js
@@ -26,7 +26,7 @@ export default (
     config.mode = "history";
 
     // Set Base Route
-    config.baseRoute = process.env.publicPath;
+    config.base = process.env.publicPath;
 
     // Guard
     config.beforeEach = (to, from, next) => {

diff --git a/src/pages/dashboard/admin/components/TransactionTable.vue b/src/pages/dashboard/admin/components/TransactionTable.vue
@@ -7,7 +7,7 @@
     </el-table-column>
     <el-table-column label="Price" width="195" align="center">
       <template slot-scope="scope">
-        ¥{{ scope.row.price | to-thousand-filter }}
+        ¥{{ scope.row.price | toThousandFilter }}
       </template>
     </el-table-column>
     <el-table-column label="Status" width="100" align="center">

diff --git a/src/sheet/variables.scss b/src/sheet/variables.scss
@@ -1,29 +1,38 @@
+// Colour
+$theme: #409eff;
+
+$white: #ffffff;
+$dark: #161616;
+$page: #f0f2f5;
+
 // base color
-$blue:#324157;
-$light-blue:#3A71A8;
-$red:#C03639;
-$pink: #E65D6E;
-$green: #30B08F;
-$tiffany: #4AB7BD;
-$yellow:#FEC171;
-$panGreen: #30B08F;
+$blue: #324157;
+$light-blue: #3a71a8;
+$red: #c03639;
+$pink: #e65d6e;
+$green: #30b08f;
+$tiffany: #4ab7bd;
+$yellow: #fec171;
+$panGreen: #30b08f;
 
 // sidebar
-$menuText:#bfcbd9;
-$menuActiveText:#409EFF;
-$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951
+$menuText: #bfcbd9;
+$menuActiveText: #409eff;
+$subMenuActiveText: #f4f4f5; // https://github.com/ElemeFE/element/issues/12951
 
-$menuBg:#304156;
-$menuHover:#263445;
+$menuBg: #304156;
+$menuHover: #263445;
 
-$subMenuBg:#1f2d3d;
-$subMenuHover:#001528;
+$subMenuBg: #1f2d3d;
+$subMenuHover: #001528;
 
 $sideBarWidth: 210px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
 :export {
+  theme: $theme;
+
   menuText: $menuText;
   menuActiveText: $menuActiveText;
   subMenuActiveText: $subMenuActiveText;