@fonixtree/magic-design 2.0.117 → 2.0.118

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

@@ -5,6 +5,9 @@
   margin-bottom: 0.48rem;
   transition: 0.2s all linear;
 }
+.BundleItemWrap:last-child {
+  margin-bottom: 0;
+}
 .BundleItemWrap .header {
   height: 0.92rem;
   padding: 0.16rem 0.24rem;

package/es/composite-comp/monpay/components/MerchantSales/mobile/{ProductItem → StoreItem}/index.js

@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _commonUtil = require("../../../../../../utils/commonUtil");
-
 var _components = require("../../../../../../meta-comp/components");
 
 var _common = require("../../../../../../common");
@@ -76,19 +74,19 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 
-var ProductItem =
+var StoreItem =
 /** @class */
 function (_super) {
-  __extends(ProductItem, _super);
+  __extends(StoreItem, _super);
 
-  function ProductItem() {
+  function StoreItem() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {};
     return _this;
   }
 
-  ProductItem.prototype.render = function () {
+  StoreItem.prototype.render = function () {
     var _a = this.props,
         data = _a.data,
         panelProps = _a.panelProps,
@@ -96,31 +94,31 @@ function (_super) {
         rest = __rest(_a, ["data", "panelProps", "onItemClick"]);
 
     return /*#__PURE__*/_react["default"].createElement("div", _extends({
-      className: (0, _classnames["default"])('monpay-merchant-product-item-wrap'),
+      className: (0, _classnames["default"])('monpay-merchant-store-item-wrap'),
       onClick: function onClick() {
         return onItemClick();
       }
     }, rest), /*#__PURE__*/_react["default"].createElement("div", {
       className: "img-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.NewImg, {
-      className: "product-img",
+      className: "store-img",
       lazy: true,
-      src: (0, _commonUtil.convertImageUrl)(data.productImg || data.imgUrlContent || data.productImageUrlContent)
+      src: data.storeLogoUrl
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "sale-tag"
     })), panelProps.merchantName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "prodName",
       data: __assign(__assign({}, panelProps.merchantName), {
-        text: data.offerName
+        text: data.storeName
       })
     }));
   };
 
-  ProductItem.defaultProps = {
+  StoreItem.defaultProps = {
     data: {}
   };
-  return ProductItem;
+  return StoreItem;
 }(_react["default"].Component);
 
-var _default = ProductItem;
+var _default = StoreItem;
 exports["default"] = _default;

package/es/composite-comp/monpay/components/MerchantSales/mobile/{ProductItem → StoreItem}/index.less

@@ -1,20 +1,20 @@
-.monpay-merchant-product-item-wrap {
+.monpay-merchant-store-item-wrap {
   display: flex;
   flex-direction: column;
-  width: 2.08rem;
+  width: 2.06rem;
   margin-bottom: 0.32rem;
   cursor: pointer;
   position: relative;
 }
-.monpay-merchant-product-item-wrap .img-wrap {
+.monpay-merchant-store-item-wrap .img-wrap {
   position: relative;
 }
-.monpay-merchant-product-item-wrap .img-wrap .product-img {
+.monpay-merchant-store-item-wrap .img-wrap .store-img {
   width: 2.08rem;
   height: 2.08rem;
   border-radius: 0.16rem;
 }
-.monpay-merchant-product-item-wrap .img-wrap .sale-tag {
+.monpay-merchant-store-item-wrap .img-wrap .sale-tag {
   background: url('../img/sale.png') no-repeat center center;
   background-size: 100%;
   width: 1.1rem;
@@ -23,7 +23,7 @@
   top: 0;
   left: 0;
 }
-.monpay-merchant-product-item-wrap .prodName {
+.monpay-merchant-store-item-wrap .prodName {
   font-weight: 400;
   font-size: 0.28rem;
   color: #000;

package/es/composite-comp/monpay/components/MerchantSales/mobile/index.js

@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 
 require("./index.less");
 
-var _ProductItem = _interopRequireDefault(require("./ProductItem"));
+var _StoreItem = _interopRequireDefault(require("./StoreItem"));
 
 var _card = _interopRequireDefault(require("./img/card.png"));
 
@@ -193,20 +193,25 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
 };
 
 var defaultData = [{
-  imgUrlContent: {
-    url: _card["default"]
-  },
-  offerName: 'Product Name'
+  storeId: 1,
+  storeLogoUrl: _card["default"],
+  storeName: 'Store Name'
 }, {
-  imgUrlContent: {
-    url: _card["default"]
-  },
-  offerName: 'Product Name'
+  storeId: 2,
+  storeLogoUrl: _card["default"],
+  storeName: 'Store Name'
 }, {
-  imgUrlContent: {
-    url: _card["default"]
-  },
-  offerName: 'Product Name'
+  storeId: 3,
+  storeLogoUrl: _card["default"],
+  storeName: 'Store Name'
+}, {
+  storeId: 4,
+  storeLogoUrl: _card["default"],
+  storeName: 'Store Name'
+}, {
+  storeId: 5,
+  storeLogoUrl: _card["default"],
+  storeName: 'Store Name'
 }];
 
 var MerchantSalesMobile =
@@ -226,8 +231,11 @@ function (_super) {
     _this.getData = function () {
       return __awaiter(_this, void 0, void 0, function () {
         var res, list;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
+
+        var _a;
+
+        return __generator(this, function (_b) {
+          switch (_b.label) {
             case 0:
               return [4
               /*yield*/
@@ -240,8 +248,8 @@ function (_super) {
               }, 'POST')];
 
             case 1:
-              res = _a.sent();
-              list = res.pageInfo.list;
+              res = _b.sent();
+              list = ((_a = res.storePage) === null || _a === void 0 ? void 0 : _a.list) || [];
               this.setState({
                 list: list
               });
@@ -269,7 +277,7 @@ function (_super) {
     var panelProps = this.props.panelProps;
     var list = this.state.list;
 
-    var _list = list.length === 0 && (0, _coreUtil.isDesignMode)() ? defaultData : list;
+    var _list = list.length > 0 && (0, _coreUtil.isDesignMode)() ? defaultData : list;
 
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, _list.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "monpay-merchant-sales-mobile"
@@ -279,11 +287,11 @@ function (_super) {
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "merchant-sales-list"
     }, _list.map(function (item) {
-      return /*#__PURE__*/_react["default"].createElement(_ProductItem["default"], {
-        key: item.productId,
+      return /*#__PURE__*/_react["default"].createElement(_StoreItem["default"], {
+        key: item.storeId,
         data: item,
         onItemClick: function onItemClick() {
-          (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
+          (0, _coreUtil.clickUrl)('/main/discount');
         },
         panelProps: panelProps.content
       });

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

@@ -1,5 +1,5 @@
 .monpay-merchant-sales-mobile {
-  padding: 0.4rem;
+  padding: 0.36rem;
 }
 .monpay-merchant-sales-mobile .headerImg {
   display: block;
@@ -9,6 +9,6 @@
   margin-top: 0.32rem;
   display: flex;
   align-items: center;
-  justify-content: space-between;
+  gap: 0.24rem;
   flex-wrap: wrap;
 }

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

@@ -754,7 +754,7 @@ function (_super) {
     }, 140);
     if (_layout === 'layout1-2' && contentWidth) imgHeight = (contentWidth - 12) / 2;
     if (_layout === 'layout1-3' && contentWidth) imgHeight = (contentWidth - 12 * 2) / 3;
-    return /*#__PURE__*/_react["default"].createElement("div", {
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, _products.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "monpay-recommend-mobile recommend_" + panelProps.id
     }, panelProps.title.headerImage.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       className: "headerImg",
@@ -855,7 +855,7 @@ function (_super) {
     })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "btnSeeAll",
       data: _seeAll
-    })));
+    }))));
   };
 
   RecommendMobile.defaultProps = {

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

@@ -5,6 +5,9 @@
   margin-bottom: 0.48rem;
   transition: 0.2s all linear;
 }
+.BundleItemWrap:last-child {
+  margin-bottom: 0;
+}
 .BundleItemWrap .header {
   height: 0.92rem;
   padding: 0.16rem 0.24rem;

package/lib/composite-comp/monpay/components/MerchantSales/mobile/{ProductItem → StoreItem}/index.js

@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _commonUtil = require("../../../../../../utils/commonUtil");
-
 var _components = require("../../../../../../meta-comp/components");
 
 var _common = require("../../../../../../common");
@@ -76,19 +74,19 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 
-var ProductItem =
+var StoreItem =
 /** @class */
 function (_super) {
-  __extends(ProductItem, _super);
+  __extends(StoreItem, _super);
 
-  function ProductItem() {
+  function StoreItem() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {};
     return _this;
   }
 
-  ProductItem.prototype.render = function () {
+  StoreItem.prototype.render = function () {
     var _a = this.props,
         data = _a.data,
         panelProps = _a.panelProps,
@@ -96,31 +94,31 @@ function (_super) {
         rest = __rest(_a, ["data", "panelProps", "onItemClick"]);
 
     return /*#__PURE__*/_react["default"].createElement("div", _extends({
-      className: (0, _classnames["default"])('monpay-merchant-product-item-wrap'),
+      className: (0, _classnames["default"])('monpay-merchant-store-item-wrap'),
       onClick: function onClick() {
         return onItemClick();
       }
     }, rest), /*#__PURE__*/_react["default"].createElement("div", {
       className: "img-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.NewImg, {
-      className: "product-img",
+      className: "store-img",
       lazy: true,
-      src: (0, _commonUtil.convertImageUrl)(data.productImg || data.imgUrlContent || data.productImageUrlContent)
+      src: data.storeLogoUrl
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "sale-tag"
     })), panelProps.merchantName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "prodName",
       data: __assign(__assign({}, panelProps.merchantName), {
-        text: data.offerName
+        text: data.storeName
       })
     }));
   };
 
-  ProductItem.defaultProps = {
+  StoreItem.defaultProps = {
     data: {}
   };
-  return ProductItem;
+  return StoreItem;
 }(_react["default"].Component);
 
-var _default = ProductItem;
+var _default = StoreItem;
 exports["default"] = _default;

package/lib/composite-comp/monpay/components/MerchantSales/mobile/{ProductItem → StoreItem}/index.less

@@ -1,20 +1,20 @@
-.monpay-merchant-product-item-wrap {
+.monpay-merchant-store-item-wrap {
   display: flex;
   flex-direction: column;
-  width: 2.08rem;
+  width: 2.06rem;
   margin-bottom: 0.32rem;
   cursor: pointer;
   position: relative;
 }
-.monpay-merchant-product-item-wrap .img-wrap {
+.monpay-merchant-store-item-wrap .img-wrap {
   position: relative;
 }
-.monpay-merchant-product-item-wrap .img-wrap .product-img {
+.monpay-merchant-store-item-wrap .img-wrap .store-img {
   width: 2.08rem;
   height: 2.08rem;
   border-radius: 0.16rem;
 }
-.monpay-merchant-product-item-wrap .img-wrap .sale-tag {
+.monpay-merchant-store-item-wrap .img-wrap .sale-tag {
   background: url('../img/sale.png') no-repeat center center;
   background-size: 100%;
   width: 1.1rem;
@@ -23,7 +23,7 @@
   top: 0;
   left: 0;
 }
-.monpay-merchant-product-item-wrap .prodName {
+.monpay-merchant-store-item-wrap .prodName {
   font-weight: 400;
   font-size: 0.28rem;
   color: #000;

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

@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 
 require("./index.less");
 
-var _ProductItem = _interopRequireDefault(require("./ProductItem"));
+var _StoreItem = _interopRequireDefault(require("./StoreItem"));
 
 var _card = _interopRequireDefault(require("./img/card.png"));
 
@@ -193,20 +193,25 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
 };
 
 var defaultData = [{
-  imgUrlContent: {
-    url: _card["default"]
-  },
-  offerName: 'Product Name'
+  storeId: 1,
+  storeLogoUrl: _card["default"],
+  storeName: 'Store Name'
 }, {
-  imgUrlContent: {
-    url: _card["default"]
-  },
-  offerName: 'Product Name'
+  storeId: 2,
+  storeLogoUrl: _card["default"],
+  storeName: 'Store Name'
 }, {
-  imgUrlContent: {
-    url: _card["default"]
-  },
-  offerName: 'Product Name'
+  storeId: 3,
+  storeLogoUrl: _card["default"],
+  storeName: 'Store Name'
+}, {
+  storeId: 4,
+  storeLogoUrl: _card["default"],
+  storeName: 'Store Name'
+}, {
+  storeId: 5,
+  storeLogoUrl: _card["default"],
+  storeName: 'Store Name'
 }];
 
 var MerchantSalesMobile =
@@ -226,8 +231,11 @@ function (_super) {
     _this.getData = function () {
       return __awaiter(_this, void 0, void 0, function () {
         var res, list;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
+
+        var _a;
+
+        return __generator(this, function (_b) {
+          switch (_b.label) {
             case 0:
               return [4
               /*yield*/
@@ -240,8 +248,8 @@ function (_super) {
               }, 'POST')];
 
             case 1:
-              res = _a.sent();
-              list = res.pageInfo.list;
+              res = _b.sent();
+              list = ((_a = res.storePage) === null || _a === void 0 ? void 0 : _a.list) || [];
               this.setState({
                 list: list
               });
@@ -269,7 +277,7 @@ function (_super) {
     var panelProps = this.props.panelProps;
     var list = this.state.list;
 
-    var _list = list.length === 0 && (0, _coreUtil.isDesignMode)() ? defaultData : list;
+    var _list = list.length > 0 && (0, _coreUtil.isDesignMode)() ? defaultData : list;
 
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, _list.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "monpay-merchant-sales-mobile"
@@ -279,11 +287,11 @@ function (_super) {
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "merchant-sales-list"
     }, _list.map(function (item) {
-      return /*#__PURE__*/_react["default"].createElement(_ProductItem["default"], {
-        key: item.productId,
+      return /*#__PURE__*/_react["default"].createElement(_StoreItem["default"], {
+        key: item.storeId,
         data: item,
         onItemClick: function onItemClick() {
-          (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
+          (0, _coreUtil.clickUrl)('/main/discount');
         },
         panelProps: panelProps.content
       });

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

@@ -1,5 +1,5 @@
 .monpay-merchant-sales-mobile {
-  padding: 0.4rem;
+  padding: 0.36rem;
 }
 .monpay-merchant-sales-mobile .headerImg {
   display: block;
@@ -9,6 +9,6 @@
   margin-top: 0.32rem;
   display: flex;
   align-items: center;
-  justify-content: space-between;
+  gap: 0.24rem;
   flex-wrap: wrap;
 }

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

@@ -754,7 +754,7 @@ function (_super) {
     }, 140);
     if (_layout === 'layout1-2' && contentWidth) imgHeight = (contentWidth - 12) / 2;
     if (_layout === 'layout1-3' && contentWidth) imgHeight = (contentWidth - 12 * 2) / 3;
-    return /*#__PURE__*/_react["default"].createElement("div", {
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, _products.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "monpay-recommend-mobile recommend_" + panelProps.id
     }, panelProps.title.headerImage.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       className: "headerImg",
@@ -855,7 +855,7 @@ function (_super) {
     })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "btnSeeAll",
       data: _seeAll
-    })));
+    }))));
   };
 
   RecommendMobile.defaultProps = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "2.0.117",
+  "version": "2.0.118",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",