tablecode
This commit is contained in:
@@ -227,8 +227,8 @@ export const useCartsStore = defineStore("carts", () => {
|
||||
|
||||
// 当前购物车数据(现在 getAllGoodsList 能直接访问)
|
||||
const list = useStorage<any[]>("carts", []);
|
||||
// 历史订单数据(现在 getAllGoodsList 能直接访问)
|
||||
const oldOrder = useStorage<any>("Instead_olold_order", {
|
||||
// 历史订单数据(现在 getAllGoodsList 能直接访问),不从本地缓存获取,改为从接口获取
|
||||
const oldOrder = ref<any>({
|
||||
detailMap: [],
|
||||
originAmount: 0
|
||||
});
|
||||
@@ -833,8 +833,9 @@ export const useCartsStore = defineStore("carts", () => {
|
||||
}
|
||||
|
||||
// 初始话订单信息/补全历史订单信息
|
||||
async function setOldOrder(data: any) {
|
||||
console.log('补全订单信息', data);
|
||||
async function setOldOrder(data: any, t: number) {
|
||||
console.log('补全历史订单信息来源', t);
|
||||
// console.log('补全订单信息', data);
|
||||
oldOrder.value = {
|
||||
...data,
|
||||
detailMap: returnDetailMap(data.detailMap)
|
||||
@@ -849,10 +850,12 @@ export const useCartsStore = defineStore("carts", () => {
|
||||
|
||||
let $initParams = {} as ApifoxModel;
|
||||
|
||||
async function init(initParams: ApifoxModel, $oldOrder: any | undefined) {
|
||||
await getGoods({});
|
||||
if ($oldOrder) setOldOrder($oldOrder);
|
||||
else oldOrder.value = { detailMap: [] };
|
||||
async function init(initParams: ApifoxModel | undefined, $oldOrder: any | undefined) {
|
||||
console.log('cart.init.initParams', initParams);
|
||||
console.log('cart.init.$oldOrder', $oldOrder);
|
||||
|
||||
|
||||
|
||||
|
||||
if (initParams) {
|
||||
initParams.table_code = initParams.table_code || '';
|
||||
@@ -860,6 +863,16 @@ export const useCartsStore = defineStore("carts", () => {
|
||||
$initParams = initParams;
|
||||
}
|
||||
|
||||
await getGoods({});
|
||||
|
||||
if ($oldOrder) {
|
||||
await setOldOrder($oldOrder);
|
||||
} else if (table_code.value) {
|
||||
await getOldOrder(table_code.value);
|
||||
} else {
|
||||
oldOrder.value = { detailMap: [] };
|
||||
}
|
||||
|
||||
concocatSocket($initParams);
|
||||
}
|
||||
|
||||
@@ -978,7 +991,7 @@ export const useCartsStore = defineStore("carts", () => {
|
||||
}
|
||||
|
||||
if (msg.operate_type === "product_update") {
|
||||
init($initParams, oldOrder.value);
|
||||
init($initParams, oldOrder.value,);
|
||||
}
|
||||
|
||||
if (msg.type === "bc") {
|
||||
|
||||
Reference in New Issue
Block a user