@fonixtree/magic-design 2.0.125 → 2.0.127

package/es/assets/less/font.less

@@ -47,6 +47,28 @@
   font-style: normal;
 }
 
+@font-face {
+  font-family: 'Inter';
+  src: url(../fonts/Inter-Bold.ttf);
+  font-weight: 700;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Inter';
+  src: url(../fonts/Inter-SemiBold.ttf);
+  font-weight: 600;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Inter';
+  src: url('../fonts/Inter-Regular.ttf');
+  font-weight: 400;
+  font-style: normal;
+}
+
+
 @font-face {
   font-family: 'Trueno';
   src: url('../fonts/Trueno-Light.otf');
@@ -66,5 +88,4 @@
   src: url(../fonts/TruenoBd.otf);
   font-weight: 600;
   font-style: normal;
-  font-display: swap;
 }

package/es/composite-comp/bol/components/WalletNuri/mobile/index.js

@@ -231,7 +231,7 @@ function (_super) {
             case 0:
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1//h5/nuri/distribute/commission')];
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/nuri/distribute/commission')];
 
             case 1:
               infoObj = _a.sent();
@@ -268,8 +268,12 @@ function (_super) {
     };
 
     _this.clickJump = function (title) {
-      if (title !== 'Voucher') {
-        (0, _coreUtil.clickUrl)('/main/my-commission');
+      if (title === 'Saldo') {
+        (0, _coreUtil.clickUrl)('/social-commerce/my-earnings');
+      } else if (title === 'Koin') {
+        (0, _coreUtil.clickUrl)('/my-points');
+      } else if (title === 'Voucher') {
+        (0, _coreUtil.clickUrl)('/my-coupon');
       }
     };
 
@@ -291,7 +295,7 @@ function (_super) {
   }
 
   WalletNuriMobile.prototype.componentDidMount = function () {
-    if (localStorage.getItem('isLogin') === 'Y') {
+    if (localStorage.getItem('isLogin') === 'Y' && !(0, _coreUtil.isDesignMode)()) {
       this.getInfo();
     }
   };

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

@@ -92,7 +92,7 @@ var renderDiscount = function renderDiscount(data) {
   var text = '';
 
   if (AMT) {
-    text = (0, _currencyUtil.formatCurrencyWithSymbol)(data.discountAmount);
+    text = (0, _currencyUtil.formatCurrency)(data.discountAmount);
   } else if (DISC) {
     var temp = (0, _currencyUtil.formatCurrency)(data.discountAmount, 2); // 折扣券处理：100 => 1%
 
@@ -125,43 +125,19 @@ function (_super) {
         onItemClick = _m.onItemClick,
         showProName = _m.showProName,
         showProgress = _m.showProgress,
+        intelligentType = _m.intelligentType,
         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"]);
+        rest = __rest(_m, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
 
     var promotions = (0, _businessUtil.getPromotionList)(data);
-    var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
-    /** 当是拼团时 显示价格 */
+    var price = (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
+    price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.specialPrice) : (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
+    var oldPrice = data.specialPrice !== null && data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null; // const discount = Number(data.discountPercent) || 0;
 
-    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;
@@ -229,7 +205,7 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "price",
       data: __assign(__assign({}, panelProps.activityPrice), {
-        text: _price
+        text: price
       }),
       readonly: true
     }), priceLabels.length > 0 && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
@@ -239,9 +215,7 @@ function (_super) {
       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, {
+    }, oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "old-price",
       data: __assign(__assign({}, panelProps.salesPrice), {
         text: oldPrice
@@ -273,7 +247,7 @@ function (_super) {
         text: "Sold " + soldNumber
       }),
       readonly: true
-    }))), data.coupons && data.coupons.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+    }))), intelligentType === 'Coupon' && data.coupons && data.coupons.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "coupons-list"
     }, data.coupons.map(function (m) {
       return /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -2,14 +2,15 @@
   display: flex;
   flex-direction: column;
   background: #FFFFFF;
-  border: 1px solid #D2D9E5;
   width: 142px;
   cursor: pointer;
   position: relative;
-  margin-right: 12px;
+  margin-right: 16px;
 
   .img-wrap {
     position: relative;
+    border-radius: 8px;
+    overflow: hidden;
 
     .product-img {
       width: 140px;
@@ -31,7 +32,6 @@
   }
 
   .content-wrap {
-    padding: 12px;
 
     .promotions-wrap {
       display: flex;
@@ -64,14 +64,13 @@
       line-height: 18px;
       max-height: 40px;
       white-space: wrap;
+      margin-top: 8px;
     }
 
     .price-wrap {
       display: flex;
       align-items: center;
       flex-wrap: wrap;
-      margin-top: 6px;
-      margin-bottom: 4px;
 
       .price {
         width: auto !important;
@@ -84,7 +83,6 @@
 
     .price-sold-wrap {
       display: flex;
-      margin-top: 0;
       align-items: center;
       white-space: nowrap;
       overflow: hidden;
@@ -106,12 +104,12 @@
           color: #fff;
           padding: 0 4px;
           background-color: #CE1126;
+          margin-right: 4px;
         }
 
         .old-price {
           text-decoration: line-through;
           width: fit-content;
-          margin-left: 4px;
         }
       }
 
@@ -191,7 +189,7 @@
     }
 
     .progress-wrap {
-      margin-top: 10px;
+      margin-top: 8px;
 
       .text {
         font-family: 'Montserrat';
@@ -232,11 +230,17 @@
 
   &.horizontal {
     flex-direction: row;
+    border: 1px solid #D2D9E5;
+    border-radius: 8px;
 
-    .product-img {
-      width: 100px;
-      height: 100%;
-      min-height: 100px;
+    .img-wrap {
+      border-radius: 8px 0 0 8px;
+
+      .product-img {
+        width: 100px;
+        height: 100%;
+        min-height: 100px;
+      }
     }
 
     .content-wrap {

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

@@ -135,9 +135,9 @@ function (_super) {
 
     var pricePrefix = (0, _commonUtil.ensure)(function () {
       return window.systemParams.prefix;
-    }, 'Rp');
+    }, 'Rp'); // 蒙古项目货币符号在后面
 
-    var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
+    var _price = integerPart + " " + (decimalPart ? '.' + decimalPart : '') + " " + pricePrefix;
 
     var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
     var discount = Number(data.discountPercent) || 0;

package/es/composite-comp/common/config-panels/InputField/index.js

@@ -92,11 +92,7 @@ function (_super) {
         inputLabel = _a.inputLabel;
     var textData = data.content;
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "m-text-config",
-      style: {
-        paddingTop: 12,
-        borderRadius: 6
-      }
+      className: "m-text-config"
     }, /*#__PURE__*/_react["default"].createElement(_common.Field, {
       title: inputLabel || (0, _locale.i18n)('PLACEHOLDER')
     }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
@@ -143,7 +139,9 @@ function (_super) {
       value: "Montserrat"
     }, (0, _locale.i18n)('MONTSERRAT')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
       value: "Open Sans"
-    }, (0, _locale.i18n)('OPEN_SANS')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+    }, (0, _locale.i18n)('OPEN_SANS')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "Inter"
+    }, (0, _locale.i18n)('INTER')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
       title: (0, _locale.i18n)('FONT_WEIGHT')
     }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
       onChange: function onChange(v) {

package/es/composite-comp/dito/components/MenuNavigation/MenuNavMetaImage/index.less

@@ -4,10 +4,12 @@
   height: 100%;
   display: flex;
   justify-content: center;
+  max-height: 65px;
+
   // overflow: hidden;
   &>img {
     width: 100%;
-    height: 100%;
+    // height: 100%;
     // object-fit: contain;
     transition: all .2s linear;
     vertical-align: initial;

package/es/composite-comp/dito/components/MobileNavigation/mobile/index.js

@@ -118,7 +118,7 @@ function (_super) {
         className: "card-image",
         data: source.image,
         limitWidthHeight: true,
-        maxHeight: 82,
+        maxHeight: 120,
         scale: 0.5
       })), source.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         className: "card-text",

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

@@ -57,6 +57,11 @@ var getDefaultJSON = function getDefaultJSON() {
           color: '#CE1126'
         }
       },
+      placeholder: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        text: 'Search product, store, or brand'
+      },
       icon: {
         id: (0, _uuid.v4)(),
         open: true,

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

@@ -307,13 +307,13 @@ function (_super) {
     };
 
     _this.onBlur = function () {
-      var _a, _b, _c;
+      var _a, _b, _c, _d, _e, _f;
 
       var value = _this.state.value;
 
-      if (!value) {
+      if (((_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.open) && !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,
+          value: (_f = (_e = (_d = _this.props.data) === null || _d === void 0 ? void 0 : _d.content) === null || _e === void 0 ? void 0 : _e.keyword) === null || _f === void 0 ? void 0 : _f.placeholder,
           editing: false
         });
       }
@@ -323,42 +323,54 @@ function (_super) {
   }
 
   SearchMobile.prototype.componentDidMount = function () {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
 
     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
-    });
+
+    if ((_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.open) {
+      this.setState({
+        value: (_f = (_e = (_d = this.props.data) === null || _d === void 0 ? void 0 : _d.content) === null || _e === void 0 ? void 0 : _e.keyword) === null || _f === void 0 ? void 0 : _f.placeholder
+      });
+    }
   };
 
   SearchMobile.prototype.componentWillReceiveProps = function (nextProps) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
 
-    if (!this.state.editing) {
+    if (((_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.open) && !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
+        value: (_f = (_e = (_d = nextProps.data) === null || _d === void 0 ? void 0 : _d.content) === null || _e === void 0 ? void 0 : _e.keyword) === null || _f === void 0 ? void 0 : _f.placeholder
+      });
+    }
+
+    if (!((_j = (_h = (_g = nextProps.data) === null || _g === void 0 ? void 0 : _g.content) === null || _h === void 0 ? void 0 : _h.keyword) === null || _j === void 0 ? void 0 : _j.open)) {
+      this.setState({
+        value: ''
       });
     }
   };
 
   SearchMobile.prototype.render = function () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
 
     var data = this.props.data;
-    var _t = this.state,
-        messageNum = _t.messageNum,
-        cartNum = _t.cartNum,
-        value = _t.value;
+    var _v = this.state,
+        messageNum = _v.messageNum,
+        cartNum = _v.cartNum,
+        value = _v.value;
 
     var style = __assign({}, (0, _Text.contentStyle)(((_a = data.content.keyword) === null || _a === void 0 ? void 0 : _a.content) || {}));
 
     Reflect.deleteProperty(style, 'width');
+
+    var _placeholder = ((_b = data.content.placeholder) === null || _b === void 0 ? void 0 : _b.open) ? (_c = data.content.placeholder) === null || _c === void 0 ? void 0 : _c.text : '';
+
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-search-bar"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "right"
-    }, data.content && ((_b = data.content.box) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement("div", {
+    }, data.content && ((_d = data.content.box) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "search-input-wrap",
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/search-page', {
@@ -366,8 +378,8 @@ function (_super) {
         });
       },
       style: {
-        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
+        borderColor: (_f = (_e = data.content.box) === null || _e === void 0 ? void 0 : _e.color) === null || _f === void 0 ? void 0 : _f.mobile,
+        backgroundColor: (_h = (_g = data.content.box) === null || _g === void 0 ? void 0 : _g.backgroundColor) === null || _h === void 0 ? void 0 : _h.mobile
       }
     }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
       className: "search-input",
@@ -376,15 +388,16 @@ function (_super) {
       onFocus: this.onFocus,
       style: (0, _commonUtil.pxToRem)(style),
       type: "text",
-      value: value
+      value: value,
+      placeholder: _placeholder
     }), /*#__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,
+      color: (_k = (_j = data.content.box) === null || _j === void 0 ? void 0 : _j.color) === null || _k === void 0 ? void 0 : _k.mobile,
       size: (0, _commonUtil.convertToRem)(24),
       type: "icon-search2"
-    })), 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", {
+    })), data.content && ((_m = (_l = data.content.icon) === null || _l === void 0 ? void 0 : _l.cartIcon) === null || _m === void 0 ? void 0 : _m.mobile) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "message-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: (_m = (_l = data.content.icon) === null || _l === void 0 ? void 0 : _l.color) === null || _m === void 0 ? void 0 : _m.mobile,
+      color: (_p = (_o = data.content.icon) === null || _o === void 0 ? void 0 : _o.color) === null || _p === void 0 ? void 0 : _p.mobile,
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/main/cart');
       },
@@ -395,10 +408,10 @@ function (_super) {
       type: "icon-ShoppingCartSimple1"
     }), !!cartNum && /*#__PURE__*/_react["default"].createElement("span", {
       className: "num"
-    }, 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", {
+    }, cartNum)), data.content && ((_r = (_q = data.content.icon) === null || _q === void 0 ? void 0 : _q.messageIcon) === null || _r === void 0 ? void 0 : _r.mobile) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "message-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: (_r = (_q = data.content.icon) === null || _q === void 0 ? void 0 : _q.color) === null || _r === void 0 ? void 0 : _r.mobile,
+      color: (_t = (_s = data.content.icon) === null || _s === void 0 ? void 0 : _s.color) === null || _t === void 0 ? void 0 : _t.mobile,
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/message-center');
       },
