diff --git a/src/gonganxitong/portal.css b/src/gonganxitong/portal.css index d03843a..645f708 100644 --- a/src/gonganxitong/portal.css +++ b/src/gonganxitong/portal.css @@ -8,6 +8,9 @@ $body.width1 div.upload.float div.action { display:flex; } $body.width1 div.upload.float div.action div.item.upload { flex-grow:1; } $body.width1 div.upload.float div.action div.item.upload input { width:100%; } $body.width1 $action div.item.text.filter { flex-grow:1; } +$body>div.inputs>div.input { + background-color:var(--output-bg-color); +} $action { background-color:transparent; position:absolute; top:0; width:100%; z-index:1; display:none; } $action div.item.filter input { border-radius:20px; border:none; } // $action div.item:last-child { margin-right:10px; } diff --git a/src/gonganxitong/portal.go b/src/gonganxitong/portal.go index 20f9997..933b88e 100644 --- a/src/gonganxitong/portal.go +++ b/src/gonganxitong/portal.go @@ -174,6 +174,8 @@ func (s Portal) List(m *ice.Message, arg ...string) { s.DisplayBase(m, "").DisplayCSS("") } func (s Portal) PlaceListOption(m *ice.Message, arg ...string) *ice.Message { + m.Option("portal_icon", m.Resource(kit.Select(ice.Info.NodeIcon, m.GetCommand().Icon))) + m.Option("space_title", ice.Info.Titles) msg := m.Cmd("", s.PlaceList, m.Option(model.USER_UID), arg[0]) if msg.Length() == 0 { msg = m.Cmd(s.Place, s.Table.Select, model.UID, arg[0]) diff --git a/src/gonganxitong/portal.js b/src/gonganxitong/portal.js index da1d3bd..e60f505 100644 --- a/src/gonganxitong/portal.js +++ b/src/gonganxitong/portal.js @@ -32,7 +32,12 @@ Volcanos(chat.ONIMPORT, { {view: html.TITLE, list: [value.auth_name||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]]}, ]}, - can.ConfIndex() != "web.team.renzhengshouquan.portal" && {view: html.STATUS, list: [value.city_name, value._street, can.ConfHelp(), can.user.info.titles]}, + can.ConfIndex() != "web.team.renzhengshouquan.portal" && {view: html.STATUS, list: [ + value.city_name, "|", + value._street, "|", + can.ConfHelp(), "|", + value.space_title||can.user.info.titles, + ]}, {view: html.STATUS, list: [value.auth_info||value._info]}, ] }, myTrans: function(can, value) { @@ -57,6 +62,7 @@ Volcanos(chat.ONIMPORT, { var USER_PLACE_ROLE = can.Conf("_user_place_role"), STREET_NAME = can.Conf("_street_name") can.user.isMobile && (can.db.hash = []) can.isCmdMode() && (can.db.hash = can.base.Obj(can.misc.SearchHash(can), can.db.hash)), can.db.hash[0] && can.onexport.place(can, can.db.hash[0]) + can.isCmdMode() && msg.Option("auth_avatar") && can.page.Append(can, document.head, [{type: "link", href: msg.Option("auth_avatar"), rel: "shortcut icon"}]) if (can.sup._goback) { can.db.hash = can.db.hash.slice(0, 1) } if (can.db.hash.length > 1 && can.db.hash[1] && can.db.hash[1] != can.ConfIndex()) { can.sup.current = can.onimport.myTrans(can, kit.Dict(msg.OptionSimple(PLACE_UID, PLACE_NAME, PLACE_TYPE, USER_PLACE_ROLE, STREET_NAME, CITY_NAME))) @@ -87,9 +93,11 @@ Volcanos(chat.ONIMPORT, { } msg.Length() > 0? can.run({}, [uid], function(msg) { showIndex(can._index_msg = msg) }): can.run({}, [uid], function(msg) { can.onimport.myOrder(can, can._index_msg = msg, can.ui.myorder) }) } else { can.onappend.style(can, "public", can._output) + can.Conf(mdb.ICONS, msg.Option("portal_icon")) var _msg = can.request({}); if (msg.Option(PLACE_NAME)) { _msg.Push(kit.Dict(UID, "", msg.OptionSimple( PLACE_UID, PLACE_NAME, PLACE_TYPE, USER_PLACE_ROLE, STREET_NAME, CITY_NAME, "member_status", "auth_status", "auth_name", "auth_info", "auth_avatar", "auth_background", "dashboard_uid", + "space_title", ))) } can.onimport.myPlace(can, _msg, can.ui.myplace) if (_msg.Length() == 0) { can.onimport.myOrder(can, msg, can.ui.myorder) } else { showIndex(can._index_msg = msg) } // can.user.agent.init(can, [msg.Option(CITY_NAME), msg.Option(STREET_NAME), msg.Option("auth_info")].join(" "), msg.Option("auth_avatar")) diff --git a/src/main.png b/src/main.png deleted file mode 100644 index 16b132d..0000000 Binary files a/src/main.png and /dev/null differ diff --git a/src/renzhengshouquan/profile.js b/src/renzhengshouquan/profile.js index b0625c1..4418639 100644 --- a/src/renzhengshouquan/profile.js +++ b/src/renzhengshouquan/profile.js @@ -26,7 +26,9 @@ Volcanos(chat.ONIMPORT, { can.onimport.myView(can, msg, function(value) { return [ {view: html.TITLE, list: [value.name, can.onimport.authView(can, value), can.onimport.textView(can, value, AUTH_TYPE), can.onimport.titleAction(can, value)]}, - value.auth_type == "service" && {view: html.STATUS, list: [value.city_name, value.street_name, value.service_name]}, + value.auth_type == "service" && {view: html.STATUS, list: [ + value.city_name, "|", value.street_name, "|", can.base.replaceAll(value.service_name, " ", " | "), + ]}, {view: html.STATUS, list: [value.info]}, ] }, function(event, value) {