@pisell/private-materials 6.1.7 → 6.1.8

package/lib/components/booking/components/customiseItemModal/index.less

@@ -0,0 +1,593 @@
+.customise-item-modal {
+  .ant-modal-content {
+    padding: 0;
+    border-radius: 16px;
+    overflow: hidden;
+  }
+
+  .ant-modal-body {
+    padding: 0;
+  }
+
+  &-content {
+    position: relative;
+    overflow: visible;
+  }
+
+  &-header {
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    padding: 0 24px 24px 0;
+    margin-bottom: 16px;
+    position: relative;
+  }
+
+  &-title {
+    font-size: 20px;
+    font-weight: 600;
+    color: #000;
+    margin: 0;
+    text-align: center;
+  }
+
+  &-close {
+    position: absolute;
+    right: 8px;
+    top: 20%;
+    transform: translateY(-50%);
+    border: none;
+    box-shadow: none;
+    padding: 8px;
+    width: 40px;
+    height: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 24px;
+    font-weight: normal;
+    
+    &:hover {
+      background: #f5f5f5;
+      border-radius: 6px;
+    }
+  }
+
+  &-body {
+    display: flex;
+    padding: 0 24px 24px;
+    gap: 32px;
+    min-height: 480px;
+  }
+
+  &-illustration {
+    flex: 0 0 240px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding-right: 24px;
+  }
+
+  .customise-item-illustration-image {
+    width: 220px;
+    height: 220px;
+    object-fit: contain;
+  }
+
+  &-form {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 20px;
+  }
+
+  .customise-item-form-group {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+
+    &:last-child {
+      margin-top: auto;
+    }
+  }
+
+  .customise-item-form-label {
+    font-size: 14px;
+    font-weight: 500;
+    color: #000;
+    margin-bottom: 4px;
+  }
+
+  .customise-item-product-name-input {
+    height: 48px;
+    border-radius: 8px;
+    border: 1px solid #d9d9d9;
+    font-size: 14px;
+
+    &:focus,
+    &:hover {
+      border-color: #722ed1;
+    }
+
+    &.ant-input-focused {
+      border-color: #722ed1;
+      box-shadow: 0 0 0 2px rgba(114, 46, 209, 0.1);
+    }
+  }
+
+  .customise-item-vouchers-checkbox {
+    font-size: 14px;
+    color: #000;
+    margin-left: 0;
+
+    .ant-checkbox {
+      top: 0;
+    }
+
+    .ant-checkbox-checked .ant-checkbox-inner {
+      background-color: #722ed1;
+      border-color: #722ed1;
+    }
+
+    .ant-checkbox:hover .ant-checkbox-inner {
+      border-color: #722ed1;
+    }
+
+    .ant-checkbox-wrapper:hover .ant-checkbox-inner {
+      border-color: #722ed1;
+    }
+  }
+
+  // 价格选项样式
+  .customise-item-price-option {
+    display: flex;
+    align-items: center;
+    gap: 16px;
+    margin-bottom: 20px;
+  }
+
+  .customise-item-price-content {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+  }
+
+  .customise-item-radio {
+    width: 20px;
+    height: 20px;
+    min-width: 20px;
+    min-height: 20px;
+    border-radius: 50%;
+    border: 2px solid #d9d9d9;
+    background: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    transition: all 0.2s ease;
+    outline: none;
+    flex-shrink: 0;
+    /* iPad 兼容性修复 */
+    -webkit-appearance: none;
+    appearance: none;
+    padding: 0;
+    margin: 0;
+    box-sizing: border-box;
+    /* 确保圆形在所有设备上正确显示 */
+    -webkit-border-radius: 50%;
+    position: relative;
+    /* 修复 flexbox 居中问题 */
+    -webkit-box-align: center;
+    -webkit-box-pack: center;
+    -webkit-align-items: center;
+    -webkit-justify-content: center;
+    margin-top: 28px;
+
+    .radio-dot {
+      width: 8px;
+      height: 8px;
+      min-width: 8px;
+      min-height: 8px;
+      border-radius: 50%;
+      background: transparent;
+      transition: all 0.2s ease;
+      flex-shrink: 0;
+      /* iPad 兼容性修复 */
+      -webkit-border-radius: 50%;
+      box-sizing: border-box;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      -webkit-transform: translate(-50%, -50%);
+      transform: translate(-50%, -50%);
+    }
+
+    &.active {
+      &.purple {
+        border-color: #722ed1;
+        
+        .radio-dot {
+          background: #722ed1;
+        }
+      }
+
+      &.red {
+        border-color: #ff4d4f;
+        
+        .radio-dot {
+          background: #ff4d4f;
+        }
+      }
+    }
+
+    /* 触摸设备优化 */
+    @media (pointer: coarse) {
+      /* 增加触摸区域 */
+      &::before {
+        content: '';
+        position: absolute;
+        top: -10px;
+        left: -10px;
+        right: -10px;
+        bottom: -10px;
+        z-index: -1;
+      }
+    }
+
+    /* WebKit 特定修复 */
+    @supports (-webkit-appearance: none) {
+      /* 修复 WebKit 中的按钮默认样式 */
+      font-family: inherit;
+      font-size: inherit;
+      line-height: inherit;
+      color: inherit;
+      background-color: #fff;
+      
+      /* 禁用 WebKit 的默认触摸高亮 */
+      -webkit-tap-highlight-color: transparent;
+      
+      /* 确保边框渲染正确 */
+      -webkit-background-clip: padding-box;
+      background-clip: padding-box;
+    }
+
+    /* iOS Safari 特定修复 */
+    @supports (-webkit-touch-callout: none) {
+      /* 禁用长按菜单 */
+      -webkit-touch-callout: none;
+      -webkit-user-select: none;
+      user-select: none;
+      
+      /* 确保点击事件正常 */
+      pointer-events: auto;
+      
+      /* 修复 iOS 上的按钮样式问题 */
+      border-style: solid;
+      border-width: 2px;
+    }
+  }
+
+  .customise-item-price-title {
+    font-size: 14px;
+    font-weight: 500;
+    color: #D0D5DD;
+    transition: all 0.2s ease;
+
+    &.purple {
+      color: #722ed1;
+    }
+
+    &.red {
+      color: #ff4d4f;
+    }
+  }
+
+  .customise-item-price-input {
+    display: flex;
+    align-items: center;
+    width: calc(100% - 32px);
+    height: 48px;
+    padding: 10px 16px;
+    border: 2px solid #d9d9d9;
+    border-radius: 12px;
+    background: #fff;
+    cursor: pointer;
+    transition: all 0.2s ease;
+    outline: none;
+    box-sizing: content-box;
+    line-height: normal;
+
+    &.active {
+      &.purple {
+        border-color: #722ed1;
+        background: #f9f0ff;
+      }
+
+      &.red {
+        border-color: #ff4d4f;
+        background: #fff2f0;
+      }
+    }
+
+    .price-currency {
+      font-size: 16px;
+      font-weight: 600;
+      color: #8c8c8c;
+      margin-right: 8px;
+      flex-shrink: 0;
+    }
+
+    .price-minus {
+      font-size: 20px;
+      font-weight: 600;
+      color: #ff4d4f;
+      margin-right: 4px;
+      flex-shrink: 0;
+      margin-top: -4px;
+    }
+
+    .price-input-display {
+      flex: 1;
+      font-size: 24px;
+      font-weight: 600;
+      color: #8c8c8c;
+      text-align: right;
+      padding: 0;
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      min-height: 32px;
+
+      &.placeholder {
+        color: #D0D5DD!important;
+      }
+
+      &:empty::before {
+        content: attr(data-placeholder);
+        color: #bfbfbf;
+        font-weight: normal;
+      }
+    }
+
+    &.active.purple .price-currency {
+      color: #722ed1;
+    }
+
+    &.active.purple .price-input-display {
+      color: #722ed1;
+    }
+
+    &.active.red .price-currency {
+      color: #ff4d4f;
+    }
+
+    &.active.red .price-input-display {
+      color: #ff4d4f;
+    }
+
+    // VirtualKeyInput 样式覆盖
+    .virtual-keyboard-input-wrap {
+      border: none;
+      background: transparent;
+      
+      .virtual-keyboard-input {
+        background: transparent;
+        border: none;
+        padding: 0;
+      }
+
+      .virtual-keyboard-input-delete {
+        display: none; // 隐藏删除按钮，因为我们已经有自己的删除逻辑
+      }
+    }
+
+    .virtual-keyboard-price-input {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+    }
+  }
+
+
+  &-footer {
+    display: flex;
+    justify-content: flex-end;
+    gap: 12px;
+    margin-top: 24px;
+    padding: 0 0 8px 0;
+  }
+
+  // 固定定位的数量选择器
+  .customise-item-quantity-selector-fixed {
+    position: absolute;
+    left: 24px;
+    bottom: 24px;
+    z-index: 10;
+  }
+
+  .customise-item-cancel-btn {
+    min-width: 100px;
+    height: 48px;
+    border-radius: 8px;
+    border: 1px solid #d9d9d9;
+    background: #fff;
+    color: #000;
+    font-weight: 500;
+
+    &:hover {
+      border-color: #722ed1;
+      color: #722ed1;
+      background: #f9f0ff;
+    }
+  }
+
+  .customise-item-save-btn {
+    min-width: 120px;
+    height: 48px;
+    border-radius: 8px;
+    background: #722ed1;
+    border-color: #722ed1;
+    font-weight: 500;
+
+    &:hover {
+      background: #9254de;
+      border-color: #9254de;
+    }
+
+    &:disabled {
+      background: #f5f5f5;
+      border-color: #d9d9d9;
+      color: #bfbfbf;
+    }
+  }
+}
+
+// iPad 特定修复
+@media (max-device-width: 1366px) and (-webkit-min-device-pixel-ratio: 1) {
+  .customise-item-modal {
+    .customise-item-radio {
+      /* 强制硬件加速 */
+      -webkit-transform: translateZ(0);
+      transform: translateZ(0);
+      /* 确保在 iPad 上正确渲染 */
+      will-change: transform;
+      
+      .radio-dot {
+        /* 强制硬件加速 */
+        -webkit-transform: translate(-50%, -50%) translateZ(0);
+        transform: translate(-50%, -50%) translateZ(0);
+        will-change: transform, background;
+      }
+    }
+  }
+}
+
+// 响应式设计
+@media (max-width: 768px) {
+  .customise-item-modal {
+    .ant-modal {
+      margin: 0;
+      max-width: 100vw;
+      height: 100vh;
+    }
+
+    .ant-modal-content {
+      height: 100vh;
+      border-radius: 0;
+    }
+
+    &-body {
+      flex-direction: column;
+      padding: 0 16px 16px;
+      gap: 16px;
+    }
+
+    &-illustration {
+      flex: none;
+      height: 120px;
+    }
+
+    .customise-item-illustration-placeholder {
+      width: 120px;
+      height: 120px;
+    }
+
+    &-header {
+      padding: 16px 16px 0;
+    }
+
+    &-footer {
+      flex-direction: column;
+      gap: 8px;
+      padding: 16px 0 0 0;
+    }
+
+    .customise-item-cancel-btn,
+    .customise-item-save-btn {
+      width: 100%;
+    }
+
+    // 移动端数量选择器固定定位调整
+    .customise-item-quantity-selector-fixed {
+      left: 16px;
+      bottom: 16px;
+      
+      .customise-item-quantity-selector {
+        .quantity-btn {
+          width: 36px;
+          height: 36px;
+          font-size: 16px;
+        }
+
+        .quantity-number {
+          min-width: 36px;
+          height: 36px;
+          font-size: 14px;
+        }
+      }
+    }
+  }
+}
+
+// 软键盘弹窗样式
+.quantity-keyboard-modal {
+  .ant-modal-content {
+    padding: 0;
+    border-radius: 16px 16px 0 0;
+    overflow: hidden;
+  }
+  .pisell-lowcode-modal-content {
+    padding: 0;
+  }
+
+  .ant-modal-body {
+    padding: 0;
+  }
+
+  // 移动端全屏
+  @media (max-width: 768px) {
+    .ant-modal {
+      max-width: 100% !important;
+      width: 100% !important;
+      margin: 0 !important;
+      padding: 0 !important;
+    }
+
+    .ant-modal-content {
+      border-radius: 16px 16px 0 0;
+      position: fixed;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      width: 100%;
+      margin: 0;
+    }
+  }
+}
+
+// 修复数量按钮样式，确保它看起来可点击
+.customise-item-quantity-selector {
+  .quantity-number {
+    cursor: pointer;
+    transition: background-color 0.15s ease;
+    border: none;
+    outline: none;
+
+    &:hover:not(:disabled) {
+      background: #f0f0f0;
+    }
+
+    &:active:not(:disabled) {
+      background: #e6e6e6;
+    }
+
+    &:disabled {
+      cursor: not-allowed;
+      opacity: 0.6;
+    }
+  }
+}
+
+ 