@@ -409,7 +422,7 @@ function (_super) {
       type: "icon-message"
     }), !!messageNum && /*#__PURE__*/_react["default"].createElement("span", {
       className: "num"
-    }, messageNum))), data.content && ((_s = data.content.logo) === null || _s === void 0 ? void 0 : _s.open) && /*#__PURE__*/_react["default"].createElement("div", {
+    }, messageNum))), data.content && ((_u = data.content.logo) === null || _u === void 0 ? void 0 : _u.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "logo",
       onClick: function onClick() {
         var _a, _b;

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

@@ -10,7 +10,6 @@
 .m-search-bar .right {
   display: flex;
   flex: 1;
-  margin-left: 0.3rem;
   align-items: center;
   justify-content: space-between;
 }
@@ -30,6 +29,7 @@
   border: none;
   height: 100%;
   width: 100%;
+  padding: 0;
   box-shadow: none;
   font-family: 'Open Sans';
   font-style: normal;
@@ -57,6 +57,9 @@
   font-size: 0.16rem;
   color: #FFFFFF;
 }
+.m-search-bar .logo {
+  margin-right: 0.3rem;
+}
 .m-search-bar .logo img {
   width: auto;
 }

package/es/composite-comp/dito/components/SearchBar/pc/index.js

@@ -25,6 +25,8 @@ var _Text = require("../../../../../meta-comp/components/Text");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 var __extends = void 0 && (void 0).__extends || function () {
   var _extendStatics = function extendStatics(d, b) {
     _extendStatics = Object.setPrototypeOf || {
@@ -101,13 +103,13 @@ function (_super) {
     };
 
     _this.onBlur = function () {
-      var _a, _b, _c;
+      var _a, _b, _c, _d, _e, _f;
 
       var inputVal = _this.state.inputVal;
 
-      if (!inputVal) {
+      if (((_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.open) && !inputVal) {
         _this.setState({
-          inputVal: (_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,
+          inputVal: (_f = (_e = (_d = _this.props.data) === null || _d === void 0 ? void 0 : _d.content) === null || _e === void 0 ? void 0 : _e.keyword) === null || _f === void 0 ? void 0 : _f.placeholder,
           editing: false
         });
       }
@@ -127,19 +129,27 @@ function (_super) {
   }
 
   SearchPc.prototype.componentDidMount = function () {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
 
-    this.setState({
-      inputVal: (_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
-    });
+    if ((_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.open) {
+      this.setState({
+        inputVal: (_f = (_e = (_d = this.props.data) === null || _d === void 0 ? void 0 : _d.content) === null || _e === void 0 ? void 0 : _e.keyword) === null || _f === void 0 ? void 0 : _f.placeholder
+      });
+    }
   };
 
   SearchPc.prototype.componentWillReceiveProps = function (nextProps) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+
+    if (((_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.open) && !this.state.editing) {
+      this.setState({
+        inputVal: (_f = (_e = (_d = nextProps.data) === null || _d === void 0 ? void 0 : _d.content) === null || _e === void 0 ? void 0 : _e.keyword) === null || _f === void 0 ? void 0 : _f.placeholder
+      });
+    }
 
-    if (!this.state.editing) {
+    if (!((_j = (_h = (_g = nextProps.data) === null || _g === void 0 ? void 0 : _g.content) === null || _h === void 0 ? void 0 : _h.keyword) === null || _j === void 0 ? void 0 : _j.open)) {
       this.setState({
-        inputVal: (_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
+        inputVal: ''
       });
     }
   };
@@ -147,7 +157,7 @@ function (_super) {
   SearchPc.prototype.render = function () {
     var _this = this;
 
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
 
     var data = this.props.data;
     var inputVal = this.state.inputVal;
@@ -155,6 +165,9 @@ function (_super) {
     var style = __assign({}, (0, _Text.contentStyle)(((_a = data.content.keyword) === null || _a === void 0 ? void 0 : _a.content) || {}));
 
     Reflect.deleteProperty(style, 'width');
+
+    var _placeholder = ((_b = data.content.placeholder) === null || _b === void 0 ? void 0 : _b.open) ? (_c = data.content.placeholder) === null || _c === void 0 ? void 0 : _c.text : '';
+
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "pc-search-bar"
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -163,9 +176,9 @@ function (_super) {
       className: "search-input-wrap",
       style: {
         borderColor: data.content.box.color.pc,
-        backgroundColor: (_c = (_b = data.content.box) === null || _b === void 0 ? void 0 : _b.backgroundColor) === null || _c === void 0 ? void 0 : _c.pc
+        backgroundColor: (_e = (_d = data.content.box) === null || _d === void 0 ? void 0 : _d.backgroundColor) === null || _e === void 0 ? void 0 : _e.pc
       }
-    }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
+    }, /*#__PURE__*/_react["default"].createElement(_antd.Input, _defineProperty({
       className: "search-input",
       onBlur: this.onBlur,
       onChange: function onChange(e) {
@@ -176,7 +189,7 @@ function (_super) {
       placeholder: (0, _locale.i18n)('PLEASE_INPUT_KEYWORDS'),
       style: (0, _commonUtil.pxToRem)(style),
       value: inputVal
-    }), /*#__PURE__*/_react["default"].createElement("div", {
+    }, "placeholder", _placeholder)), /*#__PURE__*/_react["default"].createElement("div", {
       className: "search-icon",
       onClick: this.searchProduct,
       style: {

package/es/composite-comp/dito/config-panels/PcNavigationConfig/TextOnlyFontConfig/index.js

@@ -166,7 +166,9 @@ function (_super) {
       value: "Montserrat"
     }, (0, _locale.i18n)('MONTSERRAT')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
       value: "Open Sans"
-    }, (0, _locale.i18n)('OPEN_SANS')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+    }, (0, _locale.i18n)('OPEN_SANS')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "Inter"
+    }, (0, _locale.i18n)('INTER')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
       title: (0, _locale.i18n)('FONT_WEIGHT')
     }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
       onChange: function onChange(v) {

package/es/composite-comp/dito/config-panels/SearchBarConfig/SearchBarConfigContent/index.js

@@ -75,7 +75,7 @@ function (_super) {
   SearchBarConfigContent.prototype.render = function () {
     var _this = this;
 
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
 
     var panelProps = this.props.panelProps;
     var source = [{
@@ -140,6 +140,26 @@ function (_super) {
       metaOption: panelProps.keyword
     }, {
       key: 'search4',
+      name: (0, _locale.i18n)('SEARCH_BAR_PLACEHOLDER'),
+      toggleType: 'switch',
+      value: /*#__PURE__*/_react["default"].createElement("div", {
+        className: "m-text-config",
+        style: {
+          marginTop: 10
+        }
+      }, /*#__PURE__*/_react["default"].createElement(_common.Field, {
+        title: "Input Placeholder"
+      }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
+        onChange: function onChange(e) {
+          panelProps.placeholder.text = e.target.value;
+
+          _this.selfRender();
+        },
+        value: (_e = panelProps.placeholder) === null || _e === void 0 ? void 0 : _e.text
+      }))),
+      metaOption: panelProps.placeholder
+    }, {
+      key: 'search5',
       name: (0, _locale.i18n)('ICON'),
       toggleType: 'triangle',
       value: /*#__PURE__*/_react["default"].createElement("div", {

package/es/composite-comp/monpay/components/Bundle/mobile/BundleItem/index.less

@@ -25,10 +25,10 @@
 .BundleItemWrap .prodList {
   display: flex;
   align-items: center;
+  justify-content: center;
   overflow: scroll;
 }
 .BundleItemWrap .prodList img {
-  height: 2.08rem;
   width: 1.9rem;
 }
 .BundleItemWrap .bottomWrap {