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

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

@@ -39,9 +39,12 @@ if (test) {
   userId = localStorage.getItem('wxUserID1');
 }
 // 判断是否为dev开发
-if (locationHref.indexOf('http://localhost:80') > -1) {
+if (locationHref.indexOf('80') > -1) {
+  apiPath = 'https://bird.ioliu.cn/v1?url=http://common.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=',
   // 张工
-  userId = '59e41443fb48a7552f8b459e'; // 管理员\门店老师
+  // userId = '59e41443fb48a7552f8b459e'; // 管理员\门店老师
   // userId = '5acb042a9f5160bc048b6b1b'; // master
   // userId = '5a603956fb48a70c768b4575'; // test
 
@@ -57,6 +60,7 @@ if (locationHref.indexOf('http://localhost:80') > -1) {
   // userId = '57fe2dc59f5160a1048b4591'  // 未注册
   // 家政人员
   // userId = '57fa51649f5160c4048b4948'; // 我喂自己袋盐
+  userId = '5acd6a449f51607d228b47fc'; // 史国芳
   // userId = '5acebf789f5160b3048b708c'; // 侯玉翠
   // userId = '5823fe35a84ea0c13e8b461c'; // 我喂自己袋盐2
   /* 真.巾帼家政 */

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

@@ -45,7 +45,7 @@ function $http(url, params, callback) {
   if (locationHref.indexOf('commontest.yiguanjia.me') > -1 || locationHref.indexOf('common.yiguanjia.me') > -1) {
   } else {
     // apiPath = 'http://common.yiguanjia.me/index.php?r=';
-    globalVariables.apiPath = 'http://commontest.yiguanjia.me/index.php?r='
+    // globalVariables.apiPath = ''
   }
   axios.post(globalVariables.apiPath + url, qs.stringify(params))
     .then(response => {