@fonixtree/magic-design 2.0.95 → 2.0.98

package/lib/composite-comp/common/components/MonpayProductItem/index.js

@@ -0,0 +1,283 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _commonUtil = require("../../../../utils/commonUtil");
+
+var _currencyUtil = require("../../../../utils/currencyUtil");
+
+var _common = require("../../../../common");
+
+var _ImageLabel = _interopRequireDefault(require("../ImageLabel"));
+
+var _components = require("../../../../meta-comp/components");
+
+var _businessUtil = require("../../../../utils/businessUtil");
+
+var _locale = require("../../../../locale");
+
+require("./index.less");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
+var __rest = void 0 && (void 0).__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) {
+    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  }
+
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
+var ProductItem =
+/** @class */
+function (_super) {
+  __extends(ProductItem, _super);
+
+  function ProductItem() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.state = {};
+    return _this;
+  }
+
+  ProductItem.prototype.render = function () {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+
+    var _m = this.props,
+        data = _m.data,
+        panelProps = _m.panelProps,
+        onItemClick = _m.onItemClick,
+        showProName = _m.showProName,
+        showProgress = _m.showProgress,
+        fixHeight = _m.fixHeight,
+        layout = _m.layout,
+        imgHeight = _m.imgHeight,
+        imgWidth = _m.imgWidth,
+        unknownPrice = _m.unknownPrice,
+        rest = __rest(_m, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
+
+    var promotions = (0, _businessUtil.getPromotionList)(data);
+    var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
+    /** 当是拼团时 显示价格 */
+
+    if (data.sppType && promotions.length) {
+      price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrency)(data.specialPrice) : (0, _currencyUtil.formatCurrency)(data.salesPrice);
+    }
+
+    var integerPart = price;
+    var decimalPart = null;
+
+    if (unknownPrice) {
+      if (price.length > 5) {
+        integerPart = price.slice(0, -5).replace(/\d/g, '? ') + price.slice(-5);
+      } else {
+        integerPart = price.replace(/\d/, '? ');
+      }
+    } else if (Array.isArray(price)) {
+      integerPart = price[0];
+      decimalPart = price[1];
+    }
+
+    var pricePrefix = (0, _commonUtil.ensure)(function () {
+      return window.systemParams.prefix;
+    }, 'Rp');
+
+    var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
+
+    var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
+    var discount = Number(data.discountPercent) || 0;
+    var salePercent = Number(data.salePercent) / 100 || 0;
+    var imgStyle = {};
+    if (imgWidth) imgStyle.width = imgWidth;
+    if (imgHeight) imgStyle.height = imgHeight;
+    var imgLabels = ((_a = data.labels) === null || _a === void 0 ? void 0 : _a.filter(function (f) {
+      return f.position !== '6' && f.position !== '7';
+    })) || [];
+    var prodLabels = ((_b = data.labels) === null || _b === void 0 ? void 0 : _b.filter(function (f) {
+      return f.position === '6';
+    })) || [];
+    var priceLabels = ((_c = data.labels) === null || _c === void 0 ? void 0 : _c.filter(function (f) {
+      return f.position === '7';
+    })) || [];
+    var soldNumber = data.salesCnt - data.salesCnt % 250;
+    return /*#__PURE__*/_react["default"].createElement("div", _extends({
+      className: (0, _classnames["default"])('monpay-product-item-wrap', {
+        fixHeight: fixHeight,
+        horizontal: layout === 'horizontal'
+      }),
+      onClick: function onClick() {
+        return onItemClick();
+      },
+      style: {
+        width: imgWidth + 2
+      }
+    }, rest), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "img-wrap"
+    }, /*#__PURE__*/_react["default"].createElement(_common.NewImg, {
+      className: "product-img",
+      lazy: true,
+      src: (0, _commonUtil.convertImageUrl)(data.productImg || data.imgUrlContent || data.productImageUrlContent),
+      style: imgStyle
+    }), /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
+      labels: imgLabels,
+      small: true
+    }), ((_d = panelProps.discount) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "discount-tag"
+    }, data.discountPercent, "% off")), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "content-wrap"
+    }, panelProps.label.open && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "promotions-wrap"
+    }, promotions.map(function (promot, index) {
+      return /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+        key: index,
+        className: "promotion-item",
+        data: __assign(__assign({}, panelProps.label), {
+          text: promot
+        }),
+        readonly: true
+      });
+    })), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "product-name-wrap"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "box"
+    }, prodLabels.length > 0 && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
+      labels: prodLabels,
+      small: true
+    }), showProName && panelProps.productName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+      data: __assign(__assign({}, panelProps.productName), {
+        text: data.offerName
+      }),
+      readonly: true
+    }))), panelProps.activityPrice.open && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "price-wrap"
+    }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+      className: "price",
+      data: __assign(__assign({}, panelProps.activityPrice), {
+        text: _price
+      }),
+      readonly: true
+    }), priceLabels.length > 0 && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
+      labels: priceLabels,
+      small: true
+    })), panelProps.salesPrice.open && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "price-sold-wrap"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "old-price-wrap"
+    }, !!discount && /*#__PURE__*/_react["default"].createElement("span", {
+      className: "discount"
+    }, "-", discount, "%"), oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+      className: "old-price",
+      data: __assign(__assign({}, panelProps.salesPrice), {
+        text: oldPrice
+      }),
+      readonly: true,
+      style: {
+        color: panelProps.salesPrice.content.color
+      }
+    }))), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "rate-sold-wrap"
+    }, ((_e = panelProps.evaluationScore) === null || _e === void 0 ? void 0 : _e.open) && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "evaluation-score"
+    }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+      color: "#FF8650",
+      size: 12,
+      type: "icon-star"
+    }), /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+      className: "rate-text",
+      data: __assign(__assign({}, panelProps.evaluationScore), {
+        text: (0, _currencyUtil.numberToFixed)(Number(data.evaluationAvg), 1)
+      }),
+      readonly: true
+    })), ((_f = panelProps.evaluationScore) === null || _f === void 0 ? void 0 : _f.open) && ((_g = panelProps.sold) === null || _g === void 0 ? void 0 : _g.open) && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "line"
+    }), ((_h = panelProps.sold) === null || _h === void 0 ? void 0 : _h.open) && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "sold"
+    }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+      data: __assign(__assign({}, panelProps.sold), {
+        text: "Sold " + soldNumber + "+"
+      }),
+      readonly: true
+    }))), showProgress && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "progress-wrap"
+    }, ((_j = panelProps.salesProgress) === null || _j === void 0 ? void 0 : _j.open) && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "progress-container"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "progress",
+      style: {
+        width: salePercent + "%",
+        backgroundColor: (_k = panelProps.salesProgress) === null || _k === void 0 ? void 0 : _k.color
+      }
+    })), ((_l = panelProps.stock) === null || _l === void 0 ? void 0 : _l.open) && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "text"
+    }, data.saleNum || 0, "/", data.stockNum || 0, " ", (0, _locale.i18n)('STOCK')))));
+  };
+
+  ProductItem.defaultProps = {
+    data: {},
+    panelProps: {},
+    showProName: true,
+    showProgress: true,
+    fixHeight: false,
+    layout: 'vertical'
+  };
+  return ProductItem;
+}(_react["default"].Component);
+
+var _default = ProductItem;
+exports["default"] = _default;

