Commit e531565a authored by wjf's avatar wjf

l

parent 1f50f558
...@@ -31,7 +31,12 @@ export default class PanelCtrl { ...@@ -31,7 +31,12 @@ export default class PanelCtrl {
this._parent = parent; this._parent = parent;
let bg = new Graphics(); let bg = new Graphics();
bg.beginFill(0, 1); bg.beginFill(0, 1);
bg.drawRect(0, layers.stageOffsetY - parent.y, layers.stageWidth, layers.stageHeight); bg.drawRect(
layers.stageOffsetX - parent.x,
layers.stageOffsetY - parent.y,
layers.stageWidth,
layers.stageHeight
);
bg.endFill(); bg.endFill();
bg.visible = false; bg.visible = false;
this._parent.addChild(bg); this._parent.addChild(bg);
......
...@@ -91,11 +91,10 @@ export class TaskPanel extends Panel { ...@@ -91,11 +91,10 @@ export class TaskPanel extends Panel {
//修改按钮状态 //修改按钮状态
for (var i = 0; i < list.length; i++) { for (var i = 0; i < list.length; i++) {
var l = list[i]; var l = list[i];
//未完成 //未完成!l.isComplete
if (!l.isComplete) { if (l.taskDrawStatus == 0) {
this[l.taskName].canGetStatus = false; this[l.taskName].canGetStatus = false;
this[l.taskName].enabled = true; this[l.taskName].enabled = true;
if (l.taskName == TaskType.doOrder) this.toShowMsg = 1//标记是没完成的 if (l.taskName == TaskType.doOrder) this.toShowMsg = 1//标记是没完成的
} }
//三个状态,到时确认 //三个状态,到时确认
...@@ -203,7 +202,7 @@ class CusButton extends Button { ...@@ -203,7 +202,7 @@ class CusButton extends Button {
case TaskType.doCollect: case TaskType.doCollect:
sendTbNet( sendTbNet(
TbNetName.navigateTo, TbNetName.navigateTo,
{ url: "" },//收藏页面路径待写 { url: '/pages/collectGoods/collectGoods' },//收藏页面路径待写
() => { }, () => { },
true true
); );
...@@ -219,7 +218,7 @@ class CusButton extends Button { ...@@ -219,7 +218,7 @@ class CusButton extends Button {
case TaskType.doOrder: case TaskType.doOrder:
sendTbNet( sendTbNet(
TbNetName.navigateTo, TbNetName.navigateTo,
{ url: "" },//下单页面路径待写 { url: '/pages/orderGoods/orderGoods' },//下单页面路径待写
() => { }, () => { },
true true
); );
......
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