sa2kit 1.6.79 → 1.6.83

package/dist/showmasterpiece/ui/miniapp/index.js

@@ -1006,7 +1006,7 @@ var ShowMasterpieceMiniappPage = ({
       onClick: goToCart
     },
     /* @__PURE__ */ React11__default.default.createElement(components.Text, { className: "text-lg text-white" }, "\u{1F6D2}"),
-    cartCount > 0 && /* @__PURE__ */ React11__default.default.createElement(components.View, { className: "absolute -right-1 -top-1 flex min-h-4 min-w-4 items-center justify-center rounded-full bg-rose-500 px-1" }, /* @__PURE__ */ React11__default.default.createElement(components.Text, { className: "text-[10px] font-semibold text-white" }, cartCount > 99 ? "99+" : cartCount))
+    cartCount > 0 && /* @__PURE__ */ React11__default.default.createElement(components.View, { className: "absolute -right-1 -top-1 flex min-h-4 min-w-4 items-center justify-center rounded-full bg-rose-500 px-1" }, /* @__PURE__ */ React11__default.default.createElement(components.Text, { className: "text-xs font-semibold text-white" }, cartCount > 99 ? "99+" : cartCount))
   ), miniappFloatingButtons.showHistory && /* @__PURE__ */ React11__default.default.createElement(
     components.View,
     {
@@ -1017,6 +1017,55 @@ var ShowMasterpieceMiniappPage = ({
   )));
 };
 var ShowMasterpiecePage_default = ShowMasterpieceMiniappPage;
