diff --git a/src/gonganxitong/allow.css b/src/gonganxitong/allow.css index 9edfdbb..669bbc3 100644 --- a/src/gonganxitong/allow.css +++ b/src/gonganxitong/allow.css @@ -1,2 +1,2 @@ -$output div.item.card div.title span.role { margin-left:auto; } -$output div.item.card div.title div.action { top:24px; } \ No newline at end of file +body.width1 $output div.item.card div.title span.role { margin-left:auto; } +body.width1 $output div.item.card div.title div.action { top:24px; } \ No newline at end of file diff --git a/src/gonganxitong/common.go b/src/gonganxitong/common.go index cd3557d..f9013da 100644 --- a/src/gonganxitong/common.go +++ b/src/gonganxitong/common.go @@ -51,7 +51,7 @@ type Table struct { noticeList string `name:"noticeList" role:"void"` marketPlaceInfo string `name:"marketPlaceInfo" role:"void"` messagePlaceInfo string `name:"messagePlaceInfo" role:"void"` - // applyCreate string `name:"applyCreate" role:"void"` + applyCreate string `name:"applyCreate" role:"void"` } func (s Table) LoadTrans(m *ice.Message, arg ...string) { diff --git a/src/gonganxitong/member.css b/src/gonganxitong/member.css index 6c29510..1b55011 100644 --- a/src/gonganxitong/member.css +++ b/src/gonganxitong/member.css @@ -1,2 +1,2 @@ -$output>div.item.myself div.title span { font-weight:bold; } -$output>div.item.card div.title span.role { margin-left:auto; } \ No newline at end of file +body.width1 $output>div.item.myself div.title span { font-weight:bold; } +body.width1 $output>div.item.card div.title span.role { margin-left:auto; } \ No newline at end of file diff --git a/src/gonganxitong/member.go b/src/gonganxitong/member.go index 275ddf5..c818017 100644 --- a/src/gonganxitong/member.go +++ b/src/gonganxitong/member.go @@ -62,7 +62,7 @@ func (s member) List(m *ice.Message, arg ...string) { } else { return } - defer m.Sort(kit.Fields(model.MEMBER_STATUS, USER_PLACE_ROLE, model.CREATED_AT)) + defer m.Sort(kit.Fields(model.MEMBER_STATUS, USER_PLACE_ROLE, "auth_status", model.CREATED_AT)) m.Table(func(value ice.Maps) { if !m.FieldsIsDetail() { if user_uid == value[model.USER_UID] { diff --git a/src/gonganxitong/member.js b/src/gonganxitong/member.js index cdfc5c8..cff045a 100644 --- a/src/gonganxitong/member.js +++ b/src/gonganxitong/member.js @@ -8,7 +8,7 @@ Volcanos(chat.ONIMPORT, { value.member_status != "normal" && can.onimport.textView(can, value, "member_status"), // can.onimport.titleAction(can, value), ]}, - {view: html.STATUS, list: [value.user_info]}, + {view: html.STATUS, list: [value.auth_info||value.user_info]}, can.onimport.titleAction(can, value), ] }) diff --git a/src/gonganxitong/portal.json b/src/gonganxitong/portal.json index c48fe4c..e4baeec 100644 --- a/src/gonganxitong/portal.json +++ b/src/gonganxitong/portal.json @@ -12,6 +12,7 @@ "marketInsert": "推广", "marketPlaceEnter": "进入", "pushPublic": "推广", + "process": "开始", "applyCreate": "申请权限", "commentCreate": "评论", "applyQRCode": "邀请码", "user": "用户信息", "city": "城市信息", "street": "街道信息", "school": "学校信息", "company": "公司信息", @@ -38,6 +39,9 @@ "authPersonal": "notice" }, "input": { + "process_time": "开始时间", + "plan_status": "计划状态", + "task_count": "任务数量", "My Place": "我的场景", "user_uid": "用户", "user_name": "用户昵称",