diff --git a/src/guanlixitong/company.css b/src/guanlixitong/company.css index ed59213..5dee417 100644 --- a/src/guanlixitong/company.css +++ b/src/guanlixitong/company.css @@ -12,4 +12,5 @@ $output fieldset.story>div.output>div.item>div.output div.title>div.action { } $output fieldset.story>div.status { display:none; -} \ No newline at end of file +} +$output>div.project div.list { padding-left:10px; margin-left:20px; clear:both; } \ No newline at end of file diff --git a/src/guanlixitong/company.go b/src/guanlixitong/company.go index 8052560..e4a7c5a 100644 --- a/src/guanlixitong/company.go +++ b/src/guanlixitong/company.go @@ -26,24 +26,20 @@ func (s company) Modify(m *ice.Message, arg ...string) { s.Update(m, m.OptionSimple(model.INFO), m.OptionSimple(model.UID)...) } func (s company) List(m *ice.Message, arg ...string) { + if m.Option(model.AUTH_UID) != "" { + s.AutoCmdy(m, api.RENZHENGSHOUQUAN_AUTH, m.Option(model.AUTH_UID)).Cut(model.SERVICE_UID, model.PLACE_UID) + s.SelectJoinRecent(m, "") + s.SelectJoinService(m) + m.Display("").DisplayCSS("").Sort("service_name,place_name") + return + } if len(arg) == 0 { s.CityList(m) } else if msg := s.CityList(m.Spawn(), arg[0]); len(arg) == 1 { - s.Select(m, model.CITY_UID, msg.Append(model.UID)) - m.RenameAppend("name", "company_name") + s.Select(m, model.CITY_UID, msg.Append(model.UID)).RenameAppend(model.NAME, model.COMPANY_NAME) } else if len(arg) == 2 { - s.Select(m, model.CITY_UID, msg.Append(model.UID), model.NAME, arg[1]) - if m.Append(model.AUTH_UID) == "" { - m.EchoInfoButton("请申请公司认证", s.AuthCreate) - } else { - s.AutoCmdy(m, api.RENZHENGSHOUQUAN_AUTH, m.Append(model.AUTH_UID)) - m.Cut("service_uid", "place_uid") - defer m.Sort("service_name,place_name") - s.SelectJoinRecent(m, "") - s.SelectJoinService(m) - } + s.SelectDetail(m, model.CITY_UID, msg.Append(model.UID), model.NAME, arg[1]) } - m.Display("").DisplayCSS("") } func (s company) AuthCreate(m *ice.Message, arg ...string) { msg := s.CityCmd(m, s.Select, model.UID, m.Option(model.CITY_UID)) diff --git a/src/guanlixitong/company.js b/src/guanlixitong/company.js index 2df968c..94003e9 100644 --- a/src/guanlixitong/company.js +++ b/src/guanlixitong/company.js @@ -1,6 +1,6 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { - if (can.Option("company_name")) { + if (can.Option("company_name") || can.misc.Search(can, "auth_uid")) { can.ui = can.onappend.layout(can), can.onimport.service(can, msg) } else { msg.Dump(can) diff --git a/src/guanlixitong/model/model.go b/src/guanlixitong/model/model.go index 7a8c0e7..cf0e064 100644 --- a/src/guanlixitong/model/model.go +++ b/src/guanlixitong/model/model.go @@ -14,22 +14,24 @@ const ( USER_GROUP_ROLE = "user_group_role" GROUP_UID = "group_uid" GROUP_TYPE = "group_type" - CITY_UID = "city_uid" - CITY_NAME = "city_name" - MARKET_UID = "market_uid" COMPANY_UID = "company_uid" COMPANY_NAME = "company_name" + CITY_UID = "city_uid" + CITY_NAME = "city_name" AUTH_UID = "auth_uid" - RECRUITMENT_STATUS = "recruitment_status" + PLACE_UID = "place_uid" + SERVICE_UID = "service_uid" + MARKET_UID = "market_uid" RECRUITMENT_UID = "recruitment_uid" + RECRUITMENT_STATUS = "recruitment_status" INTERVIEW_STATUS = "interview_status" - SALARY = "salary" - SENIORITY = "seniority" - MOBILE = "mobile" - DEGREE = "degree" - COUNT = "count" START_TIME = "start_time" STOP_TIME = "stop_time" + MOBILE = "mobile" + DEGREE = "degree" + SENIORITY = "seniority" + SALARY = "salary" + COUNT = "count" ) type UserGroup struct {