Merge branch 'master' of http://gitea.bugtc.com/zhouyanli/property-manager-side

wuye-manager-uniapp/api/api.js

@@ -26,6 +26,27 @@ export const getVillageList = (data) =>{
 export const switchVillage = (data) =>{
 	return post('/api/inspection/today/switchVillage',data)
 }
+// 获取当前小区
+export const getCurrentVillage = () =>{
+  return get('/api/butler/auth/today/village')
+}
+// 获取首页今日巡检
+export const getTodayInspection = () =>{
+  return get('/api/inspection/today/inspection')
+}
+// 首页最新消息通知
+export const getNewNoticeData = () =>{
+  return get('/manage/notice/new')
+}
+
+// ============通知列表===========
+export const getNoticeList = (data) =>{
+  return get('/manage/notice/repair',data)
+}
+
+
+
+
 // ======故障上报=====
 // 获取报修项目
 export const getRepairOrder = () =>{
@@ -40,8 +61,30 @@ export const uploadFile = (filePath) => {
 	return upload(filePath,' /resource/oss/upload');
 }
 
-
+// 查询一键开门
+export const getOpenDoorList = () =>{
+	return get('/manage/remote/open/accessdevice')
+}
 // 一键开门
-export const openDoor = (data) =>{
+export const switchOpenDoor = (data) =>{
 	return post('/manage/remote/open',data)
 }
+
+// ===========我的========
+// 获取管家信息
+export const getSettingInfo = () =>{
+	return get('/api/setting/info')
+}
+// =====设置=======
+// 修改密码
+export const changePassword = (data) =>{
+	return post('/api/setting/changePassword',data)
+}
+// 退出登录
+export const logout = () =>{
+	return post('/api/butler/auth/logout')
+}
+// 修改手机号
+export const changePhone = (data) =>{
+	return post('/api/setting/changePhone',data)
+}

wuye-manager-uniapp/api/request.js

@@ -1,62 +1,62 @@
-let baseUrl = '';
+let baseUrl = ''
 if (process.env.NODE_ENV === 'development') {
-  baseUrl = 'http://192.168.0.239:8080'; // 开发环境
+  baseUrl = 'http://192.168.0.239:8080' // 开发环境
 } else {
-  baseUrl = 'http://192.168.0.224:8080'; // 生产环境
+  baseUrl = 'http://192.168.0.239:8080' // 生产环境
 }
 
-export default function request(url, data = {}, method = "GET") {
+export default function request(url, data = {}, method = 'GET') {
   return new Promise((resolve, reject) => {
     uni.showLoading({
       title: '请求中...',
       mask: true
-    });
+    })
 
     uni.request({
       url: baseUrl + url,
       data: data,
       method: method,
       header: {
-        "Authorization": "Bearer " + (uni.getStorageSync("token") || ''),
-        "clientid": "butler",
+        Authorization: 'Bearer ' + (uni.getStorageSync('token') || ''),
+        clientid: 'butler',
         'content-type': 'application/json'
       },
-      success: (res) => {
-        uni.hideLoading();
+      success: res => {
+        uni.hideLoading()
 
         // HTTP 失败
         if (res.statusCode !== 200) {
           reject({
             msg: `请求异常 ${res.statusCode}`,
             code: res.statusCode
-          });
-          return;
+          })
+          return
         }
 
-        const resData = res.data || {};
+        const resData = res.data || {}
 
         // token 过期
         if (resData.code === 401) {
           uni.showToast({
             title: '登录过期，请重新登录',
             icon: 'none'
-          });
-          uni.clearStorageSync('token');
+          })
+          uni.clearStorageSync('token')
           setTimeout(() => {
             uni.reLaunch({
               url: '/pageSubPack/loginSub/pwd-login'
-            });
-          }, 1500);
+            })
+          }, 1500)
           reject({
             msg: '登录过期',
             code: 401
-          });
-          return;
+          })
+          return
         }
 
         // 成功
         if (resData.code === 200) {
-          resolve(resData);
+          resolve(resData)
         }
         // 业务失败
         else {
@@ -64,24 +64,24 @@ export default function request(url, data = {}, method = "GET") {
             msg: resData.msg || '请求失败',
             code: resData.code,
             data: resData
-          });
+          })
         }
       },
-      fail: (err) => {
-        uni.hideLoading();
+      fail: err => {
+        uni.hideLoading()
         reject({
           msg: '网络异常',
           code: -1,
           raw: err
-        });
+        })
       }
-    });
-  });
+    })
+  })
 }
 
-export const get = (url, data) => request(url, data, 'GET');
-export const post = (url, data) => request(url, data, 'POST');
-export const put = (url, data) => request(url, data, 'PUT');
+export const get = (url, data) => request(url, data, 'GET')
+export const post = (url, data) => request(url, data, 'POST')
+export const put = (url, data) => request(url, data, 'PUT')
 // export const deleteMethod = (url, data) => request(url, data, 'DELETE');
 // export const putMethod = (url, data) => request(url, data, 'PUT');
 
@@ -93,27 +93,23 @@ export const upload = (filePath, url) => {
       filePath: filePath,
       name: 'file',
       header: {
-        "Authorization": "Bearer " + (uni.getStorageSync("token") || ''),
-        "clientid": "resident"
+        Authorization: 'Bearer ' + (uni.getStorageSync('token') || ''),
+        clientid: 'resident'
       },
-      success: (res) => {
+      success: res => {
         try {
-          const data = JSON.parse(res.data);
-          resolve(data.data || ''); // 直接返回图片地址
+          const data = JSON.parse(res.data)
+          resolve(data.data || '') // 直接返回图片地址
         } catch (e) {
-          resolve('');
+          resolve('')
         }
       },
-      fail: (err) => {
-        reject(err);
+      fail: err => {
+        reject(err)
       }
-    });
-  });
-};
-
-
-
-
+    })
+  })
+}
 
 /**
  * 过滤请求参数：移除值为 null / undefined / 空字符串 的字段