Commit cce4480f by 姜雷

添加请求参数字段

parent 25a0bf16
...@@ -24,6 +24,8 @@ type Params = { ...@@ -24,6 +24,8 @@ type Params = {
areaName: string; areaName: string;
// 区域名称 // 区域名称
duration?: number;
}; };
type ResponseData = { type ResponseData = {
outTradeNo: string; outTradeNo: string;
...@@ -33,7 +35,7 @@ type ResponseData = { ...@@ -33,7 +35,7 @@ type ResponseData = {
// 微信小程序端支付信息 // 微信小程序端支付信息
}; };
export const getPayOrder = ( export const getPayOrder = (
entity: Params, entity: Params
): Promise<ResponseDataEntity<ResponseData>> => ): Promise<ResponseDataEntity<ResponseData>> =>
baseFetch({ baseFetch({
url: '/smapro/prepay/order/wx/apply/pay', url: '/smapro/prepay/order/wx/apply/pay',
......
...@@ -765,13 +765,11 @@ class Connect extends Component { ...@@ -765,13 +765,11 @@ class Connect extends Component {
const { payId, deviceDone, sockedDone } = this.state; const { payId, deviceDone, sockedDone } = this.state;
if (payId) { if (payId) {
if (device.isOnlyBluetooth && device.isOnlyBluetooth === 1) { if (device.isOnlyBluetooth && device.isOnlyBluetooth === 1) {
if (this.checkIsShower()) {
console.log(deviceDone, sockedDone); console.log(deviceDone, sockedDone);
if (!deviceDone || !sockedDone) { if (!deviceDone || !sockedDone) {
return this.showerPayHandle(); return this.showerPayHandle();
} }
} }
}
let entity = { let entity = {
equipmentNum: device.originCode, equipmentNum: device.originCode,
equipmentPos: device.position, equipmentPos: device.position,
...@@ -782,6 +780,9 @@ class Connect extends Component { ...@@ -782,6 +780,9 @@ class Connect extends Component {
areaId: device.areaId, areaId: device.areaId,
areaName: device.areaName, areaName: device.areaName,
}; };
if (device.rates[0]) {
entity.duration = device.rates[0].duration;
}
if (phoneData) { if (phoneData) {
entity = { ...entity, ...phoneData }; entity = { ...entity, ...phoneData };
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment