diff --git a/lib/user.js b/lib/user.js index efdc0f5a..965a9dda 100644 --- a/lib/user.js +++ b/lib/user.js @@ -121,7 +121,8 @@ Volcanos("user", {help: "用户模块", agent: { case "扫码": can.misc.WSS(can, {type: "chrome"}, function(event, msg, cmd, arg) { if (!msg) { return } if (cmd == "pwd") { - can.user.share(can, can.request(event, {name: arg[0]}), ["action", "apply"]) + can.user.toast(can, arg[2], arg[1], 1000000) + // can.user.share(can, can.request(event, {name: arg[0]}), ["action", "apply"]) msg.Reply() return } diff --git a/panel/Header.js b/panel/Header.js index 7f5944c3..e3d78f51 100644 --- a/panel/Header.js +++ b/panel/Header.js @@ -174,10 +174,11 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, msg, can.onlayout.topic(can) can.user.isLocalFile? init(): can.run({}, ["check"], function(msg) { - if (msg.Option("type") == "apply" && msg.Option("username") == "") { - if (can.user.confirm("auth "+msg.Option("name"))) { - can.run(event, ["action", "auth", "share", can.user.Search(can, "share")]) + if (can.user.Search(can, "auth")) { + if (can.user.confirm("auth "+can.user.Search(can, "auth"))) { + can.run(event, ["action", "auth", "space", can.user.Search(can, "auth")]) } + debugger } msg.Result()? init(): msg.Option("sso")? can.user.jumps(msg.Option("sso")): can.user.login(can, init) })