From 39bc49029a3adc76a00a587c87349c05a814aead Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Wed, 12 Mar 2025 15:05:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=EF=BC=8C=E9=94=80=E5=94=AE=E7=BB=9F=E8=AE=A1=EF=BC=8C=E6=A1=8C?= =?UTF-8?q?=E5=8F=B0=E7=BB=9F=E8=AE=A1=E6=9B=B4=E6=96=B0=EF=BC=8C404?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E6=9B=B4=E6=96=B0=EF=BC=8C?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/account/shopMerchant.ts | 8 +- src/api/order/sale-summary.ts | 4 +- src/api/order/table-summary.ts | 3 +- src/assets/images/data/ali.png | Bin 0 -> 521 bytes src/assets/images/data/bscan.png | Bin 0 -> 389 bytes src/assets/images/data/cash.png | Bin 0 -> 495 bytes src/assets/images/data/scan.png | Bin 0 -> 548 bytes src/assets/images/data/vipIn.png | Bin 0 -> 502 bytes src/assets/images/data/wx.png | Bin 0 -> 490 bytes .../NavBar/components/UserProfile.vue | 2 +- src/views/data/index.vue | 70 ++++++++---- src/views/data/sales.vue | 107 +++++++++++------- src/views/data/table.vue | 72 ++++++------ src/views/error/404.vue | 4 +- .../shop/list/components/detailModal.vue | 28 +++-- 15 files changed, 178 insertions(+), 120 deletions(-) create mode 100644 src/assets/images/data/ali.png create mode 100644 src/assets/images/data/bscan.png create mode 100644 src/assets/images/data/cash.png create mode 100644 src/assets/images/data/scan.png create mode 100644 src/assets/images/data/vipIn.png create mode 100644 src/assets/images/data/wx.png diff --git a/src/api/account/shopMerchant.ts b/src/api/account/shopMerchant.ts index 25418b9..561e836 100644 --- a/src/api/account/shopMerchant.ts +++ b/src/api/account/shopMerchant.ts @@ -6,19 +6,17 @@ const API = { return request({ url: `${baseURL}`, method: "get", - headers: { + params: { shopId: shopId } }); }, edit(shopId: string | number, data: shopMerchantType) { + delete data.id return request({ url: `${baseURL}`, method: "put", - data: data, - headers: { - shopId: shopId - } + data: { ...data, shopId }, }); } } diff --git a/src/api/order/sale-summary.ts b/src/api/order/sale-summary.ts index f8a8600..72f386d 100644 --- a/src/api/order/sale-summary.ts +++ b/src/api/order/sale-summary.ts @@ -24,7 +24,9 @@ const Api = { return request({ url: `${baseURL}/export`, method: "get", - params + params, + responseType: 'blob' + }); }, }; diff --git a/src/api/order/table-summary.ts b/src/api/order/table-summary.ts index 35bbee7..bb0c044 100644 --- a/src/api/order/table-summary.ts +++ b/src/api/order/table-summary.ts @@ -16,7 +16,8 @@ const Api = { return request({ url: `${baseURL}/export`, method: "get", - params + params, + responseType: 'blob' }); }, }; diff --git a/src/assets/images/data/ali.png b/src/assets/images/data/ali.png new file mode 100644 index 0000000000000000000000000000000000000000..7763b5619d0a8c3106097310b160bb4fa9b08bca GIT binary patch literal 521 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQajKx9jP7LeL$-D$|RtNZmxB_Vh z2ZsbONJ~ot(is^UDJdz*$;m)APz1=x%*;$pO-)Zv2a-TGP!OmFA_8Opxj^+mS%?BS z7svntpfVr{lmhcWTx2#x0Yn5@C4>zj;f7dbRI>n`YgrQH7tFxIAs`|lEhDd>tfH>1 zZ(wY0ZSU;v?e8BR9iN<>o}FJ@UR~eZ-9LHy?D_K-uU@}-`|jQQ51)Sg_)Y)pMxY_b zJzX3_BqUi6@;V=MU|_hgefC2Cg(;q1A<34{m;L&`f6aG>Gk$lK86N!F!I?NWk1?Qb zEAxt5%a}yYS90z6W4WJg$LndV0%q;nrSp`gHTl1q)1c6hvg9L=bx*u0^a z*};Wt#@sZ9r-GBWys58eX>gtA5b;-!@mOXkL)HAZ0>6I8ayDE{ls;6whmqk-@hZlD ZjEgvg-bk!F%?b1pgQu&X%Q~loCIBYw$!q`s literal 0 HcmV?d00001 diff --git a/src/assets/images/data/bscan.png b/src/assets/images/data/bscan.png new file mode 100644 index 0000000000000000000000000000000000000000..898b99e199397a2eef66cd15fe93c3d02f717321 GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQajKx9jP7LeL$-D$|k^_7~T!FNM zgF^xsq@|?+>6DZdAeoVok(`{Io}QkXnhF#FvVjaB7YKmLfNUTMXG6F^5eR^A;ew~< zW<~?8Q78%W3ua*95D<}&QBY9PH*oOq@lQ_Aub;nt|MBzppTBQJEXwldeb3g!6w5w=dP~(Zoib(O8Mj?ewDM?8TH))?Y9)Nc@uR7h30tY z@g(Y8oRgp2qZJ@|*{GyriSlm!RS| l&f;s?5*lkSPwTgT%)DGt=ySAdcs$U(44$rjF6*2UngF>AmbU-^ literal 0 HcmV?d00001 diff --git a/src/assets/images/data/cash.png b/src/assets/images/data/cash.png new file mode 100644 index 0000000000000000000000000000000000000000..4b4d8449057a2728dcb03088f00016697a51e9de GIT binary patch literal 495 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQajKx9jP7LeL$-D$|mInBQxB_Vh z2Zw}&gsiMAAeoky1|(BbQZh0!fb8Vt^z`)9)YPP;B%lb80pUUv0J%U0P(4r( zC<|8rWFU*cxj^-BHnL)%I0OI%kpWN;$o($)=LgWCW+g#>!3-=MJOUyTG78En>iPyI z=Jw9+?%u)C$;s*2`T51=)%DHo-Tl*N&tJTJ_3HJTkDot({r>aU@3ps89R-@O&C|s( zL_(7FAg5E40|UbW$DS7p7M%$S3g=*q?ppKb|K(YX2B$xZFwDqrGi%v){~Tk5jU7Yz zVdDe0?HD)k9!TP6xUG7|PN7xgm*uKz3Fg=SJNRB4d^Y9Bs)G(y4c9B=`kxna`l|5< z9Q{$;RmdBv$RE)5!L~KPDRjox4fB`nzn{r~WM4aTZ9#tLNze0hP)Shj|v!Vzm5 zmasfXWq>ZrlJ-q$>gTtevfxgJjFD|cdZf@`HpFDl`;^oU%uiw0V_wN0N zj~_pM{_^w4BimO4%{u1k;us?Czk~aqq~p6@e7w7~sWFl(zGCZzS=Wv2eCKaUYMjor=z5dzn>`2D&h0uF zxZFZ*%IbeJ_igO?#JqC%mZYO!wN9&l%%1x_P+Yd1}J^6tPe4`Tp;O?-pykxDWIZgQu&X%Q~loCIIkr<*fh! literal 0 HcmV?d00001 diff --git a/src/assets/images/data/vipIn.png b/src/assets/images/data/vipIn.png new file mode 100644 index 0000000000000000000000000000000000000000..1854acc612144ca38405cc0162868ca05d0bd835 GIT binary patch literal 502 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQajKx9jP7LeL$-D$|76tf(xB_Vh z2Zw}&gsiMAAeo$;3?wr$GJp&qNKa4C%*;$nO9P6erltZ#Qc_ZYf#?aR6OuS`y?J%)r9IBOtG!prWI1Y;JAu z;qMo;%Tz5np>yoh^o?63dVXE6d5xe7Z4Gc;6r@=)5}PTZ~F3ioJz4Yr^#h}48*V$# zv$GOdCUaBhr^q&bhv~O?#9m7FVdQ&MBb@0JeI=%K!iX literal 0 HcmV?d00001 diff --git a/src/assets/images/data/wx.png b/src/assets/images/data/wx.png new file mode 100644 index 0000000000000000000000000000000000000000..7e409004c7869b750d53c73383dfd173dbb0398a GIT binary patch literal 490 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQajKx9jP7LeL$-D$|Rs{HjxB_Vh z2Zw}&gwW7XAeoky1|*Y{lYwMLMh1|PnVAU`OifJ%veVPkfefHXQc@C-4HQpFNdYQ@ zD1gYKaUsfp3gBvx84xy*L{WJcTZnrxt3ElPs?f*DvicmzZwGPMb-+ui1S7tiUj5VGv zjv*3~tOq%rnj9Dy4n%5gy&Ywva5+hwY0aArzy6<}#mKOh zhHs61J`Y}_4dkf?2^Xtzopr0F!C7`v3p{ literal 0 HcmV?d00001 diff --git a/src/layout/components/NavBar/components/UserProfile.vue b/src/layout/components/NavBar/components/UserProfile.vue index b17b40f..118d275 100644 --- a/src/layout/components/NavBar/components/UserProfile.vue +++ b/src/layout/components/NavBar/components/UserProfile.vue @@ -32,7 +32,7 @@ const router = useRouter(); * 打开个人中心页面 */ function handleOpenUserProfile() { - router.push({ name: "Profile" }); + router.push({ name: "shopConfig" }); } /** diff --git a/src/views/data/index.vue b/src/views/data/index.vue index 252b1b7..c99c4ba 100644 --- a/src/views/data/index.vue +++ b/src/views/data/index.vue @@ -67,8 +67,7 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" - :default-time="['00:00:00', '23:59:59']" - value-format="yyyy-MM-dd HH:mm:ss" + value-format="YYYY-MM-DD " v-if="timeValue == 'custom'" @change="summarytrade" > @@ -84,12 +83,40 @@ @@ -298,8 +325,8 @@ - - + +
@@ -405,7 +432,7 @@ export default { saleTableActive: "7", saleTable: [], saleTableLoading: false, - saleTablePage: 0, + saleTablePage: 1, saleTableTotal: 0, saleTableSize: 5, __resizeHandler: null, @@ -526,8 +553,8 @@ export default { try { this.tradeLoading = true; const res = await dataSummaryApi.trade({ - beginTime: this.query.createdAt[0], - endTime: this.query.createdAt[1], + beginDate: this.query.createdAt[0], + endDate: this.query.createdAt[1], }); this.trade = res; this.tradeLoading = false; @@ -868,23 +895,20 @@ export default { } }, paginationChange(e) { - this.saleTablePage = e - 1; + this.saleTablePage = e; this.dateProduct(); }, // 获取销售额排行表格数据 async dateProduct() { try { this.saleTableLoading = true; - const res = await dataSummaryApi.productSaleDate( - this.saleTableActive, - this.saleTablePage, - this.saleTableSize - ); - this.saleTable = res.productList.content; - this.saleTableTotal = res.productList.totalElements; - this.productCount = res.productCount.payAmount; - this.productSum = res.productSum.payAmount; - + const res = await dataSummaryApi.productSaleDate({ + day: this.saleTableActive, + page: this.saleTablePage, + size: this.saleTableSize, + }); + this.saleTable = res.records; + this.saleTableTotal = res.totalRow * 1; this.summaryDateGet(res.countList); setTimeout(() => { this.saleTableLoading = false; diff --git a/src/views/data/sales.vue b/src/views/data/sales.vue index a90584d..0f0020e 100644 --- a/src/views/data/sales.vue +++ b/src/views/data/sales.vue @@ -8,10 +8,10 @@