diff --git a/src/components/Select/SelectMch.vue b/src/components/Select/SelectMch.vue index f935a38..bed8d9a 100644 --- a/src/components/Select/SelectMch.vue +++ b/src/components/Select/SelectMch.vue @@ -7,6 +7,7 @@ remote-show-suffix filterable remote + :disabled="props.disabled" :remote-method="remoteSearch" :loading="state.loading" @visible-change="(e: boolean) => e && getOptions()" @@ -34,10 +35,12 @@ const props = withDefaults( defineProps<{ placeholder?: string apiParams?: any + disabled?: boolean }>(), { placeholder: "请选择", apiParams: {}, + disabled: false, }, ) diff --git a/src/components/Select/SelectMchRule.vue b/src/components/Select/SelectMchRule.vue index d09b853..db21d9d 100644 --- a/src/components/Select/SelectMchRule.vue +++ b/src/components/Select/SelectMchRule.vue @@ -11,7 +11,7 @@ :loading="state.loading" @visible-change="(e: boolean) => e && getOptions()" > - +
diff --git a/src/views/mch/mch-manage/mch-rule-config-form.vue b/src/views/mch/mch-manage/mch-rule-config-form.vue index 260436b..0fc2896 100644 --- a/src/views/mch/mch-manage/mch-rule-config-form.vue +++ b/src/views/mch/mch-manage/mch-rule-config-form.vue @@ -9,7 +9,7 @@ - + @@ -19,10 +19,13 @@ - 老县府 + {{ form.sourceMchName ? form.sourceMchName : "???" }} 到 - 新县府 - 消费 + {{ form.targetMchName ? form.targetMchName : "???" }} + 消费,超过 + {{ form.basePrice ? displayPrice(form.basePrice) : "???" }} + 额外支付 + {{ form.multiple ? form.multiple : "???" }}% @@ -37,10 +40,10 @@ diff --git a/src/views/mch/mch-manage/setting.vue b/src/views/mch/mch-manage/setting.vue index 31571cc..67ba755 100644 --- a/src/views/mch/mch-manage/setting.vue +++ b/src/views/mch/mch-manage/setting.vue @@ -1,5 +1,5 @@