fix：修复bug

config/api/device.js

@@ -79,3 +79,15 @@ export const forcefOpenEmptyGrid = (deviceNo) => {
 	})
 }
 
+// 发送租借指令
+export const sendRentCommand = (data) => {
+	return request({
+		url: '/app/device/sendRentCommand',
+		method: 'post',
+		data,
+		headers: {
+			'Content-Type': 'application/x-www-form-urlencoded'
+		}
+	})
+}
+

config/api/order.js

@@ -104,6 +104,38 @@ export const closeWithMaxFee = (orderNo) => {
 	})
 }
 
+// 创建微信支付订单
+export const createWxPayment = (orderNo) => {
+	return request({
+		url: `/app/wx-payment/create/${orderNo}`,
+		method: 'get'
+	})
+}
+
+// 获取正在使用中的订单
+export const getInUseOrder = () => {
+	return request({
+		url: '/app/order/inUse',
+		method: 'get'
+	})
+}
+
+// 获取待支付订单
+export const getUnpaidOrder = () => {
+	return request({
+		url: '/app/order/unpaid',
+		method: 'get'
+	})
+}
+
+// 查询微信支付状态
+export const getWxPaymentStatus = (orderNo) => {
+	return request({
+		url: `/app/wx-payment/status/${orderNo}`,
+		method: 'get'
+	})
+}
+
 // 通过订单号获取支付分订单信息
 export const getOrderByOrderNoScore = (orderNo) => {
 	console.log('通过订单号获取支付分订单信息', orderNo);

config/api/system.js

@@ -27,12 +27,38 @@ export const getCommonByBrand = (brandName) => {
 	})
 }
 
-// 查询激活的且临近关闭时间最近的活动
-export const getActiveActivity = () => {
-	return request({
-	    url: '/device/activity/agent/list',
-	    method: 'get',
-	    hideLoading: true
-	})
+// 获取当前协议内容
+export const getCurrentAgreement = (data) => {
+    return request({
+        url: '/device/agreementConfig/current',
+        method: 'get',
+        data
+    })
+}
+
+// 获取当前广告内容
+export const getCurrentAdvertisement = (data) => {
+    return request({
+        url: '/device/advertisementConfig/current',
+        method: 'get',
+        data
+    })
+}
+
+// 获取当前公告内容
+export const getCurrentAnnouncement = (data) => {
+    return request({
+        url: '/device/announcementConfig/current',
+        method: 'get',
+        data
+    })
+}
+
+export const getActiveActivity = (data) => {
+    return request({
+        url: '/device/activeActivity/current',
+        method: 'get',
+        data
+    })
 }
 

config/api/user.js

@@ -10,6 +10,24 @@ export const login = (data) => {
 	})
 }
 
+// 发送验证码
+export const sendVerifyCode = (phonenumber) => {
+	return request({
+		url: '/app/user/sms/code',
+		method: 'get',
+		data: { phonenumber }
+	})
+}
+
+// 手机号+验证码登录
+export const loginWithCode = (phonenumber, smsCode) => {
+	return request({
+		url: '/app/user/sms/login',
+		method: 'post',
+		data: { phonenumber, smsCode }
+	})
+}
+
 // 用户退出登录
 export const userLogout = (data) => {
 	return request({
@@ -56,7 +74,8 @@ export const uploadUserAvatar = (filePath) => {
 			header: {
 				'appid': appid,
 				'Authorization': 'Bearer ' + uni.getStorageSync('token'),
-				'Clientid': uni.getStorageSync('client_id')
+				'Clientid': uni.getStorageSync('client_id'),
+				'Content-Language': (uni.getStorageSync('language') || 'zh-CN').replace(/-/g, '_')
 			},
 			success: (res) => {
 				try {
@@ -83,7 +102,8 @@ export const uploadOssResource = (filePath) => {
 			header: {
 				'appid': appid,
 				'Authorization': 'Bearer ' + uni.getStorageSync('token'),
-				'Clientid': uni.getStorageSync('client_id')
+				'Clientid': uni.getStorageSync('client_id'),
+				'Content-Language': (uni.getStorageSync('language') || 'zh-CN').replace(/-/g, '_')
 			},
 			success: (res) => {
 				try {
@@ -115,3 +135,12 @@ export const withdrawDeposit = (orderNo) => {
 	})
 }
 
+// 获取微信用户手机号
+export const getWxUserPhoneNumber = (data) => {
+	return request({
+		url: '/app/user/getPhoneNumber',
+		method: 'post',
+		data
+	})
+}
+

config/http.js

@@ -33,7 +33,8 @@ const request = (option) => {
 					...option.headers,
 				'appid': appid,
 				'Authorization': "Bearer " + uni.getStorageSync('token'),
-				'Clientid': uni.getStorageSync('client_id')
+				'Clientid': uni.getStorageSync('client_id'),
+				'Content-Language': (uni.getStorageSync('language') || 'zh-CN').replace(/-/g, '_')
 			},
 			success(res) {
 

config/url.js

@@ -1,7 +1,7 @@
 // export const URL = "https://my.gxfs123.com/api" //正式服务器-弃用
 // export const URL = "https://manager.fdzpower.com/api"  //正式服务器
 export const URL = "https://fansdev.gxfs123.com/api"  //测试服务器
-// export const URL = "http://192.168.5.52:8080" 		//本地调试
+// export const URL = "http://192.168.5.123:8080" 		//本地调试
 // export const URL = "http://127.0.0.1:8080" 		//本地调试
 
 export const appid = "wx2165f0be356ae7a9" //微信小程序appid