+var CONSENT_STORAGE_KEY = "__showmasterpiece_privacy_consent_v1__";
+var SERVICE_TERMS_TEXT = "\u300A\u7528\u6237\u670D\u52A1\u534F\u8BAE\u300B\u6458\u8981\uFF1A\u672C\u670D\u52A1\u7528\u4E8E\u753B\u96C6\u6D4F\u89C8\u3001\u8D2D\u7269\u8F66\u4E0B\u5355\u4E0E\u5386\u53F2\u67E5\u8BE2\uFF1B\u63D0\u4EA4\u4FE1\u606F\u4EC5\u7528\u4E8E\u8BA2\u5355\u5904\u7406\u3001\u53D1\u8D27\u53CA\u552E\u540E\u6C9F\u901A\u3002";
+var PRIVACY_POLICY_TEXT = "\u300A\u9690\u79C1\u653F\u7B56\u300B\u6458\u8981\uFF1A\u6211\u4EEC\u4F1A\u6536\u96C6\u60A8\u4E3B\u52A8\u586B\u5199\u7684QQ\u53F7\u3001\u8054\u7CFB\u65B9\u5F0F\u4E0E\u6536\u8D27\u4FE1\u606F\uFF0C\u7528\u4E8E\u9884\u8BA2\u8054\u7CFB\u4E0E\u5C65\u7EA6\uFF1B\u4EC5\u5728\u5FC5\u8981\u671F\u9650\u5185\u4FDD\u5B58\uFF0C\u4E0D\u4F5C\u65E0\u5173\u7528\u9014\u3002";
+var hasPrivacyConsent = () => {
+  try {
+    return Taro2__default.default.getStorageSync(CONSENT_STORAGE_KEY) === true;
+  } catch {
+    return false;
+  }
+};
+var markPrivacyConsent = () => {
+  try {
+    Taro2__default.default.setStorageSync(CONSENT_STORAGE_KEY, true);
+  } catch (error) {
+    console.error("[privacy-consent] persist failed", error);
+  }
+};
+var showAgreementDoc = async (type) => {
+  const title = type === "service" ? "\u7528\u6237\u670D\u52A1\u534F\u8BAE" : "\u9690\u79C1\u653F\u7B56";
+  const content = type === "service" ? SERVICE_TERMS_TEXT : PRIVACY_POLICY_TEXT;
+  await Taro2__default.default.showModal({
+    title,
+    content,
+    showCancel: false,
+    confirmText: "\u6211\u77E5\u9053\u4E86"
+  });
+};
+var ensurePrivacyConsent = async () => {
+  if (hasPrivacyConsent()) return true;
+  try {
+    const { tapIndex } = await Taro2__default.default.showActionSheet({
+      itemList: ["\u67E5\u770B\u300A\u7528\u6237\u670D\u52A1\u534F\u8BAE\u300B", "\u67E5\u770B\u300A\u9690\u79C1\u653F\u7B56\u300B", "\u540C\u610F\u5E76\u7EE7\u7EED"]
+    });
+    if (tapIndex === 0) {
+      await showAgreementDoc("service");
+      return ensurePrivacyConsent();
+    }
+    if (tapIndex === 1) {
+      await showAgreementDoc("privacy");
+      return ensurePrivacyConsent();
+    }
+    markPrivacyConsent();
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+// src/showmasterpiece/ui/miniapp/pages/CartPage.tsx
 var CartMiniappPage = ({ apiBaseUrl = DEFAULT_BASE_URL }) => {
   const [cart, setCart] = React11.useState(() => getCart());
   const [qqNumber, setQqNumber] = React11.useState("");
@@ -1025,6 +1074,7 @@ var CartMiniappPage = ({ apiBaseUrl = DEFAULT_BASE_URL }) => {
   const [shippingInfo, setShippingInfo] = React11.useState("");
   const [submitting, setSubmitting] = React11.useState(false);
   const [pendingCheckout, setPendingCheckout] = React11.useState(false);
+  const [privacyConsented, setPrivacyConsented] = React11.useState(() => hasPrivacyConsent());
   const [formErrors, setFormErrors] = React11.useState({});
   const {
     configs: popupConfigs,
@@ -1044,6 +1094,7 @@ var CartMiniappPage = ({ apiBaseUrl = DEFAULT_BASE_URL }) => {
   }, []);
   Taro2.useDidShow(() => {
     refreshCart();
+    setPrivacyConsented(hasPrivacyConsent());
   });
   const handleUpdateQuantity = (collectionId, quantity) => {
     const next = updateCartItem(collectionId, quantity);
@@ -1120,6 +1171,12 @@ var CartMiniappPage = ({ apiBaseUrl = DEFAULT_BASE_URL }) => {
     }
   };
   const handleCheckout = async () => {
+    const consented = await ensurePrivacyConsent();
+    if (!consented) {
+      Taro2__default.default.showToast({ title: "\u8BF7\u5148\u9605\u8BFB\u5E76\u540C\u610F\u534F\u8BAE", icon: "none" });
+      return;
+    }
+    setPrivacyConsented(true);
     if (!validateForm()) {
       Taro2__default.default.showToast({ title: "\u8BF7\u5148\u4FEE\u6B63\u8868\u5355\u9519\u8BEF", icon: "none" });
       return;
@@ -1207,7 +1264,21 @@ var CartMiniappPage = ({ apiBaseUrl = DEFAULT_BASE_URL }) => {
       disabled: submitting,
       error: formErrors.pickupMethod
     }
-  ), /* @__PURE__ */ React11__default.default.createElement(components.View, { className: "mt-5 flex items-center justify-between gap-3" }, /* @__PURE__ */ React11__default.default.createElement(
+  ), /* @__PURE__ */ React11__default.default.createElement(components.View, { className: "mt-4 rounded-xl bg-prussian-blue-50 px-3 py-3" }, /* @__PURE__ */ React11__default.default.createElement(components.Text, { className: "text-xs text-prussian-blue-700" }, "\u63D0\u4EA4\u524D\u8BF7\u9605\u8BFB\u5E76\u540C\u610F"), /* @__PURE__ */ React11__default.default.createElement(
+    components.Text,
+    {
+      className: "ml-1 text-xs text-blue-600",
+      onClick: () => showAgreementDoc("service")
+    },
+    "\u300A\u7528\u6237\u670D\u52A1\u534F\u8BAE\u300B"
+  ), /* @__PURE__ */ React11__default.default.createElement(components.Text, { className: "text-xs text-prussian-blue-700" }, "\u4E0E"), /* @__PURE__ */ React11__default.default.createElement(
+    components.Text,
+    {
+      className: "ml-1 text-xs text-blue-600",
+      onClick: () => showAgreementDoc("privacy")
+    },
+    "\u300A\u9690\u79C1\u653F\u7B56\u300B"
+  ), /* @__PURE__ */ React11__default.default.createElement(components.Text, { className: "ml-1 text-xs text-prussian-blue-700" }, privacyConsented ? "\uFF08\u5DF2\u540C\u610F\uFF09" : "\uFF08\u672A\u540C\u610F\uFF09")), /* @__PURE__ */ React11__default.default.createElement(components.View, { className: "mt-5 flex items-center justify-between gap-3" }, /* @__PURE__ */ React11__default.default.createElement(
     components.View,
     {
       className: "flex h-11 flex-1 items-center justify-center rounded-xl bg-prussian-blue-100",
@@ -1239,7 +1310,17 @@ var HistoryMiniappPage = ({ apiBaseUrl = DEFAULT_BASE_URL }) => {
   const [error, setError] = React11.useState(null);
   const [records, setRecords] = React11.useState([]);
   const [hasSearched, setHasSearched] = React11.useState(false);
+  const [privacyConsented, setPrivacyConsented] = React11.useState(() => hasPrivacyConsent());
+  Taro2.useDidShow(() => {
+    setPrivacyConsented(hasPrivacyConsent());
+  });
   const handleSearch = async () => {
+    const consented = await ensurePrivacyConsent();
+    if (!consented) {
+      Taro2__default.default.showToast({ title: "\u8BF7\u5148\u9605\u8BFB\u5E76\u540C\u610F\u534F\u8BAE", icon: "none" });
+      return;
+    }
+    setPrivacyConsented(true);
     if (!qqNumber.trim() && !phoneNumber.trim()) {
       Taro2__default.default.showToast({ title: "\u8BF7\u8F93\u5165QQ\u53F7\u6216\u8054\u7CFB\u65B9\u5F0F", icon: "none" });
       return;
@@ -1298,7 +1379,21 @@ var HistoryMiniappPage = ({ apiBaseUrl = DEFAULT_BASE_URL }) => {
       onChange: setPhoneNumber,
       disabled: loading
     }
-  ), /* @__PURE__ */ React11__default.default.createElement(
+  ), /* @__PURE__ */ React11__default.default.createElement(components.View, { className: "mt-4 rounded-xl bg-prussian-blue-50 px-3 py-3" }, /* @__PURE__ */ React11__default.default.createElement(components.Text, { className: "text-xs text-prussian-blue-700" }, "\u67E5\u8BE2\u524D\u8BF7\u9605\u8BFB\u5E76\u540C\u610F"), /* @__PURE__ */ React11__default.default.createElement(
+    components.Text,
+    {
+      className: "ml-1 text-xs text-blue-600",
+      onClick: () => showAgreementDoc("service")
+    },
+    "\u300A\u7528\u6237\u670D\u52A1\u534F\u8BAE\u300B"
+  ), /* @__PURE__ */ React11__default.default.createElement(components.Text, { className: "text-xs text-prussian-blue-700" }, "\u4E0E"), /* @__PURE__ */ React11__default.default.createElement(
+    components.Text,
+    {
+      className: "ml-1 text-xs text-blue-600",
+      onClick: () => showAgreementDoc("privacy")
+    },
+    "\u300A\u9690\u79C1\u653F\u7B56\u300B"
+  ), /* @__PURE__ */ React11__default.default.createElement(components.Text, { className: "ml-1 text-xs text-prussian-blue-700" }, privacyConsented ? "\uFF08\u5DF2\u540C\u610F\uFF09" : "\uFF08\u672A\u540C\u610F\uFF09")), /* @__PURE__ */ React11__default.default.createElement(
     components.View,
     {
       className: "mt-5 flex h-10 w-full items-center justify-center rounded-full",