From b4395f9dacf3a5a6f2798937a364d8a8b850208b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Mon, 6 Mar 2023 10:39:48 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/settings/index.vue | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/system/settings/index.vue b/src/views/system/settings/index.vue index 0dff2da..5096300 100644 --- a/src/views/system/settings/index.vue +++ b/src/views/system/settings/index.vue @@ -8,23 +8,23 @@ v-show="showSearch" label-width="100px" > - + - + - + @@ -163,7 +163,7 @@ prop="settingsContent" show-overflow-tooltip /> --> - + - + - + diff --git a/src/views/system/settings/index.vue b/src/views/system/settings/index.vue index 5096300..991248c 100644 --- a/src/views/system/settings/index.vue +++ b/src/views/system/settings/index.vue @@ -586,15 +586,15 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { - const ids = row.id || this.ids; + const settingsNames = row.settingsName || this.settingsNames; this.$modal .confirm( - '是否确认删除泉医到家平台系统业务设置信息编号为"' + - ids + + '是否确认删除规则名称为"' + + settingsNames + '"的数据项？' ) .then(function () { - return delSettings(ids); + return delSettings(settingsNames); }) .then(() => { this.getList(); From 8b25cbdc24d64bb1a6ba7f9b51f6a211d3561237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Mon, 6 Mar 2023 11:27:39 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/coupon/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/system/coupon/index.vue b/src/views/system/coupon/index.vue index 1f9cac5..fe9e972 100644 --- a/src/views/system/coupon/index.vue +++ b/src/views/system/coupon/index.vue @@ -144,7 +144,8 @@ --> - + + Date: Mon, 6 Mar 2023 11:52:05 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/settings/index.vue | 90 +++++++++++++++-------------- 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/src/views/system/settings/index.vue b/src/views/system/settings/index.vue index 991248c..0f4ed6c 100644 --- a/src/views/system/settings/index.vue +++ b/src/views/system/settings/index.vue @@ -25,21 +25,21 @@ /> - + - - - - + + + - + - + - + @@ -336,7 +345,6 @@ placeholder="请输入系统设置内容" v-model="form.settingsContent" > -
@@ -381,8 +389,8 @@ export default { }, ], value: "", - // 弹出层判断新增还是修改 - isEditFlag: false, + // 弹出层判断新增还是修改 + isEditFlag: false, // 遮罩层 loading: true, // 选中数组 @@ -410,7 +418,7 @@ export default { settingsContent: null, settingsType: null, totalSignInDays: null, - integralExpirationDate:null, + integralExpirationDate: null, integralCount: null, creditAmount: null, sort: null, @@ -419,8 +427,8 @@ export default { form: {}, // 表单校验 rules: { - integralExpirationDate:[ - { + integralExpirationDate: [ + { required: true, message: "请输入积分有效期", trigger: "blur", @@ -454,7 +462,7 @@ export default { trigger: "blur", }, ], - + integralCount: [ { required: true, @@ -519,7 +527,7 @@ export default { settingsContent: null, settingsType: null, totalSignInDays: null, - integralExpirationDate:null, + integralExpirationDate: null, integralCount: null, creditAmount: null, sort: null, @@ -588,11 +596,7 @@ export default { handleDelete(row) { const settingsNames = row.settingsName || this.settingsNames; this.$modal - .confirm( - '是否确认删除规则名称为"' + - settingsNames + - '"的数据项？' - ) + .confirm('是否确认删除规则名称为"' + settingsNames + '"的数据项？') .then(function () { return delSettings(settingsNames); }) From 2656ff4f0236c8179ff6cba0210d4df6fccdf3cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Mon, 6 Mar 2023 13:37:06 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/settings/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/system/settings/index.vue b/src/views/system/settings/index.vue index 0f4ed6c..e22b866 100644 --- a/src/views/system/settings/index.vue +++ b/src/views/system/settings/index.vue @@ -594,11 +594,12 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { - const settingsNames = row.settingsName || this.settingsNames; + const ids = row.id || this.ids; + const settingsNames=row.settingsName||this.settingsNames this.$modal .confirm('是否确认删除规则名称为"' + settingsNames + '"的数据项？') .then(function () { - return delSettings(settingsNames); + return delSettings(ids); }) .then(() => { this.getList(); From 664a855263b62a3f50f8809818d70419e423edc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Mon, 6 Mar 2023 13:39:06 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/settings/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/system/settings/index.vue b/src/views/system/settings/index.vue index e22b866..15c6048 100644 --- a/src/views/system/settings/index.vue +++ b/src/views/system/settings/index.vue @@ -441,13 +441,13 @@ export default { trigger: "blur", }, ], - settingsContent: [ - { - required: true, - message: "请输入系统设置内容", - trigger: "blur", - }, - ], + // settingsContent: [ + // { + // required: true, + // message: "请输入系统设置内容", + // trigger: "blur", + // }, + // ], settingsType: [ { required: true, From d7bbbaa7ae6f92e46810113cb65fe25b075b6a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Mon, 6 Mar 2023 13:39:43 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/coupon/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/system/coupon/index.vue b/src/views/system/coupon/index.vue index fe9e972..840ecf0 100644 --- a/src/views/system/coupon/index.vue +++ b/src/views/system/coupon/index.vue @@ -610,10 +610,11 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const couponTitles = row.couponTitle || this.couponTitles; + const ids = row.id || this.ids; this.$modal .confirm('是否确认删除优惠券名称为"' + couponTitles + '"的数据项？') .then(function () { - return delCoupon(couponTitles); + return delCoupon(ids); }) .then(() => { this.getList(); From d599e0bbc429743c123efd21b0938baebbcff151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Mon, 6 Mar 2023 13:41:22 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/groupQrCodeInfo/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/system/groupQrCodeInfo/index.vue b/src/views/system/groupQrCodeInfo/index.vue index efc195c..d88b304 100644 --- a/src/views/system/groupQrCodeInfo/index.vue +++ b/src/views/system/groupQrCodeInfo/index.vue @@ -729,9 +729,10 @@ export default { /** 删除按钮操作 */ handleDelete(row) { console.log(row); - const ids = row.groupName || this.groupName; + const ids = row.id || this.ids; + const groupNames = row.groupName || this.groupNames; this.$modal - .confirm('确认删除群名称为"' + ids + '"的信息吗？') + .confirm('确认删除群名称为"' + groupNames + '"的信息吗？') .then(function() { return delGroupQrCodeInfo(ids); }) From 4165b4f48d3aa5f7751c8f9d317f86edb4070d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Mon, 6 Mar 2023 13:45:36 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/settings/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/system/settings/index.vue b/src/views/system/settings/index.vue index 15c6048..f3e9973 100644 --- a/src/views/system/settings/index.vue +++ b/src/views/system/settings/index.vue @@ -225,8 +225,8 @@ Date: Mon, 6 Mar 2023 14:52:41 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/OperateGoodsInfo/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/OperateGoodsInfo/index.vue b/src/views/system/OperateGoodsInfo/index.vue index 82d9395..2379b0f 100644 --- a/src/views/system/OperateGoodsInfo/index.vue +++ b/src/views/system/OperateGoodsInfo/index.vue @@ -385,7 +385,7 @@ - +