Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

This commit is contained in:
Chopper711
2023-11-30 18:50:01 +08:00
10 changed files with 26 additions and 18 deletions

View File

@@ -114,14 +114,14 @@
<InputNumber v-model="formAdd.sortOrder"></InputNumber>
</FormItem>
<FormItem label="佣金比例(%)" prop="commissionRate" style="width: 345px">
<InputNumber v-model="formAdd.commissionRate"></InputNumber>
<InputNumber :max="100" :min="0" v-model="formAdd.commissionRate"></InputNumber>
</FormItem>
<FormItem label="是否启用" prop="deleteFlag">
<i-switch
size="large"
v-model="formAdd.deleteFlag"
:true-value="0"
:false-value="1"
:true-value="false"
:false-value="true"
>
<span slot="open">启用</span>
<span slot="close">禁用</span>

View File

@@ -64,12 +64,12 @@ export default {
value: "YESTERDAY",
},
{
title: "最近7天",
title: "过去7天",
selected: true,
value: "LAST_SEVEN",
},
{
title: "最近30天",
title: "过去30天",
selected: false,
value: "LAST_THIRTY",
},

View File

@@ -454,12 +454,12 @@ export default {
value: "YESTERDAY",
},
{
title: "最近7天",
title: "过去7天",
selected: true,
value: "LAST_SEVEN",
},
{
title: "最近30天",
title: "过去30天",
selected: false,
value: "LAST_THIRTY",
},

View File

@@ -76,12 +76,12 @@ export default {
value: "YESTERDAY",
},
{
title: "最近7天",
title: "过去7天",
selected: true,
value: "LAST_SEVEN",
},
{
title: "最近30天",
title: "过去30天",
selected: false,
value: "LAST_THIRTY",
},