diff --git a/src/components/SettingDarwer/index.less b/src/components/SettingDarwer/index.less
index 462fa36d853343ba0e62a0e3294ac43f5ca64ad1..4c7a735ca378d3883a23cb5ee9376809c60fafcd 100644
--- a/src/components/SettingDarwer/index.less
+++ b/src/components/SettingDarwer/index.less
@@ -71,5 +71,5 @@
 .productionHint {
   font-size: 12px;
   color: @text-color-secondary;
-  margin-top: 4px;
+  margin-top: 8px;
 }
diff --git a/src/models/setting.js b/src/models/setting.js
index ffb7d807c10cdc20f5252fde255d788c88c84eb7..0426604d32090c442f5342e31663241ce3f435d2 100644
--- a/src/models/setting.js
+++ b/src/models/setting.js
@@ -2,15 +2,13 @@ import { message } from 'antd';
 import defaultSetting from '../defaultSetting';
 
 let lessNodesAppended;
-const buildSettings = (themeColor, colorWeak) => {
-  document.body.className = colorWeak ? 'colorWeak' : '';
+const updateTheme = themeColor => {
   // Determine if the component is remounted
-  if (!themeColor || themeColor === '#1890FF' || themeColor === window['antd_pro_less_color']) {
+  if (!themeColor) {
     return;
   }
   const hideMessage = message.loading('正在编译主题！', 0);
   if (!lessNodesAppended) {
-    console.log('append less nodes');
     const lessStyleNode = document.createElement('link');
     const lessConfigNode = document.createElement('script');
     const lessScriptNode = document.createElement('script');
@@ -19,19 +17,18 @@ const buildSettings = (themeColor, colorWeak) => {
     lessConfigNode.innerHTML = `
       window.less = {
         async: true,
-        env: 'production',
-        javascriptEnabled: true
+        env: 'production'
       };
     `;
-    lessScriptNode.src = 'https://gw.alipayobjects.com/os/lib/less.js/3.8.1/less.min.js';
+    lessScriptNode.src = 'https://gw.alipayobjects.com/os/lib/less.js/2.7.3/less.min.js';
     lessScriptNode.async = true;
     lessScriptNode.onload = () => {
       buildIt();
       lessScriptNode.onload = null;
     };
-    document.head.appendChild(lessStyleNode);
-    document.head.appendChild(lessConfigNode);
-    document.head.appendChild(lessScriptNode);
+    document.body.appendChild(lessStyleNode);
+    document.body.appendChild(lessConfigNode);
+    document.body.appendChild(lessScriptNode);
     lessNodesAppended = true;
   } else {
     buildIt();
@@ -40,23 +37,26 @@ const buildSettings = (themeColor, colorWeak) => {
     if (!window.less) {
       return;
     }
-    window.less
-      .modifyVars({
-        '@primary-color': themeColor,
-        '@input-hover-border-color': themeColor,
-      })
-      .then(() => {
-        console.log('start to compile');
-        window['antd_pro_less_color'] = themeColor;
-        hideMessage();
-      })
-      .catch(() => {
-        message.error(`Failed to update theme`);
-        hideMessage();
-      });
+    setTimeout(() => {
+      window.less
+        .modifyVars({
+          '@primary-color': themeColor,
+        })
+        .then(() => {
+          hideMessage();
+        })
+        .catch(() => {
+          message.error('Failed to update theme');
+          hideMessage();
+        });
+    }, 200);
   }
 };
 
+const updateColorWeak = colorWeak => {
+  document.body.className = colorWeak ? 'colorWeak' : '';
+};
+
 export default {
   namespace: 'setting',
   state: defaultSetting,
@@ -71,7 +71,10 @@ export default {
         }
       });
       const { themeColor, colorWeak } = setting;
-      buildSettings(themeColor, colorWeak);
+      if (state.themeColor !== themeColor) {
+        updateTheme(themeColor);
+      }
+      updateColorWeak(colorWeak);
       return {
         ...state,
         ...setting,
@@ -97,7 +100,10 @@ export default {
         }
       });
       const { themeColor, colorWeak } = payload;
-      buildSettings(themeColor, colorWeak);
+      if (state.themeColor !== themeColor) {
+        updateTheme(themeColor);
+      }
+      updateColorWeak(colorWeak);
       window.history.replaceState(null, 'setting', urlParams.href);
       return {
         ...state,