diff --git a/admin-web-master/canvas-container/assets/font_icon/demo_index.html b/admin-web-master/canvas-container/assets/font_icon/demo_index.html index d39aeb4..5f6f227 100644 --- a/admin-web-master/canvas-container/assets/font_icon/demo_index.html +++ b/admin-web-master/canvas-container/assets/font_icon/demo_index.html @@ -3,8 +3,8 @@ iconfont Demo - - + diff --git a/admin-web-master/public/favicon.svg b/admin-web-master/public/favicon.svg new file mode 100644 index 0000000..b558a50 --- /dev/null +++ b/admin-web-master/public/favicon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/admin-web-master/public/index.html b/admin-web-master/public/index.html index f21349d..0e28f46 100644 --- a/admin-web-master/public/index.html +++ b/admin-web-master/public/index.html @@ -4,7 +4,7 @@ - + 招商服务系统 diff --git a/admin-web-master/src/api/salesReport.js b/admin-web-master/src/api/salesReport.js new file mode 100644 index 0000000..d26a48e --- /dev/null +++ b/admin-web-master/src/api/salesReport.js @@ -0,0 +1,19 @@ + +import request from '@/utils/request' +// 销售上报新增 +export function cereSalesAdd(data) { + return request({ + url: '/cereSalesReporting/add', + method: 'post', + data + }) +} +// 销售上报查询 +export function cereSalesPage(data) { + return request({ + url: '/cereSalesReporting/queryByPage', + method: 'post', + data + }) +} + diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 299b70b..9df6d21 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -16,10 +16,10 @@ 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 = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - // baseURL = 'http://128.10.249.26:9003'; + baseURL = 'http://128.10.249.46:9003'; } else { console.error('---------------------') diff --git a/admin-web-master/src/views/promotion/audit.vue b/admin-web-master/src/views/promotion/audit.vue index 793b965..5cacbc0 100644 --- a/admin-web-master/src/views/promotion/audit.vue +++ b/admin-web-master/src/views/promotion/audit.vue @@ -40,7 +40,7 @@ - + @@ -84,11 +84,11 @@
- +
{{secondData.schemeTitle}}
 - +
diff --git a/admin-web-master/src/views/serve/salesReport.vue b/admin-web-master/src/views/serve/salesReport.vue index f2eac6e..40639a6 100644 --- a/admin-web-master/src/views/serve/salesReport.vue +++ b/admin-web-master/src/views/serve/salesReport.vue @@ -15,33 +15,21 @@ label-position="left" > - + + v-model="pageIndex.brand"> - - - - - - - - + + v-model="pageIndex.productName"> @@ -60,20 +48,12 @@
-
- - - - - - - - - - + + + + + + +
+
共{{total}}条