@fonixtree/magic-design 2.0.97 → 2.0.99

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"
       });
     }))));

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

@@ -36,13 +36,26 @@ var getDefaultJSON = function getDefaultJSON() {
         open: true,
         color: {
           pc: '#D92929',
-          mobile: '#8493AF'
+          mobile: '#D2D9E5'
         },
         backgroundColor: {
           pc: '#fff',
           mobile: '#fff'
         }
       },
+      keyword: {
+        open: true,
+        type: 'InputField',
+        placeholder: 'Tshirt Woman',
+        content: {
+          sizeType: 'Customize font styles',
+          fontFamily: 'Open Sans',
+          fontWeight: 600,
+          fontSize: 12,
+          pcFontSize: 14,
+          color: '#CE1126'
+        }
+      },
       icon: {
         id: (0, _uuid.v4)(),
         open: true,

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

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _antd = require("antd");
+
 require("./index.less");
 
 var _components = require("../../../../../meta-comp/components");
@@ -15,6 +17,8 @@ var _common = require("../../../../../common");
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 
+var _Text = require("../../../../../meta-comp/components/Text");
+
 var _commonUtil = require("../../../../../utils/commonUtil");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -45,6 +49,22 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
+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 __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -198,7 +218,8 @@ function (_super) {
 
     _this.state = {
       messageNum: '',
-      cartNum: ''
+      cartNum: '',
+      editing: false
     };
 
     _this.getCartNum = function () {
@@ -265,60 +286,103 @@ function (_super) {
       });
     };
 
+    _this.onChange = function (e) {
+      _this.setState({
+        value: e.target.value,
+        editing: true
+      });
+    };
+
+    _this.onFocus = function () {
+      var _a;
+
+      var value = _this.state.value;
+
+      if (value === ((_a = _this.props.data.content.keyword) === null || _a === void 0 ? void 0 : _a.placeholder)) {
+        _this.setState({
+          value: '',
+          editing: true
+        });
+      }
+    };
+
+    _this.onBlur = function () {
+      var _a, _b, _c;
+
+      var value = _this.state.value;
+
+      if (!value) {
+        _this.setState({
+          value: (_c = (_b = (_a = _this.props.data) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.keyword) === null || _c === void 0 ? void 0 : _c.placeholder,
+          editing: false
+        });
+      }
+    };
+
     return _this;
   }
 
   SearchMobile.prototype.componentDidMount = function () {
-    // const { data } = this.props;
-    // console.log('---mobile ', data);
+    var _a, _b, _c;
+
     this.getMessageNum();
     this.getCartNum();
+    this.setState({
+      value: (_c = (_b = (_a = this.props.data) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.keyword) === null || _c === void 0 ? void 0 : _c.placeholder
+    });
+  };
+
+  SearchMobile.prototype.componentWillReceiveProps = function (nextProps) {
+    var _a, _b, _c;
+
+    if (!this.state.editing) {
+      this.setState({
+        value: (_c = (_b = (_a = nextProps.data) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.keyword) === null || _c === void 0 ? void 0 : _c.placeholder
+      });
+    }
   };
 
   SearchMobile.prototype.render = function () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
 
     var data = this.props.data;
-    var _q = this.state,
-        messageNum = _q.messageNum,
-        cartNum = _q.cartNum; // let styleWrap = {};
-    // if (data.content.background.bgType === 'color') {
-    //   styleWrap = {
-    //     backgroundColor: data.content.background.color,
-    //     opacity: data.content.background.opacity,
-    //   };
-    // } else {
-    //   styleWrap = {
-    //     backgroundImage: `url(${data.content.background.image})`,
-    //     backgroundPosition: 'center',
-    //     backgroundRepeat: 'no-repeat',
-    //     backgroundSize: '100%',
-    //   };
-    // }
+    var _t = this.state,
+        messageNum = _t.messageNum,
+        cartNum = _t.cartNum,
+        value = _t.value;
+
+    var style = __assign({}, (0, _Text.contentStyle)((_a = data.content.keyword) === null || _a === void 0 ? void 0 : _a.content));
 
+    Reflect.deleteProperty(style, 'width');
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-search-bar"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "right"
-    }, data.content && ((_a = data.content.box) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement("div", {
+    }, data.content && ((_b = data.content.box) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "search-input-wrap",
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/search-page');
       },
       style: {
-        borderColor: (_c = (_b = data.content.box) === null || _b === void 0 ? void 0 : _b.color) === null || _c === void 0 ? void 0 : _c.mobile
+        borderColor: (_d = (_c = data.content.box) === null || _c === void 0 ? void 0 : _c.color) === null || _d === void 0 ? void 0 : _d.mobile,
+        backgroundColor: (_f = (_e = data.content.box) === null || _e === void 0 ? void 0 : _e.backgroundColor) === null || _f === void 0 ? void 0 : _f.mobile
       }
-    }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: (_e = (_d = data.content.box) === null || _d === void 0 ? void 0 : _d.color) === null || _e === void 0 ? void 0 : _e.mobile,
+    }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
+      className: "search-input",
+      onBlur: this.onBlur,
+      onChange: this.onChange,
+      onFocus: this.onFocus,
+      style: (0, _commonUtil.pxToRem)(style),
+      type: "text",
+      value: value
+    }), /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+      color: (_h = (_g = data.content.box) === null || _g === void 0 ? void 0 : _g.color) === null || _h === void 0 ? void 0 : _h.mobile,
       size: (0, _commonUtil.convertToRem)(24),
