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

# Conflicts:
#	wuye-manager-uniapp/pages/index/index.vue

wuye-manager-uniapp/api/api.js

@@ -17,6 +17,8 @@ export const getLoginBySms = (data) =>{
 export const getResetPassword = (data) =>{
 	return post('/api/butler/auth/forgetPassword',data)
 }
+
+
 // ======首页=====
 // 获取小区列表
 export const getVillageList = (data) =>{
@@ -38,6 +40,12 @@ export const getTodayInspection = () =>{
 export const getNewNoticeData = () =>{
   return get('/manage/notice/new')
 }
+// 获取bannar图
+export const getBannarList = () =>{
+  return get('/api/manage/banner/list')
+}
+
+
 
 // ============通知列表===========
 export const getNoticeList = (data) =>{
@@ -58,7 +66,7 @@ export const addRepairList = (data) =>{
 }
 // 上传图片
 export const uploadFile = (filePath) => {
-	return upload(filePath,' /resource/oss/upload');
+	return upload(filePath,'/resource/oss/upload');
 }
 
 // 查询一键开门
@@ -75,6 +83,10 @@ export const switchOpenDoor = (data) =>{
 export const getSettingInfo = () =>{
 	return get('/api/setting/info')
 }
+// 上报记录
+export const getMyOrderList = (data) =>{
+	return get('/manage/repair/order/myorderlist',data)
+}
 // =====设置=======
 // 修改密码
 export const changePassword = (data) =>{