yjc/erp
1
0
Fork 0
mirror of https://gitee.com/hzchunfen/erp.git synced 2025-12-01 06:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

!266 代码合并

Browse Source 
Merge pull request !266 from 杨耀威/yyw
This commit is contained in:
杨建炊 2024-12-10 01:11:59 +00:00 committed by Gitee
commit 52424dc3cd
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
9 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/dist/css/107.fd5b2517.css → public/dist/css/193.434fb0ab.css vendored
View File

@ -1 +1 @@
#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-41a7827f]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-41a7827f]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.searchBox .time[data-v-41a7827f]{margin-left:20px;color:#999;font-size:12px}.opaBox[data-v-41a7827f]{margin-bottom:15px}
#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-01d60a76]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-01d60a76]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.searchBox .time[data-v-01d60a76]{margin-left:20px;color:#999;font-size:12px}.opaBox[data-v-01d60a76]{margin-bottom:15px}

2
public/dist/index.html vendored
View File

@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><script defer="defer" src="js/chunk-vendors.04652b46.js"></script><script defer="defer" src="js/app.304aa352.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.7e37f273.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><script defer="defer" src="js/chunk-vendors.04652b46.js"></script><script defer="defer" src="js/app.30de8ae3.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.7e37f273.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

2
public/dist/js/107.defcb221.js vendored
View File

File diff suppressed because one or more lines are too long

1
public/dist/js/107.defcb221.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/193.99e24d2b.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
public/dist/js/193.99e24d2b.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/app.304aa352.js → public/dist/js/app.30de8ae3.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/app.304aa352.js.map → public/dist/js/app.30de8ae3.js.map vendored
View File

File diff suppressed because one or more lines are too long

12
resources/frontend/src/views/dataCenter/skuStatistics.vue
View File

@ -286,10 +286,16 @@ export default {
this.downloadLoading = true
let params = {
type: this.time_type == 'day' ? 1 : 2,
start_day: this.startTime,
end_day: this.endTime,
page: 1,
per_page: this.total
per_page: this.total,
sku_id: this.sku_id
}
if(params.type == 1) {
params.start_time = this.startTime
params.end_time = this.endTime
} else {
params.start_day = this.startTime
params.end_day = this.endTime
}
getSkuSalesCount(params).then((res) => {
if(!res.data.data.data.length) {