@fonixtree/magic-design 2.0.173 → 2.0.174

package/es/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,7 @@ 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;
     return /*#__PURE__*/_react["default"].createElement("div", _extends({
       className: (0, _classnames["default"])('monpay-product-item-wrap', {
         fixHeight: fixHeight,
@@ -165,9 +164,12 @@ 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", {
+    }), ((_a = panelProps.label) === null || _a === void 0 ? void 0 : _a.open) && data.discountPercent && /*#__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 +218,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/es/composite-comp/common/components/MonpayProductItem/index.less

@@ -20,12 +20,12 @@
     }
 
     .discount-tag {
-      font-size: 12px;
-      font-weight: 700;
-      color: #fff;
-      background-color: #ff8650;
-      padding: 5px;
-      border-radius: 0 5px 5px 0;
+      // 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;

package/es/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/es/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/es/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/es/composite-comp/monpay/config-panels/MonpayRecommendConfig/RecommendConfigContent/index.js

@@ -7,6 +7,8 @@ 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");
@@ -74,8 +76,14 @@ function (_super) {
         name: (0, _locale.i18n)('FILTER'),
         value: null,
         metaOption: panelProps.filter
-      }, // { key: '1', name: i18n('LABEL'), value: <ButtonConfig data={panelProps.label} />, metaOption: panelProps.label },
-      {
+      }, {
+        key: '1',
+        name: (0, _locale.i18n)('LABEL'),
+        value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
+          data: panelProps.label
+        }),
+        metaOption: panelProps.label
+      }, {
         key: '2',
         name: (0, _locale.i18n)('PRODUCT_NAME'),
         value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {

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

@@ -21,10 +21,10 @@ var _storeUtil = require("../../../../../utils/storeUtil");
 
 var _common = require("../../../../../common");
 
-var _constants = require("../../../../../constants");
-
 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 () {
@@ -274,9 +274,8 @@ function (_super) {
     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,
@@ -333,10 +332,11 @@ function (_super) {
       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: ""
+        src: _product["default"]
       }), /*#__PURE__*/_react["default"].createElement("span", {
         className: "one_row no-reversed"
       }, "Supermarkets"));

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

@@ -124,7 +124,7 @@ function (_super) {
         layout = _a.layout,
         rest = __rest(_a, ["data", "panelProps", "onItemClick", "layout"]);
 
-    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;
     console.log(panelProps);
     var storeName = panelProps.storeName,
         storeDesc = panelProps.storeDesc,
@@ -159,7 +159,7 @@ function (_super) {
       }),
       readonly: true
     }), minOrder.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
-      className: "minOrder",
+      className: "minOrder no-reversed",
       data: __assign(__assign({}, minOrder), {
         text: (0, _commonUtil.reverseStrArr)([(0, _locale.i18n)('MIN_ORDER'), ':', (data.minOrder || 0) + " IQD"])
       }),
@@ -175,7 +175,7 @@ function (_super) {
     }), evaluateScore.open && deliveryTime.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "line1"
     }), sold.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
-      className: "sold",
+      className: "sold no-reversed",
       data: __assign(__assign({}, sold), {
         text: (0, _commonUtil.reverseStrArr)([(0, _locale.i18n)('SOLD'), soldNumber, '+'])
       }),
@@ -223,17 +223,17 @@ function (_super) {
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "row"
     }, minOrder.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
-      className: "minOrder",
+      className: "minOrder no-reversed",
       data: __assign(__assign({}, minOrder), {
-        text: (0, _locale.i18n)('MIN_ORDER') + ": " + data.minOrder
+        text: (0, _commonUtil.reverseStrArr)([(0, _locale.i18n)('MIN_ORDER'), ':', (data.minOrder || 0) + " IQD"])
       }),
       readonly: true
     }), minOrder.open && sold.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "line1"
     }), sold.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
-      className: "sold",
+      className: "sold no-reversed",
       data: __assign(__assign({}, sold), {
-        text: (0, _locale.i18n)('SOLD') + " " + soldNumber
+        text: (0, _commonUtil.reverseStrArr)([(0, _locale.i18n)('SOLD'), soldNumber, '+'])
       }),
       readonly: true
     })), /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -23,8 +23,6 @@ var _coreUtil = require("../../../../../utils/coreUtil");
 
 var _product = _interopRequireDefault(require("../../../../../assets/images/common/product.png"));
 
