Commit cce4480f by 姜雷

添加请求参数字段

parent 25a0bf16
......@@ -24,6 +24,8 @@ type Params = {
areaName: string;
// 区域名称
duration?: number;
};
type ResponseData = {
outTradeNo: string;
......@@ -33,7 +35,7 @@ type ResponseData = {
// 微信小程序端支付信息
};
export const getPayOrder = (
entity: Params,
entity: Params
): Promise<ResponseDataEntity<ResponseData>> =>
baseFetch({
url: '/smapro/prepay/order/wx/apply/pay',
......
......@@ -765,11 +765,9 @@ class Connect extends Component {
const { payId, deviceDone, sockedDone } = this.state;
if (payId) {
if (device.isOnlyBluetooth && device.isOnlyBluetooth === 1) {
if (this.checkIsShower()) {
console.log(deviceDone, sockedDone);
if (!deviceDone || !sockedDone) {
return this.showerPayHandle();
}
console.log(deviceDone, sockedDone);
if (!deviceDone || !sockedDone) {
return this.showerPayHandle();
}
}
let entity = {
......@@ -782,6 +780,9 @@ class Connect extends Component {
areaId: device.areaId,
areaName: device.areaName,
};
if (device.rates[0]) {
entity.duration = device.rates[0].duration;
}
if (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