diff --git a/Makefile b/Makefile index f95b409..6055fca 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ all: frontend build tar image: frontend docker-build save-image -TAG=v1.0.3 +TAG=v1.0.4 frontend: cd ui && yarn run build diff --git a/internal/domain/order/entity.go b/internal/domain/order/entity.go index 1ecf5ab..0570fe5 100644 --- a/internal/domain/order/entity.go +++ b/internal/domain/order/entity.go @@ -32,7 +32,7 @@ type Order struct { Coupon uint64 //优惠券 Status OrderStatus `json:"status"` // 订单状态 Description string `json:"description"` // 商品描述 - CreatedAt time.Time `xorm:"creaed" ` // 创建时间 + CreatedAt time.Time `xorm:"created" ` // 创建时间 UpdatedAt time.Time `xorm:"updated" ` // 更新时间 DeletedAt *time.Time `xorm:"deleted"` // 删除时间 } diff --git a/ui/src/app/home/confirm-order/confirm-order.page.ts b/ui/src/app/home/confirm-order/confirm-order.page.ts index 549bda5..598fa83 100644 --- a/ui/src/app/home/confirm-order/confirm-order.page.ts +++ b/ui/src/app/home/confirm-order/confirm-order.page.ts @@ -31,7 +31,7 @@ export class ConfirmOrderPage implements OnInit { return; } this.order = order as Order; - this.order.amount = Number((this.order.amount * 100).toFixed(0)) + this.order.amount = Number(Math.round(this.order.amount * 100)) } ngOnInit() {