@fonixtree/magic-design 2.0.173 → 2.0.175

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

@@ -130,9 +130,8 @@ function (_super) {
         layout = _j.layout,
         imgHeight = _j.imgHeight,
         imgWidth = _j.imgWidth,
-        showDiscountTag = _j.showDiscountTag,
         isWill = _j.isWill,
-        rest = __rest(_j, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "showDiscountTag", "isWill"]);
+        rest = __rest(_j, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "isWill"]);
 
     var price = (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
     var oldPrice = null;
@@ -146,7 +145,16 @@ function (_super) {
     var imgStyle = {};
     if (imgWidth) imgStyle.width = imgWidth;
     if (imgHeight) imgStyle.height = imgHeight;
-    var soldNumber = data.salesCnt > 250 ? data.salesCnt - data.salesCnt % 250 + "+" : data.salesCnt || 0;
+    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,
@@ -165,9 +173,19 @@ function (_super) {
       lazy: true,
       src: (0, _commonUtil.convertImageUrl)(data.productImg || data.imgUrlContent || data.productImageUrlContent),
       style: imgStyle
-    }), (((_a = panelProps.discount) === null || _a === void 0 ? void 0 : _a.open) || showDiscountTag) && data.discountPercent && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "discount-tag"
-    }, isWill ? (0, _locale.i18n)('COMING_SOON') : data.discountPercent + "% " + (0, _locale.i18n)('OFF'))), /*#__PURE__*/_react["default"].createElement("div", {
+    }), 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')
+      })
+    })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "content-wrap"
     }, showProName && panelProps.productName.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "product-name-wrap"
@@ -216,10 +234,10 @@ function (_super) {
     })), ((_c = panelProps.evaluationScore) === null || _c === void 0 ? void 0 : _c.open) && ((_d = panelProps.sold) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "line"
     }), ((_e = panelProps.sold) === null || _e === void 0 ? void 0 : _e.open) && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "sold"
+      className: "sold no-reversed"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       data: __assign(__assign({}, panelProps.sold), {
-        text: (0, _locale.i18n)('SOLD') + " " + soldNumber
+        text: (0, _commonUtil.reverseStrArr)([(0, _locale.i18n)('SOLD'), soldNumber, '+'])
       }),
       readonly: true
     }))), intelligentType === 'Coupon' && data.coupons && data.coupons.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -20,15 +20,28 @@
     }
 
     .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;
+    }
+    .giftL-tag {
       font-size: 12px;
       font-weight: 700;
       color: #fff;
-      background-color: #ff8650;
+      background-color: #FA7373;
       padding: 5px;
       border-radius: 0 5px 5px 0;
-      position: absolute;
-      top: 15px;
-      left: 0;
+      display: flex;
+      align-items: center;
+      .icon {
+        margin-right: 4px;
+      }
     }
   }
 

package/lib/composite-comp/monpay/components/MonpayRecommend/defaultJSON.js

