From c0cba8d9ad04ed0360be29f53618ced9daaf4ac1 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Fri, 30 Apr 2021 18:54:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E7=9A=84=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/shop_active.controller.ts     | 20 +++++++++----------
 src/models/shop/ShopActivity.ts               |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/admin/controllers/shop_active.controller.ts b/src/admin/controllers/shop_active.controller.ts
index fe25795..940e008 100644
--- a/src/admin/controllers/shop_active.controller.ts
+++ b/src/admin/controllers/shop_active.controller.ts
@@ -4,9 +4,9 @@ import { ShopActivity } from '../../models/shop/ShopActivity'
 import { Puzzle } from '../../models/content/Puzzle'
 import { ZError } from '../../common/ZError'
 
-class ShopActiveController extends BaseController {
-  @permission('active:read')
-  @router('post /actives')
+class ShopactivityController extends BaseController {
+  @permission('activity:read')
+  @router('post /activitys')
   async list(req, res) {
     let { start, limit, page } = req.params
     limit = +limit || 10
@@ -26,8 +26,8 @@ class ShopActiveController extends BaseController {
     }
   }
 
-  @permission('active:read')
-  @router('get /active/:id')
+  @permission('activity:read')
+  @router('get /activity/:id')
   async detail(req, res) {
     let { id } = req.params
     const record = await ShopActivity.findById(id)
@@ -37,14 +37,14 @@ class ShopActiveController extends BaseController {
     return record.toJson()
   }
 
-  @permission('active:read')
-  @router('post /active/save')
+  @permission('activity:read')
+  @router('post /activity/save')
   async save(req: any) {
     let { _id, withNext } = req.params
     let user = req.user
     let record
     if (!_id) {
-      record = new Puzzle(req.params)
+      record = new ShopActivity(req.params)
       record.createdBy = user.id
     } else {
       record = await ShopActivity.findById(_id)
@@ -54,8 +54,8 @@ class ShopActiveController extends BaseController {
     return record.toJson()
   }
 
-  @permission('active:read')
-  @router('post /active/:id/delete')
+  @permission('activity:read')
+  @router('post /activity/:id/delete')
   async delete(req: any) {
     let { id } = req.params
     if (!id) {
diff --git a/src/models/shop/ShopActivity.ts b/src/models/shop/ShopActivity.ts
index 67696a5..188b769 100644
--- a/src/models/shop/ShopActivity.ts
+++ b/src/models/shop/ShopActivity.ts
@@ -81,8 +81,8 @@ class ShopActivityClass extends BaseModule {
    * 是否启用
    * @type {number}
    */
-  @prop({default: 0})
-  public active: number
+  @prop({default: false})
+  public active: boolean
 
   /**
    * 是否删除