@pisell/private-materials 3.0.145 → 3.0.147

package/es/components/booking/components/footer/utils.js

@@ -223,8 +223,11 @@ export var formatValues = function formatValues(state) {
 
   // 日期
   if ((_values = values) !== null && _values !== void 0 && (_values$bookings = _values.bookings) !== null && _values$bookings !== void 0 && (_values$bookings$ = _values$bookings[0]) !== null && _values$bookings$ !== void 0 && _values$bookings$.select_date && !(state !== null && state !== void 0 && state.bookingId)) {
+    var _values2, _values2$bookings, _values2$bookings$;
     // 默认用第一个预约的选择日期并且是新建，编辑目前先不处理，用于解决附加费问题
-    values.schedule_date = values.bookings[0].select_date;
+    var startTime = "".concat((_values2 = values) === null || _values2 === void 0 ? void 0 : (_values2$bookings = _values2.bookings) === null || _values2$bookings === void 0 ? void 0 : (_values2$bookings$ = _values2$bookings[0]) === null || _values2$bookings$ === void 0 ? void 0 : _values2$bookings$.start_time);
+    startTime = "".concat(startTime || '00:00', ":00");
+    values.schedule_date = "".concat(values.bookings[0].select_date, " ").concat(startTime);
   }
   return values;
 };

package/es/components/booking/locales.js