package/lib/composite-comp/common/components/MonpayProductItem/index.less

@@ -0,0 +1,211 @@
+.monpay-product-item-wrap {
+  display: flex;
+  flex-direction: column;
+  background: #FFFFFF;
+  border: 1px solid #D2D9E5;
+  width: 142px;
+  cursor: pointer;
+  position: relative;
+  margin-right: 12px;
+
+  .img-wrap {
+    position: relative;
+
+    .product-img {
+      width: 140px;
+      height: 140px;
+      object-fit: cover;
+    }
+
+    .discount-tag {
+      font-size: 12px;
+      font-weight: 700;
+      color: #fff;
+      background-color: #ff8650;
+      padding: 5px;
+      border-radius: 0 5px 5px 0;
+      position: absolute;
+      top: 15px;
+      left: 0;
+    }
+  }
+
+  .content-wrap {
+    padding: 12px;
+
+    .promotions-wrap {
+      display: flex;
+      flex-wrap: wrap;
+
+      .promotion-item {
+        margin-right: 5px;
+        margin-bottom: 5px;
+
+        &:last-child {
+          margin-right: 0;
+        }
+      }
+    }
+
+    .group-num {
+      display: inline-block;
+
+      .m-meta-button .btnContent img {
+        height: 14px;
+      }
+    }
+
+    .product-name-wrap {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 2;
+      line-height: 18px;
+      max-height: 40px;
+      white-space: wrap;
+    }
+
+    .price-wrap {
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+      margin-top: 6px;
+      margin-bottom: 4px;
+
+      .price {
+        width: auto !important;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        margin-right: 6px;
+      }
+    }
+
+    .price-sold-wrap {
+      display: flex;
+      margin-top: 0;
+      align-items: center;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      flex-wrap: wrap;
+      line-height: 15px;
+
+      .old-price-wrap {
+        display: flex;
+        line-height: 13px;
+
+        .discount {
+          margin-right: 3px;
+          font-family: 'Montserrat';
+          font-style: normal;
+          font-weight: 700;
+          font-size: 8px;
+          line-height: 15px;
+          color: #fff;
+          padding: 0 4px;
+          background-color: #CE1126;
+        }
+
+        .old-price {
+          text-decoration: line-through;
+          width: fit-content;
+          margin-left: 4px;
+        }
+      }
+
+      .sold-count {
+        color: #7b7b7b;
+        font-size: 12px;
+        text-align: right;
+        flex-grow: 1;
+      }
+    }
+
+    .rate-sold-wrap {
+      margin-top: 5px;
+      display: flex;
+      align-items: center;
+
+      .evaluation-score {
+        display: inline-flex;
+        align-items: center;
+
+        .rate-text {
+          margin-left: 4px;
+        }
+      }
+
+      .line {
+        display: inline-block;
+        width: 1px;
+        height: 16px;
+        background-color: #545454;
+        margin: 0 5px;
+      }
+
+      .sold {
+        display: inline-block;
+        color: #545454;
+        font-size: 12px;
+        font-weight: 400;
+      }
+    }
+
+    .progress-wrap {
+      margin-top: 10px;
+
+      .text {
+        font-family: 'Montserrat';
+        font-style: normal;
+        font-weight: 400;
+        font-size: 12px;
+        line-height: 12px;
+        color: #848484;
+        margin-top: 6px;
+        text-align: left;
+      }
+
+      .progress-container {
+        width: 100%;
+        height: 3px;
+        background-color: #D9D9D9;
+
+        .progress {
+          background: #FF8650;
+          height: 100%;
+        }
+      }
+
+    }
+  }
+
+  &.fixHeight {
+    .promotions-wrap {
+      height: 30px;
+      flex-wrap: nowrap;
+      overflow: hidden;
+    }
+
+    .product-name-wrap {
+      height: 38px;
+    }
+  }
+
+  &.horizontal {
+    flex-direction: row;
+
+    .product-img {
+      width: 100px;
+      height: 100%;
+      min-height: 100px;
+    }
+
+    .content-wrap {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+    }
+  }
+}

