diff --git a/.env.development b/.env.development index a189928..92b6499 100644 --- a/.env.development +++ b/.env.development @@ -2,10 +2,10 @@ VITE_APP_NAME=后台管理系统 VITE_SOCKET_URL=wss://server.gxwebsoft.com VITE_SERVER_URL=https://gxtyzx-server.websoft.top/api VITE_API_URL=https://gxtyzx-modules.websoft.top/api -VITE_THINK_URL=https://gxtyzx-api2.websoft.top/api +#VITE_THINK_URL=https://gxtyzx-api2.websoft.top/api #VITE_SERVER_URL=http://127.0.0.1:30000/api #VITE_API_URL=http://127.0.0.1:9002/api -#VITE_THINK_URL=http://127.0.0.1:9099/api +VITE_THINK_URL=http://127.0.0.1:9099/api #/booking/bookingItem diff --git a/src/api/think/thinkVip/model/index.ts b/src/api/think/thinkVip/model/index.ts index b708906..d58b701 100644 --- a/src/api/think/thinkVip/model/index.ts +++ b/src/api/think/thinkVip/model/index.ts @@ -47,6 +47,8 @@ export interface ThinkVip { updateTime?: number; // 是否有效:1是,0否 isUse?: number; + // 是否销售:1是,0否 + isSale?: number; } /** @@ -54,7 +56,10 @@ export interface ThinkVip { */ export interface ThinkVipParam{ id?: number; + isSale?: number; createTimeStart?: number; createTimeEnd?: number; + timeStart?: number; + timeEnd?: number; keywords?: string; } diff --git a/src/views/think/thinkInvoice/index.vue b/src/views/think/thinkInvoice/index.vue index e1fe64a..48d11c1 100644 --- a/src/views/think/thinkInvoice/index.vue +++ b/src/views/think/thinkInvoice/index.vue @@ -31,8 +31,13 @@ @@ -69,254 +76,256 @@ diff --git a/src/views/think/thinkOrder/components/search.vue b/src/views/think/thinkOrder/components/search.vue index b336c23..230c472 100644 --- a/src/views/think/thinkOrder/components/search.vue +++ b/src/views/think/thinkOrder/components/search.vue @@ -2,13 +2,23 @@ diff --git a/src/views/think/thinkOrder/index.vue b/src/views/think/thinkOrder/index.vue index 55f8ee3..ee1f287 100644 --- a/src/views/think/thinkOrder/index.vue +++ b/src/views/think/thinkOrder/index.vue @@ -145,8 +145,7 @@ IC会员卡 - + 免费订单 @@ -178,7 +177,8 @@ + color="cyan" + > 未付款,占场中 @@ -188,20 +188,29 @@ @@ -228,8 +237,15 @@ 详情 - 退款 + 退款 @@ -245,321 +261,319 @@ diff --git a/src/views/think/thinkVip/components/search.vue b/src/views/think/thinkVip/components/search.vue index 01a10da..481fbee 100644 --- a/src/views/think/thinkVip/components/search.vue +++ b/src/views/think/thinkVip/components/search.vue @@ -18,6 +18,10 @@ > 同步会员卡权限 + + 已上架 + 已下架 + ({ id: undefined, + isSale: 1, keywords: undefined, timeStart: undefined, timeEnd: undefined diff --git a/src/views/think/thinkVip/components/thinkVipEdit.vue b/src/views/think/thinkVip/components/thinkVipEdit.vue index d4dac7c..5232af3 100644 --- a/src/views/think/thinkVip/components/thinkVipEdit.vue +++ b/src/views/think/thinkVip/components/thinkVipEdit.vue @@ -135,9 +135,9 @@ {{ form.prices }} - + 是 - 否 + 否 diff --git a/src/views/think/thinkVip/index.vue b/src/views/think/thinkVip/index.vue index a2e7c16..ccdc4da 100644 --- a/src/views/think/thinkVip/index.vue +++ b/src/views/think/thinkVip/index.vue @@ -40,6 +40,15 @@