Skip to content

Q
qiaqia_qx
Commit 348688ed authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

1111

parent 1ba639a1
Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 22 deletions
.idea/workspace.xml
View file @ 348688ed
......@@ -3,9 +3,8 @@
<component name="ChangeListManager">
<list default="true" id="31be0130-d27d-4740-b668-956a8050e1bf" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scenes/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scenes/LoadingScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/qiaqia2.getExchangeGoodsList.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/qiaqia2.getExchangeGoodsList.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/TaskPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/TaskPanel.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -66,7 +65,7 @@
<recent name="$PROJECT_DIR$/resource/taskPanel" />
</key>
</component>
<component name="RunManager" selected="npm.buildTS">
<component name="RunManager" selected="npm.dev">
<configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
......@@ -115,10 +114,10 @@
</list>
<recent_temporary>
<list>
<item itemvalue="npm.dev" />
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.build" />
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
</list>
</recent_temporary>
</component>
......@@ -154,7 +153,17 @@
<workItem from="1592203763793" duration="21589000" />
<workItem from="1592273018019" duration="24906000" />
<workItem from="1592358392926" duration="17069000" />
<workItem from="1592445169349" duration="2681000" />
<workItem from="1592445169349" duration="2694000" />
<workItem from="1592451066529" duration="1299000" />
<workItem from="1592464657033" duration="1200000" />
<workItem from="1592531767989" duration="1951000" />
<workItem from="1592552462625" duration="21000" />
<workItem from="1592555424472" duration="50000" />
<workItem from="1592794808674" duration="230000" />
<workItem from="1592798391152" duration="39000" />
<workItem from="1592805639033" duration="46000" />
<workItem from="1592830801526" duration="805000" />
<workItem from="1592880254194" duration="55000" />
</task>
<task id="LOCAL-00001" summary="1">
<created>1591003912929</created>
......@@ -478,7 +487,14 @@
<option name="project" value="LOCAL" />
<updated>1592385430032</updated>
</task>
<option name="localTasksCounter" value="47" />
<task id="LOCAL-00047" summary="1111">
<created>1592449548855</created>
<option name="number" value="00047" />
<option name="presentableId" value="LOCAL-00047" />
<option name="project" value="LOCAL" />
<updated>1592449548855</updated>
</task>
<option name="localTasksCounter" value="48" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -535,10 +551,11 @@
</state>
<state x="671" y="259" key="#com.intellij.ide.util.MemberChooser/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591344864454" />
<state x="764" y="293" key="#com.intellij.ide.util.MemberChooser/37.23.1883.1177@37.23.1883.1177" timestamp="1591929411133" />
<state x="529" y="120" key="CommitChangelistDialog2" timestamp="1592385429485">
<screen x="37" y="23" width="1883" height="1177" />
<state x="525" y="120" key="CommitChangelistDialog2" timestamp="1592449548514">
<screen x="32" y="23" width="1888" height="1177" />
</state>
<state x="502" y="120" key="CommitChangelistDialog2/0.23.1920.1177@0.23.1920.1177" timestamp="1591884607456" />
<state x="525" y="120" key="CommitChangelistDialog2/32.23.1888.1177@32.23.1888.1177" timestamp="1592449548514" />
<state x="411" y="44" key="CommitChangelistDialog2/35.23.1405.877@35.23.1405.877" timestamp="1592293157840" />
<state x="466" y="108" key="CommitChangelistDialog2/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591003912498" />
<state x="540" y="230" key="CommitChangelistDialog2/35.23.1885.1177@35.23.1885.1177" timestamp="1592373725900" />
......@@ -547,11 +564,11 @@
<state x="467" y="108" key="CommitChangelistDialog2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591846770902" />
<state x="467" y="108" key="CommitChangelistDialog2/37.23.1643.1027@37.23.1643.1027" timestamp="1591785684954" />
<state x="529" y="120" key="CommitChangelistDialog2/37.23.1883.1177@37.23.1883.1177" timestamp="1592385429485" />
<state width="930" height="191" key="GridCell.Tab.0.bottom" timestamp="1592449034591">
<state width="1366" height="130" key="GridCell.Tab.0.bottom" timestamp="1592832798441">
<screen x="32" y="23" width="1888" height="1177" />
</state>
<state width="1601" height="346" key="GridCell.Tab.0.bottom/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" />
<state width="930" height="191" key="GridCell.Tab.0.bottom/32.23.1888.1177@32.23.1888.1177" timestamp="1592449034591" />
<state width="1366" height="130" key="GridCell.Tab.0.bottom/32.23.1888.1177@32.23.1888.1177" timestamp="1592832798441" />
<state width="1363" height="191" key="GridCell.Tab.0.bottom/35.23.1405.877@35.23.1405.877" timestamp="1592296979551" />
<state width="499" height="907" key="GridCell.Tab.0.bottom/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953118" />
<state width="930" height="191" key="GridCell.Tab.0.bottom/35.23.1885.1177@35.23.1885.1177" timestamp="1592393512540" />
......@@ -562,11 +579,11 @@
<state width="252" height="907" key="GridCell.Tab.0.bottom/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591852525606" />
<state width="311" height="907" key="GridCell.Tab.0.bottom/37.23.1643.1027@37.23.1643.1027" timestamp="1591713871414" />
<state width="930" height="191" key="GridCell.Tab.0.bottom/37.23.1883.1177@37.23.1883.1177" timestamp="1592385235055" />
<state width="930" height="191" key="GridCell.Tab.0.center" timestamp="1592449034588">
<state width="1366" height="130" key="GridCell.Tab.0.center" timestamp="1592832798440">
<screen x="32" y="23" width="1888" height="1177" />
</state>
<state width="1601" height="346" key="GridCell.Tab.0.center/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" />
<state width="930" height="191" key="GridCell.Tab.0.center/32.23.1888.1177@32.23.1888.1177" timestamp="1592449034588" />
<state width="1366" height="130" key="GridCell.Tab.0.center/32.23.1888.1177@32.23.1888.1177" timestamp="1592832798440" />
<state width="1363" height="191" key="GridCell.Tab.0.center/35.23.1405.877@35.23.1405.877" timestamp="1592296979547" />
<state width="499" height="907" key="GridCell.Tab.0.center/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953116" />
<state width="930" height="191" key="GridCell.Tab.0.center/35.23.1885.1177@35.23.1885.1177" timestamp="1592393512539" />
......@@ -577,11 +594,11 @@
<state width="252" height="907" key="GridCell.Tab.0.center/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591852525596" />
<state width="311" height="907" key="GridCell.Tab.0.center/37.23.1643.1027@37.23.1643.1027" timestamp="1591713871413" />
<state width="930" height="191" key="GridCell.Tab.0.center/37.23.1883.1177@37.23.1883.1177" timestamp="1592385235054" />
<state width="930" height="191" key="GridCell.Tab.0.left" timestamp="1592449034587">
<state width="1366" height="130" key="GridCell.Tab.0.left" timestamp="1592832798440">
<screen x="32" y="23" width="1888" height="1177" />
</state>
<state width="1601" height="346" key="GridCell.Tab.0.left/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614403" />
<state width="930" height="191" key="GridCell.Tab.0.left/32.23.1888.1177@32.23.1888.1177" timestamp="1592449034587" />
<state width="1366" height="130" key="GridCell.Tab.0.left/32.23.1888.1177@32.23.1888.1177" timestamp="1592832798440" />
<state width="1363" height="191" key="GridCell.Tab.0.left/35.23.1405.877@35.23.1405.877" timestamp="1592296979544" />
<state width="499" height="907" key="GridCell.Tab.0.left/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953114" />
<state width="930" height="191" key="GridCell.Tab.0.left/35.23.1885.1177@35.23.1885.1177" timestamp="1592393512538" />
......@@ -592,11 +609,11 @@
<state width="252" height="907" key="GridCell.Tab.0.left/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591852525590" />
<state width="311" height="907" key="GridCell.Tab.0.left/37.23.1643.1027@37.23.1643.1027" timestamp="1591713871412" />
<state width="930" height="191" key="GridCell.Tab.0.left/37.23.1883.1177@37.23.1883.1177" timestamp="1592385235054" />
<state width="930" height="191" key="GridCell.Tab.0.right" timestamp="1592449034589">
<state width="1366" height="130" key="GridCell.Tab.0.right" timestamp="1592832798441">
<screen x="32" y="23" width="1888" height="1177" />
</state>
<state width="1601" height="346" key="GridCell.Tab.0.right/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" />
<state width="930" height="191" key="GridCell.Tab.0.right/32.23.1888.1177@32.23.1888.1177" timestamp="1592449034589" />
<state width="1366" height="130" key="GridCell.Tab.0.right/32.23.1888.1177@32.23.1888.1177" timestamp="1592832798441" />
<state width="1363" height="191" key="GridCell.Tab.0.right/35.23.1405.877@35.23.1405.877" timestamp="1592296979549" />
<state width="499" height="907" key="GridCell.Tab.0.right/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953118" />
<state width="930" height="191" key="GridCell.Tab.0.right/35.23.1885.1177@35.23.1885.1177" timestamp="1592393512539" />
......@@ -621,10 +638,11 @@
<screen x="35" y="23" width="1405" height="877" />
</state>
<state width="500" height="445" key="SwitcherDM/35.23.1405.877@35.23.1405.877" timestamp="1592292721015" />
<state x="518" y="313" key="Vcs.Push.Dialog.v2" timestamp="1592385431352">
<screen x="37" y="23" width="1883" height="1177" />
<state x="514" y="313" key="Vcs.Push.Dialog.v2" timestamp="1592449550590">
<screen x="32" y="23" width="1888" height="1177" />
</state>
<state x="491" y="313" key="Vcs.Push.Dialog.v2/0.23.1920.1177@0.23.1920.1177" timestamp="1591884609437" />
<state x="514" y="313" key="Vcs.Push.Dialog.v2/32.23.1888.1177@32.23.1888.1177" timestamp="1592449550590" />
<state x="517" y="313" key="Vcs.Push.Dialog.v2/35.23.1885.1177@35.23.1885.1177" timestamp="1592373729832" />
<state x="518" y="313" key="Vcs.Push.Dialog.v2/36.23.1884.1177@36.23.1884.1177" timestamp="1591966205725" />
<state x="2171" y="91" key="Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189622538" />
......@@ -651,11 +669,12 @@
<screen x="0" y="23" width="1920" height="1177" />
</state>
<state x="85" y="286" key="run.anything.popup/0.23.1920.1177@0.23.1920.1177" timestamp="1591883929114" />
<state x="590" y="283" width="904" height="778" key="search.everywhere.popup" timestamp="1592448985084">
<state x="590" y="283" width="904" height="778" key="search.everywhere.popup" timestamp="1592830804212">
<screen x="32" y="23" width="1888" height="1177" />
</state>
<state x="568" y="283" width="917" height="776" key="search.everywhere.popup/0.23.1920.1177@0.23.1920.1177" timestamp="1591884167098" />
<state x="590" y="283" width="904" height="778" key="search.everywhere.popup/32.23.1888.1177@32.23.1888.1177" timestamp="1592448985084" />
<state x="2007" y="283" width="920" height="778" key="search.everywhere.popup/32.23.1408.877/1440.23.1920.1177@1440.23.1920.1177" timestamp="1592552467353" />
<state x="590" y="283" width="904" height="778" key="search.everywhere.popup/32.23.1888.1177@32.23.1888.1177" timestamp="1592830804212" />
<state x="450" y="217" width="674" height="580" key="search.everywhere.popup/35.23.1405.877@35.23.1405.877" timestamp="1592296171796" />
<state x="522" y="250" width="670" height="676" key="search.everywhere.popup/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591066027960" />
<state x="592" y="283" width="903" height="778" key="search.everywhere.popup/35.23.1885.1177@35.23.1885.1177" timestamp="1592374136123" />
......
mock/miniTb/qiaqia2.getExchangeGoodsList.json
View file @ 348688ed
{
"code": "000000",
"data": [
{
"image": "https://source.unsplash.com/user/erondu/100x100",
"ename": "111111",
"amount": 20,
"exchangeInfo": [
{
"name": "核桃",
"storage": 110,
"type": "PECAN",
"value": 10
}
],
"restStock": 1000,
"isLimitStock": true,
"name": "权益奖品",
"startTime": 1591682068000,
"_id": "5edf3a16f344891ad1f6adab",
"endTime": 1591682068000,
"type": 1,
"desc": "描述描述描述描述",
"stock": 2000
},
{
"image": "https://source.unsplash.com/user/erondu/100x100",
"ename": "111111",
"amount": 20,
"exchangeInfo": [
{
"name": "核桃",
"storage": 110,
"type": "PECAN",
"value": 10
}
],
"restStock": 1000,
"isLimitStock": true,
"name": "权益奖品",
"startTime": 1591682068000,
"_id": "5edf3a16f344891ad1f6adab",
"endTime": 1591682068000,
"type": 1,
"desc": "描述描述描述描述",
"stock": 2000
},
{
"image": "https://source.unsplash.com/user/erondu/100x100",
"ename": "111111",
"amount": 20,
"exchangeInfo": [
{
"name": "核桃",
"storage": 110,
"type": "PECAN",
"value": 10
}
],
"restStock": 1000,
"isLimitStock": true,
"name": "权益奖品",
"startTime": 1591682068000,
"_id": "5edf3a16f344891ad1f6adab",
"endTime": 1591682068000,
"type": 1,
"desc": "描述描述描述描述",
"stock": 2000
},
{
"image": "https://source.unsplash.com/user/erondu/100x100",
"ename": "111111",
"amount": 20,
"exchangeInfo": [
{
"name": "核桃",
"storage": 110,
"type": "PECAN",
"value": 10
}
],
"restStock": 1000,
"isLimitStock": true,
"name": "权益奖品",
"startTime": 1591682068000,
"_id": "5edf3a16f344891ad1f6adab",
"endTime": 1591682068000,
"type": 1,
"desc": "描述描述描述描述",
"stock": 2000
},
{
"image": "https://source.unsplash.com/user/erondu/100x100",
"ename": "111111",
"amount": 20,
"exchangeInfo": [
{
"name": "核桃",
"storage": 110,
"type": "PECAN",
"value": 10
}
],
"restStock": 1000,
"isLimitStock": true,
"name": "权益奖品",
"startTime": 1591682068000,
"_id": "5edf3a16f344891ad1f6adab",
"endTime": 1591682068000,
"type": 1,
"desc": "描述描述描述描述",
"stock": 2000
},
{
"image": "https://source.unsplash.com/user/erondu/100x100",
"ename": "111111",
......
src/panels/TaskPanel.ts
View file @ 348688ed
......@@ -220,7 +220,7 @@ class TaskItem extends Container {
showToast(`成功邀请${~~(data.waitReceive / data.rewards)}名好友，获得${data.waitReceive}个水滴`);
return;
}
showToast(`任务完成，获得${data.rewards}个水滴`);
showToast(`任务完成，获得${data.waitReceive}个水滴`);
});
});
} else if (data.todayCompleteTimes >= data.times) {
......
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