rebase and fix review issue

mock/api.js

@@ -118,7 +118,7 @@ function getFakeList(req, res) {
 
   const result = fakeList(count);
   sourceData = result;
-  res.json(result);
+  return res.json(result);
 }
 
 function postFakeList(req, res) {
@@ -150,7 +150,7 @@ function postFakeList(req, res) {
       break;
   }
 
-  res.json(result);
+  return res.json(result);
 }
 
 const getNotice = [
@@ -318,7 +318,7 @@ const getActivities = [
 ];
 
 function getFakeCaptcha(req, res) {
-  res.json('captcha-xxx');
+  return res.json('captcha-xxx');
 }
 
 export default {

mock/geographic.js

@@ -2,11 +2,11 @@ import city from './geographic/city.json';
 import province from './geographic/province.json';
 
 function getProvince(req, res) {
-  res.json(province);
+  return res.json(province);
 }
 
 function getCity(req, res) {
-  res.json(city[req.params.province]);
+  return res.json(city[req.params.province]);
 }
 
 export default {

mock/notices.js

-const getNotices = (req, res) => {
+const getNotices = (req, res) =>
   res.json([
     {
       id: '000000001',
@@ -93,7 +93,6 @@ const getNotices = (req, res) => {
       type: '待办',
     },
   ]);
-};
 
 export default {
   'GET /api/notices': getNotices,

mock/rule.js

@@ -72,7 +72,7 @@ function getRule(req, res, u) {
     },
   };
 
-  res.json(result);
+  return res.json(result);
 }
 
 function postRule(req, res, u, b) {
@@ -129,7 +129,7 @@ function postRule(req, res, u, b) {
     },
   };
 
-  res.json(result);
+  return res.json(result);
 }
 
 export default {

src/models/setting.js

@@ -12,6 +12,24 @@ const updateTheme = primaryColor => {
     return;
   }
   const hideMessage = message.loading('正在编译主题！', 0);
+  function buildIt() {
+    if (!window.less) {
+      return;
+    }
+    setTimeout(() => {
+      window.less
+        .modifyVars({
+          '@primary-color': primaryColor,
+        })
+        .then(() => {
+          hideMessage();
+        })
+        .catch(() => {
+          message.error('Failed to update theme');
+          hideMessage();
+        });
+    }, 200);
+  }
   if (!lessNodesAppended) {
     const lessStyleNode = document.createElement('link');
     const lessConfigNode = document.createElement('script');
@@ -38,24 +56,6 @@ const updateTheme = primaryColor => {
   } else {
     buildIt();
   }
-  function buildIt() {
-    if (!window.less) {
-      return;
-    }
-    setTimeout(() => {
-      window.less
-        .modifyVars({
-          '@primary-color': primaryColor,
-        })
-        .then(() => {
-          hideMessage();
-        })
-        .catch(() => {
-          message.error('Failed to update theme');
-          hideMessage();
-        });
-    }, 200);
-  }
 };
 
 const updateColorWeak = colorWeak => {