dev2 #1

Open
panjunjie wants to merge 174 commits from dev2 into main
2 changed files with 30 additions and 3 deletions
Showing only changes of commit cfa91ae8e5 - Show all commits

View File

@ -162,6 +162,19 @@
:style="{ width: '100%' }"
/>
</el-form-item>
<el-form-item
:label="__('平台配送费(单位/分)')"
label-width="200px"
prop="inner_min_delivery_fee"
>
<el-input
v-model="form.inner_min_delivery_fee"
clearable
:placeholder="__('平台配送费(单位/分)')"
:style="{ width: '100%' }"
/>
</el-form-item>
</el-form>
</div>
<div>
@ -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,

View File

@ -150,10 +150,10 @@ export default {
name: 'distributionMode',
data() {
return {
isCitySwitch: false,
isCitySwitch: true,
isVisitSwitch: false,
showDialog: false,
switchText: '关闭',
switchText: '开启',
visitSwitchText: '关闭',
form: {
cityText: '同城配送',