diff --git a/src/gonganxitong/common.go b/src/gonganxitong/common.go index 0b31fda..6aa364d 100644 --- a/src/gonganxitong/common.go +++ b/src/gonganxitong/common.go @@ -562,6 +562,7 @@ func PortalCmd(portal ice.Any) { }, cmd.Actions[ice.CTX_INIT].Hand) } cmd("portal", portal) + cmd("goodslist", goodslist{Table: table}) cmd("paymentlist", paymentlist{Table: table}) cmd("meeting", meeting{Table: table}) cmd("document", document{Table: table}) diff --git a/src/gonganxitong/goodslist.go b/src/gonganxitong/goodslist.go new file mode 100644 index 0000000..c65e568 --- /dev/null +++ b/src/gonganxitong/goodslist.go @@ -0,0 +1,16 @@ +package gonganxitong + +import "shylinux.com/x/ice" + +type goodslist struct { + Table + order string `data:"91"` + fields string `data:"name,title,content,user_uid"` + create string `name:"create name* title* content*" role:"leader"` + remove string `name:"remove" role:"leader"` +} + +func (s goodslist) List(m *ice.Message, arg ...string) { +} + +func init() { ice.TeamCtxCmd(goodslist{Table: newTable()}) } diff --git a/src/gonganxitong/model/model.go b/src/gonganxitong/model/model.go index de907cc..3d5099b 100644 --- a/src/gonganxitong/model/model.go +++ b/src/gonganxitong/model/model.go @@ -143,6 +143,76 @@ type City struct { Name string `gorm:"type:varchar(64);index"` } +type Goodslist struct { + db.ModelWithUID + PlaceUID string `gorm:"type:char(32);index"` + UserUID string `gorm:"type:char(32)"` + Name string `gorm:"type:varchar(32)"` + Title string `gorm:"type:varchar(64)"` + Content string `gorm:"type:varchar(128)"` +} +type Quotalist struct { + db.ModelWithUID + PlaceUID string `gorm:"type:char(32);index"` + UserUID string `gorm:"type:char(32)"` + GoodslistUID string `gorm:"type:char(32)"` + Vendor string `gorm:"type:varchar(128)"` + Total int + Count int +} +type Spendlist struct { + db.ModelWithUID + PlaceUID string `gorm:"type:char(32);index"` + UserUID string `gorm:"type:char(32)"` + QuotalistUID string `gorm:"type:char(32)"` + Count int +} +type Paymentlist struct { + db.ModelWithUID + PlaceUID string `gorm:"type:char(32);index"` + UserUID string `gorm:"type:char(32);index"` + VendorUID string `gorm:"type:char(32);index"` + Vendor string `gorm:"type:varchar(128)"` + Title string `gorm:"type:varchar(128)"` + Content string `gorm:"type:varchar(128)"` + Amount int32 `gorm:"default:0"` + Status uint8 `gorm:"default:0"` + Type uint8 `gorm:"default:0"` +} +type Meeting struct { + db.ModelWithUID + PlaceUID string `gorm:"type:char(32);index"` + UserUID string `gorm:"type:char(32);index"` + Vendor string `gorm:"type:varchar(128)"` + UserID string `gorm:"type:varchar(32)"` +} +type Document struct { + db.ModelWithUID + PlaceUID string `gorm:"type:char(32);index"` + UserUID string `gorm:"type:char(32);index"` + FolderID string `gorm:"type:varchar(128)"` + Vendor string `gorm:"type:varchar(128)"` +} +type Contract struct { + db.ModelWithUID +} +type Photo struct { + db.ModelWithUID + PlaceUID string `gorm:"type:char(32);index"` + UserUID string `gorm:"type:char(32);index"` + SpaceID string `gorm:"type:varchar(128)"` + AccessToken string `gorm:"type:varchar(512)"` + ExpireTime db.Time + Vendor string `gorm:"type:varchar(128)"` +} +type Setting struct { + db.ModelWithUID + PlaceUID string `gorm:"type:char(32);index"` + UserUID string `gorm:"type:char(32);index"` + Name string `gorm:"type:varchar(64)"` + Value string `gorm:"type:varchar(255)"` +} + type Apply struct { db.ModelWithUID PlaceUID string `gorm:"type:char(32);index:idx_place"` @@ -170,52 +240,6 @@ type Notice struct { PlaceUID string `gorm:"type:char(32);index"` UserUID string `gorm:"type:char(32)"` } -type Paymentlist struct { - db.ModelWithUID - PlaceUID string `gorm:"type:char(32);index"` - UserUID string `gorm:"type:char(32);index"` - VendorUID string `gorm:"type:char(32);index"` - Vendor string `gorm:"type:varchar(128)"` - Title string `gorm:"type:varchar(128)"` - Content string `gorm:"type:varchar(128)"` - Amount int32 `gorm:"default:0"` - Status uint8 `gorm:"default:0"` - Type uint8 `gorm:"default:0"` -} -type Photo struct { - db.ModelWithUID - PlaceUID string `gorm:"type:char(32);index"` - UserUID string `gorm:"type:char(32);index"` - SpaceID string `gorm:"type:varchar(128)"` - AccessToken string `gorm:"type:varchar(512)"` - ExpireTime db.Time - Vendor string `gorm:"type:varchar(128)"` -} -type Document struct { - db.ModelWithUID - PlaceUID string `gorm:"type:char(32);index"` - UserUID string `gorm:"type:char(32);index"` - FolderID string `gorm:"type:varchar(128)"` - Vendor string `gorm:"type:varchar(128)"` -} -type Contract struct { - db.ModelWithUID -} -type Meeting struct { - db.ModelWithUID - PlaceUID string `gorm:"type:char(32);index"` - UserUID string `gorm:"type:char(32);index"` - Vendor string `gorm:"type:varchar(128)"` - UserID string `gorm:"type:varchar(32)"` -} -type Setting struct { - db.ModelWithUID - PlaceUID string `gorm:"type:char(32);index"` - UserUID string `gorm:"type:char(32);index"` - Name string `gorm:"type:varchar(64)"` - Value string `gorm:"type:varchar(255)"` -} - type Domain struct { db.ModelNameInfo } @@ -300,8 +324,8 @@ type Support struct { func init() { db.CmdModels("", &Sess{}, &User{}, &UserPlace{}, &Place{}, &Street{}, &City{}, - &Paymentlist{}, &Contract{}, &Meeting{}, &Setting{}, - &Document{}, &Photo{}, + &Paymentlist{}, &Meeting{}, &Document{}, &Contract{}, &Photo{}, &Setting{}, + &Goodslist{}, &Quotalist{}, &Spendlist{}, &Apply{}, &Allow{}, &Event{}, &Notice{}, &Domain{}, &Market{}, &Thumb{}, &Comment{}, &Favor{}, &Command{}, &Message{}, &Recent{}, &Service{}, &Support{}, diff --git a/src/gonganxitong/portal.json b/src/gonganxitong/portal.json index 580ae94..7a71755 100644 --- a/src/gonganxitong/portal.json +++ b/src/gonganxitong/portal.json @@ -1,9 +1,9 @@ { "portal": "用户场景", "placeCreate": "创建", "placeRemove": "删除", "credit": "用户名片", "member": "组织成员", - "meeting": "在线会议", "contract": "在线合同", "paymentlist": "在线支付", - "document": "在线文档", "photo": "在线相册", - "setting": "服务配置", "email": "邮箱配置", + "goodslist": "在线商城", "paymentlist": "在线支付", + "meeting": "在线会议", "document": "在线文档", "contract": "在线合同", "photo": "在线相册", + "email": "邮箱配置", "setting": "服务配置", "qrcode": "场景码", "event": "事件流", "apply": "权限申请", "allow": "权限审批", "notice": "通知公告", "domain": "领域分类", "market": "人民广场", "message": "消息待办", "recent": "最近访问", "service": "服务发现", "support": "客服支持", "cancel": "取消", "submit": "提交", "finish": "完成", "reject": "驳回", "approve": "通过", @@ -17,11 +17,13 @@ "user": "https://img.icons8.com/officel/80/qr-code.png", "city": "https://img.icons8.com/officel/80/qr-code.png", "street": "https://img.icons8.com/officel/80/qr-code.png", + + "goodslist": "https://img.icons8.com/officel/80/online-store.png", + "paymentlist": "https://img.icons8.com/officel/80/online-payment-with-a-credit-card.png", "meeting": "https://img.icons8.com/officel/80/video-conference.png", - "photo": "https://img.icons8.com/officel/50/ios-photos.png", "document": "https://img.icons8.com/officel/50/documents.png", "contract": "https://img.icons8.com/officel/80/agreement.png", - "paymentlist": "https://img.icons8.com/officel/80/online-payment-with-a-credit-card.png", + "photo": "https://img.icons8.com/officel/50/ios-photos.png", "credit": "https://img.icons8.com/officel/80/passport.png", "member": "https://img.icons8.com/officel/80/person-at-home.png", "setting": "https://img.icons8.com/officel/80/settings--v1.png", diff --git a/src/gonganxitong/quotalist.go b/src/gonganxitong/quotalist.go new file mode 100644 index 0000000..aadc123 --- /dev/null +++ b/src/gonganxitong/quotalist.go @@ -0,0 +1,15 @@ +package gonganxitong + +import "shylinux.com/x/ice" + +type quotalist struct { + Tables + fields string `data:"title,content,user_uid"` + create string `name:"create title* content*" role:"leader"` + remove string `name:"remove" role:"leader"` +} + +func (s quotalist) List(m *ice.Message, arg ...string) { +} + +func init() { ice.TeamCtxCmd(quotalist{}) } diff --git a/src/gonganxitong/spendlist.go b/src/gonganxitong/spendlist.go new file mode 100644 index 0000000..07c3550 --- /dev/null +++ b/src/gonganxitong/spendlist.go @@ -0,0 +1,15 @@ +package gonganxitong + +import "shylinux.com/x/ice" + +type spendlist struct { + Tables + fields string `data:"title,content,user_uid"` + create string `name:"create title* content*" role:"leader"` + remove string `name:"remove" role:"leader"` +} + +func (s spendlist) List(m *ice.Message, arg ...string) { +} + +func init() { ice.TeamCtxCmd(spendlist{}) } diff --git a/src/main.go b/src/main.go index cfa4b57..2de80b4 100644 --- a/src/main.go +++ b/src/main.go @@ -14,4 +14,4 @@ func main() { print(ice.Run()) } func init() { ice.Info.CodeMain = "src/gonganxitong/portal.go" ice.Info.NodeMain = "web.team.gonganxitong.portal" -} +} \ No newline at end of file diff --git a/src/renzhengshouquan/external/tencentdocument/tencentdocument.go b/src/renzhengshouquan/external/tencentdocument/tencentdocument.go index bbc981f..aa65fb3 100644 --- a/src/renzhengshouquan/external/tencentdocument/tencentdocument.go +++ b/src/renzhengshouquan/external/tencentdocument/tencentdocument.go @@ -62,6 +62,7 @@ func (s tencentdocument) Folder(m *ice.Message, arg ...string) *ice.Message { m.PushRecord(value, "browse_time", "type", "title", "ownerName", "url", "ID") }) m.RenameAppend("title", model.NAME, "url", model.LINK, "ID", model.FOLDER_ID) + m.SetResult() return m } func (s tencentdocument) Auth(m *ice.Message, arg ...string) {