From c247a506d95bbe4ec66d92d08096c7107e799e21 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Fri, 03 Nov 2023 17:44:22 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

---
 api/doorplateAddress/doorplateAddress.js |  200 ++++++++++++++++++++++++++-----------------------
 1 files changed, 105 insertions(+), 95 deletions(-)

diff --git a/api/doorplateAddress/doorplateAddress.js b/api/doorplateAddress/doorplateAddress.js
index 44c1482..96a2322 100644
--- a/api/doorplateAddress/doorplateAddress.js
+++ b/api/doorplateAddress/doorplateAddress.js
@@ -1,98 +1,108 @@
 import http from '@/http/api.js'
+import {
+	devUrl,
+	prodUrl,
+	contentType
+} from '@/common/setting'
 
-export const getDoorplateAddressList = (code, type) => {
-	return http.request({
-		url: 'blade-doorplateAddress/doorplateAddress/getDoorplateAddressList',
-		method: 'GET',
-		params: {
-			code,
-			type
-		}
-	})
-}
-
-
-
-export const getFuncList = (type, roleName) => {
-	return http.request({
-		url: 'blade-doorplateAddress/doorplateAddress/getFuncList',
-		method: 'GET',
-		params: {
-			type,
-			roleName
-		}
-	})
-}
-// 获取社区信息
-export const getHouseList = (param) => {
-	return http.request({
-		url: 'blade-doorplateAddress/doorplateAddress/getHousesList',
-		method: 'GET',
-		params: param
-	})
-}
-
-// 获取当前房屋出租信息
-export const getHouseRentInfo = (code) => {
-	return http.request({
-		url: 'blade-doorplateAddress/doorplateAddress/getHouseRentInfo',
-		method: 'GET',
-		params: {
-			code
-		}
-	})
-}
-
-// 获取房屋标签信息
-export const getHouseLabelList = () => {
-	return http.request({
-		url: 'blade-label/label/getLabelList',
-		method: 'GET',
-		params: {
-			parentId: 1001
-		}
-	})
-}
-
-// 获取房屋详细信息
-export const getHouseDetail = (houseCode) => {
-	return http.request({
-		url: 'blade-house/house/getHouseDetail',
-		method: 'GET',
-		params: {
-			houseCode
-		}
-	})
-}
-
-
-// 获取房屋详细信息
-export const addHouseRental = (data) => {
-	return http.request({
-		url: 'blade-houseRental/houseRental/add',
-		method: 'POST',
-		data
-	})
-}
-
-export const uploadFile = (data) => {
-	return http.request({
-		url: 'blade-resource/oss/endpoint/put-file',
-		method: 'post',
-		custom: {
-			Authorization: true
-		},
-		data
-	})
-}
-
-// 获取门牌地址
-export const getDoorplateAddressDetail = (params) => {
-	return http.request({
-		url: 'blade-doorplateAddress/doorplateAddress/getDoorplateAddressDetail',
-		method: 'GET',
-		params: {
-			...params
-		}
-	})
+import {
+	clientId,
+	clientSecret
+} from '@/common/setting'
+
+export const getDoorplateAddressList = (code, type) => {
+	return http.request({
+		url: 'blade-doorplateAddress/doorplateAddress/getDoorplateAddressList',
+		method: 'GET',
+		params: {
+			code,
+			type
+		}
+	})
+}
+
+
+
+export const getFuncList = (type, roleName) => {
+	return http.request({
+		url: 'blade-doorplateAddress/doorplateAddress/getFuncList',
+		method: 'GET',
+		params: {
+			type,
+			roleName
+		}
+	})
+}
+// 获取社区信息
+export const getHouseList = (param) => {
+	return http.request({
+		url: 'blade-doorplateAddress/doorplateAddress/getHousesList',
+		method: 'GET',
+		params: param
+	})
+}
+
+// 获取当前房屋出租信息
+export const getHouseRentInfo = (code) => {
+	return http.request({
+		url: 'blade-doorplateAddress/doorplateAddress/getHouseRentInfo',
+		method: 'GET',
+		params: {
+			code
+		}
+	})
+}
+
+// 获取房屋标签信息
+export const getHouseLabelList = () => {
+	return http.request({
+		url: 'blade-label/label/getLabelList',
+		method: 'GET',
+		params: {
+			parentId: 1001
+		}
+	})
+}
+
+// 获取房屋详细信息
+export const getHouseDetail = (houseCode) => {
+	return http.request({
+		url: 'blade-house/house/getHouseDetail',
+		method: 'GET',
+		params: {
+			houseCode
+		}
+	})
+}
+
+
+// 获取房屋详细信息
+export const addHouseRental = (data) => {
+	return http.request({
+		url: 'blade-houseRental/houseRental/add',
+		method: 'POST',
+		data
+	})
+}
+
+export const uploadFile = (file) => {
+	return uni.uploadFile({
+		url: (process.env.NODE_ENV === 'development' ? devUrl : prodUrl ) + '/blade-resource/oss/endpoint/put-file', 
+		filePath: file,
+		name: 'file',
+		header: {
+			Authorization: uni.getStorageSync('accessToken')
+		}
+	})
+}
+
+// 获取门牌地址
+export const getDoorplateAddressDetail = (params) => {
+	return http.request({
+		url: 'blade-doorplateAddress/doorplateAddress/getDoorplateAddressDetail',
+		method: 'GET',
+		params: {
+			...params
+		}
+	})
 }
\ No newline at end of file

--
Gitblit v1.9.3