czg_team/cashier_app
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
GaoHao
2025-03-10 17:26:39 +08:00
parent 490c513f48
commit cc97b6acca
26 changed files with 258 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
commons/utils/goodsUtil.js
View File

@@ -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

1
commons/utils/websocket.js
View File

@@ -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();