diff --git a/fuintAdmin/src/api/EventMarketing/activeConsumption.js b/fuintAdmin/src/api/EventMarketing/activeConsumption.js index 5bd2999ea..604a7cd39 100644 --- a/fuintAdmin/src/api/EventMarketing/activeConsumption.js +++ b/fuintAdmin/src/api/EventMarketing/activeConsumption.js @@ -1,5 +1,23 @@ import request from '@/utils/request' +// 油品大类 +export function getoiltype() { + return request({ + url: 'system/dict/data/type/oil_type', + method: 'get', + + }) +} +export function getoilName(query) { + return request({ + url: 'business/petrolStationManagement/oilNumber/getOilName', + method: 'get', + params: query + }) +} + + + // 查询消费有礼活动列表 export function listActiveConsumption(query) { return request({ diff --git a/fuintAdmin/src/api/EventMarketing/activeDiscount.js b/fuintAdmin/src/api/EventMarketing/activeDiscount.js index 46f4a73a8..27b3ad4ab 100644 --- a/fuintAdmin/src/api/EventMarketing/activeDiscount.js +++ b/fuintAdmin/src/api/EventMarketing/activeDiscount.js @@ -1,5 +1,6 @@ import request from '@/utils/request' + // 查询折扣营销列表 export function listActiveDiscount(query) { return request({ @@ -8,6 +9,14 @@ export function listActiveDiscount(query) { params: query }) } +export function getoilName(query) { + return request({ + url: 'business/petrolStationManagement/oilNumber/getOilName', + method: 'get', + params: query + }) +} + // 查询折扣营销详细 export function getActiveDiscount(id) { diff --git a/fuintAdmin/src/api/EventMarketing/activeFullminus.js b/fuintAdmin/src/api/EventMarketing/activeFullminus.js index f124737ec..5e89a03ef 100644 --- a/fuintAdmin/src/api/EventMarketing/activeFullminus.js +++ b/fuintAdmin/src/api/EventMarketing/activeFullminus.js @@ -8,6 +8,13 @@ export function listActiveFullminus(query) { params: query }) } +export function getoilName(query) { + return request({ + url: 'business/petrolStationManagement/oilNumber/getOilName', + method: 'get', + params: query + }) +} // 查询满减营销详细 export function getActiveFullminus(id) { diff --git a/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js b/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js index 541e61e7d..b70a05947 100644 --- a/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js +++ b/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js @@ -8,6 +8,13 @@ export function listActiveNewlyweds(query) { params: query }) } +export function getoilName(query) { + return request({ + url: 'business/petrolStationManagement/oilNumber/getOilName', + method: 'get', + params: query + }) +} // 查询新人有礼活动详细 export function getActiveNewlyweds(id) { diff --git a/fuintAdmin/src/api/EventMarketing/activeRecommend.js b/fuintAdmin/src/api/EventMarketing/activeRecommend.js index 9f6447558..a8bee6817 100644 --- a/fuintAdmin/src/api/EventMarketing/activeRecommend.js +++ b/fuintAdmin/src/api/EventMarketing/activeRecommend.js @@ -31,6 +31,13 @@ export function getActiveRecommend(id) { method: 'get' }) } +export function getoilName(query) { + return request({ + url: 'business/petrolStationManagement/oilNumber/getOilName', + method: 'get', + params: query + }) +} // 新增推荐有礼 export function addActiveRecommend(data) { diff --git a/fuintAdmin/src/components/Fuint/Doc/index.vue b/fuintAdmin/src/components/Fuint/Doc/index.vue index 806a275fa..aa0342a62 100644 --- a/fuintAdmin/src/components/Fuint/Doc/index.vue +++ b/fuintAdmin/src/components/Fuint/Doc/index.vue @@ -1,6 +1,7 @@ @@ -9,7 +10,9 @@ export default { name: 'FuintDoc', data() { return { - url: 'https://www.fuint.cn/docs/index/' + // url: 'https://www.fuint.cn/docs/index/' + url: 'http://192.168.0.181:82/#/homeindex?id=0' + } }, methods: { diff --git a/fuintAdmin/src/components/ScreenData/index.vue b/fuintAdmin/src/components/ScreenData/index.vue index 33105e918..2051d518a 100644 --- a/fuintAdmin/src/components/ScreenData/index.vue +++ b/fuintAdmin/src/components/ScreenData/index.vue @@ -12,7 +12,7 @@ }, methods:{ goToWebsite() { - window.open('http://admin.sgkjsc.cn/#/') + window.open('https://www.wanjunshijie.com/demo/shujudaping/zhihuizhaoming/vue3/#/home') this.toggleFullscreen() }, toggleFullscreen() { diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index 8a8da070b..48e1b26ee 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -44,7 +44,7 @@ - + @@ -59,22 +59,11 @@ 等级会员 - + - - - - - - -