package/lib/components/booking/components/drawer/index.d.ts

@@ -0,0 +1,19 @@
+import React from 'react';
+import { DrawerProps } from 'antd';
+import './index.less';
+export interface PisellDrawerProps extends DrawerProps {
+    header?: React.ReactNode;
+    titleNoWrap?: boolean;
+    hideScrollBar?: boolean;
+    showGoBack?: boolean;
+}
+/**
+ * @title: 自定义抽屉
+ * @description:
+ * @param {PisellDrawerProps} props
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-01-30 16:51
+ */
+declare const Drawer: (props: PisellDrawerProps) => JSX.Element;
+export default Drawer;

package/lib/components/booking/components/footer/amount.d.ts

@@ -21,4 +21,5 @@ export declare const getSumTotal: (state: any, isEdit: boolean) => {
     totalRefundAmount: number;
     dueAmount: number;
     roundingAmount: number;
+    originExpectAmount: number;
 };

package/lib/components/booking/components/footer/amount.js

@@ -31,7 +31,7 @@ var getRelationDetailsTotal = (relation_details) => {
   let total = 0;
   for (let item of relation_details) {
     const number = item.product_quantity || item.num;
-    const price = item.payment_price || item.price;
+    const price = item.selling_price || item.payment_price || item.price;
     total += Number(price) * Number(number);
   }
   return total;
@@ -169,7 +169,7 @@ var getTotalRefundAmount = (state) => {
 };
 var getShopDiscount = (state) => {
   var _a;
-  return Number((_a = state.bookingDetail) == null ? void 0 : _a.shop_discount) || 0;
+  return Number(state.shop_discount) || Number((_a = state.bookingDetail) == null ? void 0 : _a.shop_discount) || 0;
 };
 var getRoundingAmount = (state) => {
   var _a;
@@ -189,6 +189,7 @@ var getSumTotal = (state, isEdit) => {
   const totalRefundAmount = getTotalRefundAmount(state);
   const shopDiscount = getShopDiscount(state);
   const expectAmount = getExpectAmount({ price, tax, otherAmount, shopDiscount, state, isEdit });
+  const originExpectAmount = getExpectAmount({ price, tax, shopDiscount: 0, otherAmount, state, isEdit });
   const sumTotalAmount = getSumTotalAmount({ expectAmount, roundingAmount });
   const notPaidAmount = Number((0, import_utils2.formatAmount)(sumTotalAmount, 2, "")) - orderPaidAmount;
   const actualPaidAmount = paidAmount;
@@ -209,7 +210,8 @@ var getSumTotal = (state, isEdit) => {
     orderPaidAmount,
     totalRefundAmount,
     dueAmount,
-    roundingAmount
+    roundingAmount,
+    originExpectAmount
   };
 };
 // Annotate the CommonJS export names for ESM import in node: