Merge branch 'master' of git.oschina.net:yiguanjia/php

www/webapp/housekeeping/src/components/Home.vue

@@ -146,7 +146,7 @@ export default {
                   user_id: config.user_id,
                 },
                 function(res) {
-                  console.log(res.data);
+                  // console.log(res.data);
                   config.userInfo = res.data.data.user_info;
 
                   // console.log(res.data.data)

www/webapp/housekeeping/src/config/globalVariables.js

@@ -40,7 +40,7 @@ if (test) {
 }
 // 判断是否为dev开发
 if (locationHref.indexOf('80') > -1) {
-  apiPath = 'https://bird.ioliu.cn/v1?url=http://common.yiguanjia.me/index.php?r=',
+  apiPath = 'https://bird.ioliu.cn/v1?url=http://commontest.yiguanjia.me/index.php?r=',
   // apiPath = 'http://common.yiguanjia.me/index.php?r=',
   // apiPath = 'http://127.0.0.1:3000/cros/?url=http://common.yiguanjia.me/index.php?r=',
   // 张工