package/lib/composite-comp/common/components/ProductItem/index.js

@@ -140,9 +140,6 @@ function (_super) {
     var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
 
     var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
-
-    var _oldPrice = type === 'groupBuy' && data.sppMarketPrice ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.sppMarketPrice) : oldPrice;
-
     var discount = Number(data.discountPercent) || 0;
     var salePercent = Number(data.salePercent) / 100 || 0;
     var imgStyle = {};
@@ -157,9 +154,6 @@ function (_super) {
     var priceLabels = ((_c = data.labels) === null || _c === void 0 ? void 0 : _c.filter(function (f) {
       return f.position === '7';
     })) || [];
-    var shareByNum = (0, _commonUtil.ensure)(function () {
-      return data.campaigns.cmpShareBuys[0].shareByNum;
-    }, 0);
     return /*#__PURE__*/_react["default"].createElement("div", _extends({
       className: (0, _classnames["default"])('m-product-item-wrap', {
         fixHeight: fixHeight,
@@ -197,7 +191,7 @@ function (_super) {
     })), type === 'groupBuy' && panelProps.label.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "group-num",
       data: __assign(__assign({}, panelProps.label), {
-        text: shareByNum
+        text: data.shareByNum
       }),
       readonly: true
     }), /*#__PURE__*/_react["default"].createElement("div", {
@@ -228,17 +222,17 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "old-price-wrap"
     }, !!discount && /*#__PURE__*/_react["default"].createElement("span", {
-      className: "discount"
-    }, "-", discount, "%"), _oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+      className: type === 'groupBuy' ? 'discount2' : 'discount'
+    }, "-", discount, "%"), oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "old-price",
       data: __assign(__assign({}, panelProps.salesPrice), {
-        text: _oldPrice
+        text: oldPrice
       }),
       readonly: true,
       style: {
         color: panelProps.salesPrice.content.color
       }
-    })), !showProgress && data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+    })), type !== 'groupBuy' && !showProgress && data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "sold-count"
     }, (0, _commonUtil.convertCount)(data.salesCnt), " sold")), showProgress && ((_d = panelProps.salesProgress) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress-wrap"

package/lib/composite-comp/common/components/ProductItem/index.less

@@ -94,6 +94,16 @@
           background-color: #CE1126;
         }
 
