Merge branch 'main' of http://47.107.152.87:3000/liubiao/APP

# Conflicts:
#	.gitignore
#	pages/common/index/index.vue
#	unpackage/dist/dev/app-plus/app-config-service.js
#	unpackage/dist/dev/app-plus/app-service.js
#	unpackage/dist/dev/app-plus/app-view.js
#	unpackage/dist/dev/app-plus/manifest.json
#	utils/request.js

api/6170/deviceControl.js

@@ -0,0 +1,31 @@
+// 获取设备详细信息
+import request from '@/utils/request'
+export function deviceDetail(id) {
+  return request({
+    url: `/app/device/${id}`,
+    method: 'get',
+  })
+}
+// 获取设备分享详细信息
+export function deviceShareId(id) {
+  return request({
+    url: `/app/deviceShare/${id}`,
+    method: 'get',
+  })
+}
+// 人员信息登记
+export function registerPersonInfo(data) {
+  return request({
+    url: `/app/device/registerPersonInfo`,
+    method: 'post',
+	data: data
+  })
+}
+// 发送信息
+export function deviceSendMessage(data) {
+  return request({
+    url: `/app/device/sendMessage`,
+    method: 'post',
+	data: data
+  })
+}

api/6170/share.js

@@ -0,0 +1,42 @@
+import request from '@/utils/request'
+// 新增设备分享
+export function deviceShareAdd(data) {
+  return request({
+    url: '/app/deviceShare/deviceShare',
+    method: 'post',
+    data: data
+  })
+}
+
+// 分享短信验证码
+export function deviceShareCode(params) {
+  return request({
+    url: '/app/deviceShare/sms/code',
+    method: 'get',
+	data:params
+  })
+}
+
+//设备管理列表 我的分享
+export function deviceShareList(params) {
+  return request({
+    url: '/app/deviceShare/deviceShareList',
+    method: 'get',
+    data: params
+  })
+}
+// 他人分享
+export function otherDeviceShareList(params) {
+  return request({
+    url: '/app/deviceShare/otherDeviceShareList',
+    method: 'get',
+    data: params
+  })
+}
+// 移除设备管理
+export function deviceShareDelete(ids) {
+  return request({
+    url: `/app/deviceShare/${ids}`,
+    method: 'DELETE',
+  })
+}

api/common/login.js

@@ -8,11 +8,11 @@ export function login(data) {
   })
 }
 // 注册发送验证码
-export function sendRegisterSms(data) {
+export function resourceSmsCode(params) {
   return request({
-    url: '/api/appUser/sendRegisterSms', //发送验证码注册
-    method: 'POST',
-    data: data
+    url: '/resource/sms/code', //发送验证码注册
+    method: 'GET',
+    data: params
   })
 }
 // 退出登录