From 4eb76ca3c73c0c58d52ce15ecb28624eb230fb5e Mon Sep 17 00:00:00 2001 From: shy Date: Sun, 15 Sep 2024 20:00:14 +0800 Subject: [PATCH] add some --- src/gongyinglian/express.js | 2 +- src/gongyinglian/order.js | 2 +- src/gongyinglian/payment.js | 2 +- src/gongyinglian/refund.js | 2 +- src/gongyinglian/return.js | 2 +- src/guanlixitong/common.go | 4 ++-- src/guanlixitong/company.go | 2 +- src/guanlixitong/model/model.go | 1 + src/guanlixitong/target.go | 6 ++---- src/guanlixitong/target.js | 2 +- src/shichangyingxiao/promotion.js | 2 +- src/template/web.code.autogen/demo.go | 10 +++++++--- src/template/web.code.js/demo.js | 9 ++++----- src/zijinlian/investment.js | 2 +- 14 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/gongyinglian/express.js b/src/gongyinglian/express.js index 690827e..8a6cdc3 100644 --- a/src/gongyinglian/express.js +++ b/src/gongyinglian/express.js @@ -2,7 +2,7 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.onimport.myView(can, msg, function(value) { return [ {view: html.TITLE, list: [value.user_name, can.onimport.textView(can, value, "express_status", mdb.STATUS)]}, - {view: html.STATUS, list: [value.uid.slice(0, 6), can.base.TimeTrim(value.created_at)]}, + {view: html.STATUS, list: [value.uid.slice(0, 6), can.onimport.timeView(can, value)]}, {view: html.STATUS, list: [value.company_name+":", value.open_id]}, {view: html.STATUS, list: ["订单:", value.order_uid.slice(0, 6), "金额:", value.amount||"0", "数量:", value.total||"0"]}, ] }) diff --git a/src/gongyinglian/order.js b/src/gongyinglian/order.js index 79233c8..64376f6 100644 --- a/src/gongyinglian/order.js +++ b/src/gongyinglian/order.js @@ -2,7 +2,7 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.onimport.myView(can, msg, function(value) { return [ {view: html.TITLE, list: [value.name||value.user_name||"待确认", can.onimport.textView(can, value, "order_type", mdb.TYPE)]}, - {view: html.STATUS, list: [value.uid.slice(0, 6), can.base.TimeTrim(value.created_at), can.onimport.textView(can, value, "order_status", mdb.STATUS)]}, + {view: html.STATUS, list: [value.uid.slice(0, 6), can.onimport.timeView(can, value), can.onimport.textView(can, value, "order_status", mdb.STATUS)]}, {view: html.STATUS, list: ["数量:", value.total, "件", "总额:", value.amount, "元"]}, value.payment_success_time && {view: html.STATUS, list: ["收款时间:", can.base.TimeTrim(value.payment_success_time)]}, value.express_recv_time && {view: html.STATUS, list: ["收货时间:", can.base.TimeTrim(value.express_recv_time)]}, diff --git a/src/gongyinglian/payment.js b/src/gongyinglian/payment.js index 654d5b9..2267b0a 100644 --- a/src/gongyinglian/payment.js +++ b/src/gongyinglian/payment.js @@ -2,7 +2,7 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.onimport.myView(can, msg, function(value) { return [ {view: html.TITLE, list: [value.user_name, can.onimport.textView(can, value, "payment_status", mdb.STATUS)]}, - {view: html.STATUS, list: [value.uid.slice(0, 6), can.base.TimeTrim(value.created_at)]}, + {view: html.STATUS, list: [value.uid.slice(0, 6), can.onimport.timeView(can, value)]}, {view: html.STATUS, list: [value.company_name, ": ", value.open_id]}, {view: html.STATUS, list: ["订单:", value.order_uid.slice(0, 6), "金额:", value.amount||"0", "数量:", value.total||"0"]}, ] }) diff --git a/src/gongyinglian/refund.js b/src/gongyinglian/refund.js index 4d54f39..fddabea 100644 --- a/src/gongyinglian/refund.js +++ b/src/gongyinglian/refund.js @@ -2,7 +2,7 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.onimport.myView(can, msg, function(value) { return [ {view: html.TITLE, list: [value.user_name, can.onimport.textView(can, value, "refund_status", mdb.STATUS)]}, - {view: html.STATUS, list: [value.uid.slice(0, 6), can.base.TimeTrim(value.created_at)]}, + {view: html.STATUS, list: [value.uid.slice(0, 6), can.onimport.timeView(can, value)]}, {view: html.STATUS, list: [value.company_name, ": ", value.open_id]}, {view: html.STATUS, list: ["订单:", value.order_uid.slice(0, 6), "金额:", value.amount||"0", "数量:", value.total||"0"]}, ] }) diff --git a/src/gongyinglian/return.js b/src/gongyinglian/return.js index de189a3..69affeb 100644 --- a/src/gongyinglian/return.js +++ b/src/gongyinglian/return.js @@ -2,7 +2,7 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.onimport.myView(can, msg, function(value) { return [ {view: html.TITLE, list: [value.user_name, can.onimport.textView(can, value, "return_status", mdb.STATUS)]}, - {view: html.STATUS, list: [value.uid.slice(0, 6), can.base.TimeTrim(value.created_at)]}, + {view: html.STATUS, list: [value.uid.slice(0, 6), can.onimport.timeView(can, value)]}, {view: html.STATUS, list: [value.company_name+":", value.open_id]}, {view: html.STATUS, list: ["订单:", value.order_uid.slice(0, 6), "金额:", value.amount||"0", "数量:", value.total||"0"]}, ] }) diff --git a/src/guanlixitong/common.go b/src/guanlixitong/common.go index 69f0fd3..c15c964 100644 --- a/src/guanlixitong/common.go +++ b/src/guanlixitong/common.go @@ -47,10 +47,10 @@ func (s Table) RewriteAppend(m *ice.Message, arg ...string) *ice.Message { func (s Table) SelectJoinCompany(m *ice.Message) *ice.Message { return s.SelectJoin(m, company{}, model.NAME, model.CITY_UID) } -func (s Table) CheckRole(m *ice.Message, arg ...string) *ice.Message { +func (s Table) CheckRole(m *ice.Message, arg ...string) { role := UserGroupRole(s.UserPlaceRole(m)) m.WarnNotRight(!kit.IsIn(role.String(), append(arg, UserGroupCreator.String())...), role.String()) - return m + m.Option(model.USER_ROLE, kit.Format(role)) } type Tables struct{ Table } diff --git a/src/guanlixitong/company.go b/src/guanlixitong/company.go index 242091c..628546c 100644 --- a/src/guanlixitong/company.go +++ b/src/guanlixitong/company.go @@ -10,7 +10,7 @@ type company struct{ Table } func (s company) FindOrCreateByName(m *ice.Message, arg ...string) { if msg := m.Cmd(s, s.Select, model.NAME, arg[3], arg[0], arg[1]); msg.Length() == 0 { - msg := m.Cmd(s, s.Create, model.NAME, arg[3], arg[0], arg[1]) + msg := m.Cmd(s, s.Insert, model.NAME, arg[3], arg[0], arg[1]) arg[2], arg[3] = model.COMPANY_UID, msg.Result() } else { arg[2], arg[3] = model.COMPANY_UID, msg.Append(model.UID) diff --git a/src/guanlixitong/model/model.go b/src/guanlixitong/model/model.go index ae95df9..f194f8f 100644 --- a/src/guanlixitong/model/model.go +++ b/src/guanlixitong/model/model.go @@ -10,6 +10,7 @@ const ( TITLE = "title" CONTENT = "content" USER_UID = "user_uid" + USER_ROLE = "user_role" USER_GROUP_ROLE = "user_group_role" GROUP_UID = "group_uid" GROUP_NAME = "group_name" diff --git a/src/guanlixitong/target.go b/src/guanlixitong/target.go index 8ccb2a7..e7c7e0a 100644 --- a/src/guanlixitong/target.go +++ b/src/guanlixitong/target.go @@ -4,13 +4,11 @@ import "shylinux.com/x/ice" type target struct { Table - fields string `data:"title,content"` + fields string `data:"title,content,user_uid"` create string `name:"create title* content*" role:"leader"` remove string `name:"remove" role:"leader"` } -func (s target) Create(m *ice.Message, arg ...string) { s.ValueCreate(m, arg...) } -func (s target) Remove(m *ice.Message, arg ...string) { s.ValueRemove(m, arg...) } -func (s target) List(m *ice.Message, arg ...string) { s.ValueList(m, arg).Display("") } +func (s target) List(m *ice.Message, arg ...string) { s.ValueList(m, arg).Display("") } func init() { ice.TeamCtxCmd(target{}) } diff --git a/src/guanlixitong/target.js b/src/guanlixitong/target.js index 3be5f6e..d3e4f08 100644 --- a/src/guanlixitong/target.js +++ b/src/guanlixitong/target.js @@ -2,7 +2,7 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.onimport.myView(can, msg, function(value) { return [ {view: html.TITLE, list: [value.title]}, - {view: html.STATUS, list: [value.uid.slice(0, 6), can.base.TimeTrim(value.created_at), value.user_name]}, + {view: html.STATUS, list: [value.uid.slice(0, 6), can.onimport.timeView(can, value), value.user_name]}, {view: html.OUTPUT, list: [value.content]}, ] }) }, diff --git a/src/shichangyingxiao/promotion.js b/src/shichangyingxiao/promotion.js index 3be5f6e..d3e4f08 100644 --- a/src/shichangyingxiao/promotion.js +++ b/src/shichangyingxiao/promotion.js @@ -2,7 +2,7 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.onimport.myView(can, msg, function(value) { return [ {view: html.TITLE, list: [value.title]}, - {view: html.STATUS, list: [value.uid.slice(0, 6), can.base.TimeTrim(value.created_at), value.user_name]}, + {view: html.STATUS, list: [value.uid.slice(0, 6), can.onimport.timeView(can, value), value.user_name]}, {view: html.OUTPUT, list: [value.content]}, ] }) }, diff --git a/src/template/web.code.autogen/demo.go b/src/template/web.code.autogen/demo.go index 8224922..e115ec0 100644 --- a/src/template/web.code.autogen/demo.go +++ b/src/template/web.code.autogen/demo.go @@ -2,9 +2,13 @@ package {{.Option "zone"}} import "shylinux.com/x/ice" -type {{.Option "name"}} struct{ Tables } - -func (s {{.Option "name"}}) List(m *ice.Message, arg ...string) { +type {{.Option "name"}} struct { + Table + fields string `data:"title,content,user_uid"` + create string `name:"create title* content*" role:"leader"` + remove string `name:"remove" role:"leader"` } +func (s {{.Option "name"}}) List(m *ice.Message, arg ...string) { s.ValueList(m, arg).Display("") } + func init() { ice.TeamCtxCmd({{.Option "name"}}{}) } diff --git a/src/template/web.code.js/demo.js b/src/template/web.code.js/demo.js index 963d6a5..9aac8a3 100644 --- a/src/template/web.code.js/demo.js +++ b/src/template/web.code.js/demo.js @@ -1,10 +1,9 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { - if (msg.IsDetail()) { var value = msg.TableDetail(); msg.Option("_share_title", value.title), msg.Option("_share_content", value.content) } - can.onimport.itemcards(can, msg, function(value) { return [ - {view: html.TITLE, list: [{text: value.title}]}, - {view: html.STATUS, list: [{text: value.uid.slice(0, 6)}, {text: can.base.TimeTrim(value.created_at)}, {text: value.user_name}]}, - {view: html.OUTPUT, list: [{text: value.content}]}, + can.onimport.myView(can, msg, function(value) { return [ + {view: html.TITLE, list: [value.title||value.name||value.user_name]}, + {view: html.STATUS, list: [value.uid.slice(0, 6), can.onimport.timeView(can, value), value.user_name]}, + {view: html.OUTPUT, list: [value.content||value.info]}, ] }) }, }) diff --git a/src/zijinlian/investment.js b/src/zijinlian/investment.js index 3be5f6e..d3e4f08 100644 --- a/src/zijinlian/investment.js +++ b/src/zijinlian/investment.js @@ -2,7 +2,7 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.onimport.myView(can, msg, function(value) { return [ {view: html.TITLE, list: [value.title]}, - {view: html.STATUS, list: [value.uid.slice(0, 6), can.base.TimeTrim(value.created_at), value.user_name]}, + {view: html.STATUS, list: [value.uid.slice(0, 6), can.onimport.timeView(can, value), value.user_name]}, {view: html.OUTPUT, list: [value.content]}, ] }) },