From 99d08ad215ceb0fed7f784dd1565382fbc7051a0 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Mon, 4 Mar 2024 13:51:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E5=B0=91=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/stores/OrderStore.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/stores/OrderStore.js b/src/stores/OrderStore.js index 855d318..ed584df 100644 --- a/src/stores/OrderStore.js +++ b/src/stores/OrderStore.js @@ -1,10 +1,11 @@ import { create } from 'zustand' import { fetchJSON } from '@/utils/request' import { API_HOST } from '@/config' +import { isNotEmpty, prepareUrl } from '@/utils/commons' const useOrderStore = create((set, get) => ({ - orderList: [], + orderList: [], orderDetail: {}, customerDetail: {}, lastQuotation: {}, @@ -38,7 +39,7 @@ const useOrderStore = create((set, get) => ({ .append('tag', formValues.orderLabel) .append('orderstate', formValues.orderStatus) .append('remindstate', formValues.remindState) - .append('coli_id', formValues.orderNumber) + .append('coli_id', formValues.orderNumber) .append('firstName', formValues.firstName) .append('lastName', formValues.lastName) .append('emailphone', formValues.emailOrPhone) @@ -50,8 +51,8 @@ const useOrderStore = create((set, get) => ({ return fetchJSON(fetchOrderUrl) .then(json => { if (json.errcode === 0) { - set(() => ({ - orderList: json.result.map((order) => { return { ...order, key: order.COLI_ID } }), + set(() => ({ + orderList: json.result.map((order) => { return { ...order, key: order.COLI_ID } }), })) } else { throw new Error(json?.errmsg + ': ' + json.errcode) @@ -64,8 +65,8 @@ const useOrderStore = create((set, get) => ({ const json = await fetchJSON(`${API_HOST}/getorderinfo`, { colisn }) if (json.errcode === 0 && json.result.length > 0) { const orderResult = json.result[0] - set(() => ({ - orderDetail: orderResult, + set(() => ({ + orderDetail: orderResult, customerDetail: orderResult.contact.length > 0 ? orderResult.contact[0] : {}, lastQuotation: orderResult.quotes.length > 0 ? orderResult.quotes[0] : {}, quotationList: orderResult.quotes, @@ -76,7 +77,7 @@ const useOrderStore = create((set, get) => ({ setOrderPropValue: async (colisn, propName, value) => { const json = await fetchJSON(`${API_HOST}/setorderstatus`, { colisn, stype: propName, svalue: value }) if (propName === 'orderlabel') { - set((state) => ({ + set((state) => ({ orderDetail: { ...state.orderDetail, tags: value @@ -85,7 +86,7 @@ const useOrderStore = create((set, get) => ({ } if (propName === 'orderstatus') { - set((state) => ({ + set((state) => ({ orderDetail: { ...state.orderDetail, states: value @@ -96,4 +97,4 @@ const useOrderStore = create((set, get) => ({ })) -export default useOrderStore \ No newline at end of file +export default useOrderStore