diff --git a/admin/src/components/SelectBiz/index.vue b/admin/src/components/SelectBiz/index.vue index c59df69..5142072 100644 --- a/admin/src/components/SelectBiz/index.vue +++ b/admin/src/components/SelectBiz/index.vue @@ -16,6 +16,18 @@ :toolkit="[]" layout="total, prev, pager, next, jumper" > + + + + + + + 移除所有 @@ -43,9 +55,10 @@ + diff --git a/pingan/src/views/car/product/detail.vue b/pingan/src/views/car/product/detail.vue index 9b955e1..f98a1e7 100644 --- a/pingan/src/views/car/product/detail.vue +++ b/pingan/src/views/car/product/detail.vue @@ -16,7 +16,23 @@ 产品标签: - + + {{ item.dictDataName }} + + + {{ item.dictDataName }} + + 优惠 - 优惠信息1: + {{ product.discounts }} - 优惠信息2: + {{ product.discounts2 }} - 优惠信息3: + {{ product.discounts3 }} @@ -107,17 +120,25 @@ labels: [] }, crowdProfiling: [], - labels: [], // 预定义的 CSS 类数组 - availableClasses: ['', 'success', 'info', 'warning', 'danger'] + availableClasses: ['', 'success', 'info', 'warning', 'danger'], + priceRange: [], + productLevel: [], + carProductLabel: [] }; }, created() { listDictionaryData({ dictCode: 'crowdProfiling' }).then((data) => { this.crowdProfiling = data; }); + listDictionaryData({ dictCode: 'priceRange' }).then((data) => { + this.priceRange = data; + }); + listDictionaryData({ dictCode: 'productLevel' }).then((data) => { + this.productLevel = data; + }); listDictionaryData({ dictCode: 'carProductLabel' }).then((data) => { - this.labels = data; + this.carProductLabel = data; }); }, methods: { diff --git a/pingan/src/views/car/product/index.vue b/pingan/src/views/car/product/index.vue index 32a2477..012f792 100644 --- a/pingan/src/views/car/product/index.vue +++ b/pingan/src/views/car/product/index.vue @@ -41,11 +41,10 @@ :columns="columns" :datasource="datasource" :selection.sync="selection" - cache-key="syliveActivityTable" + cache-key="pingProductTable" > - + + {{ row.cityName[0] }} + + 查看所有 + + {{ row.timeStart.split(' ')[0] }}~ {{ row.timeEnd.split(' ')[0] }} @@ -86,9 +97,14 @@ > 海报 + + 电子券 + + @@ -128,6 +144,20 @@ title="产品预览" :iframe-src="current.preview" /> + + + + {{ item }} + + + @@ -163,16 +193,8 @@ prop: 'cityName', label: '推广范围', showOverflowTooltip: true, - minWidth: 80 - }, - { - prop: 'status', - label: '上架状态', - align: 'center', - width: 80, - resizable: false, - slot: 'status', - showOverflowTooltip: true + minWidth: 80, + slot: 'cityName' }, { prop: 'timeBetween', @@ -212,7 +234,9 @@ showPromotion: false, componentKey: '', dialogVisible: false, - showPoster: false + showPoster: false, + showCityName: false, + cityNames: [] }; }, created() {}, @@ -261,6 +285,19 @@ showPre(row) { this.current = row; this.dialogVisible = true; + }, + showCoupon(row) { + const path = '/car/product/coupon'; + this.$nextTick(() => { + this.$router.push({ + path, + query: row ? { id: row.id, title: row.title } : undefined + }); + }); + }, + showAllCityName(row) { + this.showCityName = true; + this.cityNames = row.cityName; } } };