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 @@
{{ record.info }}
- 开票金额:{{ record.price }}元,租赁面积:{{ record.size }}㎡,租赁时间:{{ record.rentStartDate
- }}~{{ record.rentEndDate }}
+ 开票金额:{{ record.price }}元,租赁面积:{{
+ record.size
+ }}㎡,租赁时间:{{ record.rentStartDate }}~{{
+ record.rentEndDate
+ }}
@@ -52,7 +57,9 @@
拒绝
- 已拒绝
+ 已拒绝
@@ -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 @@
付款状态
-
+
全部
已付款
未付款
订单状态
-
+
全部
已完成
未使用
@@ -18,7 +28,12 @@
退款成功
付款方式
-
+
全部
微信支付
余额支付
@@ -39,7 +54,12 @@
IC季卡
开票状态
-
+
已开票
未开票
不能开票
@@ -65,7 +85,9 @@
style="width: 380px"
/>
重置
- 设置已开票
+ 设置已开票
@@ -76,165 +98,168 @@
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 @@
+
+ 已上架
+ 已下架
+
+
修改
(1);
// 表格数据源
const datasource: DatasourceFunction = ({
@@ -104,6 +115,9 @@
if (filters) {
where.status = filters.status;
}
+ if (where.isSale == undefined) {
+ where.isSale = isSale.value;
+ }
return pageThinkVip({
...where,
...orders,
@@ -270,6 +284,9 @@
/* 搜索 */
const reload = (where?: ThinkVipParam) => {
+ if (where?.isSale) {
+ isSale.value = where.isSale;
+ }
selection.value = [];
tableRef?.value?.reload({ where: where });
};
@@ -280,6 +297,16 @@
showEdit.value = true;
};
+ const updateStatus = (row: ThinkVip) => {
+ updateThinkVip({
+ id: row.id,
+ isSale: row.isSale == 1 ? 0 : 1
+ }).then(() => {
+ message.success('操作成功');
+ reload();
+ });
+ };
+
/* 打开批量移动弹窗 */
const openMove = () => {
showMove.value = true;