Merge remote-tracking branch 'origin/main' into dev/chat

dev/chat
Lei OT 2 years ago
commit 0e8042d256

@ -53,7 +53,7 @@ const useOrderStore = create((set, get) => ({
if (json.errcode === 0) { if (json.errcode === 0) {
set(() => ({ set(() => ({
orderList: json.result.map((order) => { return { ...order, key: order.COLI_ID } }), orderList: json.result.map((order) => { return { ...order, key: order.COLI_ID } }),
})) }))
} else { } else {
throw new Error(json?.errmsg + ': ' + json.errcode) throw new Error(json?.errmsg + ': ' + json.errcode)
} }

@ -49,11 +49,13 @@ function AuthApp() {
}, []) }, [])
let defaultPath = 'follow' let defaultPath = '/order/follow'
if (href !== '/') { if (href !== '/') {
const splitPath = href.split('/') const splitPath = href.split('/')
defaultPath = href if (splitPath.length > 2) {
defaultPath = '/' + splitPath[1] + '/' + splitPath[2]
}
} }
const { const {

Loading…
Cancel
Save