-var _constants = require("../../../../../constants");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -155,9 +153,8 @@ function (_super) {
 
     var _list = list.length === 0 && (0, _coreUtil.isDesignMode)() ? defaultData : list;
 
-    var needReverse = ((0, _storeUtil.getStore)(_constants.STORAGE_KEY.FISHX_LOCALE) || (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE)) === 'ba';
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, _list.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])('m-stores-mobile', (_a = {}, _a['reversed-layout'] = needReverse, _a))
+      className: (0, _classnames["default"])('m-stores-mobile', (_a = {}, _a['reversed-layout'] = (0, _commonUtil.needReverse)(), _a))
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "stores-title"
     }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -23,10 +23,6 @@
   padding-right: 0;
   padding-left: 0.4rem;
 }
-.m-stores-mobile.reversed-layout .sold,
-.m-stores-mobile.reversed-layout .minOrder {
-  direction: ltr;
-}
 .m-stores-mobile.reversed-layout .flag {
   right: -0.04rem !important;
   left: unset !important;

package/es/composite-comp/public/config-panels/WalletConfig/index.js

@@ -7,7 +7,7 @@ exports["default"] = WalletNuriConfig;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _WalletNuriConfigImageGroup = _interopRequireDefault(require("./WalletNuriConfigImageGroup"));
+var _WalletConfigImageGroup = _interopRequireDefault(require("./WalletConfigImageGroup"));
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
@@ -31,7 +31,7 @@ function WalletNuriConfig(props) {
     source: [{
       key: 'walletNuri1',
       name: (0, _locale.i18n)('GROUP'),
-      value: /*#__PURE__*/_react["default"].createElement(_WalletNuriConfigImageGroup["default"], {
+      value: /*#__PURE__*/_react["default"].createElement(_WalletConfigImageGroup["default"], {
         source: data.groupSource
       })
     }, {

package/es/locale/index.js

@@ -11,7 +11,7 @@ var _es = _interopRequireDefault(require("./es/es.json"));
 
 var _mn = _interopRequireDefault(require("./mn/mn.json"));
 
-var _ba = _interopRequireDefault(require("./ba/ba.json"));
+var _ar = _interopRequireDefault(require("./ar/ar.json"));
 
 var _constants = require("../constants");
 
@@ -24,7 +24,7 @@ var localeMap = {
   es: _es["default"],
   mn: _mn["default"],
   'id-ID': _mn["default"],
-  ba: _ba["default"]
+  ar: _ar["default"]
 };
 /** 国际化 */
 
@@ -43,7 +43,7 @@ function i18n(key, args) {
       var reg = new RegExp("{" + key + "}", 'g');
       str_1 = tempString.replace(reg, args[key]);
     });
-    if (locale === 'ba') return str_1.split(' ').reverse().join(' ');
+    if (locale === 'ar') return str_1.split(' ').reverse().join(' ');
     return str_1;
   } else {
     console.log('未找到国际化KEY:' + key);

package/es/utils/commonUtil.js

@@ -21,7 +21,7 @@ exports.goLogin = goLogin;
 exports.importAsync = void 0;
 exports.isLogin = isLogin;
 exports.navigateBack = navigateBack;
-exports.onListenTouch = exports.nextTick = exports.navigateTo = void 0;
+exports.onListenTouch = exports.nextTick = exports.needReverse = exports.navigateTo = void 0;
 exports.pushGA = pushGA;
 exports.setDefaultAddressFromIP = exports.reverseStrArr = exports.pxToRem = void 0;
 exports.shareFacebook = shareFacebook;
@@ -508,10 +508,14 @@ var getUrlParams = function getUrlParams(name) {
 
 exports.getUrlParams = getUrlParams;
 
-var reverseStrArr = function reverseStrArr(arr) {
-  var locale = (0, _storeUtil.getStore)(_constants.STORAGE_KEY.FISHX_LOCALE) || (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE);
+var needReverse = function needReverse() {
+  return ((0, _storeUtil.getStore)(_constants.STORAGE_KEY.FISHX_LOCALE) || (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE)) === 'ar';
+};
 
-  if (locale === 'ba') {
+exports.needReverse = needReverse;
+
+var reverseStrArr = function reverseStrArr(arr) {
+  if (needReverse()) {
     return arr.reverse().join(' ').replace('+ ', '+').replace(': ', ':');
   }
 

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,7 @@ 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;
     return /*#__PURE__*/_react["default"].createElement("div", _extends({
       className: (0, _classnames["default"])('monpay-product-item-wrap', {
         fixHeight: fixHeight,
@@ -165,9 +164,12 @@ 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", {
+    }), ((_a = panelProps.label) === null || _a === void 0 ? void 0 : _a.open) && data.discountPercent && /*#__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 +218,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,12 +20,12 @@
     }
 
     .discount-tag {
-      font-size: 12px;
-      font-weight: 700;
-      color: #fff;
-      background-color: #ff8650;
-      padding: 5px;
-      border-radius: 0 5px 5px 0;
+      // 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;

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/monpay/config-panels/MonpayRecommendConfig/RecommendConfigContent/index.js

@@ -7,6 +7,8 @@ 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");
@@ -74,8 +76,14 @@ function (_super) {
         name: (0, _locale.i18n)('FILTER'),
         value: null,
         metaOption: panelProps.filter
-      }, // { key: '1', name: i18n('LABEL'), value: <ButtonConfig data={panelProps.label} />, metaOption: panelProps.label },
-      {
+      }, {
+        key: '1',
+        name: (0, _locale.i18n)('LABEL'),
+        value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
+          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

@@ -21,10 +21,10 @@ var _storeUtil = require("../../../../../utils/storeUtil");
 
 var _common = require("../../../../../common");
 
-var _constants = require("../../../../../constants");
-
 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 () {
@@ -274,9 +274,8 @@ function (_super) {
     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,
@@ -333,10 +332,11 @@ function (_super) {
       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: ""
+        src: _product["default"]
       }), /*#__PURE__*/_react["default"].createElement("span", {
         className: "one_row no-reversed"
       }, "Supermarkets"));

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

@@ -124,7 +124,7 @@ function (_super) {
         layout = _a.layout,
         rest = __rest(_a, ["data", "panelProps", "onItemClick", "layout"]);
 
-    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;
     console.log(panelProps);
     var storeName = panelProps.storeName,
         storeDesc = panelProps.storeDesc,
@@ -159,7 +159,7 @@ function (_super) {
       }),
       readonly: true
     }), minOrder.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
-      className: "minOrder",
+      className: "minOrder no-reversed",
       data: __assign(__assign({}, minOrder), {
         text: (0, _commonUtil.reverseStrArr)([(0, _locale.i18n)('MIN_ORDER'), ':', (data.minOrder || 0) + " IQD"])
       }),
@@ -175,7 +175,7 @@ function (_super) {
     }), evaluateScore.open && deliveryTime.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "line1"
     }), sold.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
-      className: "sold",
+      className: "sold no-reversed",
       data: __assign(__assign({}, sold), {
         text: (0, _commonUtil.reverseStrArr)([(0, _locale.i18n)('SOLD'), soldNumber, '+'])
       }),
@@ -223,17 +223,17 @@ function (_super) {
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "row"
     }, minOrder.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
-      className: "minOrder",
+      className: "minOrder no-reversed",
       data: __assign(__assign({}, minOrder), {
-        text: (0, _locale.i18n)('MIN_ORDER') + ": " + data.minOrder
+        text: (0, _commonUtil.reverseStrArr)([(0, _locale.i18n)('MIN_ORDER'), ':', (data.minOrder || 0) + " IQD"])
       }),
       readonly: true
     }), minOrder.open && sold.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "line1"
     }), sold.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
-      className: "sold",
+      className: "sold no-reversed",
       data: __assign(__assign({}, sold), {
-        text: (0, _locale.i18n)('SOLD') + " " + soldNumber
+        text: (0, _commonUtil.reverseStrArr)([(0, _locale.i18n)('SOLD'), soldNumber, '+'])
       }),
       readonly: true
     })), /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -23,8 +23,6 @@ var _coreUtil = require("../../../../../utils/coreUtil");
 
 var _product = _interopRequireDefault(require("../../../../../assets/images/common/product.png"));
 
