From c2f98043df94ef78503cc1f25dd7eb2f3c5a7301 Mon Sep 17 00:00:00 2001
From: AhJindeg <AhJindeg@gmail.com>
Date: Thu, 21 Mar 2024 17:20:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=90=9E=20add=20inputChange=20f?=
=?UTF-8?q?or=20crontab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Crontab/src/Crontab.vue | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/components/Crontab/src/Crontab.vue b/src/components/Crontab/src/Crontab.vue
index 90b40b2f..e61fef89 100644
--- a/src/components/Crontab/src/Crontab.vue
+++ b/src/components/Crontab/src/Crontab.vue
@@ -503,9 +503,13 @@ const submit = () => {
emit('update:modelValue', defaultValue.value)
dialogVisible.value = false
}
+
+const inputChange = () => {
+ emit('update:modelValue', defaultValue.value)
+}
</script>
<template>
- <el-input v-model="defaultValue" class="input-with-select" v-bind="$attrs">
+ <el-input v-model="defaultValue" class="input-with-select" v-bind="$attrs" @input="inputChange">
<template #append>
<el-select v-model="select" placeholder="生成器" style="width: 115px">
<el-option label="每分钟" value="0 * * * * ?" />
From 427c2d5d2afd526117c1351218608ed908545682 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 Mar 2024 15:42:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?MALL=EF=BC=9A=E4=BF=AE=E5=A4=8D=E8=90=A5?=
=?UTF-8?q?=E9=94=80=E7=9A=84=E5=95=86=E5=93=81=E8=8C=83=E5=9B=B4=E6=9E=9A?=
=?UTF-8?q?=E4=B8=BE=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/constants.ts | 6 +++---
src/views/pay/app/components/channel/WeixinChannelForm.vue | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 76ce3e77..f4d67b4e 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -248,15 +248,15 @@ export const CouponTemplateTakeTypeEnum = {
*/
export const PromotionProductScopeEnum = {
ALL: {
- scope: 10,
+ scope: 1,
name: '通用劵'
},
SPU: {
- scope: 20,
+ scope: 2,
name: '商品劵'
},
CATEGORY: {
- scope: 30,
+ scope: 3,
name: '品类劵'
}
}
diff --git a/src/views/pay/app/components/channel/WeixinChannelForm.vue b/src/views/pay/app/components/channel/WeixinChannelForm.vue
index bafa4bfe..34e92c69 100644
--- a/src/views/pay/app/components/channel/WeixinChannelForm.vue
+++ b/src/views/pay/app/components/channel/WeixinChannelForm.vue
@@ -18,10 +18,10 @@
<template #append>%</template>
</el-input>
</el-form-item>
- <el-form-item label-width="180px" label="公众号 APPID" prop="config.appId">
+ <el-form-item label-width="180px" label="微信 APPID" prop="config.appId">
<el-input
v-model="formData.config.appId"
- placeholder="请输入公众号 APPID"
+ placeholder="请输入微信 APPID"
clearable
:style="{ width: '100%' }"
/>