@pisell/private-materials 6.3.29 → 6.3.31

package/es/pro/Login2.0/steps/steps.less

@@ -0,0 +1,423 @@
+/**
+ * 注册步骤组件样式
+ */
+
+.register-step-container {
+  width: 100%;
+  min-height: 400px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 40px 0;
+}
+
+/* 左上角返回按钮 */
+.back-button-top {
+  position: absolute;
+  top: 2px;
+  left: 2px;
+  width: 40px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: transparent;
+  border: none;
+  cursor: pointer;
+  color: #344054;
+  transition: all 0.2s ease;
+  padding: 0;
+  .login-lm-drawer-popover & {
+    position: fixed;
+    top: 12px;
+    left: 12px;
+  }
+  .ant-modal-body & {
+    position: absolute;
+    left: -55px;
+    top: -14px;
+  }
+
+  &:hover {
+    color: #101828;
+    background: #F9FAFB;
+    border-radius: 8px;
+  }
+
+  &:active {
+    color: #101828;
+    background: #F2F4F7;
+  }
+
+  .anticon {
+    font-size: 24px;
+  }
+}
+
+.register-step-content {
+  width: 100%;
+  text-align: center;
+}
+
+.register-step-title {
+  margin: 0 0 8px 0;
+  font-size: 16px;
+  font-weight: 600;
+  line-height: 32px;
+  color: #101828;
+  text-align: center;
+}
+
+.register-step-desc {
+  margin: 0 0 24px 0;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 24px;
+  color: #475467;
+  text-align: center;
+}
+.register-step-title-verify-email {
+  margin: 0 0 8px 0;
+  font-size: 16px;
+  font-weight: 600;
+  color: #101828;
+  text-align: center;
+}
+.register-step-desc-verify-email {
+  margin: 0 0 8px 0;
+  font-size: 14px;
+  font-weight: 400;
+  color: #475467;
+  text-align: center;
+}
+
+/* 重发区域 */
+.register-resend-section {
+  margin-top: 24px;
+  text-align: center;
+  font-size: 14px;
+  font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+  line-height: 20px;
+
+  .resend-text {
+    color: #475467;
+    font-weight: 400;
+  }
+
+  .resend-link {
+    color: var(--theme-color, #7F56D9);
+    font-weight: 600;
+    background: transparent;
+    border: none;
+    cursor: pointer;
+    padding: 0;
+    text-decoration: none;
+    transition: all 0.2s ease;
+
+    &:hover:not(:disabled) {
+      opacity: 0.8;
+      text-decoration: underline;
+    }
+
+    &:active:not(:disabled) {
+      opacity: 0.6;
+    }
+
+    &:disabled {
+      opacity: 0.4;
+      cursor: not-allowed;
+    }
+  }
+}
+
+/* 登录提示 */
+.register-login-prompt {
+  margin-top: 32px;
+  text-align: center;
+  font-size: 14px;
+  font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+  line-height: 20px;
+
+  .prompt-text {
+    color: #475467;
+    font-weight: 400;
+  }
+
+  .login-link {
+    color: var(--theme-color, #7F56D9);
+    font-weight: 600;
+    background: transparent;
+    border: none;
+    cursor: pointer;
+    padding: 0;
+    text-decoration: none;
+    transition: all 0.2s ease;
+
+    &:hover {
+      opacity: 0.8;
+      text-decoration: underline;
+    }
+
+    &:active {
+      opacity: 0.6;
+    }
+  }
+}
+
+/* 邮箱已注册提示消息 */
+.email-already-registered-message {
+  margin: 0 0 32px 0;
+  font-size: 16px;
+  font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+  font-weight: 600;
+  line-height: 24px;
+  color: #101828;
+  text-align: center;
+}
+
+/* 验证码输入 */
+.code-input-group {
+  display: flex;
+  gap: 12px;
+  justify-content: center;
+  margin: 24px 0 24px 0;
+}
+
+.code-input-box {
+  width: 80px;
+  height: 80px;
+  font-size: 40px;
+  font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+  font-weight: 600;
+  text-align: center;
+  color: var(--theme-color, #7F56D9);
+  background: #FFFFFF;
+  border: 2px solid #D0D5DD;
+  border-radius: 8px;
+  outline: none;
+  transition: all 0.2s ease;
+
+  &:focus {
+    border-color: var(--theme-color, #7F56D9);
+    box-shadow: 0px 0px 0px 4px rgba(127, 86, 217, 0.12);
+  }
+
+  &.has-value {
+    border-color: var(--theme-color, #7F56D9);
+  }
+
+  &.has-error {
+    border-color: #ff4d4f;
+    box-shadow: 0px 0px 0px 4px rgba(255, 77, 79, 0.12);
+  }
+
+  &:disabled {
+    background: #F9FAFB;
+    cursor: not-allowed;
+  }
+}
+
+.code-input-error {
+  color: #ff4d4f;
+  font-size: 14px;
+  margin-top: -20px;
+  margin-bottom: 24px;
+  text-align: left;
+  line-height: 22px;
+  min-height: 22px;
+}
+
+/* 按钮样式 */
+.register-submit-btn {
+  height: 44px;
+  margin-bottom: 12px;
+  border-radius: 8px;
+  font-size: 16px;
+  font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+  font-weight: 600;
+  background: var(--theme-color, #7F56D9);
+  border-color: var(--theme-color, #7F56D9);
+
+  &:hover:not(:disabled) {
+    background: var(--theme-color-hover, #6941C6);
+    border-color: var(--theme-color-hover, #6941C6);
+  }
+
+  &:active:not(:disabled) {
+    background: var(--theme-color-active, #53389E);
+    border-color: var(--theme-color-active, #53389E);
+  }
+}
+
+.register-back-btn {
+  height: 44px;
+  border-radius: 8px;
+  font-size: 16px;
+  font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+  font-weight: 600;
+  color: #344054;
+  border: 1px solid #D0D5DD;
+  background: #FFFFFF;
+
+  &:hover {
+    border-color: #98A2B3;
+    background: #F9FAFB;
+    color: #344054;
+  }
+
+  &:active {
+    border-color: #667085;
+    background: #F2F4F7;
+    color: #344054;
+  }
+}
+
+/* 成功图标 */
+.success-icon-wrapper {
+  margin: 0 auto 24px auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+/* 密码设置表单 */
+.password-set-form {
+  margin-top: 32px;
+
+  .password-input {
+    height: 44px;
+    border-radius: 8px;
+    font-size: 16px;
+
+    input {
+      font-size: 16px;
+    }
+
+    .ant-input-password-icon {
+      color: #667085;
+      font-size: 20px;
+    }
+  }
+
+  .ant-form-item {
+    margin-bottom: 16px;
+  }
+
+  .ant-form-item-explain-error {
+    font-size: 14px;
+    line-height: 20px;
+    text-align: left;
+  }
+}
+
+/* 邮箱显示区域 */
+.register-email-display {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 10px;
+  margin: 0 0 32px 0;
+
+  .email-text {
+    line-height: 24px;
+    color: #475467;
+    font-size: 14px;
+  }
+
+  .edit-email-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: transparent;
+    border: none;
+    cursor: pointer;
+    padding: 0;
+    border-radius: 4px;
+    transition: all 0.2s ease;
+
+    &:hover {
+      background: #F9FAFB;
+    }
+
+    &:active {
+      background: #F2F4F7;
+    }
+  }
+}
+
+/* 邮件链接验证页面 */
+.verifying-email-link-page {
+  .register-step-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    min-height: 400px;
+  }
+
+  .verifying-text {
+    margin-top: 24px;
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 24px;
+    color: #101828;
+    text-align: center;
+  }
+}
+
+/* 邮件链接结果页面（过期、已使用） */
+.email-link-expired-page,
+.email-link-already-used-page {
+  .email-link-result-title {
+    margin: 0 0 12px 0;
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 24px;
+    color: #101828;
+    text-align: center;
+  }
+
+  .email-link-result-desc {
+    margin: 0 0 32px 0;
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 24px;
+    color: #475467;
+    text-align: center;
+  }
+
+  .register-footer-prompt {
+    margin-top: 32px;
+    text-align: center;
+    font-size: 14px;
+    font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+    font-weight: 400;
+    line-height: 20px;
+    color: #475467;
+
+    .prompt-text {
+      color: #475467;
+    }
+
+    .prompt-link {
+      color: var(--theme-color, #7F56D9);
+      font-weight: 600;
+      cursor: pointer;
+      background: transparent;
+      border: none;
+      padding: 0;
+      text-decoration: none;
+      transition: all 0.2s ease;
+
+      &:hover {
+        opacity: 0.8;
+        text-decoration: underline;
+      }
+
+      &:active {
+        opacity: 0.6;
+      }
+    }
+  }
+}
+

package/es/pro/Login2.0/types.js

@@ -0,0 +1 @@
+export {};

package/lib/components/appointmentBooking/components/Cart/Item/index.js

@@ -45,7 +45,7 @@ var import_Total = __toESM(require("./Total"));
 var import_Deposit = __toESM(require("../../Deposit"));
 var import_utils3 = require("../utils");
 var import_index = require("./index.less");
-var CartItem = ({ onNext }) => {
+var CartItem = ({ onNext, renderContactInfo }) => {
   var _a, _b, _c, _d, _e;
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
   const {
@@ -152,7 +152,9 @@ var CartItem = ({ onNext }) => {
   const products = (0, import_react.useMemo)(() => {
     if (!(carts == null ? void 0 : carts.length)) return [];
     carts.forEach((item) => {
-      item.isShowChangeHolder = !appointmentBooking.isTargetCartIdNormalProduct(item == null ? void 0 : item._id);
+      item.isShowChangeHolder = !appointmentBooking.isTargetCartIdNormalProduct(
+        item == null ? void 0 : item._id
+      );
     });
     if ((currentSelectedResources == null ? void 0 : currentSelectedResources.length) > 0) {
       const newCarts = carts.map((item) => {
@@ -181,7 +183,7 @@ var CartItem = ({ onNext }) => {
     {
       className: `appointment-cart-item-wrap ${(0, import_utils.isMobile)() ? "appointment-cart-mobile-item-wrap" : ""}`
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "content" }, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "content" }, renderContactInfo ? renderContactInfo() : null, /* @__PURE__ */ import_react.default.createElement(
       import_shoppingCart.default,
       {
         productParams: {

package/lib/components/appointmentBooking/components/ConfirmInformation/index.js

@@ -41,6 +41,9 @@ var import_Item = __toESM(require("../Cart/Item"));
 var import_utils2 = require("../../utils");
 var import_utils3 = require("./utils");
 var import_index = require("./index.less");
+var import_ContactInfoContent = __toESM(require("../../../../plus/contactInfoModal/ContactInfoContent"));
+var import_antd = require("antd");
+var import_useLoginUser = __toESM(require("../../../../hooks/useLoginUser"));
 var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
   var _a, _b;
   const hasSubscribedRef = (0, import_react.useRef)(false);
@@ -49,7 +52,69 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
   const utils = (0, import_hooks.contextUtils)();
   const { pubsub } = context.appHelper.utils;
   const { appointmentBooking, summary, isAgreeDepositPolicy, setLoading } = (0, import_context.useAppointmentBookingContext)();
-  const { isRetailTemplate } = (0, import_hooks.useAppointmentBookingSetting)();
+  const { isRetailTemplate, bookingSetting } = (0, import_hooks.useAppointmentBookingSetting)();
+  console.log(bookingSetting, "bookingSetting");
+  const [form] = import_antd.Form.useForm();
+  const userInfo = (0, import_useLoginUser.default)();
+  const getContactsInfo = async () => {
+    var _a2;
+    let contacts_info = null;
+    try {
+      const res = await ((_a2 = appointmentBooking == null ? void 0 : appointmentBooking.getContactInfo) == null ? void 0 : _a2.call(appointmentBooking, {
+        key: "contacts_info"
+      }));
+      if ((res == null ? void 0 : res.code) == 200 && (res == null ? void 0 : res.data)) {
+        contacts_info = res == null ? void 0 : res.data;
+      }
+    } catch (error) {
+      console.log("error", error);
+      contacts_info = null;
+    }
+    const transfromCountryCallingCode = (code) => {
+      if (!code) {
+        return "";
+      }
+      return (code == null ? void 0 : code.startsWith("+")) ? code : `+${code}`;
+    };
+    if (contacts_info) {
+      const { first_name, last_name, phone, email } = contacts_info || {};
+      form.setFieldsValue({
+        first_name,
+        last_name,
+        phone: {
+          phone: phone == null ? void 0 : phone.phone,
+          countryCallingCode: transfromCountryCallingCode(
+            phone == null ? void 0 : phone.country_calling_code
+          ),
+          countryCode: phone == null ? void 0 : phone.country_code
+        },
+        email
+      });
+    } else {
+      console.log("userInfo", userInfo);
+      const {
+        first_name,
+        last_name,
+        phone,
+        email,
+        country_calling_code,
+        country_code
+      } = userInfo || {};
+      form.setFieldsValue({
+        first_name,
+        last_name,
+        phone: {
+          phone,
+          countryCallingCode: transfromCountryCallingCode(country_calling_code),
+          countryCode: country_code
+        },
+        email
+      });
+    }
+  };
+  (0, import_react.useEffect)(() => {
+    getContactsInfo();
+  }, []);
   const goPaymentFinish = (order_id, amount) => {
     var _a2;
     const url = `/payment-finish/success?order_id=${order_id}&amount=${Number(
@@ -60,17 +125,17 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
   };
   (0, import_react.useEffect)(() => {
     if (isRetailTemplate) {
-      handleForm();
+      handleForm(false);
     }
   }, [isRetailTemplate]);
-  const handleForm = async (isSubmit) => {
+  const handleForm = async (isSubmit, extraData) => {
     var _a2;
     const carts = await appointmentBooking.getCart();
     const key = "isRetailFormSubmit";
     const isRetailFormSubmit = appointmentBooking.getOtherData(key);
     const callback = () => {
       if (isSubmit) {
-        onCheckout();
+        onCheckout(extraData);
       }
     };
     if (isRetailFormSubmit) {
@@ -94,7 +159,7 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
       }
     });
   };
-  const handleNext = async () => {
+  const handleNext = async (extraData) => {
     var _a2;
     const { deposit } = summary;
     if ((deposit == null ? void 0 : deposit.hasDeposit) && ((_a2 = deposit == null ? void 0 : deposit.protocols) == null ? void 0 : _a2.length) > 0 && !isAgreeDepositPolicy) {
@@ -102,15 +167,15 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
     }
     setLoading(true);
     if (isRetailTemplate) {
-      handleForm(true);
+      handleForm(true, extraData);
       return;
     }
-    onCheckout();
+    onCheckout(extraData);
   };
-  const onCheckout = async () => {
+  const onCheckout = async (extraData) => {
     try {
       const { deposit } = summary;
-      const { data } = await appointmentBooking.submitOrder();
+      const { data } = await appointmentBooking.submitOrder(extraData);
       const { is_deposit, deposit_amount, total_amount, order_id } = data || {};
       const _total = is_deposit ? deposit_amount : total_amount;
       if (_total > 0) {
@@ -143,8 +208,8 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
       }, 50);
     }
   };
-  const handleSubmit = () => {
-    var _a2, _b2, _c, _d;
+  const handleSubmit = async () => {
+    var _a2, _b2, _c, _d, _e, _f, _g;
     if ((_b2 = (_a2 = utils == null ? void 0 : utils.businessUtils) == null ? void 0 : _a2.isGuestUser) == null ? void 0 : _b2.call(_a2)) {
       if (!hasSubscribedRef.current) {
         pubsub.subscribe("bind.guest.user", handleNext);
@@ -153,7 +218,23 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
       (_d = (_c = utils == null ? void 0 : utils.businessUtils) == null ? void 0 : _c.openRegisterModal) == null ? void 0 : _d.call(_c, true);
       return;
     }
-    handleNext();
+    let contacts_info = null;
+    try {
+      if (showContactInfo) {
+        contacts_info = await form.validateFields();
+        const newPhone = {
+          phone: ((_e = contacts_info == null ? void 0 : contacts_info.phone) == null ? void 0 : _e.phone) || "",
+          country_calling_code: ((_f = contacts_info == null ? void 0 : contacts_info.phone) == null ? void 0 : _f.countryCallingCode) || "",
+          country_code: ((_g = contacts_info == null ? void 0 : contacts_info.phone) == null ? void 0 : _g.countryCode) || ""
+        };
+        contacts_info.phone = newPhone;
+        console.log("contacts_info", contacts_info);
+      }
+    } catch (error) {
+      console.log("error", error);
+      return;
+    }
+    handleNext({ contacts_info });
   };
   (0, import_react.useEffect)(() => {
     return () => {
@@ -164,7 +245,64 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
   (0, import_react.useImperativeHandle)(ref, () => ({
     next: handleSubmit
   }));
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-wrap" }, (0, import_utils.isMobile)() ? /* @__PURE__ */ import_react.default.createElement(import_Item.default, { onNext: handleSubmit }) : /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "image" }, /* @__PURE__ */ import_react.default.createElement(
+  const showContactInfo = (0, import_react.useMemo)(() => {
+    let visible = false;
+    const { showContactInfo: showContactInfoValue, contactInfoSetting } = bookingSetting || {};
+    if (showContactInfoValue === 1 || showContactInfoValue === "1") {
+      const { showName, showPhone, showEmail } = contactInfoSetting || {};
+      if ((showName === 0 || showName === "0") && (showPhone === 0 || showPhone === "0") && (showEmail === 0 || showEmail === "0")) {
+        visible = false;
+      } else {
+        visible = true;
+      }
+    } else {
+      visible = false;
+    }
+    return visible;
+  }, [bookingSetting == null ? void 0 : bookingSetting.showContactInfo, bookingSetting == null ? void 0 : bookingSetting.contactInfoSetting]);
+  const renderContactInfo = () => {
+    const {
+      emailRequired,
+      nameRequired,
+      phoneRequired,
+      showEmail,
+      showName,
+      showPhone
+    } = (bookingSetting == null ? void 0 : bookingSetting.contactInfoSetting) || {};
+    if (!showContactInfo) {
+      return null;
+    }
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-contact-info-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-contact-info-title" }, import_utils.locales.getText("pisell2.text.contact-info.title")), /* @__PURE__ */ import_react.default.createElement(
+      import_ContactInfoContent.default,
+      {
+        dataSource: null,
+        form,
+        config: {
+          first_name: {
+            visible: showName === 0 ? false : true,
+            required: nameRequired === "required" ? true : false
+            // 姓名默认选填
+          },
+          last_name: {
+            visible: showName === 0 ? false : true,
+            required: nameRequired === "required" ? true : false
+            // 姓名默认选填
+          },
+          phone: {
+            visible: showPhone === 0 ? false : true,
+            required: phoneRequired === "optional" ? false : true
+            // 手机号默认必填
+          },
+          email: {
+            visible: showEmail === 0 ? false : true,
+            required: emailRequired === "optional" ? false : true
+            // 邮箱默认选填
+          }
+        }
+      }
+    ));
+  };
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-wrap" }, (0, import_utils.isMobile)() ? /* @__PURE__ */ import_react.default.createElement(import_Item.default, { onNext: handleSubmit, renderContactInfo }) : showContactInfo ? renderContactInfo() : /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "image" }, /* @__PURE__ */ import_react.default.createElement(
     "img",
     {
       src: `${config == null ? void 0 : config.awsStatic}/checkout_confirm.png`,

package/lib/components/appointmentBooking/components/ConfirmInformation/index.less

@@ -33,3 +33,18 @@
     }
   }
 }
+.appointment-confirm-information-contact-info-wrap {
+  .appointment-confirm-information-contact-info-title {
+    color: #1b1b1b;
+    font-size: 20px;
+    font-weight: 600;
+  }
+
+  .pisell-contact-info-modal-content {
+    padding: 14px 0;
+  }
+
+  .pisell-lowcode-form-item {
+    margin-bottom: 14px;
+  }
+}