-var _constants = require("../../../../../constants");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -155,9 +153,8 @@ function (_super) {
 
     var _list = list.length === 0 && (0, _coreUtil.isDesignMode)() ? defaultData : list;
 
-    var needReverse = ((0, _storeUtil.getStore)(_constants.STORAGE_KEY.FISHX_LOCALE) || (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE)) === 'ba';
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, _list.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])('m-stores-mobile', (_a = {}, _a['reversed-layout'] = needReverse, _a))
+      className: (0, _classnames["default"])('m-stores-mobile', (_a = {}, _a['reversed-layout'] = (0, _commonUtil.needReverse)(), _a))
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "stores-title"
     }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -23,10 +23,6 @@
   padding-right: 0;
   padding-left: 0.4rem;
 }
-.m-stores-mobile.reversed-layout .sold,
-.m-stores-mobile.reversed-layout .minOrder {
-  direction: ltr;
-}
 .m-stores-mobile.reversed-layout .flag {
   right: -0.04rem !important;
   left: unset !important;

package/lib/composite-comp/public/config-panels/WalletConfig/index.js

@@ -7,7 +7,7 @@ exports["default"] = WalletNuriConfig;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _WalletNuriConfigImageGroup = _interopRequireDefault(require("./WalletNuriConfigImageGroup"));
+var _WalletConfigImageGroup = _interopRequireDefault(require("./WalletConfigImageGroup"));
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
@@ -31,7 +31,7 @@ function WalletNuriConfig(props) {
     source: [{
       key: 'walletNuri1',
       name: (0, _locale.i18n)('GROUP'),
-      value: /*#__PURE__*/_react["default"].createElement(_WalletNuriConfigImageGroup["default"], {
+      value: /*#__PURE__*/_react["default"].createElement(_WalletConfigImageGroup["default"], {
         source: data.groupSource
       })
     }, {

package/lib/locale/index.js

@@ -11,7 +11,7 @@ var _es = _interopRequireDefault(require("./es/es.json"));
 
 var _mn = _interopRequireDefault(require("./mn/mn.json"));
 
-var _ba = _interopRequireDefault(require("./ba/ba.json"));
+var _ar = _interopRequireDefault(require("./ar/ar.json"));
 
 var _constants = require("../constants");
 
@@ -24,7 +24,7 @@ var localeMap = {
   es: _es["default"],
   mn: _mn["default"],
   'id-ID': _mn["default"],
-  ba: _ba["default"]
+  ar: _ar["default"]
 };
 /** 国际化 */
 
@@ -43,7 +43,7 @@ function i18n(key, args) {
       var reg = new RegExp("{" + key + "}", 'g');
       str_1 = tempString.replace(reg, args[key]);
     });
-    if (locale === 'ba') return str_1.split(' ').reverse().join(' ');
+    if (locale === 'ar') return str_1.split(' ').reverse().join(' ');
     return str_1;
   } else {
     console.log('未找到国际化KEY:' + key);

package/lib/utils/commonUtil.js

@@ -21,7 +21,7 @@ exports.goLogin = goLogin;
 exports.importAsync = void 0;
 exports.isLogin = isLogin;
 exports.navigateBack = navigateBack;
-exports.onListenTouch = exports.nextTick = exports.navigateTo = void 0;
+exports.onListenTouch = exports.nextTick = exports.needReverse = exports.navigateTo = void 0;
 exports.pushGA = pushGA;
 exports.setDefaultAddressFromIP = exports.reverseStrArr = exports.pxToRem = void 0;
 exports.shareFacebook = shareFacebook;
@@ -508,10 +508,14 @@ var getUrlParams = function getUrlParams(name) {
 
 exports.getUrlParams = getUrlParams;
 
-var reverseStrArr = function reverseStrArr(arr) {
-  var locale = (0, _storeUtil.getStore)(_constants.STORAGE_KEY.FISHX_LOCALE) || (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE);
+var needReverse = function needReverse() {
+  return ((0, _storeUtil.getStore)(_constants.STORAGE_KEY.FISHX_LOCALE) || (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE)) === 'ar';
+};
 
-  if (locale === 'ba') {
+exports.needReverse = needReverse;
+
+var reverseStrArr = function reverseStrArr(arr) {
+  if (needReverse()) {
     return arr.reverse().join(' ').replace('+ ', '+').replace(': ', ':');
   }
 

package/package.json

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