Compare commits
No commits in common. "c46a2a03900e2d8dbea909fffd6a36ea3209b242" and "d0b115e0c0aefbea981b0048c1bb368e537bcb7e" have entirely different histories.
c46a2a0390
...
d0b115e0c0
@ -44,7 +44,7 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item :label="__('砍价商品')" prop="product_item_name">
|
||||
<el-form-item :label="__('砍价商品')" prop="product_item_name">
|
||||
<el-input
|
||||
v-model="form.product_item_name"
|
||||
clearable
|
||||
@ -53,23 +53,6 @@
|
||||
@focus="showItemTable"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<div class="grid-content bg-purple">
|
||||
<el-form-item :label="__('砍价有效期')" prop="cut_hour">
|
||||
<el-input v-model="form.cut_hour" placeholder="请输入有效期（小时）" clearable />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<div class="grid-content bg-purple"></div>
|
||||
<el-form-item :label="__('活动商品总数')" prop="product_count">
|
||||
<el-input v-model="form.product_count" placeholder="请输入参与活动商品总数" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
||||
<el-form-item :label="__('砍价底价')" prop="cut_down_min_limit_price">
|
||||
<el-input
|
||||
v-model="form.cut_down_min_limit_price"
|
||||
@ -140,8 +123,6 @@
|
||||
activity_type_id: 1124,
|
||||
activity_starttime: '',
|
||||
activity_endtime: '',
|
||||
cut_hour:'',
|
||||
product_count:''
|
||||
},
|
||||
title: '',
|
||||
dialogFormVisible: false,
|
||||
@ -190,12 +171,6 @@
|
||||
message: this.__('活动结束时间'),
|
||||
},
|
||||
],
|
||||
cut_hour: [
|
||||
{ required: true, trigger: 'blur', message: this.__(' 砍价有效期') },
|
||||
],
|
||||
product_count: [
|
||||
{ required: true, trigger: 'blur', message: this.__('参与活动商品总数') },
|
||||
],
|
||||
},
|
||||
}
|
||||
},
|
||||
@ -237,8 +212,6 @@
|
||||
row.activity_rule.cut_down_min_limit_price,
|
||||
cut_down_type: row.activity_rule.cut_down_type,
|
||||
cut_down_user_num: row.activity_rule.cut_down_user_num,
|
||||
cut_hour:row.activity_rule.cut_hour,
|
||||
product_count:row.activity_rule.product_count
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -94,41 +94,19 @@
|
||||
label-width="150px"
|
||||
prop="store_biz_state"
|
||||
>
|
||||
<el-select
|
||||
<el-switch
|
||||
v-model="storeForm.store_biz_state"
|
||||
clearable
|
||||
filterable
|
||||
active-color="#13ce66"
|
||||
:active-value="1"
|
||||
:inactive-value="2"
|
||||
inactive-color="#ff4949"
|
||||
active-text="营业中"
|
||||
@change="handleStoreStatus"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in store_biz_state_option"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
inactive-text="已打烊"
|
||||
></el-switch>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12" v-if="storeForm.store_biz_state == 3">
|
||||
<div class="grid-content bg-purple">
|
||||
<el-form-item
|
||||
label="开业时间"
|
||||
label-width="150px"
|
||||
prop="store_biz_opening_date"
|
||||
>
|
||||
<el-date-picker
|
||||
v-model="storeForm.store_biz_opening_date"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
:placeholder="__('选择日期')"
|
||||
:picker-options="endTimeOptions"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
@ -525,23 +503,6 @@
|
||||
},
|
||||
test: 666,
|
||||
treeData: [],
|
||||
store_biz_state_option:[
|
||||
{
|
||||
index:1,
|
||||
value:1,
|
||||
label:'营业中',
|
||||
},
|
||||
{
|
||||
index:1,
|
||||
value:2,
|
||||
label:'已打烊',
|
||||
},
|
||||
{
|
||||
index:1,
|
||||
value:3,
|
||||
label:'开业筹备中',
|
||||
},
|
||||
],
|
||||
activeName: 'first',
|
||||
optionslist: [
|
||||
{
|
||||
@ -557,17 +518,6 @@
|
||||
label: this.__('免费送货'),
|
||||
},
|
||||
],
|
||||
tomorrow() {
|
||||
const d = new Date();
|
||||
d.setDate(d.getDate() + 1);
|
||||
d.setHours(0, 0, 0, 0);
|
||||
return d.getTime();
|
||||
},
|
||||
endTimeOptions: {
|
||||
disabledDate: time => {
|
||||
return time.getTime() < this.tomorrow();
|
||||
}
|
||||
},
|
||||
value: '',
|
||||
options: {
|
||||
theme: 'snow',
|
||||
@ -643,7 +593,6 @@
|
||||
store_o2o_tags: [],
|
||||
store_district_id: '',
|
||||
packing_fee: 0,
|
||||
store_biz_opening_date:'',
|
||||
},
|
||||
queryArea: {
|
||||
province: { code: '', name: '' },
|
||||
@ -687,7 +636,6 @@
|
||||
company_description: form.company_description,
|
||||
store_biz_state: form.store_biz_state,
|
||||
packing_fee: form.packing_fee,
|
||||
store_biz_opening_date: form.store_biz_opening_date
|
||||
}
|
||||
|
||||
if (this.queryArea.province.name) {
|
||||
@ -803,7 +751,6 @@
|
||||
store_biz_state: data.store_biz_state,
|
||||
packing_fee: data.packing_fee,
|
||||
ringtone_is_enable: data.ringtone_is_enable,
|
||||
store_biz_opening_date: data.store_biz_opening_date || '',
|
||||
}
|
||||
|
||||
this.srcList.push(data.wx_qrcode)
|
||||
@ -827,14 +774,6 @@
|
||||
this.initQueryArea(store_district_id, store_area)
|
||||
this.form.store_o2o_flag = data.store_o2o_flag
|
||||
},
|
||||
disabledPastDates(time) {
|
||||
// 获取今天的凌晨 00:00:00 时间戳
|
||||
const today = new Date();
|
||||
today.setHours(0, 0, 0, 0);
|
||||
|
||||
// 时间戳对比：如果选择的日期 <= 今天凌晨，则禁用（返回 true 表示禁用）
|
||||
return time.getTime() <= today.getTime();
|
||||
},
|
||||
initQueryArea(store_district_id, store_area) {
|
||||
if (!store_district_id && store_area) return
|
||||
if (store_district_id[0]) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user