@shopbb/helium 0.5.0 → 0.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/DiscountProvider.d.ts +14 -1
- package/dist/components/DiscountProvider.d.ts.map +1 -1
- package/dist/components/DiscountProvider.js +65 -13
- package/dist/components/DiscountProvider.js.map +1 -1
- package/dist/components/DiscountSelector.d.ts +0 -1
- package/dist/components/DiscountSelector.d.ts.map +1 -1
- package/dist/components/DiscountSelector.js +8 -36
- package/dist/components/DiscountSelector.js.map +1 -1
- package/package.json +1 -1
- package/src/components/DiscountProvider.tsx +86 -15
- package/src/components/DiscountSelector.tsx +13 -37
|
@@ -102,17 +102,30 @@ export interface DiscountContextValue {
|
|
|
102
102
|
/**
|
|
103
103
|
* 当前 cart 上的折扣分配明细。
|
|
104
104
|
* W5 起:cart 上最多一张券(自动选最佳 / 买家手动选)。
|
|
105
|
-
* 数组语义保留兼容(未来可能允许多张叠加)。
|
|
106
105
|
*/
|
|
107
106
|
cartAllocations: CartDiscountAllocation[];
|
|
108
107
|
/** 当前应用的 claim ID(W5),null = 无折扣或买家未登录 */
|
|
109
108
|
appliedClaimId: string | null;
|
|
109
|
+
/** 当前应用的券标题 + code(来自 Cart.appliedDiscountClaim) */
|
|
110
|
+
appliedClaim: {
|
|
111
|
+
claimId: string;
|
|
112
|
+
code: string | null;
|
|
113
|
+
title: string;
|
|
114
|
+
} | null;
|
|
110
115
|
/** 错误 */
|
|
111
116
|
error: string | null;
|
|
112
117
|
claim: (code: string) => Promise<{
|
|
113
118
|
claim?: DiscountClaim;
|
|
114
119
|
userErrors: DiscountUserError[];
|
|
115
120
|
}>;
|
|
121
|
+
/** 显式选中一张已领的券应用到当前 cart */
|
|
122
|
+
selectCartDiscount: (claimId: string) => Promise<{
|
|
123
|
+
userErrors: DiscountUserError[];
|
|
124
|
+
}>;
|
|
125
|
+
/** 清掉显式选择,让 cart 回到"自动选最佳"或"无折扣" */
|
|
126
|
+
clearCartDiscount: () => Promise<{
|
|
127
|
+
userErrors: DiscountUserError[];
|
|
128
|
+
}>;
|
|
116
129
|
refetchMyDiscounts: () => Promise<void>;
|
|
117
130
|
refetchPublicDiscounts: () => Promise<void>;
|
|
118
131
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscountProvider.d.ts","sourceRoot":"","sources":["../../src/components/DiscountProvider.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DiscountProvider.d.ts","sourceRoot":"","sources":["../../src/components/DiscountProvider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -41,18 +41,25 @@ export function DiscountProvider(props) {
|
|
|
41
41
|
return null;
|
|
42
42
|
return localStorage.getItem(DEFAULT_TOKEN_KEY) || localStorage.getItem('shopflare:buyer_token');
|
|
43
43
|
}, [tokenProvider]);
|
|
44
|
-
const storefrontGql = React.useCallback(async (query, variables) => {
|
|
44
|
+
const storefrontGql = React.useCallback(async (query, variables, opts) => {
|
|
45
|
+
const headers = {
|
|
46
|
+
'Content-Type': 'application/json',
|
|
47
|
+
'X-Storefront-Access-Token': shop.storefrontAccessToken,
|
|
48
|
+
};
|
|
49
|
+
// 部分 storefront mutation 需要登录买家(如 cartDiscountSelect)
|
|
50
|
+
if (opts?.withBuyerAuth) {
|
|
51
|
+
const token = getToken();
|
|
52
|
+
if (token)
|
|
53
|
+
headers.Authorization = `Bearer ${token}`;
|
|
54
|
+
}
|
|
45
55
|
const res = await fetch(shop.apiUrl, {
|
|
46
56
|
method: 'POST',
|
|
47
|
-
headers
|
|
48
|
-
'Content-Type': 'application/json',
|
|
49
|
-
'X-Storefront-Access-Token': shop.storefrontAccessToken,
|
|
50
|
-
},
|
|
57
|
+
headers,
|
|
51
58
|
body: JSON.stringify({ query, variables }),
|
|
52
59
|
credentials: 'include',
|
|
53
60
|
});
|
|
54
61
|
return res.json();
|
|
55
|
-
}, [shop.apiUrl, shop.storefrontAccessToken]);
|
|
62
|
+
}, [shop.apiUrl, shop.storefrontAccessToken, getToken]);
|
|
56
63
|
const customerGql = React.useCallback(async (query, variables) => {
|
|
57
64
|
const token = getToken();
|
|
58
65
|
if (!token)
|
|
@@ -163,23 +170,68 @@ export function DiscountProvider(props) {
|
|
|
163
170
|
const cartAllocations = cartCtx?.cart && cartCtx.cart.discountAllocations
|
|
164
171
|
? cartCtx.cart.discountAllocations
|
|
165
172
|
: [];
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
? cartCtx.cart.appliedDiscountClaim.claimId
|
|
173
|
+
const appliedClaim = cartCtx?.cart && cartCtx.cart.appliedDiscountClaim
|
|
174
|
+
? cartCtx.cart.appliedDiscountClaim
|
|
169
175
|
: null;
|
|
176
|
+
const appliedClaimId = appliedClaim?.claimId ?? null;
|
|
177
|
+
// ----- W5: select / clear cart discount -----
|
|
178
|
+
// 走 Storefront GraphQL(不是 Customer Account),但需要 buyer JWT 让服务端 ctx.buyerUserId
|
|
179
|
+
// 有值。withBuyerAuth=true 触发 storefrontGql 加 Authorization header。
|
|
180
|
+
const selectCartDiscount = React.useCallback(async (claimId) => {
|
|
181
|
+
if (!cartCtx?.cart) {
|
|
182
|
+
return { userErrors: [{ code: 'NO_CART', message: 'cart 不存在' }] };
|
|
183
|
+
}
|
|
184
|
+
try {
|
|
185
|
+
const result = await storefrontGql(`mutation S($id: ID!, $c: ID!) {
|
|
186
|
+
cartDiscountSelect(cartId: $id, claimId: $c) {
|
|
187
|
+
cart { id }
|
|
188
|
+
userErrors { field code message }
|
|
189
|
+
}
|
|
190
|
+
}`, { id: cartCtx.cart.id, c: claimId }, { withBuyerAuth: true });
|
|
191
|
+
if (result.errors?.length) {
|
|
192
|
+
return { userErrors: [{ code: 'NETWORK_ERROR', message: result.errors[0].message }] };
|
|
193
|
+
}
|
|
194
|
+
await cartCtx.refetch();
|
|
195
|
+
return { userErrors: result.data.cartDiscountSelect.userErrors };
|
|
196
|
+
}
|
|
197
|
+
catch (e) {
|
|
198
|
+
return { userErrors: [{ code: 'NETWORK_ERROR', message: e?.message ?? String(e) }] };
|
|
199
|
+
}
|
|
200
|
+
}, [cartCtx, storefrontGql]);
|
|
201
|
+
const clearCartDiscount = React.useCallback(async () => {
|
|
202
|
+
if (!cartCtx?.cart) {
|
|
203
|
+
return { userErrors: [{ code: 'NO_CART', message: 'cart 不存在' }] };
|
|
204
|
+
}
|
|
205
|
+
try {
|
|
206
|
+
const result = await storefrontGql(`mutation C($id: ID!) {
|
|
207
|
+
cartDiscountClear(cartId: $id) {
|
|
208
|
+
cart { id }
|
|
209
|
+
userErrors { field code message }
|
|
210
|
+
}
|
|
211
|
+
}`, { id: cartCtx.cart.id }, { withBuyerAuth: true });
|
|
212
|
+
if (result.errors?.length) {
|
|
213
|
+
return { userErrors: [{ code: 'NETWORK_ERROR', message: result.errors[0].message }] };
|
|
214
|
+
}
|
|
215
|
+
await cartCtx.refetch();
|
|
216
|
+
return { userErrors: result.data.cartDiscountClear.userErrors };
|
|
217
|
+
}
|
|
218
|
+
catch (e) {
|
|
219
|
+
return { userErrors: [{ code: 'NETWORK_ERROR', message: e?.message ?? String(e) }] };
|
|
220
|
+
}
|
|
221
|
+
}, [cartCtx, storefrontGql]);
|
|
170
222
|
const value = React.useMemo(() => ({
|
|
171
223
|
publicDiscounts, publicDiscountsStatus,
|
|
172
224
|
myDiscounts, myDiscountsStatus,
|
|
173
225
|
cartAllocations,
|
|
174
|
-
appliedClaimId,
|
|
226
|
+
appliedClaimId, appliedClaim,
|
|
175
227
|
error,
|
|
176
|
-
claim,
|
|
228
|
+
claim, selectCartDiscount, clearCartDiscount,
|
|
177
229
|
refetchMyDiscounts, refetchPublicDiscounts,
|
|
178
230
|
}), [
|
|
179
231
|
publicDiscounts, publicDiscountsStatus,
|
|
180
232
|
myDiscounts, myDiscountsStatus,
|
|
181
|
-
cartAllocations, appliedClaimId, error,
|
|
182
|
-
claim,
|
|
233
|
+
cartAllocations, appliedClaimId, appliedClaim, error,
|
|
234
|
+
claim, selectCartDiscount, clearCartDiscount,
|
|
183
235
|
refetchMyDiscounts, refetchPublicDiscounts,
|
|
184
236
|
]);
|
|
185
237
|
return _jsx(Ctx.Provider, { value: value, children: children });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscountProvider.js","sourceRoot":"","sources":["../../src/components/DiscountProvider.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"DiscountProvider.js","sourceRoot":"","sources":["../../src/components/DiscountProvider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,6 @@ export interface DiscountSelectorProps {
|
|
|
29
29
|
currencyCode: string;
|
|
30
30
|
};
|
|
31
31
|
onChange: () => void;
|
|
32
|
-
onClear: () => void;
|
|
33
32
|
}) => React.ReactNode;
|
|
34
33
|
}
|
|
35
34
|
export declare function DiscountSelector(props: DiscountSelectorProps): import("react/jsx-runtime").JSX.Element;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscountSelector.d.ts","sourceRoot":"","sources":["../../src/components/DiscountSelector.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"DiscountSelector.d.ts","sourceRoot":"","sources":["../../src/components/DiscountSelector.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,MAAM,WAAW,qBAAqB;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wBAAwB;IACxB,uBAAuB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1C,YAAY;IACZ,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,YAAY,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,QAAQ,EAAE,MAAM,IAAI,CAAA;KAAE,KAAK,KAAK,CAAC,SAAS,CAAC;CAC5J;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,2CAgG5D"}
|
|
@@ -18,48 +18,24 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
|
|
|
18
18
|
*/
|
|
19
19
|
import * as React from 'react';
|
|
20
20
|
import { useDiscounts } from './DiscountProvider';
|
|
21
|
-
import { useCart } from './CartProvider';
|
|
22
|
-
import { useShop } from './ShopProvider';
|
|
23
21
|
import { useAnalytics } from './AnalyticsProvider';
|
|
24
22
|
import { Money } from './Money';
|
|
25
23
|
export function DiscountSelector(props) {
|
|
26
24
|
const { className, unauthenticatedFallback, renderApplied } = props;
|
|
27
|
-
const { myDiscounts, myDiscountsStatus, cartAllocations } = useDiscounts();
|
|
28
|
-
const { cart, refetch: refetchCart } = useCart();
|
|
29
|
-
const shop = useShop();
|
|
25
|
+
const { myDiscounts, myDiscountsStatus, cartAllocations, appliedClaim, selectCartDiscount, } = useDiscounts();
|
|
30
26
|
const analytics = useAnalytics();
|
|
31
27
|
const [open, setOpen] = React.useState(false);
|
|
32
28
|
const [pending, setPending] = React.useState(false);
|
|
33
29
|
// 服务端已经决定了 cart 上是哪张券
|
|
34
30
|
const appliedAlloc = cartAllocations[0];
|
|
35
|
-
const appliedClaimId =
|
|
36
|
-
const appliedTitle =
|
|
37
|
-
const appliedCode =
|
|
38
|
-
const
|
|
39
|
-
if (!cart)
|
|
40
|
-
return;
|
|
31
|
+
const appliedClaimId = appliedClaim?.claimId ?? null;
|
|
32
|
+
const appliedTitle = appliedClaim?.title ?? appliedAlloc?.title;
|
|
33
|
+
const appliedCode = appliedClaim?.code ?? appliedAlloc?.code;
|
|
34
|
+
const handleSelect = async (claimId) => {
|
|
41
35
|
setPending(true);
|
|
42
36
|
try {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
? `mutation S($id: ID!, $c: ID!) { cartDiscountSelect(cartId: $id, claimId: $c) { cart { id } userErrors { message } } }`
|
|
46
|
-
: `mutation C($id: ID!) { cartDiscountClear(cartId: $id) { cart { id } userErrors { message } } }`;
|
|
47
|
-
const variables = { id: cart.id };
|
|
48
|
-
if (claimId)
|
|
49
|
-
variables.c = claimId;
|
|
50
|
-
const res = await fetch(shop.apiUrl, {
|
|
51
|
-
method: 'POST',
|
|
52
|
-
headers: {
|
|
53
|
-
'Content-Type': 'application/json',
|
|
54
|
-
'X-Storefront-Access-Token': shop.storefrontAccessToken,
|
|
55
|
-
...(token ? { Authorization: `Bearer ${token}` } : {}),
|
|
56
|
-
},
|
|
57
|
-
body: JSON.stringify({ query: mutation, variables }),
|
|
58
|
-
credentials: 'include',
|
|
59
|
-
});
|
|
60
|
-
await res.json();
|
|
61
|
-
// 重新拉 cart 让 UI 更新(拿到新的 discountAllocations)
|
|
62
|
-
await refetchCart();
|
|
37
|
+
await selectCartDiscount(claimId);
|
|
38
|
+
analytics.emit('discount_select', { claimId });
|
|
63
39
|
}
|
|
64
40
|
finally {
|
|
65
41
|
setPending(false);
|
|
@@ -82,11 +58,7 @@ export function DiscountSelector(props) {
|
|
|
82
58
|
title: appliedTitle ?? '',
|
|
83
59
|
amount: appliedAlloc?.discountedAmount ?? { amount: '0', currencyCode: 'CNY' },
|
|
84
60
|
onChange: () => setOpen(true),
|
|
85
|
-
|
|
86
|
-
}) : (_jsxs("div", { "data-applied": true, children: [_jsxs("div", { "data-info": true, children: [_jsx("span", { "data-label": true, children: "\u5DF2\u4F7F\u7528" }), _jsx("strong", { "data-title": true, children: appliedTitle }), appliedAlloc && (_jsxs("span", { "data-amount": true, children: ["\u2212 ", _jsx(Money, { data: { amount: appliedAlloc.discountedAmount.amount, currencyCode: appliedAlloc.discountedAmount.currencyCode } })] }))] }), _jsxs("div", { "data-actions": true, children: [_jsx("button", { type: "button", onClick: () => setOpen(true), disabled: pending, children: "\u5207\u6362" }), _jsx("button", { type: "button", onClick: () => callSelectMutation(null), disabled: pending, "data-clear": true, children: "\u4E0D\u4F7F\u7528" })] })] }))) : (_jsxs("div", { "data-empty-applied": true, children: [_jsx("div", { "data-info": true, children: _jsxs("span", { "data-label": true, children: ["\u6709 ", availableClaims.length, " \u5F20\u53EF\u7528\u4F18\u60E0\u5238"] }) }), _jsx("button", { type: "button", onClick: () => setOpen(true), disabled: pending, children: "\u9009\u62E9" })] })) }), open && (_jsx(DiscountPickerSheet, { claims: availableClaims, currentClaimId: appliedClaimId, onSelect: (claimId) => {
|
|
87
|
-
analytics.emit('discount_select', { claimId });
|
|
88
|
-
callSelectMutation(claimId);
|
|
89
|
-
}, onClose: () => setOpen(false), pending: pending }))] }));
|
|
61
|
+
}) : (_jsxs("div", { "data-applied": true, children: [_jsxs("div", { "data-info": true, children: [_jsx("span", { "data-label": true, children: "\u5DF2\u4F7F\u7528" }), _jsx("strong", { "data-title": true, children: appliedTitle }), appliedAlloc && (_jsxs("span", { "data-amount": true, children: ["\u2212 ", _jsx(Money, { data: { amount: appliedAlloc.discountedAmount.amount, currencyCode: appliedAlloc.discountedAmount.currencyCode } })] }))] }), _jsx("div", { "data-actions": true, children: _jsx("button", { type: "button", onClick: () => setOpen(true), disabled: pending, children: "\u5207\u6362" }) })] }))) : (_jsxs("div", { "data-empty-applied": true, children: [_jsx("div", { "data-info": true, children: _jsxs("span", { "data-label": true, children: ["\u6709 ", availableClaims.length, " \u5F20\u53EF\u7528\u4F18\u60E0\u5238"] }) }), _jsx("button", { type: "button", onClick: () => setOpen(true), disabled: pending, children: "\u9009\u62E9" })] })) }), open && (_jsx(DiscountPickerSheet, { claims: availableClaims, currentClaimId: appliedClaimId, onSelect: handleSelect, onClose: () => setOpen(false), pending: pending }))] }));
|
|
90
62
|
}
|
|
91
63
|
/**
|
|
92
64
|
* 抽屉式选券面板。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscountSelector.js","sourceRoot":"","sources":["../../src/components/DiscountSelector.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAsB,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"DiscountSelector.js","sourceRoot":"","sources":["../../src/components/DiscountSelector.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -90,16 +90,21 @@ export interface DiscountContextValue {
|
|
|
90
90
|
/**
|
|
91
91
|
* 当前 cart 上的折扣分配明细。
|
|
92
92
|
* W5 起:cart 上最多一张券(自动选最佳 / 买家手动选)。
|
|
93
|
-
* 数组语义保留兼容(未来可能允许多张叠加)。
|
|
94
93
|
*/
|
|
95
94
|
cartAllocations: CartDiscountAllocation[];
|
|
96
95
|
/** 当前应用的 claim ID(W5),null = 无折扣或买家未登录 */
|
|
97
96
|
appliedClaimId: string | null;
|
|
97
|
+
/** 当前应用的券标题 + code(来自 Cart.appliedDiscountClaim) */
|
|
98
|
+
appliedClaim: { claimId: string; code: string | null; title: string } | null;
|
|
98
99
|
/** 错误 */
|
|
99
100
|
error: string | null;
|
|
100
101
|
|
|
101
102
|
// 操作
|
|
102
103
|
claim: (code: string) => Promise<{ claim?: DiscountClaim; userErrors: DiscountUserError[] }>;
|
|
104
|
+
/** 显式选中一张已领的券应用到当前 cart */
|
|
105
|
+
selectCartDiscount: (claimId: string) => Promise<{ userErrors: DiscountUserError[] }>;
|
|
106
|
+
/** 清掉显式选择,让 cart 回到"自动选最佳"或"无折扣" */
|
|
107
|
+
clearCartDiscount: () => Promise<{ userErrors: DiscountUserError[] }>;
|
|
103
108
|
refetchMyDiscounts: () => Promise<void>;
|
|
104
109
|
refetchPublicDiscounts: () => Promise<void>;
|
|
105
110
|
}
|
|
@@ -149,19 +154,25 @@ export function DiscountProvider(props: DiscountProviderProps) {
|
|
|
149
154
|
}, [tokenProvider]);
|
|
150
155
|
|
|
151
156
|
const storefrontGql = React.useCallback(
|
|
152
|
-
async <T = any>(query: string, variables?: any): Promise<{ data?: T; errors?: any[] }> => {
|
|
157
|
+
async <T = any>(query: string, variables?: any, opts?: { withBuyerAuth?: boolean }): Promise<{ data?: T; errors?: any[] }> => {
|
|
158
|
+
const headers: Record<string, string> = {
|
|
159
|
+
'Content-Type': 'application/json',
|
|
160
|
+
'X-Storefront-Access-Token': shop.storefrontAccessToken,
|
|
161
|
+
};
|
|
162
|
+
// 部分 storefront mutation 需要登录买家(如 cartDiscountSelect)
|
|
163
|
+
if (opts?.withBuyerAuth) {
|
|
164
|
+
const token = getToken();
|
|
165
|
+
if (token) headers.Authorization = `Bearer ${token}`;
|
|
166
|
+
}
|
|
153
167
|
const res = await fetch(shop.apiUrl, {
|
|
154
168
|
method: 'POST',
|
|
155
|
-
headers
|
|
156
|
-
'Content-Type': 'application/json',
|
|
157
|
-
'X-Storefront-Access-Token': shop.storefrontAccessToken,
|
|
158
|
-
},
|
|
169
|
+
headers,
|
|
159
170
|
body: JSON.stringify({ query, variables }),
|
|
160
171
|
credentials: 'include',
|
|
161
172
|
});
|
|
162
173
|
return res.json();
|
|
163
174
|
},
|
|
164
|
-
[shop.apiUrl, shop.storefrontAccessToken],
|
|
175
|
+
[shop.apiUrl, shop.storefrontAccessToken, getToken],
|
|
165
176
|
);
|
|
166
177
|
|
|
167
178
|
const customerGql = React.useCallback(
|
|
@@ -284,26 +295,86 @@ export function DiscountProvider(props: DiscountProviderProps) {
|
|
|
284
295
|
const cartAllocations = cartCtx?.cart && (cartCtx.cart as any).discountAllocations
|
|
285
296
|
? (cartCtx.cart as any).discountAllocations as CartDiscountAllocation[]
|
|
286
297
|
: [];
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
298
|
+
const appliedClaim: { claimId: string; code: string | null; title: string } | null =
|
|
299
|
+
cartCtx?.cart && (cartCtx.cart as any).appliedDiscountClaim
|
|
300
|
+
? (cartCtx.cart as any).appliedDiscountClaim
|
|
301
|
+
: null;
|
|
302
|
+
const appliedClaimId = appliedClaim?.claimId ?? null;
|
|
303
|
+
|
|
304
|
+
// ----- W5: select / clear cart discount -----
|
|
305
|
+
// 走 Storefront GraphQL(不是 Customer Account),但需要 buyer JWT 让服务端 ctx.buyerUserId
|
|
306
|
+
// 有值。withBuyerAuth=true 触发 storefrontGql 加 Authorization header。
|
|
307
|
+
const selectCartDiscount = React.useCallback(
|
|
308
|
+
async (claimId: string) => {
|
|
309
|
+
if (!cartCtx?.cart) {
|
|
310
|
+
return { userErrors: [{ code: 'NO_CART', message: 'cart 不存在' }] };
|
|
311
|
+
}
|
|
312
|
+
try {
|
|
313
|
+
const result = await storefrontGql<{ cartDiscountSelect: { cart: any; userErrors: DiscountUserError[] } }>(
|
|
314
|
+
`mutation S($id: ID!, $c: ID!) {
|
|
315
|
+
cartDiscountSelect(cartId: $id, claimId: $c) {
|
|
316
|
+
cart { id }
|
|
317
|
+
userErrors { field code message }
|
|
318
|
+
}
|
|
319
|
+
}`,
|
|
320
|
+
{ id: cartCtx.cart.id, c: claimId },
|
|
321
|
+
{ withBuyerAuth: true },
|
|
322
|
+
);
|
|
323
|
+
if (result.errors?.length) {
|
|
324
|
+
return { userErrors: [{ code: 'NETWORK_ERROR', message: result.errors[0].message }] };
|
|
325
|
+
}
|
|
326
|
+
await cartCtx.refetch();
|
|
327
|
+
return { userErrors: result.data!.cartDiscountSelect.userErrors };
|
|
328
|
+
} catch (e: any) {
|
|
329
|
+
return { userErrors: [{ code: 'NETWORK_ERROR', message: e?.message ?? String(e) }] };
|
|
330
|
+
}
|
|
331
|
+
},
|
|
332
|
+
[cartCtx, storefrontGql],
|
|
333
|
+
);
|
|
334
|
+
|
|
335
|
+
const clearCartDiscount = React.useCallback(
|
|
336
|
+
async () => {
|
|
337
|
+
if (!cartCtx?.cart) {
|
|
338
|
+
return { userErrors: [{ code: 'NO_CART', message: 'cart 不存在' }] };
|
|
339
|
+
}
|
|
340
|
+
try {
|
|
341
|
+
const result = await storefrontGql<{ cartDiscountClear: { cart: any; userErrors: DiscountUserError[] } }>(
|
|
342
|
+
`mutation C($id: ID!) {
|
|
343
|
+
cartDiscountClear(cartId: $id) {
|
|
344
|
+
cart { id }
|
|
345
|
+
userErrors { field code message }
|
|
346
|
+
}
|
|
347
|
+
}`,
|
|
348
|
+
{ id: cartCtx.cart.id },
|
|
349
|
+
{ withBuyerAuth: true },
|
|
350
|
+
);
|
|
351
|
+
if (result.errors?.length) {
|
|
352
|
+
return { userErrors: [{ code: 'NETWORK_ERROR', message: result.errors[0].message }] };
|
|
353
|
+
}
|
|
354
|
+
await cartCtx.refetch();
|
|
355
|
+
return { userErrors: result.data!.cartDiscountClear.userErrors };
|
|
356
|
+
} catch (e: any) {
|
|
357
|
+
return { userErrors: [{ code: 'NETWORK_ERROR', message: e?.message ?? String(e) }] };
|
|
358
|
+
}
|
|
359
|
+
},
|
|
360
|
+
[cartCtx, storefrontGql],
|
|
361
|
+
);
|
|
291
362
|
|
|
292
363
|
const value: DiscountContextValue = React.useMemo(
|
|
293
364
|
() => ({
|
|
294
365
|
publicDiscounts, publicDiscountsStatus,
|
|
295
366
|
myDiscounts, myDiscountsStatus,
|
|
296
367
|
cartAllocations,
|
|
297
|
-
appliedClaimId,
|
|
368
|
+
appliedClaimId, appliedClaim,
|
|
298
369
|
error,
|
|
299
|
-
claim,
|
|
370
|
+
claim, selectCartDiscount, clearCartDiscount,
|
|
300
371
|
refetchMyDiscounts, refetchPublicDiscounts,
|
|
301
372
|
}),
|
|
302
373
|
[
|
|
303
374
|
publicDiscounts, publicDiscountsStatus,
|
|
304
375
|
myDiscounts, myDiscountsStatus,
|
|
305
|
-
cartAllocations, appliedClaimId, error,
|
|
306
|
-
claim,
|
|
376
|
+
cartAllocations, appliedClaimId, appliedClaim, error,
|
|
377
|
+
claim, selectCartDiscount, clearCartDiscount,
|
|
307
378
|
refetchMyDiscounts, refetchPublicDiscounts,
|
|
308
379
|
],
|
|
309
380
|
);
|
|
@@ -18,8 +18,6 @@
|
|
|
18
18
|
|
|
19
19
|
import * as React from 'react';
|
|
20
20
|
import { useDiscounts, type DiscountClaim } from './DiscountProvider';
|
|
21
|
-
import { useCart } from './CartProvider';
|
|
22
|
-
import { useShop } from './ShopProvider';
|
|
23
21
|
import { useAnalytics } from './AnalyticsProvider';
|
|
24
22
|
import { Money } from './Money';
|
|
25
23
|
|
|
@@ -28,14 +26,16 @@ export interface DiscountSelectorProps {
|
|
|
28
26
|
/** 未登录时显示的内容;不传则显示默认 */
|
|
29
27
|
unauthenticatedFallback?: React.ReactNode;
|
|
30
28
|
/** 自定义渲染 */
|
|
31
|
-
renderApplied?: (props: { code: string | null; title: string; amount: { amount: string; currencyCode: string }; onChange: () => void
|
|
29
|
+
renderApplied?: (props: { code: string | null; title: string; amount: { amount: string; currencyCode: string }; onChange: () => void }) => React.ReactNode;
|
|
32
30
|
}
|
|
33
31
|
|
|
34
32
|
export function DiscountSelector(props: DiscountSelectorProps) {
|
|
35
33
|
const { className, unauthenticatedFallback, renderApplied } = props;
|
|
36
|
-
const {
|
|
37
|
-
|
|
38
|
-
|
|
34
|
+
const {
|
|
35
|
+
myDiscounts, myDiscountsStatus,
|
|
36
|
+
cartAllocations, appliedClaim,
|
|
37
|
+
selectCartDiscount,
|
|
38
|
+
} = useDiscounts();
|
|
39
39
|
const analytics = useAnalytics();
|
|
40
40
|
|
|
41
41
|
const [open, setOpen] = React.useState(false);
|
|
@@ -43,39 +43,20 @@ export function DiscountSelector(props: DiscountSelectorProps) {
|
|
|
43
43
|
|
|
44
44
|
// 服务端已经决定了 cart 上是哪张券
|
|
45
45
|
const appliedAlloc = cartAllocations[0];
|
|
46
|
-
const appliedClaimId =
|
|
47
|
-
const appliedTitle =
|
|
48
|
-
const appliedCode =
|
|
46
|
+
const appliedClaimId = appliedClaim?.claimId ?? null;
|
|
47
|
+
const appliedTitle = appliedClaim?.title ?? appliedAlloc?.title;
|
|
48
|
+
const appliedCode = appliedClaim?.code ?? appliedAlloc?.code;
|
|
49
49
|
|
|
50
|
-
const
|
|
51
|
-
if (!cart) return;
|
|
50
|
+
const handleSelect = async (claimId: string) => {
|
|
52
51
|
setPending(true);
|
|
53
52
|
try {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
? `mutation S($id: ID!, $c: ID!) { cartDiscountSelect(cartId: $id, claimId: $c) { cart { id } userErrors { message } } }`
|
|
57
|
-
: `mutation C($id: ID!) { cartDiscountClear(cartId: $id) { cart { id } userErrors { message } } }`;
|
|
58
|
-
const variables: any = { id: cart.id };
|
|
59
|
-
if (claimId) variables.c = claimId;
|
|
60
|
-
const res = await fetch(shop.apiUrl, {
|
|
61
|
-
method: 'POST',
|
|
62
|
-
headers: {
|
|
63
|
-
'Content-Type': 'application/json',
|
|
64
|
-
'X-Storefront-Access-Token': shop.storefrontAccessToken,
|
|
65
|
-
...(token ? { Authorization: `Bearer ${token}` } : {}),
|
|
66
|
-
},
|
|
67
|
-
body: JSON.stringify({ query: mutation, variables }),
|
|
68
|
-
credentials: 'include',
|
|
69
|
-
});
|
|
70
|
-
await res.json();
|
|
71
|
-
// 重新拉 cart 让 UI 更新(拿到新的 discountAllocations)
|
|
72
|
-
await refetchCart();
|
|
53
|
+
await selectCartDiscount(claimId);
|
|
54
|
+
analytics.emit('discount_select', { claimId });
|
|
73
55
|
} finally {
|
|
74
56
|
setPending(false);
|
|
75
57
|
setOpen(false);
|
|
76
58
|
}
|
|
77
59
|
};
|
|
78
|
-
|
|
79
60
|
// 未登录
|
|
80
61
|
if (myDiscountsStatus === 'unauthenticated') {
|
|
81
62
|
return unauthenticatedFallback !== undefined ? <>{unauthenticatedFallback}</> : (
|
|
@@ -109,7 +90,6 @@ export function DiscountSelector(props: DiscountSelectorProps) {
|
|
|
109
90
|
title: appliedTitle ?? '',
|
|
110
91
|
amount: appliedAlloc?.discountedAmount ?? { amount: '0', currencyCode: 'CNY' },
|
|
111
92
|
onChange: () => setOpen(true),
|
|
112
|
-
onClear: () => callSelectMutation(null),
|
|
113
93
|
}) : (
|
|
114
94
|
<div data-applied>
|
|
115
95
|
<div data-info>
|
|
@@ -121,7 +101,6 @@ export function DiscountSelector(props: DiscountSelectorProps) {
|
|
|
121
101
|
</div>
|
|
122
102
|
<div data-actions>
|
|
123
103
|
<button type="button" onClick={() => setOpen(true)} disabled={pending}>切换</button>
|
|
124
|
-
<button type="button" onClick={() => callSelectMutation(null)} disabled={pending} data-clear>不使用</button>
|
|
125
104
|
</div>
|
|
126
105
|
</div>
|
|
127
106
|
)
|
|
@@ -139,10 +118,7 @@ export function DiscountSelector(props: DiscountSelectorProps) {
|
|
|
139
118
|
<DiscountPickerSheet
|
|
140
119
|
claims={availableClaims}
|
|
141
120
|
currentClaimId={appliedClaimId}
|
|
142
|
-
onSelect={
|
|
143
|
-
analytics.emit('discount_select', { claimId });
|
|
144
|
-
callSelectMutation(claimId);
|
|
145
|
-
}}
|
|
121
|
+
onSelect={handleSelect}
|
|
146
122
|
onClose={() => setOpen(false)}
|
|
147
123
|
pending={pending}
|
|
148
124
|
/>
|