diff --git a/admin-web-master/src/api/piaowu.js b/admin-web-master/src/api/piaowu.js index 0f2d819..2d5cba0 100644 --- a/admin-web-master/src/api/piaowu.js +++ b/admin-web-master/src/api/piaowu.js @@ -3,7 +3,15 @@ import request from '@/utils/request' // 票务 export function QuestionGetAll(data) { return request({ - url: '/ticket/getSalesSituation', + url: '/youZan/getSalesSituation', + method: 'post', + data + }) +} +//票种销售数据统计 +export function getTicketType(data) { + return request({ + url: '/youZan/getTicketType', method: 'post', data }) diff --git a/admin-web-master/src/components/add/addinformation.vue b/admin-web-master/src/components/add/addinformation.vue index ec52a10..d904abe 100644 --- a/admin-web-master/src/components/add/addinformation.vue +++ b/admin-web-master/src/components/add/addinformation.vue @@ -60,6 +60,7 @@ + diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue index 5c47878..e748c5a 100644 --- a/admin-web-master/src/layout/index.vue +++ b/admin-web-master/src/layout/index.vue @@ -737,8 +737,8 @@ // const childrenResult = findMatchingValues(item1.children, item2.children); // result = result.concat(childrenResult); // } - }); - }); + }) + }) return result; }, diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 5fd5881..7627609 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -16,9 +16,7 @@ let hostall = window.location.href; let baseURL = '' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { - baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; - // baseURL = 'http://128.10.250.209:9003'; - + // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; // baseURL = 'http://128.10.249.47:9003'; @@ -69,7 +67,7 @@ service.interceptors.response.use( if (response.config.responseType === 'blob') { return response.data } - if (res.code !== '' && res.code != 200 && res.code != '40104') { + if (res.code !== '' && res.code != 200 && res.code != '40104' && res.code != '40103') { Message({ message: res.message || 'Error', type: 'error', diff --git a/admin-web-master/src/views/analysis/ranking/index.vue b/admin-web-master/src/views/analysis/ranking/index.vue index 9dcc26d..ebcab64 100644 --- a/admin-web-master/src/views/analysis/ranking/index.vue +++ b/admin-web-master/src/views/analysis/ranking/index.vue @@ -37,10 +37,12 @@
销售排名
- + + + 导出 @@ -51,21 +53,23 @@ :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" > - + + {{ (currentPage - 1) * pageSize + scope.$index + 1 }} + - + - - + + - - - - + + + +