Commit 1bba8287 authored by wildfirecode13's avatar wildfirecode13

Merge branch 'disu0811' of http://gitlab2.dui88.com/wildfirecode13/wfc13 into disu0811

parents d25f3c81 913e019f
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
"webpack-merge": "^4.1.2" "webpack-merge": "^4.1.2"
}, },
"dependencies": { "dependencies": {
"@spark/api-base": "^2.0.30",
"@spark/share": "^2.0.90", "@spark/share": "^2.0.90",
"@spark/ui": "^2.0.36",
"duiba-utils": "^1.0.11" "duiba-utils": "^1.0.11"
}, },
"scripts": { "scripts": {
......
...@@ -12,6 +12,9 @@ import { NoPrizePanel } from "./noprize"; ...@@ -12,6 +12,9 @@ import { NoPrizePanel } from "./noprize";
import { notEnoughMoneyPanel } from "./notEnoughMoney"; import { notEnoughMoneyPanel } from "./notEnoughMoney";
import { PrizePanel } from "./prize"; import { PrizePanel } from "./prize";
import { waitAPI } from "./wait2"; import { waitAPI } from "./wait2";
import { polling } from '@spark/api-base';
import { Toast } from '@spark/ui';
let section; let section;
export class CostPanel extends Panel { export class CostPanel extends Panel {
...@@ -36,17 +39,34 @@ export class CostPanel extends Panel { ...@@ -36,17 +39,34 @@ export class CostPanel extends Panel {
toPlaywayId: 'dazzle', toActionId: 'drawPrize' toPlaywayId: 'dazzle', toActionId: 'drawPrize'
}; };
let result, prizeData;
let result, prizeData, resultPolling;
if (indexResult.data.type == 1) { if (indexResult.data.type == 1) {
params.credits = indexResult.data.needCredits; params.credits = indexResult.data.needCredits;
result = await sendWebNet(WebNetName.getCreditCost, params); result = await sendWebNet(WebNetName.getCreditCost, params);
await waitAPI(500); resultPolling = await polling(
(rsp) => rsp.code == "0000000000",
'/projectx/{projectId}/credits/queryStatus.do',
{
ticketNum: result.data
},
10,
500,
'get'
).catch((e) => {
console.log("2222222", e)
Toast('网络异常,请再试一次');
})
if (resultPolling == 1) {
if(!result.success) { if(!result.success) {
btn.mouseEnable=true; btn.mouseEnable=true;
return; return;
} }
prizeData = await sendWebNetWithToken(WebNetName.drawPrize, { ticket: result.data }); prizeData = await sendWebNetWithToken(WebNetName.drawPrize, { ticket: result.data });
btn.mouseEnable=true; btn.mouseEnable=true;
} else if (resultPolling == 2) {
Toast('扣分失败');
}
} }
else { else {
prizeData = await sendWebNetWithToken(WebNetName.drawPrize); prizeData = await sendWebNetWithToken(WebNetName.drawPrize);
...@@ -70,6 +90,8 @@ export class CostPanel extends Panel { ...@@ -70,6 +90,8 @@ export class CostPanel extends Panel {
} }
get groupNames() { get groupNames() {
return ["cost"]; return ["cost"];
} }
......
This diff is collapsed.
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