@@ -237,7 +237,7 @@ export default {
     'pisell2.text.edit': '编辑',
     'pisell2.text.remove': '移除',
     'pisell2.text.apply': '应用',
-    'pisell2.text.to-pay': '待支付',
+    'pisell2.text.to-pay': '待付款',
     'pisell2.text.details': '详情',
     'pisell2.text.checkout': '结账',
     'pisell2.text.save': '保存',
@@ -370,8 +370,8 @@ export default {
     'pisell2.text.rebook': "再次预约",
     'pisell2.text.now': '现在',
     'pisell2.text.deposit-list': "定金列表",
-    'pisell2.text.deposit-item-status-paid': "已支付",
-    'pisell2.text.deposit-item-status-unpaid': "未支付",
+    'pisell2.text.deposit-item-status-paid': "已付款",
+    'pisell2.text.deposit-item-status-unpaid': "未付款",
     'pisell2.text.deposit-item-status-partially-paid': "部分付款",
     'pisell2.text.deposit-order-total': "订单总额",
     'pisell2.text.deposit-order-detail': "订单详情",
@@ -379,10 +379,10 @@ export default {
     'pisell2.text.deposit-order-no': "订单编号",
     'pisell2.text.deposit-amount': "金额",
     'pisell2.text.deposit-deposit-amount': "定金金额",
-    'pisell2.text.deposit-deposit-paid': "\u5DF2\u652F\u4ED8",
-    'pisell2.text.deposit-deposit-paid-due': "\u5F85\u652F\u4ED8",
+    'pisell2.text.deposit-deposit-paid': "\u5DF2\u4ED8\u6B3E",
+    'pisell2.text.deposit-deposit-paid-due': "\u5F85\u4ED8\u6B3E",
     'pisell2.text.deposit-deposit-paid-including-surcharge': "\u5305\u542B\u652F\u4ED8\u624B\u7EED\u8D39",
-    'pisell2.text.deposit-generate-payment-link': "生成支付链接",
+    'pisell2.text.deposit-generate-payment-link': "生成付款链接",
     'pisell2.text.deposit-list-empty': "请添加定金",
     'pisell2.text.deposit-amount-message': "金额必须大于0",
     'pisell2.text.deposit-amount-message2': "定金金额不能大于订单总额",
@@ -447,7 +447,7 @@ export default {
     'page.booking.text.cancel-booking.msg': "该操作不可撤销，请谨慎操作。",
     'page.booking.text.disabled-tickets': "所有票单将被禁用。",
     'page.booking.text.paid.msg': function pageBookingTextPaidMsg(x) {
-      return "\u5173\u8054\u8BA2\u5355".concat(x === 'paid' ? '已支付' : '部分支付', "\u3002");
+      return "\u5173\u8054\u8BA2\u5355".concat(x === 'paid' ? '已付款' : '部分付款', "\u3002");
     },
     'page.booking.text.please-choose-an-option': "请选择：",
     'page.booking.text.please-choose-an-option-1': "退款：取消预约，同时处理退款。",
@@ -466,7 +466,7 @@ export default {
     'pisell2.text.edit': '編輯',
     'pisell2.text.remove': '移除',
     'pisell2.text.apply': '應用',
-    'pisell2.text.to-pay': '待支付',
+    'pisell2.text.to-pay': '待付款',
     'pisell2.text.details': '詳情',
     'pisell2.text.checkout': '結賬',
     'pisell2.text.save': '保存',
@@ -599,8 +599,8 @@ export default {
     'pisell2.text.rebook': "再次預約",
     'pisell2.text.now': '現在',
     'pisell2.text.deposit-list': "定金列表",
-    'pisell2.text.deposit-item-status-paid': "已支付",
-    'pisell2.text.deposit-item-status-unpaid': "未支付",
+    'pisell2.text.deposit-item-status-paid': "已付款",
+    'pisell2.text.deposit-item-status-unpaid': "未付款",
     'pisell2.text.deposit-item-status-partially-paid': "部分付款",
     'pisell2.text.deposit-order-total': "訂單總額",
     'pisell2.text.deposit-order-detail': "訂單詳情",
@@ -608,10 +608,10 @@ export default {
     'pisell2.text.deposit-order-no': "訂單編號",
     'pisell2.text.deposit-amount': "金額",
     'pisell2.text.deposit-deposit-amount': "定金金額",
-    'pisell2.text.deposit-deposit-paid': "\u5DF2\u652F\u4ED8",
-    'pisell2.text.deposit-deposit-paid-due': "\u5F85\u652F\u4ED8",
+    'pisell2.text.deposit-deposit-paid': "\u5DF2\u4ED8\u6B3E",
+    'pisell2.text.deposit-deposit-paid-due': "\u5F85\u4ED8\u6B3E",
     'pisell2.text.deposit-deposit-paid-including-surcharge': "\u5305\u542B\u652F\u4ED8\u624B\u7E8C\u8CBB",
-    'pisell2.text.deposit-generate-payment-link': "生成支付鏈接",
+    'pisell2.text.deposit-generate-payment-link': "生成付款鏈接",
     'pisell2.text.deposit-list-empty': "請添加定金",
     'pisell2.text.deposit-amount-message': "金額必須大於0",
     'pisell2.text.deposit-amount-message2': "定金金額不能大於訂單總額",
@@ -676,7 +676,7 @@ export default {
     'page.booking.text.cancel-booking.msg': '該操作不可撤銷，請謹慎操作。',
     'page.booking.text.disabled-tickets': '所有票單將被禁用。',
     'page.booking.text.paid.msg': function pageBookingTextPaidMsg(x) {
-      return "\u95DC\u806F\u8A02\u55AE".concat(x === 'paid' ? '已支付' : '部分支付', "\u3002");
+      return "\u95DC\u806F\u8A02\u55AE".concat(x === 'paid' ? '已付款' : '部分付款', "\u3002");
     },
     'page.booking.text.please-choose-an-option': '請選擇：',
     'page.booking.text.please-choose-an-option-1': '退款：取消預約，同時處理退款。',

package/es/components/booking/payments/index.d.ts

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Payments: (props: any) => any;
+declare const Payments: any;
 export default Payments;

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

@@ -162,7 +162,7 @@ var formatHolder = (state, values) => {
   return obj;
 };
 var formatValues = (state) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e;
   let values = {
     type: state.renderType === "eventBooking" ? "event_booking_v2" : "appointment_booking",
     platform: "shop",
@@ -190,7 +190,9 @@ var formatValues = (state) => {
   values.holder = formatHolder(state, values);
   values.bookings = formatBookings(state);
   if (((_c = (_b = values == null ? void 0 : values.bookings) == null ? void 0 : _b[0]) == null ? void 0 : _c.select_date) && !(state == null ? void 0 : state.bookingId)) {
-    values.schedule_date = values.bookings[0].select_date;
+    let startTime = `${(_e = (_d = values == null ? void 0 : values.bookings) == null ? void 0 : _d[0]) == null ? void 0 : _e.start_time}`;
+    startTime = `${startTime || "00:00"}:00`;
+    values.schedule_date = `${values.bookings[0].select_date} ${startTime}`;
   }
   return values;
 };

package/lib/components/booking/locales.js

@@ -264,7 +264,7 @@ var locales_default = {
     "pisell2.text.edit": "编辑",
     "pisell2.text.remove": "移除",
     "pisell2.text.apply": "应用",
-    "pisell2.text.to-pay": "待支付",
+    "pisell2.text.to-pay": "待付款",
     "pisell2.text.details": "详情",
     "pisell2.text.checkout": "结账",
     "pisell2.text.save": "保存",
@@ -391,8 +391,8 @@ var locales_default = {
     "pisell2.text.rebook": "再次预约",
     "pisell2.text.now": "现在",
     "pisell2.text.deposit-list": "定金列表",
-    "pisell2.text.deposit-item-status-paid": "已支付",
-    "pisell2.text.deposit-item-status-unpaid": "未支付",
+    "pisell2.text.deposit-item-status-paid": "已付款",
+    "pisell2.text.deposit-item-status-unpaid": "未付款",
     "pisell2.text.deposit-item-status-partially-paid": "部分付款",
     "pisell2.text.deposit-order-total": "订单总额",
     "pisell2.text.deposit-order-detail": "订单详情",
@@ -400,10 +400,10 @@ var locales_default = {
     "pisell2.text.deposit-order-no": "订单编号",
     "pisell2.text.deposit-amount": "金额",
     "pisell2.text.deposit-deposit-amount": "定金金额",
-    "pisell2.text.deposit-deposit-paid": `已支付`,
-    "pisell2.text.deposit-deposit-paid-due": `待支付`,
+    "pisell2.text.deposit-deposit-paid": `已付款`,
+    "pisell2.text.deposit-deposit-paid-due": `待付款`,
     "pisell2.text.deposit-deposit-paid-including-surcharge": `包含支付手续费`,
-    "pisell2.text.deposit-generate-payment-link": "生成支付链接",
+    "pisell2.text.deposit-generate-payment-link": "生成付款链接",
     "pisell2.text.deposit-list-empty": "请添加定金",
     "pisell2.text.deposit-amount-message": "金额必须大于0",
     "pisell2.text.deposit-amount-message2": "定金金额不能大于订单总额",
@@ -468,7 +468,7 @@ var locales_default = {
     "page.booking.text.cancel-booking": "取消预约",
     "page.booking.text.cancel-booking.msg": "该操作不可撤销，请谨慎操作。",
     "page.booking.text.disabled-tickets": "所有票单将被禁用。",
-    "page.booking.text.paid.msg": (x) => `关联订单${x === "paid" ? "已支付" : "部分支付"}。`,
+    "page.booking.text.paid.msg": (x) => `关联订单${x === "paid" ? "已付款" : "部分付款"}。`,
     "page.booking.text.please-choose-an-option": "请选择：",
     "page.booking.text.please-choose-an-option-1": "退款：取消预约，同时处理退款。",
     "page.booking.text.please-choose-an-option-2": "仅取消：仅取消预约，但不进行退款处理。（您仍然可以在取消后再进行退款操作）"
@@ -486,7 +486,7 @@ var locales_default = {
     "pisell2.text.edit": "編輯",
     "pisell2.text.remove": "移除",
     "pisell2.text.apply": "應用",
-    "pisell2.text.to-pay": "待支付",
+    "pisell2.text.to-pay": "待付款",
     "pisell2.text.details": "詳情",
     "pisell2.text.checkout": "結賬",
     "pisell2.text.save": "保存",
@@ -613,8 +613,8 @@ var locales_default = {
     "pisell2.text.rebook": "再次預約",
     "pisell2.text.now": "現在",
     "pisell2.text.deposit-list": "定金列表",
-    "pisell2.text.deposit-item-status-paid": "已支付",
-    "pisell2.text.deposit-item-status-unpaid": "未支付",
+    "pisell2.text.deposit-item-status-paid": "已付款",
+    "pisell2.text.deposit-item-status-unpaid": "未付款",
     "pisell2.text.deposit-item-status-partially-paid": "部分付款",
     "pisell2.text.deposit-order-total": "訂單總額",
     "pisell2.text.deposit-order-detail": "訂單詳情",
@@ -622,10 +622,10 @@ var locales_default = {
     "pisell2.text.deposit-order-no": "訂單編號",
     "pisell2.text.deposit-amount": "金額",
     "pisell2.text.deposit-deposit-amount": "定金金額",
-    "pisell2.text.deposit-deposit-paid": `已支付`,
-    "pisell2.text.deposit-deposit-paid-due": `待支付`,
+    "pisell2.text.deposit-deposit-paid": `已付款`,
+    "pisell2.text.deposit-deposit-paid-due": `待付款`,
     "pisell2.text.deposit-deposit-paid-including-surcharge": `包含支付手續費`,
-    "pisell2.text.deposit-generate-payment-link": "生成支付鏈接",
+    "pisell2.text.deposit-generate-payment-link": "生成付款鏈接",
     "pisell2.text.deposit-list-empty": "請添加定金",
     "pisell2.text.deposit-amount-message": "金額必須大於0",
     "pisell2.text.deposit-amount-message2": "定金金額不能大於訂單總額",
@@ -690,7 +690,7 @@ var locales_default = {
     "page.booking.text.cancel-booking": "取消預約",
     "page.booking.text.cancel-booking.msg": "該操作不可撤銷，請謹慎操作。",
     "page.booking.text.disabled-tickets": "所有票單將被禁用。",
-    "page.booking.text.paid.msg": (x) => `關聯訂單${x === "paid" ? "已支付" : "部分支付"}。`,
+    "page.booking.text.paid.msg": (x) => `關聯訂單${x === "paid" ? "已付款" : "部分付款"}。`,
     "page.booking.text.please-choose-an-option": "請選擇：",
     "page.booking.text.please-choose-an-option-1": "退款：取消預約，同時處理退款。",
     "page.booking.text.please-choose-an-option-2": "僅取消：僅取消預約，但不進行退款處理。（您仍然可以在取消後再進行退款操作）"

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

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Payments: (props: any) => any;
+declare const Payments: any;
 export default Payments;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.145",
+  "version": "3.0.147",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/utils": "1.0.42",
-    "@pisell/materials": "3.0.48",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "1.0.100"
+    "@pisell/utils": "1.0.42",
+    "@pisell/date-picker": "1.0.100",
+    "@pisell/materials": "3.0.48"
   },
   "peerDependencies": {
     "react": "^18.0.0",