From aa6ca8100b2b06d77ece7f8e24a953598cc3a9c8 Mon Sep 17 00:00:00 2001 From: shy Date: Fri, 4 Oct 2024 12:23:33 +0800 Subject: [PATCH] add some --- src/gongyinglian/portal.go | 2 +- src/guanlixitong/company.go | 11 ++++------- src/guanlixitong/portal.go | 2 +- src/guanlixitong/portal.json | 7 ++----- src/shichangyingxiao/model/model.go | 4 +--- src/shichangyingxiao/portal.go | 2 +- src/zijinlian/model/model.go | 4 +--- src/zijinlian/portal.go | 2 +- 8 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/gongyinglian/portal.go b/src/gongyinglian/portal.go index ef23e86..36ef2b4 100644 --- a/src/gongyinglian/portal.go +++ b/src/gongyinglian/portal.go @@ -13,7 +13,7 @@ type Portal struct { guanlixitong.Portal product Product order Order - placeCreate string `name:"placeCreate city_name* company_name* store_name* store_type*:select" role:"void"` + placeCreate string `name:"placeCreate city_name* company_name* store_name* store_type:select" role:"void"` } func (s Portal) AfterPlaceAuth(m *ice.Message, arg ...string) { diff --git a/src/guanlixitong/company.go b/src/guanlixitong/company.go index 048d333..6cde9a5 100644 --- a/src/guanlixitong/company.go +++ b/src/guanlixitong/company.go @@ -2,7 +2,6 @@ package guanlixitong import ( "shylinux.com/x/ice" - kit "shylinux.com/x/toolkits" "shylinux.com/x/enterprise/src/guanlixitong/model" ) @@ -23,24 +22,22 @@ func (s company) FindOrCreateByName(m *ice.Message, arg ...string) { } } func (s company) Modify(m *ice.Message, arg ...string) { - s.Update(m, kit.Dict(m.OptionSimple(model.INFO)), m.OptionSimple(model.UID)...) + s.Update(m, m.OptionSimple(model.INFO), m.OptionSimple(model.UID)...) } func (s company) List(m *ice.Message, arg ...string) { if len(arg) == 0 { s.CityList(m) - } else if len(arg) == 1 { - msg := s.CityList(m.Spawn(), arg[0]) + } else if msg := s.CityList(m.Spawn(), arg[0]); len(arg) == 1 { s.Select(m, model.CITY_UID, msg.Append(model.UID)) } else if len(arg) == 2 { - msg := s.CityList(m.Spawn(), arg[0]) s.Select(m, model.CITY_UID, msg.Append(model.UID), model.NAME, arg[1]) - if m.Append(model.AUTH_UID) == "" && m.IsTech() { + if m.Append(model.AUTH_UID) == "" { m.EchoInfoButton("请申请公司认证", s.AuthCreate) } } } func (s company) AuthCreate(m *ice.Message, arg ...string) { - msg := m.Cmd("web.team.gonganxitong.city", s.Select, model.UID, m.Option(model.CITY_UID)) + msg := s.CityCmd(m, s.Select, model.UID, m.Option(model.CITY_UID)) s.Table.AuthCreate(m, 4, msg.Append(model.AUTH_UID), m.OptionSimple(model.UID)...) } diff --git a/src/guanlixitong/portal.go b/src/guanlixitong/portal.go index f2e5a60..d9f5c59 100644 --- a/src/guanlixitong/portal.go +++ b/src/guanlixitong/portal.go @@ -4,7 +4,7 @@ import "shylinux.com/x/community/src/gonganxitong" type Portal struct { gonganxitong.Portal - placeCreate string `name:"placeCreate city_name* company_name* group_name* group_type*:select" role:"void"` + placeCreate string `name:"placeCreate city_name* company_name* group_name* group_type:select" role:"void"` } func init() { gonganxitong.PortalCmd(NewPortal(userGroup{}, group{})) } diff --git a/src/guanlixitong/portal.json b/src/guanlixitong/portal.json index 1e5e654..a4405a0 100644 --- a/src/guanlixitong/portal.json +++ b/src/guanlixitong/portal.json @@ -1,8 +1,6 @@ { - "portal": "管理系统", + "portal": "管理系统", "member": "团队成员", "target": "目标计划", - "member": "团队成员", - "company": "公司信息", "icons": { "target": "https://img.icons8.com/officel/80/goal--v1.png" }, @@ -10,8 +8,7 @@ "My Group": "我的团队", "user_group_role": "成员角色", "group_name": "团队名称", - "group_type": "团队类型", - "company_name": "公司名称" + "group_type": "团队类型" }, "value": { "user_group_role": { diff --git a/src/shichangyingxiao/model/model.go b/src/shichangyingxiao/model/model.go index b3f417b..6329cf3 100644 --- a/src/shichangyingxiao/model/model.go +++ b/src/shichangyingxiao/model/model.go @@ -5,17 +5,15 @@ import "shylinux.com/x/mysql-story/src/db" const ( UID = "uid" NAME = "name" + INFO = "info" TYPE = "type" TITLE = "title" CONTENT = "content" USER_UID = "user_uid" USER_CHANNEL_ROLE = "user_channel_role" CHANNEL_UID = "channel_uid" - CHANNEL_NAME = "channel_name" CHANNEL_TYPE = "channel_type" PROMOTION_UID = "promotion_uid" - COMPANY_UID = "company_uid" - CITY_UID = "city_uid" ) type UserChannel struct { diff --git a/src/shichangyingxiao/portal.go b/src/shichangyingxiao/portal.go index 814c23f..6aaa1d3 100644 --- a/src/shichangyingxiao/portal.go +++ b/src/shichangyingxiao/portal.go @@ -7,7 +7,7 @@ import ( type Portal struct { guanlixitong.Portal - placeCreate string `name:"placeCreate city_name* company_name* channel_name* channel_type*:select" role:"void"` + placeCreate string `name:"placeCreate city_name* company_name* channel_name* channel_type:select" role:"void"` } func init() { gonganxitong.PortalCmd(Portal{Portal: guanlixitong.NewPortal(userChannel{}, channel{})}) } diff --git a/src/zijinlian/model/model.go b/src/zijinlian/model/model.go index 8742d05..aa265a5 100644 --- a/src/zijinlian/model/model.go +++ b/src/zijinlian/model/model.go @@ -5,17 +5,15 @@ import "shylinux.com/x/mysql-story/src/db" const ( UID = "uid" NAME = "name" + INFO = "info" TYPE = "type" TITLE = "title" CONTENT = "content" USER_UID = "user_uid" USER_CAPITAL_ROLE = "user_capital_role" CAPITAL_UID = "capital_uid" - CAPITAL_NAME = "capital_name" CAPITAL_TYPE = "capital_type" INVESTMENT_UID = "investment_uid" - COMPANY_UID = "company_uid" - CITY_UID = "city_uid" ) type UserCapital struct { diff --git a/src/zijinlian/portal.go b/src/zijinlian/portal.go index cabb934..30a9c79 100644 --- a/src/zijinlian/portal.go +++ b/src/zijinlian/portal.go @@ -7,7 +7,7 @@ import ( type Portal struct { guanlixitong.Portal - placeCreate string `name:"placeCreate city_name* company_name* capital_name* capital_type*:select" role:"void"` + placeCreate string `name:"placeCreate city_name* company_name* capital_name* capital_type:select" role:"void"` } func init() { gonganxitong.PortalCmd(Portal{Portal: guanlixitong.NewPortal(userCapital{}, capital{})}) }