样式修改

src/layout/components/Settings/index.vue

@@ -31,7 +31,6 @@
 export default {
   data() {
     return {
-      theme: this.$store.state.settings.theme,
       sideTheme: this.$store.state.settings.sideTheme,
       form: {
         theme: '1' // 主题风格

src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   computed: {
     // 根据选择的风格切换图标
     logo() {
-      if (localStorage.getItem('theme') === '1') {
+      if (!localStorage.getItem('theme') || localStorage.getItem('theme') === '1') {
         return require('@/assets/image/denglu_logo@2x.png')
       } else {
         return require('@/assets/themeBImage/menuLogo.png')

src/layout/components/Sidebar/index.vue

@@ -46,7 +46,7 @@ export default {
     },
     variables() {
       // 根据选择的风格变量决定引用哪套variables变量文件
-      if (localStorage.getItem('theme') === '1') {
+      if (!localStorage.getItem('theme') || localStorage.getItem('theme') === '1') {
         return variables
       } else {
         return themeBvariables

src/main.js

@@ -10,7 +10,7 @@ import xhr from '@/utils/request'
 import '@/styles/index.scss' // global css
 // 样式文件切换，通过localStorage存储的theme变量决定用哪套样式文件
 const storageValue = window.localStorage.getItem('theme') // 获取 localStorage 中的值
-if (storageValue === '1') {
+if (!storageValue || storageValue === '1') {
   import('@/styles/themeA/index.scss')
 } else {
   import('@/styles/themeB/index.scss')

src/styles/themeB/sidebar.scss

@@ -263,7 +263,7 @@
     font-size: 16px!important;
     color: #333333 !important;
     font-weight: bold!important;
-    margin: 0 10px!important;
+    //margin: 0 10px!important;
     height: 42px!important;
     line-height: 42px!important;
     border-radius: 4px!important;

src/views/login/login.vue

@@ -25,8 +25,8 @@
             <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
           </el-input>
         </el-form-item>
-        <div class="loginCode_formItem">
-          <el-form-item v-if="captchaType === 'MATH' || captchaType === 'CHAR'" prop="code">
+        <div v-if="captchaType === 'MATH' || captchaType === 'CHAR'" class="loginCode_formItem">
+          <el-form-item prop="code">
             <el-input
               v-model="loginForm.code"
               auto-complete="off"

src/views/system/role/index.vue

@@ -44,8 +44,8 @@
       </el-form-item>
       <div style="float: right">
         <el-form-item>
-          <coolbutton :class-name="commonField.addClass" style="padding: 8px 7px;" :type="commonField.typePrimary" :name="commonField.addName" :size="commonField.smallSize" :icon="commonField.addIcon" :haspermi="hasAddPerm" @btn-click="handleAdd" />
-          <coolbutton :class-name="commonField.exportClass" style="padding: 8px 7px;" :type="commonField.typeSuccess" :name="commonField.exportName" :size="commonField.smallSize" :icon="commonField.exportIcon" :haspermi="hasExportPerm" @btn-click="handleExport" />
+          <coolbutton :class-name="commonField.addClass" :type="commonField.typePrimary" :name="commonField.addName" :size="commonField.smallSize" :icon="commonField.addIcon" :haspermi="hasAddPerm" @btn-click="handleAdd" />
+          <coolbutton :class-name="commonField.exportClass" :type="commonField.typeSuccess" :name="commonField.exportName" :size="commonField.smallSize" :icon="commonField.exportIcon" :haspermi="hasExportPerm" @btn-click="handleExport" />
         </el-form-item>
       </div>
     </el-form>