@@ -195,31 +195,31 @@ var getDefaultJSON = function getDefaultJSON() {
         text: 'Button',
         content: {
           url: '',
-          backgroundColor: '#CE1126'
+          backgroundColor: '#ff8650'
         },
         buttonText: {
           sizeType: 'Customize font styles',
           fontFamily: defaultFontFamily,
-          fontWeight: 600,
-          fontSize: 8,
+          fontWeight: 700,
+          fontSize: 12,
           fontStyle: 'normal',
           color: '#fff'
         },
         buttonBorder: {
           open: true,
           borderColor: '',
-          borderRadius: 0
+          borderRadius: '0 5px 5px 0'
         },
         spacing: {
           pc: {
-            paddingTop: 0,
-            paddingBottom: 0,
+            paddingTop: 3,
+            paddingBottom: 3,
             paddingLeft: 5,
             paddingRight: 5
           },
           mobile: {
-            paddingTop: 0,
-            paddingBottom: 0,
+            paddingTop: 3,
+            paddingBottom: 3,
             paddingLeft: 5,
             paddingRight: 5
           }

package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js

@@ -724,20 +724,22 @@ function (_super) {
   };
 
   RecommendMobile.prototype.render = function () {
+    var _a;
+
     var _this = this;
 
-    var _a;
+    var _b;
 
     var panelProps = this.props.panelProps;
-    var _b = this.state,
-        tabIndex = _b.tabIndex,
-        tabLeft = _b.tabLeft,
-        tabWidth = _b.tabWidth,
-        groupSource = _b.groupSource,
-        hideTabs = _b.hideTabs,
-        contentWidth = _b.contentWidth,
-        filterObj = _b.filterObj,
-        searchParams = _b.searchParams;
+    var _c = this.state,
+        tabIndex = _c.tabIndex,
+        tabLeft = _c.tabLeft,
+        tabWidth = _c.tabWidth,
+        groupSource = _c.groupSource,
+        hideTabs = _c.hideTabs,
+        contentWidth = _c.contentWidth,
+        filterObj = _c.filterObj,
+        searchParams = _c.searchParams;
     var products = this.state["products" + tabIndex] || [];
 
     var _products = products.length === 0 && (0, _coreUtil.isDesignMode)() ? defaultData : products;
@@ -762,7 +764,7 @@ function (_super) {
     if (_layout === 'layout1-2' && contentWidth) imgHeight = (contentWidth - 12) / 2;
     if (_layout === 'layout1-3' && contentWidth) imgHeight = (contentWidth - 12 * 2) / 3;
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, (groupSource.length === 1 && _products.length > 0 || groupSource.length > 1) && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "monpay-recommend-mobile recommend_" + panelProps.id
+      className: (0, _classnames["default"])("monpay-recommend-mobile recommend_" + panelProps.id, (_a = {}, _a['reversed-layout'] = (0, _commonUtil.needReverse)(), _a))
     }, panelProps.title.headerImage.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       className: "headerImg",
       data: panelProps.title.headerImage,
@@ -804,7 +806,7 @@ function (_super) {
         transform: "translateX(" + tabLeft + "px)",
         background: this.getTabBarActiveColor(panelProps)
       }
-    })), ((_a = panelProps.content.filter) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement(_SearchCondition["default"], {
+    })), ((_b = panelProps.content.filter) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement(_SearchCondition["default"], {
       filterObj: filterObj,
       onChange: this.onSearchCondChange,
       value: searchParams
@@ -834,7 +836,6 @@ function (_super) {
           (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
-        showDiscountTag: true,
         showProgress: false
       });
     })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
@@ -870,7 +871,6 @@ function (_super) {
           (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
-        showDiscountTag: true,
         showProgress: false
       });
     })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {

package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.less

@@ -82,3 +82,14 @@
   display: block;
   margin: 0.6rem auto;
 }
+.monpay-recommend-mobile.reversed-layout .monpay-product-item-wrap .discount-tag {
+  left: unset !important;
+  right: 0;
+}
+.monpay-recommend-mobile.reversed-layout .monpay-product-item-wrap.horizontal .img-wrap {
+  margin-right: 0;
+  margin-left: 0.16rem;
+}
+.monpay-recommend-mobile.reversed-layout .monpay-product-item-wrap.horizontal .img-wrap .product-img {
+  border-radius: 0 0.16rem 0.16rem 0;
+}

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

@@ -11,18 +11,12 @@ 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 _constants = require("../../../../../constants");
-
 var _locale = require("../../../../../locale");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -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,63 +71,18 @@ 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;
 
     var panelProps = this.props.panelProps;
-    var needReverse = ((0, _storeUtil.getStore)(_constants.STORAGE_KEY.FISHX_LOCALE) || (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE)) === 'ba';
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])('m-location-mobile', (_a = {}, _a['reversed-layout'] = needReverse, _a))
+      className: (0, _classnames["default"])('m-location-mobile', (_a = {}, _a['reversed-layout'] = (0, _commonUtil.needReverse)(), _a))
     }, panelProps.content.logo.open && /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       color: panelProps.content.logo.color,
       size: 20,
@@ -329,18 +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", {
-        className: "item"
-      }, /*#__PURE__*/_react["default"].createElement("img", {
-        alt: "",
-        src: ""
-      }), /*#__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;