diff --git a/src/views/home/index.vue b/src/views/home/index.vue index fc2abac..b88ea81 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -164,22 +164,22 @@ const condition1 = ref([]); watch(condition1, (value) => { store.dispatch('home/loadChartData1', { - beginDateTime: value[0].split(' ')[0], - endDateTime: value[1].split(' ')[0], + beginDate: value[0].split(' ')[0], + endDate: value[1].split(' ')[0], }); }); const condition2 = ref([]); watch(condition2, (value) => { store.dispatch('home/loadChartData2', { - beginDateTime: value[0].split(' ')[0], - endDateTime: value[1].split(' ')[0], + beginDate: value[0].split(' ')[0], + endDate: value[1].split(' ')[0], }); }); const condition3 = ref([]); watch(condition3, (value) => { store.dispatch('home/loadChartData3', { - beginDateTime: value[0].split(' ')[0], - endDateTime: value[1].split(' ')[0], + beginDate: value[0].split(' ')[0], + endDate: value[1].split(' ')[0], }); }); const handleValue = (item) => { diff --git a/src/views/operation/advertise/form.vue b/src/views/operation/advertise/form.vue index e6580fd..e7db630 100644 --- a/src/views/operation/advertise/form.vue +++ b/src/views/operation/advertise/form.vue @@ -147,7 +147,9 @@ watch( () => form.jumpType, () => { - form.jumpUrl = null; + if (!unref(loading)) { + form.jumpUrl = null; + } }, { immediate: true } ); @@ -161,7 +163,9 @@ res.dateRange = [res.advertisementStartTime, res.advertisementEndTime]; Object.assign(form, res); } - loading.value = false; + nextTick(() => { + loading.value = false; + }); } }; onActivated(handleLoad); @@ -191,18 +195,6 @@ isEnable: false, }); } else { - Object.assign(form, { - id: null, - platform: 1, - location: 1, - productCategoryId: null, - name: null, - dateRange: [], - pictureUrl: null, - jumpType: 1, - jumpUrl: null, - isEnable: false, - }); store.commit('layout/closeTab', { current: true }); handleClose(); } @@ -221,6 +213,18 @@ } }; const handleClose = () => { + Object.assign(form, { + id: null, + platform: 1, + location: 1, + productCategoryId: null, + name: null, + dateRange: [], + pictureUrl: null, + jumpType: 1, + jumpUrl: null, + isEnable: false, + }); router.push({ name: 'AdvertiseManagement' }); }; diff --git a/src/views/operation/advertise/index.vue b/src/views/operation/advertise/index.vue index 3cdc593..e588dc4 100644 --- a/src/views/operation/advertise/index.vue +++ b/src/views/operation/advertise/index.vue @@ -5,7 +5,7 @@ :code="code" :config="config" :data="list" - :operation="['create', 'search']" + :operation="['create', 'search', 'remove']" :reset="handleReset" title="广告" :total="total" @@ -107,6 +107,10 @@ const config = reactive({ // 表格列配置 columns: [ + { + type: 'selection', + width: 60, + }, { label: 'ID', prop: 'id', diff --git a/src/views/sales/product/picker.vue b/src/views/sales/product/picker.vue index 83262b2..1a8f640 100644 --- a/src/views/sales/product/picker.vue +++ b/src/views/sales/product/picker.vue @@ -115,6 +115,9 @@ /* 列表配置 */ const config = reactive({ + table: { + height: '500px', + }, columns: [ { label: '编号',