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

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

@@ -33,17 +33,17 @@ if (test) {
   apiPath = 'http://commontest.yiguanjia.me/index.php?r=';
   // userId = '57e38f1b9f5160ac048b457d'
 
-  if (localStorage.getItem('wxUserID') === null) {
+  if (localStorage.getItem('wxUserID1') === null) {
     // userId = '57e238929f5160d6048b456d' // 管理员
     // userId = '57fa51649f5160c4048b4948'
   } else {
-    userId = localStorage.getItem('wxUserID')
+    userId = localStorage.getItem('wxUserID1')
   }
 
-  // userId = localStorage.getItem('wxUserID')
+  // userId = localStorage.getItem('wxUserID1')
 } else {
   apiPath = 'http://common.yiguanjia.me/index.php?r=';
-  userId = localStorage.getItem('wxUserID')
+  userId = localStorage.getItem('wxUserID1')
 }
 // 判断是否为dev开发
 if (locationHref.indexOf('http://localhost:80') > -1) {