f5742048d1
在 `config/url.js` 中新增了本地调试地址 `"http://127.0.0.1:8080"` 的注释配置,便于开发人员快速切换调试环境。 fix(device): 修复设备详情页费用配置解析逻辑 在 `pages/device/detail.vue` 中增强了对 `feeConfig` 字段的判断,防止因字段不存在导致页面报错,并设置默认值以提升用户体验。同时调整了订单创建后的套餐信息更新逻辑,暂时将其注释以便后续排查问题。 refactor(device): 调整订单金额计算方式 修改订单金额计算逻辑,从原来的押金加套餐价改为仅使用押金部分作为总价展示,并修正跳转支付页面时传递的价格参数为实际单位价格。 feat(feedback): 反馈页面增加联系方式输入框 在 `pages/feedback/index.vue` 表单中添加了联系方式输入框,支持用户填写手机号码用于后续客服联系,并将图片上传功能临时隐藏待优化。 chore(build): 更新构建产物中的 JS 文件内容 同步更新了打包目录下相关 JS 构建文件的内容,包括 `user.js` 和 `detail.js` 等,确保与源代码变更一致。
206 lines
4.1 KiB
JavaScript
206 lines
4.1 KiB
JavaScript
import request from './http'
|
|
|
|
|
|
export const login = (data) => {
|
|
return request({
|
|
url: '/app/user/login',
|
|
method: 'get',
|
|
data
|
|
})
|
|
}
|
|
|
|
|
|
export const getMyIndexInfo = (data) => {
|
|
return request({
|
|
url: '/app/user/userInfo',
|
|
method: 'get',
|
|
data,
|
|
})
|
|
}
|
|
|
|
// 添加押金提现API
|
|
export const withdrawDeposit = (orderNo) => {
|
|
return request({
|
|
url: `/app/withdraw/add/${orderNo}`,
|
|
method: 'get',
|
|
hideLoading: true
|
|
})
|
|
}
|
|
|
|
//获取所有全部订单
|
|
export const getOrderList = (data) => {
|
|
return request({
|
|
url: '/app/order/list',
|
|
method: 'get',
|
|
data,
|
|
hideLoading: true
|
|
})
|
|
}
|
|
|
|
//查询是否有订单
|
|
export const queryHasOrder = (deviceNo) => {
|
|
return request({
|
|
url: `/app/order/list?deviceNo=${deviceNo}&orderStatus=in_used`,
|
|
method: 'get',
|
|
})
|
|
}
|
|
|
|
// 查询指定设备号下,特定状态的订单列表
|
|
export const checkOrdersByStatus = (deviceNo, statuses) => {
|
|
// statuses 是一个包含状态字符串的数组,例如 ['in_used', 'waiting_for_payment']
|
|
const statusQuery = statuses.join(','); // 后端需要支持逗号分隔的状态查询
|
|
return request({
|
|
url: `/app/order/list?deviceNo=${deviceNo}&orderStatus=${statusQuery}`,
|
|
method: 'get',
|
|
hideLoading: true, // 隐藏加载提示,避免干扰用户
|
|
ignoreEmptyError: true // 添加标记,表示即使返回空数据也不视为错误
|
|
})
|
|
}
|
|
|
|
//设备查询
|
|
export const getDeviceInfo = (deviceNo) => {
|
|
return request({
|
|
url: `/app/device/${deviceNo}`,
|
|
method: 'get',
|
|
})
|
|
}
|
|
|
|
|
|
//创建订单
|
|
export const createOrder = (data) => {
|
|
return request({
|
|
url: '/app/order/add',
|
|
method: 'post',
|
|
data,
|
|
})
|
|
}
|
|
|
|
//查询订单
|
|
export const queryById = (id) => {
|
|
console.log(`查询订单详情, orderId: ${id}`)
|
|
return request({
|
|
url: `/app/order/${id}`,
|
|
method: 'get',
|
|
hideLoading: true
|
|
})
|
|
}
|
|
|
|
|
|
//取消订单
|
|
export const cancelOrder = (data) => {
|
|
return request({
|
|
url: `/device/order/clear/${data.orderId}`,
|
|
method: 'get',
|
|
data,
|
|
})
|
|
}
|
|
|
|
|
|
//结束订单
|
|
export const overOrderById = (orderId) => {
|
|
console.log(`调用结束订单API, orderId: ${orderId}`)
|
|
return request({
|
|
url: `/app/order/close/${orderId}`,
|
|
method: 'get',
|
|
})
|
|
}
|
|
|
|
//立即租借
|
|
export const rentPowerBank = (deviceNo, phone) => {
|
|
return request({
|
|
url: '/app/device/rentPowerBank',
|
|
method: 'post',
|
|
data: {
|
|
deviceNo,
|
|
phone
|
|
}
|
|
})
|
|
}
|
|
|
|
//确认支付并弹出风扇
|
|
export const confirmPaymentAndRent = (orderId) => {
|
|
console.log(`确认支付并弹出风扇, orderId: ${orderId}`)
|
|
return request({
|
|
url: `/app/device/confirmPaymentAndRent?orderId=${orderId}`,
|
|
method: 'GET'
|
|
})
|
|
}
|
|
|
|
|
|
|
|
//投诉反馈
|
|
export const addUserFeedback = (data) => {
|
|
console.log(data);
|
|
return request({
|
|
url: '/app/feedback/add',
|
|
method: 'post',
|
|
data,
|
|
})
|
|
}
|
|
|
|
//强制打开空格子
|
|
export const forcefOpenEmptyGrid = (deviceNo) => {
|
|
console.log(`强制打开空格子, deviceNo: ${deviceNo}`)
|
|
return request({
|
|
url: `/app/device/forcef/${deviceNo}`,
|
|
method: 'post'
|
|
})
|
|
}
|
|
|
|
// 通过订单号获取订单信息
|
|
export const getOrderByOrderNo = (orderNo) => {
|
|
return request({
|
|
url: `/app/order/byOrderNo/${orderNo}`,
|
|
method: 'get',
|
|
hideLoading: true
|
|
})
|
|
}
|
|
// 通过订单号获取支付分订单信息
|
|
export const getOrderByOrderNoScore = (orderNo) => {
|
|
console.log('通过订单号获取支付分订单信息', orderNo);
|
|
return request({
|
|
url: `/app/wx-payment/score/create/${orderNo}`,
|
|
method: 'get',
|
|
hideLoading: true
|
|
})
|
|
}
|
|
|
|
export const getOrderByOrderNoScorePayStatus = (orderNo) => {
|
|
console.log('通过订单号获取支付分订单状态', orderNo);
|
|
return request({
|
|
url: `/app/wx-payment/score/status/${orderNo}`,
|
|
method: 'get',
|
|
hideLoading: true
|
|
})
|
|
}
|
|
|
|
// 更新订单套餐信息
|
|
export const updateOrderPackage = (data) => {
|
|
console.log('更新订单套餐信息:', data)
|
|
return request({
|
|
url: '/app/device/updateOrderPackage',
|
|
method: 'post',
|
|
data
|
|
})
|
|
}
|
|
|
|
// 更新用户余额
|
|
export const updateUserBalance = (orderId) => {
|
|
return request({
|
|
url: `/app/user/updateBalance/${orderId}`,
|
|
method: 'post',
|
|
hideLoading: true
|
|
})
|
|
}
|
|
|
|
/*
|
|
*弃用
|
|
*/
|
|
export const getPotionsDetail = (data) => {
|
|
console.log(data);
|
|
return request({
|
|
url: '/device/position/positionDetails',
|
|
method: 'get',
|
|
data
|
|
})
|
|
} |