尝试解决主分支冲突

api/670/HBY670.js

@@ -1,4 +1,4 @@
-import {request,baseURL} from '@/utils/request'
+import request, { baseURL } from '@/utils/request'
 
 function getdata(data,url,method){
 	return new Promise((resolve,reject)=>{
@@ -14,8 +14,10 @@ function getdata(data,url,method){
 		  method: method,
 		  data:data
 		}).then((res)=>{
+			console.log("res=",res);
 			resolve(res);
 		}).catch(ex=>{
+			console.log("ex=",ex);
 			reject(ex);
 		});
 	});
@@ -81,10 +83,18 @@ function sendPic(data){
 	});
 }
 
+//设备详情
+function getDetail(id){
+	return request({
+	  url: '/api/xinghan/device/'+id,
+	  method: 'get',	  
+	})
+}
 export default{
 	sendUsr:sendUsr,
 	warnMsg:warnMsg,
-	sendPic:sendPic
+	sendPic:sendPic,
+	getDetail:getDetail
 }
 
 

api/670/History.js

@@ -0,0 +1,55 @@
+import request, { baseURL } from '@/utils/request'
+
+function getdata(data,url,method){
+	return new Promise((resolve,reject)=>{
+		if(!url){
+			reject('url为空');
+			return;
+		}
+		if(!method){
+			method='POST';
+		}
+		request({
+		  url: url,
+		  method: method,
+		  data:data
+		}).then((res)=>{
+			console.log("res=",res);
+			resolve(res);
+		}).catch(ex=>{
+			console.log("ex=",ex);
+			reject(ex);
+		});
+	});
+	
+}
+
+
+//获取开关机数据
+function getSwithData(data){
+	let url="";
+	return getdata(data,url,"POST");
+}
+
+//报警信息
+function getWarnData(data){
+	let url=""
+	return getdata(data,url,"POST");
+}
+
+//故障信息
+function getFaulData(data){
+	let url=""
+	return getdata(data,url,"POST");
+}
+
+export default{
+	getSwithData:getSwithData,
+	getWarnData:getWarnData,
+	getFaulData:getFaulData
+}
+
+
+
+
+

api/common/login.js

@@ -15,16 +15,65 @@ export function resourceSmsCode(params) {
     data: params
   })
 }
+
 // 退出登录
 export function Logout(data) {
   return request({
-    url: '/app/auth/logout',
+    url: '/app/userCenter/logout',
     method: 'POST',
     data: data
   })
 }
 
+// 注册
+export function register(data) {
+  return request({
+    url: '/app/auth/register',
+    method: 'POST',
+    data: data
+  })
+}
 
+// 用户注册短信验证码
+export function registerSmsCode(data) {
+  return request({
+    url: '/app/auth/registerSmsCode',
+    method: 'GET',
+    data: data
+  })
+}
 
+// 忘记密码短信验证码
+export function forgetPasswordSmsCode(data) {
+  return request({
+    url: '/app/auth/forgetPasswordSmsCode',
+    method: 'GET',
+    data: data
+  })
+}
 
+// 找回密码登录
+export function forgetPassword(data) {
+  return request({
+    url: '/app/auth/forgetPassword',
+    method: 'POST',
+    data: data
+  })
+}
 
+// 修改密码
+export function updatePassword(data) {
+  return request({
+    url: '/app/userCenter/updatePassword',
+    method: 'POST',
+    data: data
+  })
+}
+// 用户注销
+export function cancelAccount(data) {
+  return request({
+    url: '/app/userCenter/cancelAccount',
+    method: 'POST',
+    data: data
+  })
+}