diff --git a/src/views/data/index.vue b/src/views/data/index.vue index ea9dbaf..4b64a57 100644 --- a/src/views/data/index.vue +++ b/src/views/data/index.vue @@ -688,6 +688,7 @@ export default { async geiShopList() { let res = await ShopApi.getBranchList() this.branchList = res; + this.shopId = res[0].shopId }, shopChange() { this.summarytrade(); @@ -714,7 +715,7 @@ export default { beginDate: this.query.createdAt[0], endDate: this.query.createdAt[1], rangeType: this.timeValue, - shopId: this.shopInfo.id + shopId: this.shopId }); this.trade = res; this.tradeSale = res.sale; @@ -1277,7 +1278,7 @@ export default { this.saleTableLoading = true; const res = await dataSummaryApi.productSaleDate({ day: this.saleTableActive, - shopId: this.shopInfo.id, + shopId: this.shopId, }); this.saleTable = res; this.saleTableTotal = res.length; @@ -1293,7 +1294,7 @@ export default { async datePayType() { try { this.payChartLoading = true; - const res = await dataSummaryApi.datePayType({ day: this.saleActive, shopId: this.shopInfo.id }); + const res = await dataSummaryApi.datePayType({ day: this.saleActive, shopId: this.shopId }); const data = res.map((item) => { return { value: item.count, diff --git a/src/views/data/sales.vue b/src/views/data/sales.vue index 54c950e..8dd6991 100644 --- a/src/views/data/sales.vue +++ b/src/views/data/sales.vue @@ -16,11 +16,11 @@ - + @@ -250,6 +250,7 @@ export default { async geiShopList() { let res = await ShopApi.getBranchList() this.branchList = res; + this.shopId = res[0].shopId }, totalfilter(item, d) { let num = item + d; @@ -280,9 +281,9 @@ export default { beginDate: this.query.createdAt[0], endDate: this.query.createdAt[1], rangeType: this.timeValue, - prodCategoryId: this.query.prodCategoryId, + categoryId: this.query.prodCategoryId, productName: this.query.productName, - shopId: this.shopInfo.id, + shopId: this.shopId, type: this.orderType, }); this.payCount = res; @@ -300,7 +301,7 @@ export default { const file = await saleSummaryApi.export({ beginDate: this.query.createdAt[0], endDate: this.query.createdAt[1], - prodCategoryId: this.query.prodCategoryId, + categoryId: this.query.prodCategoryId, productName: this.query.productName, shopId: this.shopId }); @@ -343,8 +344,8 @@ export default { endDate: this.query.createdAt[1], rangeType: this.timeValue, productName: this.query.productName, - prodCategoryId: this.query.prodCategoryId, - shopId: this.shopInfo.id, + categoryId: this.query.prodCategoryId, + shopId: this.shopId, }); this.tableData.totalList = _.chunk(res, this.tableData.size); this.tableData.data = this.tableData.totalList[this.tableData.page - 1] || []; diff --git a/src/views/data/table.vue b/src/views/data/table.vue index 7137add..a360083 100644 --- a/src/views/data/table.vue +++ b/src/views/data/table.vue @@ -153,6 +153,7 @@ export default { async geiShopList() { let res = await ShopApi.getBranchList() this.branchList = res; + this.shopId = res[0].shopId }, //携带table id跳转到订单列表页面 toTableOrderList(data) { @@ -214,7 +215,7 @@ export default { rangeType: this.timeValue, beginDate: this.query.createdAt[0], endDate: this.query.createdAt[1], - shopId: this.shopInfo.id + shopId: this.shopId }); this.tableData.loading = false; this.tableData.totalList = _.chunk(res, this.tableData.size); diff --git a/src/views/online-shop/index.vue b/src/views/online-shop/index.vue index 6141806..9df282a 100644 --- a/src/views/online-shop/index.vue +++ b/src/views/online-shop/index.vue @@ -10,7 +10,8 @@
- + + @@ -155,7 +156,8 @@
- + + @@ -192,7 +194,7 @@
+ v-if="selectItem.autoKey == 'index_bg' || selectItem.autoKey == 'shopinfo_bg'">
确认修改