diff --git a/src/views/settings/config/operation/index.vue b/src/views/settings/config/operation/index.vue
index 5818296..8f8925e 100644
--- a/src/views/settings/config/operation/index.vue
+++ b/src/views/settings/config/operation/index.vue
@@ -162,6 +162,19 @@
:style="{ width: '100%' }"
/>
+
+
+
+
@@ -295,10 +308,11 @@
order_cutprice_time: null,
product_inventory_warning: null,
product_salenum_flag: null,
+ inner_min_delivery_fee:0,
},
promoteForm: {
plantform_poster_bg: null,
- product_poster_bg: null,
+ product_poster_bg: null,
},
rules: {
product_verify_flag: [
@@ -322,6 +336,18 @@
trigger: 'change',
},
],
+ inner_min_delivery_fee:[
+ {
+ require:true,
+ message:this.__('平台运费不能为空'),
+ trigger: 'blur',
+ },
+ {
+ type:'number',
+ min:0,
+ max:1000
+ }
+ ]
},
show_cancel_timeOptions: [
{
@@ -388,6 +414,7 @@
product_virtual_salenum: data.product_virtual_salenum
? data.product_virtual_salenum
: 0,
+ inner_min_delivery_fee:Number(data.inner_min_delivery_fee),
user_cutprice_num: data.user_cutprice_num,
order_cutprice_time: data.order_cutprice_time,
product_inventory_warning: data.product_inventory_warning,
diff --git a/src/views/store/base/distributionSetup/distributionMode.vue b/src/views/store/base/distributionSetup/distributionMode.vue
index f7b83b5..7f8b859 100644
--- a/src/views/store/base/distributionSetup/distributionMode.vue
+++ b/src/views/store/base/distributionSetup/distributionMode.vue
@@ -150,10 +150,10 @@ export default {
name: 'distributionMode',
data() {
return {
- isCitySwitch: false,
+ isCitySwitch: true,
isVisitSwitch: false,
showDialog: false,
- switchText: '关闭',
+ switchText: '开启',
visitSwitchText: '关闭',
form: {
cityText: '同城配送',