diff --git a/api/config.sample.toml b/api/config.sample.toml index e3c9fa17..b89ca439 100644 --- a/api/config.sample.toml +++ b/api/config.sample.toml @@ -46,7 +46,7 @@ WeChatBot = false Active = "local" # 默认使用本地文件存储引擎 [OSS.Local] BasePath = "./static/upload" # 本地文件上传根路径 - BaseURL = "/static/upload" # 本地上传文件根 URL 如果是线上,则直接设置为 /static/upload 即可 + BaseURL = "http://localhost:5678/static/upload" # 本地上传文件前缀 URL,线上需要把 localhost 替换成自己的实际域名或者IP [OSS.Minio] Endpoint = "" # 如 172.22.11.200:9000 AccessKey = "" # 自己去 Minio 控制台去创建一个 Access Key diff --git a/api/handler/admin/order_handler.go b/api/handler/admin/order_handler.go index 229dd2a2..44edc839 100644 --- a/api/handler/admin/order_handler.go +++ b/api/handler/admin/order_handler.go @@ -8,6 +8,7 @@ import ( "chatplus/store/vo" "chatplus/utils" "chatplus/utils/resp" + "github.com/gin-gonic/gin" "gorm.io/gorm" ) @@ -26,6 +27,7 @@ func NewOrderHandler(app *core.AppServer, db *gorm.DB) *OrderHandler { func (h *OrderHandler) List(c *gin.Context) { var data struct { OrderNo string `json:"order_no"` + Status int `json:"status"` PayTime []string `json:"pay_time"` Page int `json:"page"` PageSize int `json:"page_size"` @@ -44,8 +46,9 @@ func (h *OrderHandler) List(c *gin.Context) { end := utils.Str2stamp(data.PayTime[1] + " 00:00:00") session = session.Where("pay_time >= ? AND pay_time <= ?", start, end) } - session = session.Where("status = ?", types.OrderPaidSuccess) - + if data.Status >= 0 { + session = session.Where("status", data.Status) + } var total int64 session.Model(&model.Order{}).Count(&total) var items []model.Order @@ -85,7 +88,7 @@ func (h *OrderHandler) Remove(c *gin.Context) { return } - res = h.db.Where("id = ?", id).Delete(&model.Order{}) + res = h.db.Unscoped().Where("id = ?", id).Delete(&model.Order{}) if res.Error != nil { resp.ERROR(c, "更新数据库失败!") return diff --git a/web/src/views/ChatPlus.vue b/web/src/views/ChatPlus.vue index 5635eac6..4cf35e15 100644 --- a/web/src/views/ChatPlus.vue +++ b/web/src/views/ChatPlus.vue @@ -249,7 +249,7 @@ import { ArrowDown, Check, Close, - Delete, Document, + Delete, Edit, Plus, Promotion, @@ -259,15 +259,7 @@ import { VideoPause } from '@element-plus/icons-vue' import 'highlight.js/styles/a11y-dark.css' -import { - dateFormat, - escapeHTML, - isMobile, - processContent, - randString, - removeArrayItem, - UUID -} from "@/utils/libs"; +import {dateFormat, escapeHTML, isMobile, processContent, randString, removeArrayItem, UUID} from "@/utils/libs"; import {ElMessage, ElMessageBox} from "element-plus"; import hl from "highlight.js"; import {getSessionId, getUserToken, removeUserToken} from "@/store/session"; @@ -361,7 +353,7 @@ onMounted(() => { notice.value = md.render(res.data['content']) const oldNotice = localStorage.getItem(noticeKey.value); // 如果公告有更新,则显示公告 - if (oldNotice !== notice.value) { + if (oldNotice !== notice.value && notice.value.length > 10) { showNotice.value = true } }).catch(e => { diff --git a/web/src/views/admin/Order.vue b/web/src/views/admin/Order.vue index 2b79ccd9..ec966186 100644 --- a/web/src/views/admin/Order.vue +++ b/web/src/views/admin/Order.vue @@ -2,6 +2,14 @@
+ + + { fetchData()