From cc97b6acca528d73f8a10cc86a6f37c471312ba7 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Mon, 10 Mar 2025 17:26:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/product.js | 22 ++-
api/summary.js | 14 ++
commons/utils/goodsUtil.js | 9 +-
commons/utils/websocket.js | 1 +
pageCoupon/components/select-goods.vue | 8 +-
pageCreditBuyer/index.vue | 7 +-
pageCreditBuyer/rePaymentRecord.vue | 2 +-
.../edit-group-goods/edit-group-goods.vue | 4 +-
pageProduct/add-Product/add-Product.vue | 7 +-
.../add-Product/components/choose-goods.vue | 6 +-
pageProduct/index/components/goods.vue | 2 +-
pageProduct/index/index.vue | 4 +-
pageSalesSummary/index.vue | 172 +++++++-----------
pageSalesSummary/productSalesRanking.vue | 42 +----
pages/index/components/statistics.vue | 19 +-
pages/index/index.vue | 82 ++++-----
.../confirm-order/components/discount.vue | 2 +-
.../confirm-order/confirm-order.vue | 9 +-
.../index/components/list-goods-item.vue | 4 +-
pagesCreateOrder/index/index.vue | 113 +++++-------
pagesOrder/detail/components/list.vue | 8 +-
pagesOrder/detail/detail.vue | 1 -
pagesOrder/index/compoents/order-item.vue | 4 +-
pagesOrder/index/index.vue | 9 +-
pagesOrder/pay-order/pay-order.vue | 5 +-
pagesOrder/tuikuan/tuikuan.vue | 7 +-
26 files changed, 258 insertions(+), 305 deletions(-)
diff --git a/api/product.js b/api/product.js
index 8fc85c2..372a92b 100644
--- a/api/product.js
+++ b/api/product.js
@@ -2,10 +2,10 @@ import http from '@/http/http.js'
const request = http.request
// 商品----------------------------------------------------------------------------------------------------
/**
- * 获取商品列表
+ * 获取商品分页
* @returns
*/
-export function getProductList(data, urlType = 'product' ,showLoading) {
+export function getProductPage(data, urlType = 'product' ,showLoading) {
return request({
url: `${urlType}/admin/product/page`,
method: "GET",
@@ -16,6 +16,22 @@ export function getProductList(data, urlType = 'product' ,showLoading) {
})
}
+/**
+ * 获取商品列表
+ * @returns
+ */
+export function getProductList(data, urlType = 'product' ,showLoading) {
+ return request({
+ url: `${urlType}/admin/product/list`,
+ method: "GET",
+ data: {
+ ...data
+ },
+ showLoading
+ })
+}
+
+
/**
* 获取商品详情
* @returns
@@ -59,7 +75,7 @@ export function delProduct(id, urlType = 'product') {
*/
export function productOnOff (data, urlType = 'product') {
return request({
- url: `${urlType}/admin/product/on-off`,
+ url: `${urlType}/admin/product/onOff`,
method: "POST",
data: {
...data
diff --git a/api/summary.js b/api/summary.js
index c849489..b530d1c 100644
--- a/api/summary.js
+++ b/api/summary.js
@@ -1,6 +1,20 @@
import http from '@/http/http.js'
const request = http.request
+/**
+ * 营业板块
+ * @returns
+ */
+export function getTrade(data, urlType = 'order') {
+ return request({
+ url: `${urlType}/admin/data/summary/trade`,
+ method: "GET",
+ data: {
+ ...data
+ }
+ })
+}
+
/**
* 商品销售汇总
* @returns
diff --git a/commons/utils/goodsUtil.js b/commons/utils/goodsUtil.js
index c664c34..4f93583 100644
--- a/commons/utils/goodsUtil.js
+++ b/commons/utils/goodsUtil.js
@@ -1,5 +1,5 @@
export function canComputedPackFee(v) {
- return v.pack && v.status != 'return' && v.status != 'refund' && v.status != 'refunding'
+ return v.pack && v.status != 'return' && v.status != 'refund' && v.status != 'part_refund'
}
export function returnCanComputedGoodsArr(arr) {
return arr.filter(v => canComputedPackFee(v))
@@ -18,7 +18,8 @@ export function canTuicai(orderInfo, item) {
}
export function canTuiKuan(orderInfo, item) {
if( item ){
- return orderInfo.status == 'done' && item.status != 'return' && item.status != 'refund' && item.status != 'refunding'
+ return (orderInfo.status == 'done' || orderInfo.status == 'part_refund')
+ && item.status != 'return' && item.status != 'refund' && item.status != 'refunding'
} else {
let goodsList = []
let data = false;
@@ -29,7 +30,7 @@ export function canTuiKuan(orderInfo, item) {
console.log("goodsList===",goodsList)
goodsList.some((v,i)=>{
console.log(v)
- if( orderInfo.status == 'done' && v.status != 'return' && v.status != 'refund' && v.status != 'refunding' ){
+ if( (orderInfo.status == 'done' || orderInfo.status == 'part_refund') && v.status != 'return' && v.status != 'refund' && v.status != 'refunding' ){
data = true
console.log(data)
return data
@@ -44,7 +45,7 @@ export function isTuiCai(item) {
return item.status == 'return' || item.status == 'part_refund'
}
export function isTui(item) {
- return item.status == 'return' || item.status == 'refund' || item.status == 'refunding'
+ return item.status == 'return' || item.status == 'refund' || item.status == 'part_refund'
}
export function isGift(item) {
return !isTui(item) && item.isGift == 1
diff --git a/commons/utils/websocket.js b/commons/utils/websocket.js
index 19b0663..2c51627 100644
--- a/commons/utils/websocket.js
+++ b/commons/utils/websocket.js
@@ -35,6 +35,7 @@ class WebsocketUtil {
this.socketTask.onOpen((res) => {
console.log('WebSocket连接正常！==',res);
+ this.send(JSON.stringify({"type": "ping_interval22"}));
this.isOpen = true;
// 连接成功后启动心跳和消息监听
this.startHeartbeat();
diff --git a/pageCoupon/components/select-goods.vue b/pageCoupon/components/select-goods.vue
index 5f45a4f..2922d18 100644
--- a/pageCoupon/components/select-goods.vue
+++ b/pageCoupon/components/select-goods.vue
@@ -33,9 +33,9 @@