修改domain

client/actions/common.js

@@ -2,6 +2,9 @@ import fetch from 'isomorphic-fetch';
 import actionType from '../actiontype/common'
 import actionType from '../actiontype/common'
 import {addErrorInfo} from './uploadError'
 import {addErrorInfo} from './uploadError'
 let domain = ENV.domain;
 let domain = ENV.domain;
+
+let domain1 = "http://192.168.10.169:7788/web/"
+
 let myHeaders = new Headers({
 let myHeaders = new Headers({
     // 'Access-Control-Allow-Origin': '*',
     // 'Access-Control-Allow-Origin': '*',
     // 'Content-Type': 'text/plain;charset=UTF-8',
     // 'Content-Type': 'text/plain;charset=UTF-8',
@@ -13,7 +16,7 @@ let myHeaders = new Headers({
 const getStoreInfo = (storeId)=>{
 const getStoreInfo = (storeId)=>{
     return(dispatch)=>{
     return(dispatch)=>{
         let bodyData = {storeId};
         let bodyData = {storeId};
-        fetch(domain + 'pad_warehouse/getMachineData.action',{
+        fetch(domain1 + 'pad_warehouse/getMachineData.action',{
             // credentials : 'include',
             // credentials : 'include',
             method : 'POST',
             method : 'POST',
             mode : 'cors',
             mode : 'cors',
@@ -37,7 +40,7 @@ const getStoreInfo = (storeId)=>{
 const getUserinfo = (employeeId,storeId)=>{
 const getUserinfo = (employeeId,storeId)=>{
     let bodyData = Object.assign({},{employeeId,storeId})
     let bodyData = Object.assign({},{employeeId,storeId})
     return(dispatch)=>{
     return(dispatch)=>{
-        fetch(domain + 'machine_pad/get_alowed_task.action',{
+        fetch(domain1 + 'machine_pad/get_alowed_task.action',{
             // credentials : 'include',
             // credentials : 'include',
             method : 'POST',
             method : 'POST',
             mode : 'cors',
             mode : 'cors',

client/env/development.js

@@ -2,6 +2,6 @@
  * Created by ruibing on 16/11/2.
  * Created by ruibing on 16/11/2.
  */
  */
 module.exports = {
 module.exports = {
-    domain: 'http://192.168.10.169:7788/web/',
+    domain: 'http://192.168.10.128:8080/web/',
     uploadImg : 'https://preprod.mjitech.com/static/uploadTrouble'
     uploadImg : 'https://preprod.mjitech.com/static/uploadTrouble'
 }
 }
\ No newline at end of file