diff --git a/src/gonganxitong/common.go b/src/gonganxitong/common.go index 580d89f..08fb7a0 100644 --- a/src/gonganxitong/common.go +++ b/src/gonganxitong/common.go @@ -42,6 +42,7 @@ type Table struct { checkRole string `name:"checkRole role"` inputs string `name:"inputs" role:"void"` list string `name:"list place_uid uid auto" role:"void"` + market string `name:"market domain_uid* title* content" role:"leader"` } func (s Table) LoadTrans(m *ice.Message, arg ...string) { @@ -242,6 +243,9 @@ func (s Table) UserPlaceInit(m *ice.Message, arg ...string) { } m.Cmd(s.Prefix(m, Portal{}), "placeCmd", "addCount", model.INIT, 1, m.Option(model.PLACE_UID), m.Option(model.PLACE_INIT)) } +func (s Table) Market(m *ice.Message, arg ...string) { + s.MarketInsert(m, arg...) +} func (s Table) MarketInsert(m *ice.Message, arg ...string) { m.Cmdy(s.Prefix(m, Portal{}), s.MarketInsert, arg) } diff --git a/src/gonganxitong/market.js b/src/gonganxitong/market.js index 023e260..e0126ff 100644 --- a/src/gonganxitong/market.js +++ b/src/gonganxitong/market.js @@ -20,14 +20,20 @@ Volcanos(chat.ONIMPORT, { }, _data: function(can, msg) { can.onmotion.clear(can, can.ui.list) can.onimport.itemcards(can, msg, function(value) { return [ - {view: html.STATUS, list: [{text: [value.user_name, "", "username"]}, can.onimport.authView(can, value), can.onimport.timeView(can, value)]}, + {view: html.STATUS, list: [ + {text: [value.user_name, "", "username"], onclick: function(event) { + can.onkeymap.prevent(event) + can.onappend.plugin(can, {index: "web.team.gonganxitong.profile", args: [value.user_uid]}) + }}, + can.onimport.authView(can, value), can.onimport.timeView(can, value), + ]}, {view: html.STATUS, list: [ // {text: [value.city_name, "", "street"]}, - {text: [value.street_name, "", "street"]}, + // {text: [value.service_name.split(" ")[0], "", "service"]}, {text: [value.place_name, "", "place"]}, - {text: [value.service_name.split(" ")[0], "", "service"]}, + {text: ["@"+value.street_name, "", "street"]}, ]}, - {view: html.TITLE, list: [value.title]}, + // {view: html.TITLE, list: [value.title]}, {view: html.OUTPUT, list: [value.content]}, {view: html.ACTION, list: [ {view: html.ITEM, list: [{icon: "bi bi-hand-thumbs-up"}, {text: value.thumb_count||"点赞"}], onclick: function(event) { @@ -47,11 +53,9 @@ Volcanos(chat.ONIMPORT, { }, thumbs: function(event, can, value, button) { can.onkeymap.prevent(event) var target = can.page.SelectOne(can, event.currentTarget, "span") - can.run(can.request(event, value), [ctx.ACTION, button], function(msg) { - target.innerHTML = msg.Result() - }) + can.run(can.request(event, value), [ctx.ACTION, button], function(msg) { target.innerHTML = msg.Result() }) }, layout: function(can) { can.ui.list && can.page.styleHeight(can, can.ui.list, can.ConfHeight()-can.ui.tabs.offsetHeight) }, -}) \ No newline at end of file +}) diff --git a/src/gonganxitong/portal.css b/src/gonganxitong/portal.css index cc1531a..ece42e0 100644 --- a/src/gonganxitong/portal.css +++ b/src/gonganxitong/portal.css @@ -8,6 +8,7 @@ $output div.item.card div.status span { word-break:break-all; } $output div.item.card img { border-radius:5px; padding:0; margin:0; margin-right:10px; height:48px; } $output div.item.card.sticky>div.output { background-color:var(--plugin-bg-color); color:var(--notice-bg-color); } $output>div>div.list { box-shadow:var(--box-shadow); border-radius:10px; background-color:var(--output-bg-color); padding:10px; margin:10px; } +$output>div>div.list { min-height:105px; } $output>div>div.list>div.title { font-weight:bold; display:flex; align-items:center; } $output>div>div.list>div.title span:first-child { flex-grow:1; } $output>div>div.list>div.title div.action div.item { margin-right:5px; } @@ -27,7 +28,24 @@ $output>div>div.list>div.action { display:flex; justify-content:center; display: $output>div>div.list>div.action div.item { margin-right:5px; } $output>div>div.list>div.action div.item input[type=button] { color:var(--notice-bg-color); border:none; } $output>div>div.list>div.action div.item i { display:none; } -// $output>div.output>div.list:last-child { margin-bottom:0; } + +$action { background-color:transparent; } +$action>div.list { background-color:transparent; } +$action div.item.button { margin-right:5px; padding:0; } +$action div.item.button input { border:none; color:var(--notice-bg-color); min-width:60px; float:left; display:unset; } +$action div.item.button input:hover { background-color:var(--hover-bg-color); } +$action div.item.button span { display:none; } +$action div.item.button i { display:none; } +$output { position:unset; } + +fieldset.Action>div.action { background-color:transparent; } +fieldset.Action>div.action>div.list { background-color:transparent; } +fieldset.Action>div.action div.item.button { margin-right:5px; padding:0; } +fieldset.Action>div.action div.item.button input { border:none; color:var(--notice-bg-color); min-width:60px; float:left; } +fieldset.Action>div.action div.item.button input:hover { background-color:var(--hover-bg-color); } +fieldset.Action>div.action div.item.button span { display:none; } +fieldset.Action>div.action div.item.button i { display:none; } + $output>div.action { background-color:transparent; } $output>div.action>div.list { background-color:transparent; } $output>div.action div.item.button { margin-right:5px; } @@ -35,6 +53,7 @@ $output>div.action div.item.button input { border:none; color:var(--notice-bg-co $output>div.action div.item.button input:hover { background-color:var(--hover-bg-color); } $output>div.action div.item.button span { display:none; } $output>div.action div.item.button i { display:none; } + $output input[type=button][name=submit] { background-color:var(--notice-bg-color); color:var(--notice-fg-color); padding:0 20px; } $output input[type=button][name=cancel] { background-color:var(--danger-bg-color); color:var(--danger-fg-color); padding:0 20px; } $output input[type=button][name=reject] { background-color:var(--danger-bg-color); color:var(--danger-fg-color); padding:0 20px; } @@ -75,6 +94,7 @@ $output>fieldset.market>div.output>div.list div.item.card div.status>span.userna $output>fieldset.market>div.output>div.list div.item.card div.status>span.time { float:right; } $output>fieldset.market>div.output>div.list div.item.card div.output div.action { color:gray; font-size:14px; width:100%; max-width:100%; display:flex; justify-content:space-around; position:relative; } $output>fieldset.market>div.output>div.list div.item.card div.output div.action i { margin-right:5px; } +$output>fieldset.market>div.output>div.list div.item.card div.output div.output { padding:10px 0; } $output>fieldset.market>div.output>div.list div.item.card div.output div.action div.item.done { color:var(--notice-bg-color); } // $output>fieldset.market>div.output>div.list div.item.card div.status>span.street { color:var(--notice-bg-color); } // $output>fieldset.market>div.output>div.list div.item.card div.status>span.place { color:var(--notice-bg-color); } @@ -86,4 +106,4 @@ body.light.mobile { --plugin-bg-color:#f4f5f9; --output-bg-color:#fefefd; } body.mobile $output>div>div.list div.item.index span { font-size:12px; white-space:pre; } body.mobile fieldset.panel.Action>div.output { background-color:var(--plugin-bg-color); } body:not(.mobile) $output>fieldset.story>div.output div.item.card:not(:hover) { background-color:var(--output-bg-color); } -body.en $output>fieldset table.content td:first-child { max-width:180px; width:unset;} \ No newline at end of file +body.en $output>fieldset table.content td:first-child { max-width:180px; width:unset;} diff --git a/src/gonganxitong/portal.js b/src/gonganxitong/portal.js index 7ecea21..2798aa3 100644 --- a/src/gonganxitong/portal.js +++ b/src/gonganxitong/portal.js @@ -1,38 +1,42 @@ var UID = "uid", PLACE_UID = "place_uid", PLACE_NAME = "place_name", PLACE_TYPE = "place_type", STREET_NAME = "street_name", CITY_NAME = "city_name" Volcanos(chat.ONIMPORT, { _init: function(can, msg) { - if (can.user.isMobile && can.isCmdMode()) { can.onappend.style(can, html.OUTPUT) - can.onmotion.delay(can, function() { can.sup.onimport.size(can.sup, window.innerHeight, window.innerWidth) }) - can.onmotion.delay(can, function() { can.sup.onimport.size(can.sup, window.innerHeight, window.innerWidth) }, 300) - can.onmotion.delay(can, function() { can.sup.onimport.size(can.sup, window.innerHeight, window.innerWidth) }, 3000) - } + if (can.user.isMobile && can.isCmdMode()) { can.onappend.style(can, html.OUTPUT), can.sup.onimport.size(can.sup, window.innerHeight, window.innerWidth) } can.onimport.myPortal(can, msg) }, typeStyle: function(can, value, key) { return can.Conf("_trans.value."+key+".style."+value[key])||"" }, roleStyle: function(can, value, key) { return can.Conf("_trans.value."+key+".style."+value[key])||"" }, - timeView: function(can, value) { return {text: [can.base.TimeTrim(value.updated_at||value.created_at), "", "time"]} }, - authView: function(can, value) { - return can.base.isIn(value.auth_status, "issued", "2") && {view: ["auth", html.SPAN], list: [{icon: "bi bi-patch-check-fill", style: {color: "var(--notice-bg-color)"}}]} - }, + timeView: function(can, value) { return {text: [can.base.TimeTrim(value.updated_at||value.created_at), "", mdb.TIME]} }, + authView: function(can, value) { return can.base.isIn(value.auth_status, "issued", "2") && {view: [aaa.AUTH, html.SPAN], list: [{icon: "bi bi-patch-check-fill", style: {color: "var(--notice-bg-color)"}}]} }, myValue: function(can, value) { return [ - {view: html.TITLE, list: [value._name, - can.base.isIn(value.auth_status, "issued", "2") && {view: ["auth", html.SPAN], list: [{icon: "bi bi-patch-check-fill", style: {color: "var(--notice-bg-color)"}}]}, + {view: html.TITLE, list: [value._name, can.onimport.authView(can, value), {text: [value.__type, "", [mdb.TYPE, value._type, value._type_style]]}, value._role != "visitor" && {text: [value.__role, "", [aaa.ROLE, value._role, value._role_style]]}, ]}, {view: html.STATUS, list: [value.uid.slice(0, 6), value.city_name, value._street]}, ] }, + myTrans: function(can, value, PLACE_UID, PLACE_NAME, PLACE_TYPE, STREET_NAME, USER_PLACE_ROLE) { + value.icons = value.icons||can.Conf(can.core.Keys("_trans.value", PLACE_TYPE, mdb.ICONS, value[PLACE_TYPE])) + value._uid = value[PLACE_UID], value._name = value[PLACE_NAME], value._street = value[STREET_NAME] + value._type = value[PLACE_TYPE], value.__type = can.user.transValue(can, value, PLACE_TYPE) + value._role = value[USER_PLACE_ROLE], value.__role = can.user.transValue(can, value, USER_PLACE_ROLE) + value._role_style = can.onimport.roleStyle(can, value, USER_PLACE_ROLE) + value._type_style = can.onimport.typeStyle(can, value, PLACE_TYPE) + }, myPortal: function(can, msg) { var PLACE_UID = msg.Option("_place_uid"), PLACE_NAME = msg.Option("_place_name"), PLACE_TYPE = msg.Option("_place_type") var USER_PLACE_ROLE = msg.Option("_user_place_role"), STREET_NAME = msg.Option("_street_name") - can.isCmdMode() && (can.db.hash = can.base.Obj(can.misc.SearchHash(can), can.db.hash)), can.db.hash[0] && can.onexport.session(can, PLACE_UID, can.db.hash[0]) if (can.Option(PLACE_UID) == "" && can.Option(ctx.INDEX) == "") { - if (can.db.hash.length > 1 && can.db.hash[0]) { return can.Option(PLACE_UID, can.db.hash[0]), can.Option(ctx.INDEX, can.db.hash[1]), can.Update() } + can.isCmdMode() && (can.db.hash = can.base.Obj(can.misc.SearchHash(can), can.db.hash)), can.db.hash[0] && can.onexport.session(can, PLACE_UID, can.db.hash[0]) + if (can.db.hash.length > 1 && can.db.hash[0]) { + return can.run({}, can.db.hash, function(msg) { + msg.Table(function(value) { can.onimport.myStory(can, msg, value, PLACE_UID, PLACE_NAME, STREET_NAME) }) + }) + } can.ui = can.page.Append(can, can._output, [ - {view: html.OUTPUT, list: ["mydebug.list", "myplace.list", "mycount.list", "myinit.list", "myindex.list", "myallow.list"]}, + {view: html.OUTPUT, list: ["myplace.list", "mycount.list", "myinit.list", "myindex.list", "myallow.list"]}, {view: html.ACTION, list: ["myorder.list"]}, ]) - can.onimport.myDebug(can, msg, can.ui.mydebug) var uid = can.onimport.myPlace(can, msg, can.ui.myplace, PLACE_UID, PLACE_NAME, PLACE_TYPE) msg.Length() > 0? can.run({}, [uid], function(msg) { can._index_msg = msg can.onimport.myIndex(can, msg, can.ui.myindex, PLACE_UID, USER_PLACE_ROLE), can.onimport.selectIndex(can, can.sup.current) @@ -42,15 +46,13 @@ Volcanos(chat.ONIMPORT, { can.onimport.myOrder(can, msg, can.ui.myorder, PLACE_UID, USER_PLACE_ROLE) }), can.ui.place_count = msg.Length() } else if (can.Option(ctx.INDEX) == "") { - can.sup._back_args = [can.Option(PLACE_UID)] can.ui = can.page.Append(can, can._output, [ {view: html.OUTPUT, list: ["myplace.list", "myindex.list", "myallow.list"]}, {view: html.ACTION, list: ["myorder.list"]}, ]) - var _msg = can.request({}, {_user_place_role: msg.Option("_user_place_role"), _street_name: msg.Option("_street_name")}); _msg.Push(kit.Dict( - UID, "", PLACE_UID, can.Option(PLACE_UID), PLACE_NAME, msg.Option(PLACE_NAME), PLACE_TYPE, msg.Option(PLACE_TYPE), USER_PLACE_ROLE, msg.Option(USER_PLACE_ROLE), - STREET_NAME, msg.Option(STREET_NAME), CITY_NAME, msg.Option(CITY_NAME), - "auth_status", msg.Option("auth_status"), + var _msg = can.request({}, {_user_place_role: msg.Option("_user_place_role"), _street_name: msg.Option("_street_name")}); _msg.Push(kit.Dict(UID, "", + PLACE_UID, can.Option(PLACE_UID), PLACE_NAME, msg.Option(PLACE_NAME), PLACE_TYPE, msg.Option(PLACE_TYPE), USER_PLACE_ROLE, msg.Option(USER_PLACE_ROLE), + CITY_NAME, msg.Option(CITY_NAME), STREET_NAME, msg.Option(STREET_NAME), "auth_status", msg.Option("auth_status"), )) _msg.Option(ice.MSG_ACTION, msg.Option(USER_PLACE_ROLE) == "visitor"? '[]': '["placeCreate","placeSearch"]') can.onimport.myPlace(can, _msg, can.ui.myplace, PLACE_UID, PLACE_NAME, PLACE_TYPE) @@ -58,37 +60,22 @@ Volcanos(chat.ONIMPORT, { can.onimport.myAllow(can, msg, can.ui.myallow, PLACE_UID, USER_PLACE_ROLE) can.onimport.myOrder(can, msg, can.ui.myorder, PLACE_UID, USER_PLACE_ROLE) } else { - can.onimport.story(can, msg, can._output, PLACE_UID, PLACE_NAME, STREET_NAME) + msg.Table(function(value) { can.onimport.myStory(can, msg, value, PLACE_UID, PLACE_NAME, STREET_NAME) }) } }, - myTrans: function(can, value, PLACE_UID, PLACE_NAME, PLACE_TYPE, USER_PLACE_ROLE, STREET_NAME) { - value.icons = can.Conf(can.core.Keys("_trans.value", PLACE_TYPE, mdb.ICONS, value[PLACE_TYPE])) - value._uid = value[PLACE_UID], value._name = value[PLACE_NAME], value._street = value[STREET_NAME] - value._type = value[PLACE_TYPE], value.__type = can.user.transValue(can, value, PLACE_TYPE) - value._role = value[USER_PLACE_ROLE], value.__role = can.user.transValue(can, value, USER_PLACE_ROLE) - value._type_style = can.onimport.typeStyle(can, value, PLACE_TYPE) - value._role_style = can.onimport.roleStyle(can, value, USER_PLACE_ROLE) - value.icons = can.Conf(can.core.Keys("_trans.value", PLACE_TYPE, mdb.ICONS, value[PLACE_TYPE])) - }, - myDebug: function(can, msg, target, PLACE_UID, USER_PLACE_ROLE) { can.onmotion.hidden(can, target) - can.page.Append(can, target, [{view: html.TITLE, list: [{text: can.user.trans(can, "My Debug", "我的调试")}]}]) - can.page.Append(can, target, [{text: window.innerWidth+", "+window.innerHeight}]) - }, myPlace: function(can, msg, target, PLACE_UID, PLACE_NAME, PLACE_TYPE) { var place_uid + var USER_PLACE_ROLE = msg.Option("_user_place_role"), STREET_NAME = msg.Option("_street_name") can.page.Append(can, target, [{view: html.TITLE, list: [ {text: can.user.trans(can, "My "+can.base.capital(PLACE_NAME.replace("_name", "")), null, html.INPUT)}, - {view: html.ACTION, _init: function(target) { msg.Option(ice.MSG_ACTION) && can.onappend._action(can, msg.Option(ice.MSG_ACTION), target) }} - ]}]) - var USER_PLACE_ROLE = msg.Option("_user_place_role"), STREET_NAME = msg.Option("_street_name") - can.ui._target = can.page.Append(can, target||can._output, [html.OUTPUT])._target + msg.Option(ice.MSG_ACTION) && {view: html.ACTION, _init: function(target) { can.onappend._action(can, msg.Option(ice.MSG_ACTION), target) }} + ]}]), can.ui._target = can.page.Append(can, target||can._output, [html.OUTPUT])._target msg.Length() > 0 && can.page.Append(can, can.ui._target, msg.Table(function(value) { - place_uid = place_uid||value[PLACE_UID], value[PLACE_UID] == can.onexport.session(can, PLACE_UID) && (place_uid = value[PLACE_UID]) - place_uid == value[PLACE_UID] && (can.sup.current = value) - can.onimport.myTrans(can, value, PLACE_UID, PLACE_NAME, PLACE_TYPE, USER_PLACE_ROLE, STREET_NAME) + can.onimport.myTrans(can, value, PLACE_UID, PLACE_NAME, PLACE_TYPE, STREET_NAME, USER_PLACE_ROLE) + place_uid = place_uid||value._uid, value._uid == can.onexport.session(can, PLACE_UID) && (place_uid = value._uid), place_uid == value._uid && (can.sup.current = value) return can.onimport.itemcard(can, value, can.onimport.myValue(can, value, PLACE_UID, PLACE_NAME, STREET_NAME), function(event) { can.onexport.value(can, value, PLACE_UID, PLACE_NAME) }) - })), can.page.Append(can, target, [{view: html.ACTION, _init: function(target) { can.onappend._action(can, msg.Option(ice.MSG_ACTION), target) }}]) + })), msg.Option(ice.MSG_ACTION) && can.page.Append(can, target, [{view: html.ACTION, _init: function(target) { can.onappend._action(can, msg.Option(ice.MSG_ACTION), target) }}]) return place_uid||"" }, myCount: function(can, msg, value, target) { if (!msg) { return } can.onmotion.toggle(can, target, !!value._count) @@ -101,27 +88,23 @@ Volcanos(chat.ONIMPORT, { myInit: function(can, msg, value, target) { if (!msg) { return } can.onmotion.toggle(can, target, !!value._init) if (can.onmotion.cache(can, function() { return value._uid }, target)) { return } can.page.Append(can, target, [{view: html.TITLE, list: [{text: can.user.trans(can, "My Init", "我的初始化")}]}]) - msg.Table(function(val) { if (parseInt(val.init) == parseInt(value.init)+1) { val.args = [value._uid], val.style = html.OUTPUT, value._init = true - can.onappend.plugin(can, val, function(sub) { var run = sub.run - sub.run = function(event, cmds, cb) { - run(can.request(event, {place_uid: value._uid, place_init: value.init}), cmds, function(msg) { - if (cmds[1] == mdb.CREATE || cmds.length == 1 && msg.Length() > 0) { can.onmotion.clearInput(can), can.Update() } else { cb(msg) } - }) - } - }, target), can.onmotion.toggle(can, target, !!value._init) + msg.Table(function(val) { if (parseInt(val.init) == parseInt(value.init)+1) { value._init = true, val.args = [value._uid], val.style = html.OUTPUT + can.onappend.plugin(can, val, function(sub) { var run = sub.run; sub.run = function(event, cmds, cb) { + run(can.request(event, {place_uid: value._uid, place_init: value.init}), cmds, function(msg) { + if (cmds[1] == mdb.CREATE || cmds.length == 1 && msg.Length() > 0) { can.onmotion.clearInput(can), can.Update() } else { cb(msg) } + }) + }, can.onmotion.toggle(can, target, !!value._init) }, target) } }) }, myList: function(can, msg, target, PLACE_UID, USER_PLACE_ROLE) { var width = (can.ConfWidth()-40)/parseInt((can.ConfWidth()-40)/100); can.user.isMobile && !can.user.isLandscape() && (width = (can.ConfWidth()-40)/5) can.page.Append(can, target, msg.Table(function(value) { if (value.enable == ice.FALSE) { return } return {view: [[html.ITEM, ctx.INDEX].concat( - value.type? [mdb.TYPE]: [], can.core.Split(value.type||""), - value.role? [aaa.ROLE]: [], can.core.Split(value.role||""), + value.type? [mdb.TYPE]: [], can.core.Split(value.type||""), value.role? [aaa.ROLE]: [], can.core.Split(value.role||""), )], style: {width: width}, list: [ {img: can.misc.ResourceIcons(can, value.icons)}, {text: can.user.trans(can, value.index.split(".").pop(), value.name)}, ], onclick: function(event) { - can.page.ClassList.del(can, can._fields, "_back"), can.page.ClassList.add(can, can._fields, "_goto") - can.Option(PLACE_UID, can.onexport.session(can, PLACE_UID)), can.Option(ctx.INDEX, value.index), can.Update() + can.onimport.myStory(can, msg, {space: can.ConfSpace(), index: value.index, args: [can.onexport.session(can, PLACE_UID)]}, PLACE_UID, PLACE_NAME, STREET_NAME) }} })) }, @@ -129,30 +112,29 @@ Volcanos(chat.ONIMPORT, { can.page.Append(can, target, [{view: html.TITLE, list: [{text: can.user.trans(can, "My Index", "我的应用")}]}]) var role = can.page.Append(can, target, [{view: aaa.ROLE, list: can.core.Item(can.Conf("_trans.value."+USER_PLACE_ROLE), function(key, value) { if (can.base.isIn(key, ctx.STYLE, mdb.ICONS)) { return } - return {text: [can.user.trans(can, key, value), "", key], onclick: function(event) { can.onexport.value(can, can.sup.current, PLACE_UID) - can.onimport.selectIndex(can, can.sup.current, key), can.onmotion.select(can, role, html.SPAN, event.target) + return {text: [can.user.trans(can, key, value), "", key], onclick: function(event) { + can.onexport.value(can, can.sup.current, PLACE_UID), can.onimport.selectIndex(can, can.sup.current, key) + can.onmotion.select(can, role, html.SPAN, event.target) }} }) }])._target; can.ui.role = role var _msg = can.request(); msg.Table(function(value) { if (value.order < 90) { _msg.Push(value) } }) - var output = can.page.Append(can, target, [html.OUTPUT])._target - can.onimport.myList(can, _msg, output, PLACE_UID, USER_PLACE_ROLE) + var output = can.page.Append(can, target, [html.OUTPUT])._target; can.onimport.myList(can, _msg, output, PLACE_UID, USER_PLACE_ROLE) }, myAllow: function(can, msg, target, PLACE_UID, USER_PLACE_ROLE) { can.page.Append(can, target, [{view: html.TITLE, list: [{text: can.user.trans(can, "My Allow", "我的权限")}]}]) var _msg = can.request(); msg.Table(function(value) { if (value.order > 89 && value.order < 100) { _msg.Push(value) } }) - var output = can.page.Append(can, target, [html.OUTPUT])._target - can.onimport.myList(can, _msg, output, PLACE_UID, USER_PLACE_ROLE) + var output = can.page.Append(can, target, [html.OUTPUT])._target; can.onimport.myList(can, _msg, output, PLACE_UID, USER_PLACE_ROLE) }, myOrder: function(can, msg, target, PLACE_UID, USER_PLACE_ROLE) { can.page.Append(can, target, [{view: html.TITLE, list: [{text: can.user.trans(can, "My Order", "我的系统")}]}]) var _msg = can.request(); msg.Table(function(value) { if (value.order > 99) { _msg.Push(value) } }) - var output = can.page.Append(can, target, [html.OUTPUT])._target - can.onimport.myList(can, _msg, output, PLACE_UID, USER_PLACE_ROLE) + var output = can.page.Append(can, target, [html.OUTPUT])._target; can.onimport.myList(can, _msg, output, PLACE_UID, USER_PLACE_ROLE) + if (can.user.isMobile && can.isCmdMode()) { can.sup.onimport.size(can.sup, window.innerHeight, window.innerWidth) } can.onimport.layout(can), can.onexport.value(can, can.sup.current, PLACE_UID) }, selectIndex: function(can, value, role) { role = role||value._role can.ui.role && can.onmotion.toggle(can, can.ui.role, value._role == "creator") - if (isNaN(parseInt(role))) { can.ui.role && can.onmotion.select(can, can.ui.role, html.SPAN, can.page.SelectOne(can, can.ui.role, "span."+role)) } + can.ui.role && can.onmotion.select(can, can.ui.role, html.SPAN, can.page.SelectOne(can, can.ui.role, "span."+role)) can.page.Select(can, can.ui.myindex, html.DIV_ITEM, function(target) { var list = target.className.split(" ") if (list.indexOf(mdb.TYPE) > -1 && list.indexOf(value._type) == -1) { can.onmotion.toggle(can, target, false) @@ -163,107 +145,19 @@ Volcanos(chat.ONIMPORT, { } }) }, - story: function(can, msg, target, PLACE_UID, PLACE_NAME, STREET_NAME) { - msg.Table(function(value) { function goback() {} function reload() {} - var list = [can.page.button(can, can.user.trans(can, "goback", "返回"), function(event) { goback() }), can.page.button(can, can.user.trans(can, "reload", "刷新"), function(event) { reload() })] - var ui = can.page.Append(can, can._output, [{view: html.ACTION}]) - if (can.db.hash.length > 2 && can.db.hash[0] && can.db.hash[2]) { value.args = [can.db.hash[0], can.db.hash[2]] } - value.style = html.OUTPUT, value.height = can.ConfHeight()-html.ACTION_HEIGHT - can.onappend.plugin(can, value, function(sub) { sub.sup = can - can.core.List(["_trans", "_icons", "_style", "_trans.input", "_trans.value"], function(key) { - var value = sub.Conf(key); value && can.core.Item(can.Conf(key), function(k, v) { value[k] = value[k]||v }) - }) - can.onexport.title(can, sub.Conf(PLACE_NAME, msg.Option(PLACE_NAME)), value.help) - sub.onexport.title = function(sub) { can.onexport.title.apply(can.onexport, [can].concat(can.core.List(arguments).slice(1))) } - var run = sub.run; sub.run = function(event, cmds, cb) { - run(can.request(event, { - city_name: msg.Option(CITY_NAME), street_name: msg.Option(STREET_NAME), place_name: msg.Option(PLACE_NAME), - command_uid: msg.Option("command_uid"), portal_name: can.ConfHelp(), - dashboard_uid: msg.Option("dashboard_uid"), - }), cmds, cb) - } - can.page.Appends(can, ui.action, list) - goback = function() { can.page.ClassList.add(can, can._fields, "_back") - can.onexport.hash(can, ""), can.Option(PLACE_UID, ""), can.Option(ctx.INDEX, ""), can.Update() - } - reload = function() { sub.Update(), can.onmotion.delay(can, function() { can.user.toastSuccess(can, "reload") }, 300) } - sub.onexport._output = function(_sub, msg) { - can.core.Item(can.onimport, function(key, value) { _sub.onimport[key] = _sub.onimport[key]||value }) - can.core.Item(can.onexport, function(key, value) { _sub.onexport[key] = _sub.onexport[key]||value }) - } - sub.onexport.output = function(_sub, msg) { can.onappend.style(sub, html.OUTPUT) - can.page.styleHeight(can, _sub._target, can.ConfHeight() - 32) - _sub.onimport._option = function(_sub, uid, index, place_uid) { - can.Option(PLACE_UID, place_uid), can.Option(ctx.INDEX, index) - can.onexport.hash(can, place_uid||can.Option(PLACE_UID), index||can.Option(ctx.INDEX), uid), can.Update() - } - _sub.onexport.title = function(_sub, title) { - title? can.onexport.title(can, title): can.onexport.title(can, sub.Conf(PLACE_NAME), sub.ConfHelp(), msg.Option("_share_title")||"") - } - can.onexport.hash(can, can.Option(PLACE_UID), value.index, sub.Option(UID)) - can.onexport.title(can, sub.Conf(PLACE_NAME), sub.ConfHelp(), msg.Option("_share_title")||"") - can.user.agent.init(can, msg.Option("_share_content"), msg.Option("_share_icons")||value.icons) - can.page.Appends(can, ui.action, list), msg.Option(ice.MSG_ACTION) && can.onappend._action(sub, msg.Option(ice.MSG_ACTION), ui.action, null, true) - goback = function() { can.page.ClassList.add(can, can._fields, "_back") - if (_sub.onaction._goback && _sub.onaction._goback(_sub)) { return } can.Update() - } - _sub.onaction._goback = function(_sub) { - if (sub.Option(UID)) { - can.onexport.hash(can, can.Option(PLACE_UID), can.Option(ctx.INDEX)), sub.Option(UID, ""), sub.Update() - } else { - if (can.sup._back_args) { - can.onexport.hash(can, ""), can.Option(PLACE_UID, can.sup._back_args[0]), can.Option(ctx.INDEX, ""), can.Update() - } else { - can.onexport.hash(can, ""), can.Option(PLACE_UID, ""), can.Option(ctx.INDEX, ""), can.Update() - } - } - } - reload = function() { - if (_sub.onaction._reload) { return _sub.onaction._reload(_sub) } - sub.Update(), can.onmotion.delay(can, function() { can.user.toastSuccess(can, "reload") }, 300) - } - } - }) + layout: function(can) { + can.ui.action && can.ui.output && can.onmotion.delay(can, function() { + can.page.style(can, can.ui.output, html.HEIGHT, can.ConfHeight() - can.ui.action.offsetHeight) }) }, - plugin: function(can, value) { var action = can._root.Action - var sup = can.sup.sup - value.space = value.space||sup.ConfSpace(), value.index = value.index||sup.ConfIndex() - var key = [value.space, value.index, value.args].join(","), sub = action._plugins[key] - if (sub) { - can.page.SelectChild(can, action._output, html.FIELDSET_PLUGIN, function(target) { can.onmotion.toggle(can, target, target == sub._target) }) - sub.onimport.size(sub, window.innerHeight, window.innerWidth), can.user.title((value._title||"")+" "+sub.ConfHelp()) - return - } - can.misc.localStorage(can, [value.space, value.index, mdb.HASH].join(","), value.args? [value.args[0]]: "") - var args = value.args; args && (value.args = [args[0]]); value.type = html.PLUGIN, value.style = html.OUTPUT - can._root.Action.onappend.plugin(can._root.Action, value, function(sub) { action._plugins[key] = sub - sub._back_args = value.args - can.page.SelectChild(can, action._output, html.FIELDSET_PLUGIN, function(target) { can.onmotion.toggle(can, target, target == sub._target) }) - sub.onimport.size(sub, window.innerHeight, window.innerWidth), can.user.title((value._title||"")+" "+sub.ConfHelp()) - sub.onexport.title = function(can, title) { can.user.title(can.core.List(arguments).slice(1).join(" ")) } - }, action._output) - }, - float: function(can, value, cb) { value.style = html.OUTPUT - can.onappend.plugin(can, value, function(sub) { var _goback = can.onaction._goback - can.onaction._goback = function() { can.onaction._goback = _goback, can.page.Remove(can, sub._target), can.onexport.title(can); return true } - can.onaction._reload = function() { sub.Update(), can.onmotion.delay(can, function() { can.user.toastSuccess(can, "reload") }, 300) } - sub.onexport.output = function(_sub, msg) { can.onexport.title(can, sub.ConfHelp()+" "+msg.Option("_share_title")) - sub.onimport.size(sub, window.innerHeight-html.ACTION_HEIGHT, window.innerWidth, false) - } - cb && cb(sub) - }) - }, - layout: function(can) { can.ui.action && can.ui.output && can.onmotion.delay(can, function() { - can.page.style(can, can.ui.output, html.HEIGHT, can.ConfHeight() - can.ui.action.offsetHeight) - }) }, }) Volcanos(chat.ONEXPORT, { value: function(can, value, PLACE_UID) { if (!value) { return } can.sup.current = value, can.onimport.selectIndex(can, can.sup.current) - can.onexport.session(can, PLACE_UID, value._uid), can.onexport.hash(can, value._uid), can.onexport.title(can, value._name, can.ConfHelp()), can.user.agent.init(can) + can.sup.Conf("place_name", value._name), can.onexport.title(can, can.sup.Conf("place_name"), can.ConfHelp()) + can.onexport.session(can, PLACE_UID, value._uid), can.onexport.hash(can, value._uid), can.user.agent.init(can) can.page.Select(can, can.ui._target, "div.item.card.uid-"+value._uid, function(item) { can.onmotion.select(can, can.ui._target, html.DIV_ITEM, item) }) - can.ui.myallow && can.onmotion.toggle(can, can.ui.myallow, can.page.Select(can, can.ui.myallow, "div.item.index.role."+value._role).length > 0) can.onimport.myCount(can, can._index_msg, value, can.ui.mycount), can.onimport.myInit(can, can._index_msg, value, can.ui.myinit) + can.onmotion.toggle(can, can.ui.myallow, can.page.Select(can, can.ui.myallow, "div.item.index.role."+value._role).length > 0) }, share_title: function(can, msg, title, role) { msg.Option("_share_icons", msg.Append("user_avatar")), msg.Option("_share_content", can.user.transValue(can, msg, role)+" "+msg.Append("user_name")) diff --git a/src/gonganxitong/profile.go b/src/gonganxitong/profile.go new file mode 100644 index 0000000..db67770 --- /dev/null +++ b/src/gonganxitong/profile.go @@ -0,0 +1,22 @@ +package gonganxitong + +import ( + "shylinux.com/x/ice" + + "shylinux.com/x/community/src/gonganxitong/model" +) + +type profile struct { + Tables + user user +} + +func (s profile) List(m *ice.Message, arg ...string) { + if len(arg) == 1 { + m.Cmdy(s.user, s.Select, model.UID, arg[0]) + } + m.Echo("hello world") + m.Display("") +} + +func init() { ice.TeamCtxCmd(profile{}) } diff --git a/src/gonganxitong/profile.js b/src/gonganxitong/profile.js new file mode 100644 index 0000000..eb56576 --- /dev/null +++ b/src/gonganxitong/profile.js @@ -0,0 +1,5 @@ +Volcanos(chat.ONIMPORT, { + _init: function(can, msg) { + can.page.Append(can, can._output, [{img: can.misc.Resource(can, msg.Append("avatar"))}]) + }, +}) \ No newline at end of file diff --git a/src/gonganxitong/recent.js b/src/gonganxitong/recent.js index a9c8d32..d3920d4 100644 --- a/src/gonganxitong/recent.js +++ b/src/gonganxitong/recent.js @@ -7,8 +7,13 @@ Volcanos(chat.ONIMPORT, { {view: html.TITLE, list: [value.place_name, can.onimport.authView(can, value), sub? {text: ["load", "", mdb.STATUS]}: "", can.onimport.timeView(can, value)]}, {view: html.STATUS, list: [value.city_name, value.street_name, value.service_name]}, ] - }, function(event, value) { var args = can.core.Split(value.args); can.onaction._goback(can) - can.onimport.plugin(can, {_title: value.place_name, space: value.space, index: value.index, args: [args[0]]}) + }, function(event, value) { + var args = can.core.Split(value.args) + // debugger + // can.onaction._goback(can) + can.onimport.myPlugin(can, {_title: value.place_name, space: value.space, index: value.index, args: [args[0]]}, function(sub) { + can.onaction._goback(can) + }) }) }, -}) \ No newline at end of file +}) diff --git a/src/gonganxitong/service.js b/src/gonganxitong/service.js index 3a40328..22a08aa 100644 --- a/src/gonganxitong/service.js +++ b/src/gonganxitong/service.js @@ -6,8 +6,10 @@ Volcanos(chat.ONIMPORT, { {view: html.STATUS, list: [value.index]}, {view: html.STATUS, list: [value.module, value.version]}, // {view: html.STATUS, list: [value.domain.split("?")[0]]}, - ] }, function(event, value) { can.onaction._goback(can) - can.onimport.plugin(can, {space: value.space||value.nodename, index: value.index}) + ] }, function(event, value) { + // can.onaction._goback(can) + can.onimport.myPlugin(can, {space: value.space||value.nodename, index: value.index}) + can.onmotion.delay(can, function() { can.onaction._goback(can) }, 300) }) }, -}) \ No newline at end of file +}) diff --git a/src/yuehaoxitong/open.go b/src/yuehaoxitong/open.go index 65af84b..f9eea8f 100644 --- a/src/yuehaoxitong/open.go +++ b/src/yuehaoxitong/open.go @@ -21,6 +21,7 @@ func (s open) Create(m *ice.Message, arg ...string) { func (s open) List(m *ice.Message, arg ...string) { m.Cmdy(s.volume, arg) kit.If(m.Length() == 0, func() { m.EchoInfoButton("") }) + m.PushAction(s.Market) } func init() { ice.TeamCtxCmd(open{}) }