9.17

509e3a8b · 张冬 · 3ecd64dc · 509e3a8b
Commit 509e3a8b authored Sep 17, 2020 by 张冬
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

request.js utils/request.js +1 -4

No files found.
--- a/utils/request.js
+++ b/utils/request.js
@@ -7,10 +7,7 @@ import axios from 'axios'
 const service = axios.create({
  baseURL: 'http://192.168.200.201:8082/apis', // api的base_url
  // baseURL: 'http://192.168.3.35:8085/apis',
-<<<<<<< HEAD
-  baseURL: 'http://192.168.3.35:8085/apis',
-=======
->>>>>>> dc9266017f34991399bc736f62e34d785f1d83af
+  // baseURL: 'http://192.168.3.35:8085/apis',
  timeout: 35000 // 请求超时时间
 })