Browse Source

添加四种皮肤

lex-xin 3 years ago
parent
commit
e7d75f6d95

+ 2 - 2
src/App.vue

@@ -40,7 +40,7 @@ export default {
   display: none !important;
 }
 #app {
-  --color-primary: #14928a;
+  --color-primary: #00A79D;
 }
 // 13817a
 body {
@@ -54,7 +54,7 @@ body {
   visibility: hidden;
 }
 .el-checkbox__inner:hover {
-  background-color: rgb(19, 129, 122);
+  background-color: #00A79D;
 }
 .el-checkbox__input.is-checked .el-checkbox__inner,
 .el-checkbox__input.is-indeterminate .el-checkbox__inner {

+ 6 - 6
src/layout/components/Navbar.vue

@@ -409,7 +409,7 @@ export default {
             //判断是否是当前路由
             // if(url == this.$route.path) {
               tenantConfig.tenantId = tenantForm.tenantId
-              tenantConfig.tenantName = tenantForm.tenantName
+              tenantConfig.tenantName = tenantName
               sessionStorage.setItem('tenantConfig', JSON.stringify(tenantConfig))
               this.$router.push({
                   path: '/redirect',
@@ -543,13 +543,13 @@ export default {
     &:hover,
     &.active {
       span {
-        background: #fff;
-        border-radius: 6px;
+        font-weight: 500;
+      //   border-radius: 6px;
       }
     }
-    &.active span {
-      font-weight: bold;
-    }
+    // &.active span {
+    //   font-weight: bold;
+    // }
   }
   .breadcrumb {
     line-height: 90px;

+ 1 - 1
src/store/modules/user.js

@@ -120,7 +120,7 @@ const actions = {
           if(tenantId > 0) { // 判断是机构才会根据主题去设置
             const themeColor = tenantConfig.themeColor
             const theme = tenantConfig.theme
-            setTheme(themeColor)
+            setTheme({ theme, themeColor })
           }
           sessionStorage.setItem('baseTenantId', tenantId)
           commit('SET_NAME', username)

+ 4 - 0
src/styles/index.scss

@@ -3,6 +3,10 @@
 @import './transition.scss';
 @import './element-ui.scss';
 @import './sidebar.scss';
+// 引用其它三种皮肤
+@import './theme/berlinBlue.scss';
+@import './theme/cloudAshes.scss';
+@import './theme/volcanicRed.scss';
 
 // $--color-primary: red;
 body {

+ 5 - 77
src/styles/sidebar.scss

@@ -1,9 +1,4 @@
-#app, #app.green {
-  .indexlayout-top-menu-li {
-    &:hover, &.active {
-      color: $menuActiveText2 !important;
-    }
-  }
+#app, #app.adenGreen {
   .sidebar-container {
     background-color: $menuBg;
     // menu hover
@@ -65,7 +60,7 @@
 
 
   .el-menu-item.is-active {
-    font-weight: bold;
+    // font-weight: bold;
     position: relative;
     &::after {
       position: absolute;
@@ -303,7 +298,7 @@
   }
 
   .el-menu-item.is-active {
-    font-weight: bold;
+    // font-weight: bold;
     position: relative;
     &::after {
       position: absolute;
@@ -322,80 +317,13 @@
       color: #fff;
     }
   }
-}
-
-#app.dark {
   .indexlayout-top-menu-li {
     &:hover, &.active {
-      color: $darkmenuActiveText2 !important;
-    }
-  }
-  .sidebar-container {
-    background-color: $darkmenuBg;
-    .submenu-title-noDropdown,
-    .el-submenu__title {
-      &:hover {
-        background-color: $darkmenuHover !important;
-        color: $darkmenuActiveText2 !important;
-        &::after{
-          background-color: $darkmenuActiveText2;
-        }
-      }
-    }
-    .is-active>.el-submenu__title {
-      color: $darksubMenuActiveText !important;
-    }
-
-    & .nest-menu .el-submenu>.el-submenu__title,
-    & .el-submenu .el-menu-item {
-      background-color: $darksubMenuBg!important;
-
-      &:hover {
-        background-color: $darksubMenuHover!important;
-        color: $darkmenuActiveText2 !important;
-        &::after{
-          background-color: $darkmenuActiveText2;
-        }
-      }
-    }
-
-    & .el-menu-item {
-      &:hover {
-        background-color: $darksubMenuHover!important;
-        color: $darkmenuActiveText2 !important;
-        &::after{
-          background-color: $darkmenuActiveText2;
-        }
-      }
-    }
-  }
-
-  .el-submenu .el-menu-item.is-active {
-    background-color: $darksubMenuActiveBg!important;
-    &::after{
-      background-color: $darkmenuActiveText2;
-    }
-  }
-
-  .el-menu-item.is-active {
-    background-color: $darkmenuHover !important;
-    color: $darkmenuActiveText2 !important;
-    &::after {
-      background-color: $darkmenuActiveAfter;
-    }
-  }
-  .el-submenu .el-menu-item.is-active {
-    color: $darkmenuActiveText2 !important;
-  }
-
-  .navbar {
-    background: $darkmenuPrimary;
-    .left-menu {
-      color: #fff;
+      color: $menuActiveText !important;
+      background-color: $menuActiveBg !important;
     }
   }
 }
-
 // when menu collapsed
 // .el-menu--vertical {
 //   &>.el-menu {

+ 86 - 0
src/styles/theme/berlinBlue.scss

@@ -0,0 +1,86 @@
+// 第二套样式配置
+$bluemenuPrimary: #2B78CC;
+$bluemenuActiveBg: #2568B2;
+$bluemenuText:#1a1a1a;
+$bluemenuActiveText:#fff;
+$bluemenuActiveText2:#2B78CC;
+$bluesubMenuActiveText:#030303; //https://github.com/ElemeFE/element/issues/12951
+$bluemenuBg:#fff; // 侧边栏一级默认样式
+$bluemenuHover: #EDF6FF; // 侧边栏一级滑动样式
+$bluesubMenuBg:#fff; // 侧边栏二级默认样式
+$bluesubMenuHover:#EDF6FF; // 侧边栏二级鼠标滑动样式
+$bluesubMenuActiveBg:#EDF6FF; // 侧边栏二级选中样式
+$bluemenuActiveAfter: #2B78CC;
+
+#app.berlinBlue {
+  .sidebar-container {
+    background-color: $bluemenuBg;
+    .submenu-title-noDropdown,
+    .el-submenu__title {
+      &:hover {
+        background-color: $bluemenuHover !important;
+        color: $bluemenuActiveText2 !important;
+        &::after{
+          background-color: $bluemenuActiveText2;
+        }
+      }
+    }
+    .is-active>.el-submenu__title {
+      color: $bluesubMenuActiveText !important;
+    }
+
+    & .nest-menu .el-submenu>.el-submenu__title,
+    & .el-submenu .el-menu-item {
+      background-color: $bluesubMenuBg!important;
+
+      &:hover {
+        background-color: $bluesubMenuHover!important;
+        color: $bluemenuActiveText2 !important;
+        &::after{
+          background-color: $bluemenuActiveText2;
+        }
+      }
+    }
+
+    & .el-menu-item {
+      &:hover {
+        background-color: $bluesubMenuHover!important;
+        color: $bluemenuActiveText2 !important;
+        &::after{
+          background-color: $bluemenuActiveText2;
+        }
+      }
+    }
+  }
+
+  .el-submenu .el-menu-item.is-active {
+    background-color: $bluesubMenuActiveBg!important;
+    &::after{
+      background-color: $bluemenuActiveText2;
+    }
+  }
+
+  .el-menu-item.is-active {
+    background-color: $bluemenuHover !important;
+    color: $bluemenuActiveText2 !important;
+    &::after {
+      background-color: $bluemenuActiveAfter;
+    }
+  }
+  .el-submenu .el-menu-item.is-active {
+    color: $bluemenuActiveText2 !important;
+  }
+
+  .navbar {
+    background: $bluemenuPrimary;
+    .left-menu {
+      color: #fff;
+    }
+  }
+  .indexlayout-top-menu-li {
+    &:hover, &.active {
+      color: $bluemenuActiveText !important;
+      background-color: $bluemenuActiveBg !important;
+    }
+  }
+}

+ 86 - 0
src/styles/theme/cloudAshes.scss

@@ -0,0 +1,86 @@
+// 第二套样式配置
+$ashesmenuPrimary: #444D5C;
+$ashesmenuActiveBg: #363A49; // 头部菜单选中背景色
+$ashesmenuText:#1a1a1a;
+$ashesmenuActiveText:#fff;
+$ashesmenuActiveText2:#444D5C;
+$ashessubMenuActiveText:#030303; //https://github.com/ElemeFE/element/issues/12951
+$ashesmenuBg:#fff; // 侧边栏一级默认样式
+$ashesmenuHover: #F3F4F7; // 侧边栏一级滑动样式
+$ashessubMenuBg:#fff; // 侧边栏二级默认样式
+$ashessubMenuHover:#F3F4F7; // 侧边栏二级鼠标滑动样式
+$ashessubMenuActiveBg:#F3F4F7; // 侧边栏二级选中样式
+$ashesmenuActiveAfter: #444D5C;
+
+#app.cloudAshes {
+  .sidebar-container {
+    background-color: $ashesmenuBg;
+    .submenu-title-noDropdown,
+    .el-submenu__title {
+      &:hover {
+        background-color: $ashesmenuHover !important;
+        color: $ashesmenuActiveText2 !important;
+        &::after{
+          background-color: $ashesmenuActiveText2;
+        }
+      }
+    }
+    .is-active>.el-submenu__title {
+      color: $ashessubMenuActiveText !important;
+    }
+
+    & .nest-menu .el-submenu>.el-submenu__title,
+    & .el-submenu .el-menu-item {
+      background-color: $ashessubMenuBg!important;
+
+      &:hover {
+        background-color: $ashessubMenuHover!important;
+        color: $ashesmenuActiveText2 !important;
+        &::after{
+          background-color: $ashesmenuActiveText2;
+        }
+      }
+    }
+
+    & .el-menu-item {
+      &:hover {
+        background-color: $ashessubMenuHover!important;
+        color: $ashesmenuActiveText2 !important;
+        &::after{
+          background-color: $ashesmenuActiveText2;
+        }
+      }
+    }
+  }
+
+  .el-submenu .el-menu-item.is-active {
+    background-color: $ashessubMenuActiveBg!important;
+    &::after{
+      background-color: $ashesmenuActiveText2;
+    }
+  }
+
+  .el-menu-item.is-active {
+    background-color: $ashesmenuHover !important;
+    color: $ashesmenuActiveText2 !important;
+    &::after {
+      background-color: $ashesmenuActiveAfter;
+    }
+  }
+  .el-submenu .el-menu-item.is-active {
+    color: $ashesmenuActiveText2 !important;
+  }
+
+  .navbar {
+    background: $ashesmenuPrimary;
+    .left-menu {
+      color: #fff;
+    }
+  }
+  .indexlayout-top-menu-li {
+    &:hover, &.active {
+      color: $ashesmenuActiveText !important;
+      background-color: $ashesmenuActiveBg !important;
+    }
+  }
+}

+ 86 - 0
src/styles/theme/volcanicRed.scss

@@ -0,0 +1,86 @@
+// 第二套样式配置
+$redmenuPrimary: #BC3030;
+$redmenuActiveBg: #A62929;
+$redmenuText:#1a1a1a;
+$redmenuActiveText:#fff;
+$redmenuActiveText2:#BC3030;
+$redsubMenuActiveText:#030303; //https://github.com/ElemeFE/element/issues/12951
+$redmenuBg:#fff; // 侧边栏一级默认样式
+$redmenuHover: #FBF3F3; // 侧边栏一级滑动样式
+$redsubMenuBg:#fff; // 侧边栏二级默认样式
+$redsubMenuHover:#FBF3F3; // 侧边栏二级鼠标滑动样式
+$redsubMenuActiveBg:#FBF3F3; // 侧边栏二级选中样式
+$redmenuActiveAfter: #BC3030;
+
+#app.volcanicRed {
+  .sidebar-container {
+    background-color: $redmenuBg;
+    .submenu-title-noDropdown,
+    .el-submenu__title {
+      &:hover {
+        background-color: $redmenuHover !important;
+        color: $redmenuActiveText2 !important;
+        &::after{
+          background-color: $redmenuActiveText2;
+        }
+      }
+    }
+    .is-active>.el-submenu__title {
+      color: $redsubMenuActiveText !important;
+    }
+
+    & .nest-menu .el-submenu>.el-submenu__title,
+    & .el-submenu .el-menu-item {
+      background-color: $redsubMenuBg!important;
+
+      &:hover {
+        background-color: $redsubMenuHover!important;
+        color: $redmenuActiveText2 !important;
+        &::after{
+          background-color: $redmenuActiveText2;
+        }
+      }
+    }
+
+    & .el-menu-item {
+      &:hover {
+        background-color: $redsubMenuHover!important;
+        color: $redmenuActiveText2 !important;
+        &::after{
+          background-color: $redmenuActiveText2;
+        }
+      }
+    }
+  }
+
+  .el-submenu .el-menu-item.is-active {
+    background-color: $redsubMenuActiveBg!important;
+    &::after{
+      background-color: $redmenuActiveText2;
+    }
+  }
+
+  .el-menu-item.is-active {
+    background-color: $redmenuHover !important;
+    color: $redmenuActiveText2 !important;
+    &::after {
+      background-color: $redmenuActiveAfter;
+    }
+  }
+  .el-submenu .el-menu-item.is-active {
+    color: $redmenuActiveText2 !important;
+  }
+
+  .navbar {
+    background: $redmenuPrimary;
+    .left-menu {
+      color: #fff;
+    }
+  }
+  .indexlayout-top-menu-li {
+    &:hover, &.active {
+      color: $redmenuActiveText !important;
+      background-color: $redmenuActiveBg !important;
+    }
+  }
+}

+ 10 - 33
src/styles/variables.scss

@@ -1,34 +1,21 @@
 // 默认大雅绿样式
-$menuPrimary: #14928A;
+$menuPrimary: #00A79D;
+$menuActiveBg: #00928A; // 头部菜单选中背景色
 $menuText:#1a1a1a;    // #000
 $menuActiveText:#fff;
-$menuActiveText2:#14928A;
-$subMenuActiveText:#1a1a1a; //https://github.com/ElemeFE/element/issues/12951
+$menuActiveText2:#00A79D;
+$subMenuActiveText:#030303; //https://github.com/ElemeFE/element/issues/12951
 $menuBg:#fff; // 侧边栏一级默认样式
-$menuHover: #EEF4F4; // 侧边栏一级滑动样式
+$menuHover: #F0FAF9; // 侧边栏一级滑动样式
 $subMenuBg:#fff; // 侧边栏二级默认样式
-$subMenuHover:#EEF4F4; // 侧边栏二级鼠标滑动样式
-$subMenuActiveBg:#EEF4F4; // 侧边栏二级选中样式
-$menuActiveAfter: #14928A;
-
-// 第二套样式配置
-$darkmenuPrimary: #177ddc;
-$darkmenuText:#fff;
-$darkmenuActiveText:#fff;
-$darkmenuActiveText2:#000;
-$darksubMenuActiveText:#fff; //https://github.com/ElemeFE/element/issues/12951
-$darkmenuBg:#000; // 侧边栏一级默认样式
-$darkmenuHover: #177ddc; // 侧边栏一级滑动样式
-$darksubMenuBg:#000; // 侧边栏二级默认样式
-$darksubMenuHover:#177ddc; // 侧边栏二级鼠标滑动样式
-$darksubMenuActiveBg:#177ddc; // 侧边栏二级选中样式
-$darkmenuActiveAfter: #000;
-
+$subMenuHover:#F0FAF9; // 侧边栏二级鼠标滑动样式
+$subMenuActiveBg:#F0FAF9; // 侧边栏二级选中样式
+$menuActiveAfter: #00A79D;
 
 
 $sideBarWidth: 195px;
 /* 改变主题色变量 */
-// $--color-primary: rgb(19, 129, 122);
+// $--color-primary: #00A79D;
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
 :export {
@@ -42,20 +29,10 @@ $sideBarWidth: 195px;
   subMenuHover: $subMenuHover;
   menuActiveAfter: $menuActiveAfter;
   sideBarWidth: $sideBarWidth;
-
-  darkmenuText: $darkmenuText;
-  darkmenuActiveText: $darkmenuActiveText;
-  darkmenuActiveText2: $darkmenuActiveText2;
-  darksubMenuActiveText: $darksubMenuActiveText;
-  darkmenuBg: $darkmenuBg;
-  darkmenuHover: $darkmenuHover;
-  darksubMenuBg: $darksubMenuBg;
-  darksubMenuHover: $darksubMenuHover;
-  darkmenuActiveAfter: $darkmenuActiveAfter
 }
 
 /* 改变主题色变量 */
-$--color-primary: #14928a;
+$--color-primary: #00A79D;
 
 /* 改变 icon 字体路径变量,必需 */
 $--font-path: '~element-ui/lib/theme-chalk/fonts';

+ 1 - 0
src/utils/auth.js

@@ -35,6 +35,7 @@ export function removeToken () {
 export function removeTenant() {
   // 移除跟机构相关信息
   sessionStorage.removeItem('tenantConfig')
+  sessionStorage.removeItem('baseTenantId')
 }
 
 export function setCrossToken (token) {

+ 53 - 38
src/utils/setTheme.js

@@ -4,7 +4,7 @@ const version = require('element-ui/package.json').version // element-ui version
 const ORIGINAL_THEME = '#409EFF' // default color
 
 let chalk = ''
-let theme = ''
+// let theme = ''
 
 // themeList: [{
 //   selected: true,
@@ -48,58 +48,73 @@ let theme = ''
 //   style: 'background-color: #722ed1'
 // }],
 
-export const setTheme = async (val, isLoading) => { // 是否显示加载样式
-  const oldVal = ORIGINAL_THEME
-  if (typeof val !== 'string') return
-  const themeCluster = getThemeCluster(val.replace('#', ''))
-  const originalCluster = getThemeCluster(oldVal.replace('#', ''))
 
-  if(isLoading) {
-    showFullScreenLoading()
-  }
+// 设置主题色
+export const setTheme = async (params) => { // 是否显示加载样式
+  const { themeColor, theme, isLoading } = params
+  if(themeColor) {
+    const oldVal = ORIGINAL_THEME
+    if (typeof themeColor !== 'string') return
+    const themeCluster = getThemeCluster(themeColor.replace('#', ''))
+    const originalCluster = getThemeCluster(oldVal.replace('#', ''))
 
-  const getHandler = (variable, id) => {
-    return () => {
-      const originalCluster = getThemeCluster(ORIGINAL_THEME.replace('#', ''))
-      const newStyle = updateStyle(chalk, originalCluster, themeCluster)
+    if(isLoading) {
+      showFullScreenLoading()
+    }
 
-      let styleTag = document.getElementById(id)
-      if (!styleTag) {
-        styleTag = document.createElement('style')
-        styleTag.setAttribute('id', id)
-        document.head.appendChild(styleTag)
+    const getHandler = (variable, id) => {
+      return () => {
+        const originalCluster = getThemeCluster(ORIGINAL_THEME.replace('#', ''))
+        const newStyle = updateStyle(chalk, originalCluster, themeCluster)
+
+        let styleTag = document.getElementById(id)
+        if (!styleTag) {
+          styleTag = document.createElement('style')
+          styleTag.setAttribute('id', id)
+          document.head.appendChild(styleTag)
+        }
+        styleTag.innerText = newStyle
       }
-      styleTag.innerText = newStyle
     }
-  }
 
-  if (!chalk) {
-    const url = `https://unpkg.com/element-ui@${version}/lib/theme-chalk/index.css`
-    await getCSSString(url, 'chalk')
-  }
+    if (!chalk) {
+      const url = `https://unpkg.com/element-ui@${version}/lib/theme-chalk/index.css`
+      await getCSSString(url, 'chalk')
+    }
 
-  const chalkHandler = getHandler('chalk', 'chalk-style')
+    const chalkHandler = getHandler('chalk', 'chalk-style')
 
-  chalkHandler()
+    chalkHandler()
 
-  const styles = [].slice.call(document.querySelectorAll('style'))
-    .filter(style => {
-      const text = style.innerText
-      return new RegExp(oldVal, 'i').test(text) && !/Chalk Variables/.test(text)
+    const styles = [].slice.call(document.querySelectorAll('style'))
+      .filter(style => {
+        const text = style.innerText
+        return new RegExp(oldVal, 'i').test(text) && !/Chalk Variables/.test(text)
+      })
+    styles.forEach(style => {
+      const { innerText } = style
+      if (typeof innerText !== 'string') return
+      style.innerText = updateStyle(innerText, originalCluster, themeCluster)
     })
-  styles.forEach(style => {
-    const { innerText } = style
-    if (typeof innerText !== 'string') return
-    style.innerText = updateStyle(innerText, originalCluster, themeCluster)
-  })
 
-  const element = document.getElementById('app')
-  element.style.setProperty('--color-primary', val)
+    // 修改其它不是组件里面的颜色
+    const element = document.getElementById('app')
+    element.style.setProperty('--color-primary', themeColor)
+  }
+  // 修改主题
+  if(theme) {
+    document.querySelector("#app").className = theme
+  }
 
   // 修改存的主题色
   let tenantConfig = sessionStorage.getItem('tenantConfig')
   tenantConfig = tenantConfig ? JSON.parse(tenantConfig) : {}
-  tenantConfig.themeColor = val
+  if(themeColor) {
+    tenantConfig.themeColor = themeColor
+  }
+  if(theme) {
+    tenantConfig.theme = theme
+  }
   sessionStorage.setItem('tenantConfig', JSON.stringify(tenantConfig))
 
   if(isLoading) {

+ 1 - 1
src/views/login/index.vue

@@ -179,7 +179,7 @@ export default {
 /* 修复input 背景不协调 和光标变色 */
 /* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
 .loginBtn {
-  background-color: rgb(19, 129, 122);
+  background-color: #00A79D;
   text-align: center;
   width: 100%;
   height: 51px;

+ 31 - 20
src/views/organManager/components/organInfo.vue

@@ -34,6 +34,7 @@
               v-model="form.theme"
               :disabled="isDisabled"
               placeholder="请选择主题"
+              @change="themeChange"
             >
               <el-option v-for="item in themeList" :key="item.color" :label="item.name" :value="item.value"></el-option>
             </el-select>
@@ -215,8 +216,8 @@ export default {
         address: null,
         customerServicePhone: null,
         remark: null,
-        theme: 'green',
-        themeColor: '#14928a'
+        theme: 'adenGreen',
+        themeColor: '#00A79D'
       },
       payState: null,
       imageWidthM: 72,
@@ -232,13 +233,13 @@ export default {
       this.payState = this.data.payState
     }
     // 选中默认颜色
-    this.themeList.forEach(theme => {
-      if(theme.color == this.form.themeColor) {
-        theme.selected = true
-      } else {
-        theme.selected = false
-      }
-    })
+    // this.themeList.forEach(theme => {
+    //   if(theme.color == this.form.themeColor) {
+    //     theme.selected = true
+    //   } else {
+    //     theme.selected = false
+    //   }
+    // })
     // 判断是否有城市编号
     if(this.form.areaId) {
       await getParentArea({ id: this.form.areaId }).then(async (res) => {
@@ -268,13 +269,21 @@ export default {
     }
   },
   methods: {
-    onSelectTheme(item) {
+    themeChange(val) {
+      // 切换主题时设置跟主题对应的主题色
       this.themeList.forEach(theme => {
-        theme.selected = false
-      })
-      item.selected = true
-      this.form.themeColor = item.color
+        if(theme.value == val) {
+          this.form.themeColor = theme.color
+        }
+      });
     },
+    // onSelectTheme(item) {
+    //   this.themeList.forEach(theme => {
+    //     theme.selected = false
+    //   })
+    //   item.selected = true
+    //   this.form.themeColor = item.color
+    // },
     onSubmit() {
       let state = false
       this.$refs.form.validate(_ => {
@@ -322,6 +331,14 @@ export default {
       };
       const isImage = imageType[file.type];
       const isLt2M = file.size / 1024 / 1024 < 2;
+      if (!isImage) {
+        this.$message.error("只能上传图片格式!");
+        return false
+      }
+      if (!isLt2M) {
+        this.$message.error("上传头像图片大小不能超过 2MB!");
+        return false
+      }
       const imageWidth = this.imageWidthM;
       const imageHeigh = this.imageHeightM;
       const _URL = window.URL || window.webkitURL;
@@ -355,12 +372,6 @@ export default {
           return Promise.reject();
         }
       );
-      if (!isImage) {
-        this.$message.error("只能上传图片格式!");
-      }
-      if (!isLt2M) {
-        this.$message.error("上传头像图片大小不能超过 2MB!");
-      }
       return isImage && isLt2M && isSize;
     },
   },

+ 4 - 4
src/views/teamBuild/components/teamBaseInfo.vue

@@ -1546,16 +1546,16 @@ input[disabled] {
   color: #606266;
 }
 /deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
-  background-color: rgb(19, 129, 122);
-  border-color: rgb(19, 129, 122);
+  background-color: #00A79D;
+  border-color: #00A79D;
   // -webkit-box-shadow: -1px 0 0 0 rgb (19, 129, 122);
-  box-shadow: -1px 0 0 rgb(19, 129, 122);
+  box-shadow: -1px 0 0 #00A79D;
   color: #fff;
   outline: none;
 }
 /deep/.el-radio-button__inner {
   &:hover {
-    color: rgb(19, 129, 122);
+    color: #00A79D;
   }
   outline: none;
 }

+ 8 - 1
src/views/tenantSetting/tenantInfo.vue

@@ -64,7 +64,14 @@ export default {
       try {
           const res = await tenantInfoUpdate(params)
           this.$message.success('修改更新成功')
-          setTheme(themeColor)
+          // 机构购买不能修改主题
+          let baseTenantId = sessionStorage.getItem('baseTenantId')
+          if(baseTenantId > 0) {
+            setTheme({
+              theme,
+              themeColor
+            })
+          }
         } catch(e) {}
     }
   },