diff --git a/src/api/order/orderInfo.js b/src/api/order/orderInfo.js index fe07c14..40e1784 100644 --- a/src/api/order/orderInfo.js +++ b/src/api/order/orderInfo.js @@ -92,6 +92,13 @@ export default { data: time }) }, + getProductOverview() { + // 获取商品统计信息 + return request({ + url: `/${service_name}/mallProductInfo/getProductOverview`, + method: 'get' + }) + }, exportExcel(page) { // 导出 return request({ diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue index 8fe7248..bf928d4 100644 --- a/src/components/Upload/index.vue +++ b/src/components/Upload/index.vue @@ -89,10 +89,10 @@ export default { } }, beforeAvatarUpload(file) { - const isLt2M = file.size / 1024 < 50 + const isLt2M = file.size / 1024 < 500 if (!isLt2M) { - this.$message.error('图片大小不能超过50KB! 请重新上传!') + this.$message.error('图片大小不能超过500KB! 请重新上传!') } return isLt2M } diff --git a/src/views/dashboard/admin/index.vue b/src/views/dashboard/admin/index.vue index 7ac3f3f..f35bd4e 100644 --- a/src/views/dashboard/admin/index.vue +++ b/src/views/dashboard/admin/index.vue @@ -45,23 +45,9 @@ 商品总览
-
-
100
-
已下架
-
-
-
100
-
已下架
-
- -
-
100
-
已下架
-
- -
-
100
-
已下架
+
+
{{ item.currentNum }}
+
{{ item.productStatus }}
@@ -230,7 +216,8 @@ export default { } } ] - } + }, + productList: [] } }, created() { @@ -244,6 +231,7 @@ export default { this.getMainDataOne() this.getMainDataTwo(sevenDaysAgo, DaysAgo) + this.getProductOverview() }, methods: { // 表格搜索 @@ -284,6 +272,13 @@ export default { } }) }, + async getProductOverview() { + await orderInfoApi.getProductOverview().then(res => { + if ((res.code = 20000)) { + this.productList = res.data + } + }) + }, timeBefore(date) { if (!date) { date = new Date() diff --git a/src/views/marketing/advertisement/advertisementAdd.vue b/src/views/marketing/advertisement/advertisementAdd.vue index 536ae06..4a23d24 100644 --- a/src/views/marketing/advertisement/advertisementAdd.vue +++ b/src/views/marketing/advertisement/advertisementAdd.vue @@ -37,7 +37,7 @@
- +
diff --git a/vue.config.js b/vue.config.js index 5ecc24f..d6d7129 100644 --- a/vue.config.js +++ b/vue.config.js @@ -25,8 +25,8 @@ module.exports = { proxy: { [process.env.VUE_APP_BASE_API]: { // target: `cls`, - // target: `http://192.168.0.6:38080`, - target: `http://192.168.0.24:38080`, + target: `http://192.168.0.254:38080`, + // target: `http://192.168.0.24:38080`, // target: `http://192.168.1.83:38080`, // target: 'http://222.132.26.119:8081', // target: `https://www.xingoil.com/adminapi`,