Skip to content

B
babycare_xiaoxiao
Commit dd212356 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

下单任务修改跳到店铺首页

parent b80e54c7
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 46 deletions
.idea/workspace.xml
View file @ dd212356
......@@ -5,10 +5,7 @@
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/mapGuide.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/mapGuide.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapMid.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapMid.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapTop.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapTop.ts" 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" />
......@@ -200,14 +197,7 @@
<workItem from="1602380089772" duration="7488000" />
<workItem from="1602467369737" duration="13722000" />
<workItem from="1602553054726" duration="8321000" />
<workItem from="1602640287576" duration="7863000" />
</task>
<task id="LOCAL-00045" summary="换了点皮">
<created>1600860005659</created>
<option name="number" value="00045" />
<option name="presentableId" value="LOCAL-00045" />
<option name="project" value="LOCAL" />
<updated>1600860005659</updated>
<workItem from="1602640287576" duration="9837000" />
</task>
<task id="LOCAL-00046" summary="换了点皮">
<created>1600860296336</created>
......@@ -545,7 +535,14 @@
<option name="project" value="LOCAL" />
<updated>1602666865225</updated>
</task>
<option name="localTasksCounter" value="94" />
<task id="LOCAL-00094" summary="首页树的动画修改">
<created>1602669914705</created>
<option name="number" value="00094" />
<option name="presentableId" value="LOCAL-00094" />
<option name="project" value="LOCAL" />
<updated>1602669914705</updated>
</task>
<option name="localTasksCounter" value="95" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -563,7 +560,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<MESSAGE value="map effect" />
<MESSAGE value="effect" />
<MESSAGE value="Success Panel Effect!" />
<MESSAGE value="aaa" />
......@@ -588,7 +584,8 @@
<MESSAGE value="按钮放反了" />
<MESSAGE value="1" />
<MESSAGE value="礼盒loading引导" />
<option name="LAST_COMMIT_MESSAGE" value="礼盒loading引导" />
<MESSAGE value="首页树的动画修改" />
<option name="LAST_COMMIT_MESSAGE" value="首页树的动画修改" />
</component>
<component name="WindowStateProjectService">
<state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1595229546530">
......@@ -612,51 +609,51 @@
</state>
<state x="250" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/30.23.1890.1177@30.23.1890.1177" timestamp="1601454738211" />
<state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" />
<state x="560" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1602666864286">
<state x="560" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1602669911870">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="557" y="23" key="CommitChangelistDialog2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472142620" />
<state x="423" y="142" width="783" height="664" key="CommitChangelistDialog2/30.23.1410.877@30.23.1410.877" timestamp="1601389896862" />
<state x="560" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1602666864286" />
<state x="560" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1602669911870" />
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" />
<state x="131" y="63" width="1683" height="1037" key="DiffContextDialog" timestamp="1602321352721">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="131" y="63" width="1683" height="1037" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1602321352721" />
<state width="1187" height="321" key="GridCell.Tab.0.bottom" timestamp="1602667682190">
<state width="1187" height="321" key="GridCell.Tab.0.bottom" timestamp="1602680241273">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.bottom/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="1187" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1602605289405" />
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="1187" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602667682190" />
<state width="1187" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602680241273" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state width="1187" height="321" key="GridCell.Tab.0.center" timestamp="1602667682189">
<state width="1187" height="321" key="GridCell.Tab.0.center" timestamp="1602680241272">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.center/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="1187" height="321" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1602605289404" />
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="1187" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602667682189" />
<state width="1187" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602680241272" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918464" />
<state width="1187" height="321" key="GridCell.Tab.0.left" timestamp="1602667682188">
<state width="1187" height="321" key="GridCell.Tab.0.left" timestamp="1602680241270">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.left/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154150" />
<state width="1187" height="321" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1602605289403" />
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="1187" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602667682188" />
<state width="1187" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602680241270" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577197" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918463" />
<state width="1187" height="321" key="GridCell.Tab.0.right" timestamp="1602667682189">
<state width="1187" height="321" key="GridCell.Tab.0.right" timestamp="1602680241272">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.right/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="1187" height="321" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1602605289404" />
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="1187" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602667682189" />
<state width="1187" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602680241272" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326">
......@@ -673,12 +670,12 @@
</state>
<state x="762" y="247" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1602321211804" />
<state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1602666866724">
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1602669915981">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472144830" />
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877@30.23.1410.877" timestamp="1601389898667" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1602666866724" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1602669915981" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584299423" />
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" />
......@@ -711,11 +708,11 @@
</state>
<state x="156" y="286" key="run.anything.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596432664001" />
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" />
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup" timestamp="1602669760593">
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup" timestamp="1602679995316">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="484" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1600829323295" />
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1602669760593" />
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1602679995316" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" />
<state x="249" y="530" key="vcs.readOnlyHandler.ReadOnlyStatusDialog" timestamp="1602310103215">
<screen x="30" y="23" width="1890" height="1177" />
......
output.js
View file @ dd212356
......@@ -21132,17 +21132,17 @@ var _a;
var Panel_1 = __webpack_require__(/*! ../../module/views/Panel */ "./module/views/Panel.ts");
var layers_1 = __webpack_require__(/*! ../../module/views/layers */ "./module/views/layers.ts");
var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts");
var Tween = FYGE.Tween;
var Ease = FYGE.Ease;
var Button = FYGE.Button;
var Main_1 = __webpack_require__(/*! ../Main */ "./src/Main.ts");
var G_EVENT_1 = __webpack_require__(/*! ../common/G_EVENT */ "./src/common/G_EVENT.ts");
var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
var Item_1 = __webpack_require__(/*! ../../module/views/Item */ "./module/views/Item.ts");
var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts");
var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
var Tween = FYGE.Tween;
var Ease = FYGE.Ease;
var Button = FYGE.Button;
var ScrollList = FYGE.ScrollList;
var Sprite = FYGE.Sprite;
var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
var MouseEvent = FYGE.MouseEvent;
var TaskType;
(function (TaskType) {
......@@ -21338,9 +21338,7 @@ var TaskItem = (function (_super) {
}, true);
break;
case TaskType.orderGoods:
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateTo, {
url: '/pages/goodsPage/goodsPage?taskType=orderGoods&itemIds=' + this.data.itemIds
});
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateToOutside, { url: 'https://popmart.m.tmall.com' });
break;
}
};
output.js.map
View file @ dd212356
This source diff could not be displayed because it is too large. You can view the blob instead.
src/panels/TaskPanel.ts
View file @ dd212356
import { Panel } from "../../module/views/Panel";
import { layers } from "../../module/views/layers";
import { sendTbNet, TbNetName } from "../TaoBaoNet";
import Tween = FYGE.Tween;
import Ease = FYGE.Ease;
import Button = FYGE.Button;
import { GDispatcher } from "../Main";
import { G_EVENT } from "../common/G_EVENT";
import { showWaiting, hideWaiting, showToast, getCurrentScene } from "../../module/ctrls";
import Container = FYGE.Container;
import { getCurrentScene, hideWaiting, showToast, showWaiting } from "../../module/ctrls";
import { Item } from "../../module/views/Item";
import { Tools } from "../Tools";
import { RES } from "../../module/RES";
import Tween = FYGE.Tween;
import Ease = FYGE.Ease;
import Button = FYGE.Button;
import ScrollList = FYGE.ScrollList;
import Sprite = FYGE.Sprite;
import TextField = FYGE.TextField;
import { RES } from "../../module/RES";
import MouseEvent = FYGE.MouseEvent;
// 任务类型（invites 、member、follow、browseGoods、orderGoods）
......@@ -287,9 +286,11 @@ class TaskItem extends Item {
}, true);
break;
case TaskType.orderGoods:
sendTbNet(TbNetName.navigateTo, {
url: '/pages/goodsPage/goodsPage?taskType=orderGoods&itemIds=' + this.data.itemIds
});
/// TODO 修改跳到店铺首页 2020.10.14
// sendTbNet(TbNetName.navigateTo, {
// url: '/pages/goodsPage/goodsPage?taskType=orderGoods&itemIds=' + this.data.itemIds
// });
sendTbNet(TbNetName.navigateToOutside, {url: 'https://popmart.m.tmall.com'});
break;
}
}
......
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