@fonixtree/magic-design 2.0.174 → 2.0.177

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;

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

@@ -15,14 +15,10 @@ var _StoreItem = _interopRequireDefault(require("./StoreItem"));
 
 var _components = require("../../../../../meta-comp/components");
 
-var _storeUtil = require("../../../../../utils/storeUtil");
-
 var _commonUtil = require("../../../../../utils/commonUtil");
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 
-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 () {
@@ -67,65 +63,173 @@ var __assign = void 0 && (void 0).__assign || function () {
   return __assign.apply(this, arguments);
 };
 
-var defaultData = [{
-  imgUrlContent: {
-    url: _product["default"]
-  },
-  offerName: 'Product Name Long Long Long Long Long',
-  salesPrice: 10000,
-  specialPrice: null,
-  marketPrice: 20000,
-  salePercent: 500,
-  discountPercent: 90,
-  coupons: [{
-    couponId: '1',
-    discountMethod: 'DISC',
-    discountAmount: 3000
-  }, {
-    couponId: '2',
-    discountMethod: 'AMT',
-    discountAmount: 100
-  }, {
-    couponId: '3',
-    discountMethod: 'AMT',
-    discountAmount: 1000
-  }, {
-    couponId: '4',
-    discountMethod: 'AMT',
-    discountAmount: 10000
-  }, {
-    couponId: '5',
-    discountMethod: 'AMT',
-    discountAmount: 100000
-  }]
-}, {
-  imgUrlContent: {
-    url: _product["default"]
-  },
-  offerName: 'Product Name',
-  salesPrice: 10000,
-  specialPrice: null,
-  marketPrice: 20000,
-  salePercent: 500
-}, {
-  imgUrlContent: {
-    url: _product["default"]
+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: []
   },
-  offerName: 'Product Name Long Long Long Long Long',
-  salesPrice: 18000000,
-  specialPrice: 18000000,
-  marketPrice: 19000000,
-  discountPercent: 10,
-  salePercent: 500
+      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 defaultData = [{
+  storeId: 1,
+  storeName: '落落彩虹的大超市',
+  comments: '没有比我面积更大、性价比更高的商品了。',
+  storeLogoUrl: '/get/resource/store6/conf/20240905/picture/3331831612826257207296_600.jpg',
+  storePosterUrl: '/get/resource/store6/conf/20240905/picture/11111831612121177927680_600.png',
+  freeShipping: null,
+  distance: '0',
+  deliveryTime: null,
+  minOrderAmount: 5900,
+  comEvalRate: null,
+  salesCnt: null
 }, {
-  imgUrlContent: {
-    url: _product["default"]
-  },
-  offerName: 'Product Name',
-  salesPrice: 18000000,
-  specialPrice: 18000000,
-  marketPrice: 19000000,
-  salePercent: 500
+  storeId: 2,
+  storeName: '落落彩虹的大超市',
+  comments: '没有比我面积更大、性价比更高的商品了。',
+  storeLogoUrl: '/get/resource/store6/conf/20240905/picture/3331831612826257207296_600.jpg',
+  storePosterUrl: '/get/resource/store6/conf/20240905/picture/11111831612121177927680_600.png',
+  freeShipping: 'Y',
+  distance: '18',
+  deliveryTime: null,
+  minOrderAmount: 5900,
+  comEvalRate: null,
+  salesCnt: null
 }];
 
 var Mobile =
@@ -136,15 +240,54 @@ function (_super) {
   function Mobile() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
-    _this._cache = (0, _coreUtil.isDesignMode)() ? {} : (0, _commonUtil.ensure)(function () {
-      return (0, _storeUtil.getMagicStore)("stores_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
-    }, {});
     _this.state = {
       list: []
     };
+
+    _this.getData = function () {
+      return __awaiter(_this, void 0, void 0, function () {
+        var params, res, list;
+
+        var _a;
+
+        return __generator(this, function (_b) {
+          switch (_b.label) {
+            case 0:
+              params = {
+                pageIndex: 1,
+                pageSize: 10
+              };
+
+              if ((0, _commonUtil.isLogin)()) {
+                params.longitude = '118.78344';
+                params.latitude = '31.90613';
+              }
+
+              return [4
+              /*yield*/
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/store/es', params, 'POST')];
+
+            case 1:
+              res = _b.sent();
+              list = ((_a = res.storePage) === null || _a === void 0 ? void 0 : _a.list) || [];
+              this.setState({
+                list: list
+              });
+              return [2
+              /*return*/
+              ];
+          }
+        });
+      });
+    };
+
     return _this;
   }
 
+  Mobile.prototype.componentDidMount = function () {
+    this.getData();
+  };
+
   Mobile.prototype.render = function () {
     var _a;
 
@@ -162,10 +305,7 @@ function (_super) {
     }, panelProps.title.name.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       data: panelProps.title.name
     })), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "right",
-      onClick: function onClick() {
-        return (0, _coreUtil.clickUrl)('/spike');
-      }
+      className: "right"
     }, panelProps.title.seeAll.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       data: panelProps.title.seeAll
     }))), /*#__PURE__*/_react["default"].createElement("div", {
@@ -178,7 +318,7 @@ function (_super) {
         data: __assign({}, item),
         layout: panelProps.customize.layout,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || ''));
+          return (0, _coreUtil.clickUrl)("store-" + item.storeId + "}");
         },
         panelProps: panelProps.content
       });

package/lib/locale/ar/ar.json

@@ -1,4 +1,5 @@
 {
+  "GIFT": "Gift",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",
   "MIN_ORDER": "Min Order",
   "FREE_SHIPPING_STORES": "Free shipping stores",

package/lib/locale/en/en.json

@@ -1,4 +1,5 @@
 {
+  "GIFT": "Gift",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",
   "MIN_ORDER": "Min Order",
   "FREE_SHIPPING_STORES": "Free shipping stores",

package/lib/locale/es/es.json

@@ -1,4 +1,5 @@
 {
+  "GIFT": "Gift",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",
   "MIN_ORDER": "Min Order",
   "FREE_SHIPPING_STORES": "Free shipping stores",

package/lib/locale/mn/mn.json

@@ -1,4 +1,5 @@
 {
+  "GIFT": "Бэлэгтэй",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",
   "MIN_ORDER": "Min Order",
   "FREE_SHIPPING_STORES": "Free shipping stores",

package/package.json

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