1

src/utils/httpRequest.js

@@ -5,16 +5,11 @@ import qs from 'qs'
 import merge from 'lodash/merge'
 import { clearLoginInfo } from '@/utils'
 
-<<<<<<< HEAD
 // var cookies = document.cookie.split(' ')
 // var cookie = cookies[1].split('=')
 // var farmId = cookie[1]
 let farmId = localStorage.getItem('farmId');
 
-=======
-let farmId = localStorage.getItem('farmId');
->>>>>>> 775577d48d9d0e1a9a60f8d066cce0fc33bc0003
-
 const http = axios.create({
   timeout: 1000 * 30,
   withCredentials: true,
@@ -63,11 +58,7 @@ http.adornUrl = (actionName) => {
 http.adornParams = (params = {}, openDefultParams = true) => {
   var defaults = {
     't': new Date().getTime(),
-<<<<<<< HEAD
-    'farmId': farmId
-=======
     farmId: farmId
->>>>>>> 775577d48d9d0e1a9a60f8d066cce0fc33bc0003
   }
   return openDefultParams ? merge(defaults, params) : params
 }