Merge branch 'master' of http://101.133.214.75:3000/yuanMM/html

api/request.js

@@ -1,15 +1,22 @@
-// // 动态获取url
-// const BASEURL = getRequestPrefix();
+// 动态获取url
+const BASEURL = getRequestPrefix();
+
+// 动态获取用户名密码
+const LOGIN_NAME = sessionStorage.getItem('V_LOGINNAME');
+const LOGIN_PASSWORD = sessionStorage.getItem('V_PASSWORD');
+
 
-// // 动态获取用户名密码
-// const LOGIN_NAME = sessionStorage.getItem('V_LOGINNAME');
-// const LOGIN_PASSWORD = sessionStorage.getItem('V_PASSWORD');
 
 
 // //服务端url
 // // const BASEURL = "http://101.133.214.75:8080/Device_Manager/";
 
+<<<<<<< HEAD
 
+=======
+// //本地调试url
+// const BASEURL = "http://127.0.0.1:8080/Device_Manager/";
+>>>>>>> 367d44477e07140a575d1c0b0e1297518c8b0c3f
 
 // //最新测试url
 // // const BASEURL = "http://121.40.217.77:8080/Device_Manager/";
@@ -18,8 +25,8 @@
 const BASEURL = "http://127.0.0.1:8080/Device_Manager/";
 
 //用户名、密码 
-const LOGIN_NAME = "admin";
-const LOGIN_PASSWORD = "e10adc3949ba59abbe56e057f20f883e";
+// const LOGIN_NAME = "admin";
+// const LOGIN_PASSWORD = "e10adc3949ba59abbe56e057f20f883e";