@fonixtree/magic-design 2.0.174 → 2.0.175

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

@@ -146,6 +146,15 @@ function (_super) {
     if (imgWidth) imgStyle.width = imgWidth;
     if (imgHeight) imgStyle.height = imgHeight;
     var soldNumber = data.salesCnt > 250 ? "" + (data.salesCnt - data.salesCnt % 250) : data.salesCnt || 0;
+    var isGift = false;
+
+    if (data.promotType && data.promotType !== '[]') {
+      //  赠品
+      if (data.promotType.includes('G')) {
+        isGift = true;
+      }
+    }
+
     return /*#__PURE__*/_react["default"].createElement("div", _extends({
       className: (0, _classnames["default"])('monpay-product-item-wrap', {
         fixHeight: fixHeight,
@@ -164,7 +173,14 @@ function (_super) {
       lazy: true,
       src: (0, _commonUtil.convertImageUrl)(data.productImg || data.imgUrlContent || data.productImageUrlContent),
       style: imgStyle
-    }), ((_a = panelProps.label) === null || _a === void 0 ? void 0 : _a.open) && data.discountPercent && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+    }), isGift && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "discount-tag giftL-tag"
+    }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+      className: "icon",
+      color: "#fff",
+      size: 18,
+      type: "icon-a-EssentionalUI"
+    }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('GIFT'))), ((_a = panelProps.label) === null || _a === void 0 ? void 0 : _a.open) && data.discountPercent && !isGift && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "discount-tag",
       data: __assign(__assign({}, panelProps.label), {
         text: isWill ? (0, _locale.i18n)('COMING_SOON') : data.discountPercent + "% " + (0, _locale.i18n)('OFF')

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

@@ -30,6 +30,19 @@
       top: 15px;
       left: 0;
     }
+    .giftL-tag {
+      font-size: 12px;
+      font-weight: 700;
+      color: #fff;
+      background-color: #FA7373;
+      padding: 5px;
+      border-radius: 0 5px 5px 0;
+      display: flex;
+      align-items: center;
+      .icon {
+        margin-right: 4px;
+      }
+    }
   }
 
   .content-wrap {

package/lib/composite-comp/monpay/config-panels/MonpayRecommendConfig/RecommendConfigContent/index.js

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _ButtonConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/ButtonConfig"));
-
 var _TextConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/TextConfig"));
 
 var _coreUtil = require("../../../../../utils/coreUtil");
@@ -76,14 +74,8 @@ function (_super) {
         name: (0, _locale.i18n)('FILTER'),
         value: null,
         metaOption: panelProps.filter
-      }, {
-        key: '1',
-        name: (0, _locale.i18n)('LABEL'),
-        value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
-          data: panelProps.label
-        }),
-        metaOption: panelProps.label
-      }, {
+      }, // { key: '1', name: i18n('LABEL'), value: <ButtonConfig data={panelProps.label} />, metaOption: panelProps.label },
+      {
         key: '2',
         name: (0, _locale.i18n)('PRODUCT_NAME'),
         value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {

package/lib/composite-comp/public/components/Location/mobile/index.js

@@ -11,20 +11,14 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 require("./index.less");
 
-var _coreUtil = require("../../../../../utils/coreUtil");
-
 var _components = require("../../../../../meta-comp/components");
 
 var _commonUtil = require("../../../../../utils/commonUtil");
 
-var _storeUtil = require("../../../../../utils/storeUtil");
-
 var _common = require("../../../../../common");
 
 var _locale = require("../../../../../locale");
 
-var _product = _interopRequireDefault(require("../../../../../assets/images/common/product.png"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -69,149 +63,6 @@ var __assign = void 0 && (void 0).__assign || function () {
   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) {
-      resolve(value);
-    });
-  }
-
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function rejected(value) {
-      try {
-        step(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-
-var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
-  var _ = {
-    label: 0,
-    sent: function sent() {
-      if (t[0] & 1) throw t[1];
-      return t[1];
-    },
-    trys: [],
-    ops: []
-  },
-      f,
-      y,
-      t,
-      g;
-  return g = {
-    next: verb(0),
-    "throw": verb(1),
-    "return": verb(2)
-  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-    return this;
-  }), g;
-
-  function verb(n) {
-    return function (v) {
-      return step([n, v]);
-    };
-  }
-
-  function step(op) {
-    if (f) throw new TypeError("Generator is already executing.");
-
-    while (_) {
-      try {
-        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-        if (y = 0, t) op = [op[0] & 2, t.value];
-
-        switch (op[0]) {
-          case 0:
-          case 1:
-            t = op;
-            break;
-
-          case 4:
-            _.label++;
-            return {
-              value: op[1],
-              done: false
-            };
-
-          case 5:
-            _.label++;
-            y = op[1];
-            op = [0];
-            continue;
-
-          case 7:
-            op = _.ops.pop();
-
-            _.trys.pop();
-
-            continue;
-
-          default:
-            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-              _ = 0;
-              continue;
-            }
-
-            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-              _.label = op[1];
-              break;
-            }
-
-            if (op[0] === 6 && _.label < t[1]) {
-              _.label = t[1];
-              t = op;
-              break;
-            }
-
-            if (t && _.label < t[2]) {
-              _.label = t[2];
-
-              _.ops.push(op);
-
-              break;
-            }
-
-            if (t[2]) _.ops.pop();
-
-            _.trys.pop();
-
-            continue;
-        }
-
-        op = body.call(thisArg, _);
-      } catch (e) {
-        op = [6, e];
-        y = 0;
-      } finally {
-        f = t = 0;
-      }
-    }
-
-    if (op[0] & 5) throw op[1];
-    return {
-      value: op[0] ? op[1] : void 0,
-      done: true
-    };
-  }
-};
-
 var MerchantSalesMobile =
 /** @class */
 function (_super) {
@@ -220,55 +71,11 @@ function (_super) {
   function MerchantSalesMobile() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
-    _this.state = {
-      list: (0, _coreUtil.isDesignMode)() ? [] : (0, _commonUtil.ensure)(function () {
-        return (0, _storeUtil.getMagicStore)("merchantSales_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
-      }, [])
-    };
-
-    _this.getData = function () {
-      return __awaiter(_this, void 0, void 0, function () {
-        var res, list;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
-            case 0:
-              return [4
-              /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', {
-                pageIndex: 1,
-                pageSize: 50,
-                qryStorePage: 'Y',
-                storeOfferCnt: 0,
-                campaignType: '2,14'
-              }, 'POST')];
-
-            case 1:
-              res = _a.sent();
-              list = (0, _commonUtil.ensure)(function () {
-                return res.storePage.list;
-              }, []);
-              this.setState({
-                list: list
-              });
-
-              if (!(0, _coreUtil.isDesignMode)()) {
-                (0, _storeUtil.setMagicStore)("merchantSales_" + (window.magicDesign.pageId || '') + "_" + this.props.panelProps.id, list);
-              }
-
-              return [2
-              /*return*/
-              ];
-          }
-        });
-      });
-    };
-
+    _this.state = {};
     return _this;
   }
 
