diff --git a/internal/web/actions/default/servers/index.go b/internal/web/actions/default/servers/index.go index 3b883139..83c77f7a 100644 --- a/internal/web/actions/default/servers/index.go +++ b/internal/web/actions/default/servers/index.go @@ -199,6 +199,12 @@ func (this *IndexAction) RunGet(params struct { } } + // 提交审核时间 + var auditingTime = "" + if server.AuditingAt > 0 { + auditingTime = timeutil.FormatTime("Y-m-d", server.AuditingAt) + } + serverMaps = append(serverMaps, maps.Map{ "id": server.Id, "isOn": server.IsOn, @@ -215,6 +221,7 @@ func (this *IndexAction) RunGet(params struct { "isAuditing": server.IsAuditing, "auditingIsOk": auditingIsOk, "user": userMap, + "auditingTime": auditingTime, }) } this.Data["servers"] = serverMaps diff --git a/internal/web/actions/default/servers/server/settings/serverNames/index.go b/internal/web/actions/default/servers/server/settings/serverNames/index.go index 44a7de5b..92e6b598 100644 --- a/internal/web/actions/default/servers/server/settings/serverNames/index.go +++ b/internal/web/actions/default/servers/server/settings/serverNames/index.go @@ -30,8 +30,26 @@ func (this *IndexAction) RunGet(params struct { return } + // 已审核域名 + var passedDomains = []string{} + if len(serverNamesResp.ServerNamesJSON) > 0 { + var passedServerNameConfigs = []*serverconfigs.ServerNameConfig{} + err = json.Unmarshal(serverNamesResp.ServerNamesJSON, &passedServerNameConfigs) + if err == nil { + passedDomains = serverconfigs.PlainServerNames(passedServerNameConfigs) + } + } + this.Data["passedDomains"] = passedDomains + + // 提交审核时间 + var auditingTime = "" + if serverNamesResp.AuditingAt > 0 { + auditingTime = timeutil.FormatTime("Y-m-d", serverNamesResp.AuditingAt) + } + serverNamesConfig := []*serverconfigs.ServerNameConfig{} this.Data["isAuditing"] = serverNamesResp.IsAuditing + this.Data["auditingTime"] = auditingTime this.Data["auditingResult"] = maps.Map{ "isOk": true, } diff --git a/web/views/@default/servers/index.css b/web/views/@default/servers/index.css index 178b01ed..5251c0c0 100644 --- a/web/views/@default/servers/index.css +++ b/web/views/@default/servers/index.css @@ -7,7 +7,7 @@ padding-right: 1em; } .node-logs-box { - max-height: 11.6em; + max-height: 14em; overflow-y: auto; } .node-logs-box::-webkit-scrollbar { diff --git a/web/views/@default/servers/index.css.map b/web/views/@default/servers/index.css.map index 99fa71de..59be8e59 100644 --- a/web/views/@default/servers/index.css.map +++ b/web/views/@default/servers/index.css.map @@ -1 +1 @@ -{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA,GAAG,QACF,MAAK;EACJ,kBAAA;EACA,UAAA;EACA,UAAA;;AAJF,GAAG,QAOF;EACC,kBAAA;;AAIF;EACC,kBAAA;EACA,gBAAA;;AAGD,cAAc;EACb,UAAA","file":"index.css"} \ No newline at end of file +{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA,GAAG,QACF,MAAK;EACJ,kBAAA;EACA,UAAA;EACA,UAAA;;AAJF,GAAG,QAOF;EACC,kBAAA;;AAIF;EACC,gBAAA;EACA,gBAAA;;AAGD,cAAc;EACb,UAAA","file":"index.css"} \ No newline at end of file diff --git a/web/views/@default/servers/index.html b/web/views/@default/servers/index.html index 5204ebad..662f7694 100644 --- a/web/views/@default/servers/index.html +++ b/web/views/@default/servers/index.html @@ -101,7 +101,7 @@
- 审核中   + 审核中({{server.auditingTime}})  
diff --git a/web/views/@default/servers/index.less b/web/views/@default/servers/index.less index 5c74227a..0cc94727 100644 --- a/web/views/@default/servers/index.less +++ b/web/views/@default/servers/index.less @@ -11,7 +11,7 @@ } .node-logs-box { - max-height: 11.6em; + max-height: 14em; overflow-y: auto; } diff --git a/web/views/@default/servers/server/settings/serverNames/index.html b/web/views/@default/servers/server/settings/serverNames/index.html index ba8b1ff4..0e266b36 100644 --- a/web/views/@default/servers/server/settings/serverNames/index.html +++ b/web/views/@default/servers/server/settings/serverNames/index.html @@ -12,11 +12,16 @@ 审核中域名 - - {{serverName}} + + {{serverName.name}} +

绿色标注的域名表示之前已经审核通过的域名。

+ + 提交审核时间 + {{auditingTime}} + 审核结果 diff --git a/web/views/@default/servers/server/settings/serverNames/index.js b/web/views/@default/servers/server/settings/serverNames/index.js index 44a5d043..bdfbc297 100644 --- a/web/views/@default/servers/server/settings/serverNames/index.js +++ b/web/views/@default/servers/server/settings/serverNames/index.js @@ -6,10 +6,26 @@ Tea.context(function () { let that = this this.serverNames.forEach(function (v) { if (v.subNames == null || v.subNames.length == 0) { - that.allServerNames.push(v.name) + that.allServerNames.push({ + name: v.name, + isPassed: that.passedDomains.$contains(v.name) + }) } else { - that.allServerNames.$pushAll(v.subNames) + v.subNames.forEach(function (subName) { + that.allServerNames.push({ + name: subName, + isPassed: that.passedDomains.$contains(subName) + }) + }) } }) + + this.hasPassedDomains = false + this.allServerNames.forEach(function (serverName) { + if (serverName.isPassed) { + that.hasPassedDomains = true + } + }) + this.auditing = 1 }) \ No newline at end of file