+        .discount2 {
+          margin-right: 3px;
+          font-family: 'Montserrat';
+          font-style: normal;
+          font-weight: 700;
+          font-size: 12px;
+          line-height: 15px;
+          color: #2F3043;
+        }
+
         .old-price {
           text-decoration: line-through;
           width: fit-content;

package/lib/composite-comp/common/config-panels/CustomizeConfig/index.js

@@ -148,6 +148,19 @@ function (_super) {
             showRowNum: true
           });
         }
+      } // monpayRecommend
+
+
+      if (component === 'monpayRecommend') {
+        if (v === 'layout2' || v === 'layout4') {
+          _this.setState({
+            showRowNum: false
+          });
+        } else {
+          _this.setState({
+            showRowNum: true
+          });
+        }
       } // 移动端导航特殊处理
       // 更改需求，两个布局都需 可选行数
       // if (component == 'mobileNavigation') {

package/lib/composite-comp/{bol/config-panels/NewsletterConfig → common/config-panels}/InputField/index.js

@@ -9,15 +9,15 @@ var _react = _interopRequireDefault(require("react"));
 
 var _antd = require("antd");
 
-var _FontStyles = _interopRequireDefault(require("../../../../../common/FontStyles"));
+var _FontStyles = _interopRequireDefault(require("../../../../common/FontStyles"));
 
-var _common = require("../../../../../common");
+var _common = require("../../../../common");
 
-var _businessUtil = require("../../../../../utils/businessUtil");
+var _businessUtil = require("../../../../utils/businessUtil");
 
-var _TextConfig = require("../../../../../meta-comp/config-panels/TextConfig");
+var _TextConfig = require("../../../../meta-comp/config-panels/TextConfig");
 
-var _locale = require("../../../../../locale");
+var _locale = require("../../../../locale");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -87,15 +87,18 @@ function (_super) {
   TextConfig.prototype.render = function () {
     var _this = this;
 
-    var data = this.props.data;
+    var _a = this.props,
+        data = _a.data,
+        inputLabel = _a.inputLabel;
     var textData = data.content;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-text-config",
       style: {
-        paddingTop: 20
+        paddingTop: 12,
+        borderRadius: 6
       }
     }, /*#__PURE__*/_react["default"].createElement(_common.Field, {
-      title: (0, _locale.i18n)('PLACEHOLDER')
+      title: inputLabel || (0, _locale.i18n)('PLACEHOLDER')
     }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
       onChange: function onChange(e) {
         data.placeholder = e.target.value;
@@ -158,13 +161,18 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
       onChange: function onChange(_a) {
         var count = _a.count;
-        textData.fontSize = count;
+
+        if (window.magicDesign.device == 'pc') {
+          textData.pcFontSize = count;
+        } else {
+          textData.fontSize = count;
+        }
 
         _this.selfRender();
       },
       unit: "px",
       value: {
-        count: textData.fontSize
+        count: window.magicDesign.device == 'pc' ? textData.pcFontSize : textData.fontSize
       }
     }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
       title: ""

package/lib/composite-comp/dito/components/GroupBuy/defaultJSON.js

@@ -191,10 +191,6 @@ var getDefaultJSON = function getDefaultJSON() {
           open: false,
           lineHeight: 18
         }
-      },
-      salesProgress: {
-        open: true,
-        color: '#CE1126'
       }
     },
     spacing: {

package/lib/composite-comp/dito/components/GroupBuy/mobile/index.js

@@ -251,10 +251,9 @@ function (_super) {
             case 0:
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', {
-                campaignType: '4',
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/sharebuy/offer/page', {
                 sortType: this.sortType
-              }, 'POST')];
+              }, 'GET')];
 
             case 1:
               res = _a.sent();
@@ -326,6 +325,7 @@ function (_super) {
           (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || ''));
         },
         panelProps: panelProps.content,
+        showProgress: false,
         type: "groupBuy"
       });
     }))));