-      style: {
-        display: 'flex'
-      },
       type: "icon-search2"
-    })), data.content && ((_g = (_f = data.content.icon) === null || _f === void 0 ? void 0 : _f.cartIcon) === null || _g === void 0 ? void 0 : _g.mobile) && /*#__PURE__*/_react["default"].createElement("div", {
+    })), data.content && ((_k = (_j = data.content.icon) === null || _j === void 0 ? void 0 : _j.cartIcon) === null || _k === void 0 ? void 0 : _k.mobile) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "message-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: (_j = (_h = data.content.icon) === null || _h === void 0 ? void 0 : _h.color) === null || _j === void 0 ? void 0 : _j.mobile,
+      color: (_m = (_l = data.content.icon) === null || _l === void 0 ? void 0 : _l.color) === null || _m === void 0 ? void 0 : _m.mobile,
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/main/cart');
       },
@@ -329,10 +393,10 @@ function (_super) {
       type: "icon-ShoppingCartSimple1"
     }), !!cartNum && /*#__PURE__*/_react["default"].createElement("span", {
       className: "num"
-    }, cartNum)), data.content && ((_l = (_k = data.content.icon) === null || _k === void 0 ? void 0 : _k.messageIcon) === null || _l === void 0 ? void 0 : _l.mobile) && /*#__PURE__*/_react["default"].createElement("div", {
+    }, cartNum)), data.content && ((_p = (_o = data.content.icon) === null || _o === void 0 ? void 0 : _o.messageIcon) === null || _p === void 0 ? void 0 : _p.mobile) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "message-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: (_o = (_m = data.content.icon) === null || _m === void 0 ? void 0 : _m.color) === null || _o === void 0 ? void 0 : _o.mobile,
+      color: (_r = (_q = data.content.icon) === null || _q === void 0 ? void 0 : _q.color) === null || _r === void 0 ? void 0 : _r.mobile,
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/message-center');
       },
@@ -343,7 +407,7 @@ function (_super) {
       type: "icon-message"
     }), !!messageNum && /*#__PURE__*/_react["default"].createElement("span", {
       className: "num"
-    }, messageNum))), data.content && ((_p = data.content.logo) === null || _p === void 0 ? void 0 : _p.open) && /*#__PURE__*/_react["default"].createElement("div", {
+    }, messageNum))), data.content && ((_s = data.content.logo) === null || _s === void 0 ? void 0 : _s.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "logo",
       onClick: function onClick() {
         var _a, _b;
@@ -366,7 +430,8 @@ function (_super) {
   };
 
   SearchMobile.defaultProps = {
-    data: {}
+    data: {},
+    value: ''
   };
   return SearchMobile;
 }(_react["default"].Component);

package/lib/composite-comp/dito/components/SearchBar/mobile/index.less

@@ -23,7 +23,17 @@
   height: 0.64rem;
   text-align: right;
   display: flex;
-  justify-content: flex-end;
+  justify-content: space-between;
+}
+.m-search-bar .right .search-input-wrap .search-input {
+  background-color: transparent;
+  border: none;
+  height: 100%;
+  box-shadow: none;
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 0.28rem;
 }
 .m-search-bar .right .message-wrap {
   position: relative;