-  MerchantSalesMobile.prototype.componentDidMount = function () {
-    this.getData();
-  };
+  MerchantSalesMobile.prototype.componentDidMount = function () {};
 
   MerchantSalesMobile.prototype.render = function () {
     var _a;
@@ -328,19 +135,7 @@ function (_super) {
       color: panelProps.content.arrowIcon.color,
       size: 18,
       type: "icon-chevron-right"
-    }))), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "list"
-    }, [1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13].slice(0, 10).map(function (item) {
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        key: item,
-        className: "item"
-      }, /*#__PURE__*/_react["default"].createElement("img", {
-        alt: "",
-        src: _product["default"]
-      }), /*#__PURE__*/_react["default"].createElement("span", {
-        className: "one_row no-reversed"
-      }, "Supermarkets"));
-    })));
+    }))));
   };
 
   MerchantSalesMobile.defaultProps = {

package/lib/composite-comp/public/components/Location/mobile/index.less

@@ -47,36 +47,6 @@
   text-align: left;
   max-width: 80%;
 }
-.m-location-mobile .list {
-  margin: 0.4rem 0.4rem 0 0.4rem;
-  display: flex;
-  justify-content: center;
-  gap: 0.38rem;
-  flex-wrap: wrap;
-  max-height: 3.1rem;
-  overflow: hidden;
-}
-.m-location-mobile .list .item {
-  display: inline-block;
-  width: 1rem;
-  background: url('./img/img-circle.png');
-  background-repeat: no-repeat;
-  background-size: 100%;
-}
-.m-location-mobile .list .item > img {
-  display: inline-block;
-  width: 1rem;
-  height: 1rem;
-  border-radius: 50%;
-}
-.m-location-mobile .list .item > span {
-  font-weight: 400;
-  font-size: 0.16rem;
-  color: #000;
-  max-width: 1rem;
-  display: block;
-  margin-top: 0.1rem;
-}
 .m-location-mobile.reversed-layout .search-input {
   margin-right: 0;
   margin-left: 0.32rem;

package/lib/composite-comp/public/components/Stores/mobile/StoreItem/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.renderDiscount = exports["default"] = void 0;
+exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -80,30 +80,6 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 
-var renderDiscount = function renderDiscount(data) {
-  var AMT = data.discountMethod === 'AMT'; // 金额扣减
-
-  var DISC = data.discountMethod === 'DISC'; // 百分比
-
-  var text = '';
-
-  if (AMT) {
-    text = (0, _currencyUtil.formatCurrencyWithSymbol)(data.discountAmount);
-  } else if (DISC) {
-    var temp = (0, _currencyUtil.formatCurrency)(data.discountAmount, 2); // 折扣券处理：100 => 1%
-
-    text = parseInt(temp, 10) + "%";
-  }
-
-  return {
-    text: text,
-    isBig: text.length > 6 && text.length <= 9,
-    isHide: text.length > 9
-  };
-};
-
-exports.renderDiscount = renderDiscount;
-
 var StoreItem =
 /** @class */
 function (_super) {
@@ -146,8 +122,8 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement(_common.NewImg, {
       className: "product-img",
       lazy: true,
-      src: (0, _commonUtil.convertImageUrl)(data.productImg || data.imgUrlContent || data.productImageUrlContent)
-    }), freeDeliveryLabel.open && data.discountPercent && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+      src: (0, _commonUtil.convertImageUrl)(data.storePosterUrl || data.storeLogoUrl)
+    }), freeDeliveryLabel.open && data.freeShipping === 'Y' && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "flag",
       data: freeDeliveryLabel
     })), /*#__PURE__*/_react["default"].createElement("div", {
@@ -155,13 +131,13 @@ function (_super) {
     }, storeName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "name",
       data: __assign(__assign({}, storeName), {
-        text: data.offerName
+        text: data.storeName
       }),
       readonly: true
     }), minOrder.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "minOrder no-reversed",
       data: __assign(__assign({}, minOrder), {
-        text: (0, _commonUtil.reverseStrArr)([(0, _locale.i18n)('MIN_ORDER'), ':', (data.minOrder || 0) + " IQD"])
+        text: (0, _commonUtil.reverseStrArr)([(0, _locale.i18n)('MIN_ORDER'), ':', (data.minOrderAmount || 0) + " IQD"])
       }),
       readonly: true
     }), /*#__PURE__*/_react["default"].createElement("div", {
@@ -169,7 +145,7 @@ function (_super) {
     }, evaluateScore.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "score",
       data: __assign(__assign({}, evaluateScore), {
-        text: (0, _currencyUtil.numberToFixed)(Number(data.evaluationAvg), 1)
+        text: (0, _currencyUtil.numberToFixed)(Number(data.comEvalRate), 1)
       }),
       readonly: true
     }), evaluateScore.open && deliveryTime.open && /*#__PURE__*/_react["default"].createElement("div", {
@@ -183,13 +159,13 @@ function (_super) {
     }), deliveryTime.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "time",
       data: __assign(__assign({}, deliveryTime), {
-        text: '17 mins'
+        text: data.deliveryTime || '17 mins'
       }),
       readonly: true
     }), distance.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "distance",
       data: __assign(__assign({}, distance), {
-        text: '1 km'
+        text: data.distance || '1 km'
       }),
       readonly: true
     })))) : /*#__PURE__*/_react["default"].createElement("div", _extends({
@@ -202,8 +178,8 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement(_common.NewImg, {
       className: "product-img",
       lazy: true,
-      src: (0, _commonUtil.convertImageUrl)(data.productImg || data.imgUrlContent || data.productImageUrlContent)
-    }), freeDeliveryLabel.open && data.discountPercent && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+      src: (0, _commonUtil.convertImageUrl)(data.storePosterUrl || data.storeLogoUrl)
+    }), freeDeliveryLabel.open && data.freeShipping === 'Y' && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "flag",
       data: freeDeliveryLabel
     })), /*#__PURE__*/_react["default"].createElement("div", {
@@ -211,13 +187,13 @@ function (_super) {
     }, storeName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "name",
       data: __assign(__assign({}, storeName), {
-        text: data.offerName
+        text: data.storeName
       }),
       readonly: true
     }), storeDesc.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "desc",
       data: __assign(__assign({}, storeDesc), {
-        text: data.offerName
+        text: data.comments
       }),
       readonly: true
     }), /*#__PURE__*/_react["default"].createElement("div", {
@@ -225,7 +201,7 @@ function (_super) {
     }, minOrder.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "minOrder no-reversed",
       data: __assign(__assign({}, minOrder), {
-        text: (0, _commonUtil.reverseStrArr)([(0, _locale.i18n)('MIN_ORDER'), ':', (data.minOrder || 0) + " IQD"])
+        text: (0, _commonUtil.reverseStrArr)([(0, _locale.i18n)('MIN_ORDER'), ':', (data.minOrderAmount || 0) + " IQD"])
       }),
       readonly: true
     }), minOrder.open && sold.open && /*#__PURE__*/_react["default"].createElement("div", {
@@ -241,7 +217,7 @@ function (_super) {
     }, evaluateScore.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "score",
       data: __assign(__assign({}, evaluateScore), {
-        text: (0, _currencyUtil.numberToFixed)(Number(data.evaluationAvg), 1)
+        text: (0, _currencyUtil.numberToFixed)(Number(data.comEvalRate), 1)
       }),
       readonly: true
     }), evaluateScore.open && deliveryTime.open && /*#__PURE__*/_react["default"].createElement("div", {
@@ -249,7 +225,7 @@ function (_super) {
     }), deliveryTime.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "time",
       data: __assign(__assign({}, deliveryTime), {
-        text: '17 mins'
+        text: data.deliveryTime || '17 mins'
       }),
       readonly: true
     }), deliveryTime.open && distance.open && /*#__PURE__*/_react["default"].createElement("div", {
@@ -257,7 +233,7 @@ function (_super) {
     }), distance.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "distance",
       data: __assign(__assign({}, distance), {
-        text: '1km'
+        text: data.distance || '1 km'
       }),
       readonly: true
     })))));

package/lib/composite-comp/public/components/Stores/mobile/StoreItem/index.less

@@ -58,7 +58,7 @@
   width: 0.02rem;
   height: 0.24rem;
   background-color: #D9D9D9;
-  margin: 0 0.16rem;
+  margin: 0 0.12rem;
 }
 .m-store-item-wrap.horizontal {
   flex-direction: column;