@fonixtree/magic-design 2.0.189 → 2.0.190

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

@@ -7,16 +7,17 @@
   position: relative;
   margin-right: 16px;
   border-radius: 8px;
+  border: 1px solid #E4E4E4;
 
   .img-wrap {
     position: relative;
-    border-radius: 8px;
+    border-radius: 8px 8px 0 0;
     // overflow: hidden;
 
     .product-img {
       width: 140px;
       height: 140px;
-      border-radius: 8px;
+      border-radius: 8px 8px 0 0;
       object-fit: cover;
     }
 
@@ -31,6 +32,7 @@
       top: 15px;
       left: 0;
     }
+
     .giftL-tag {
       font-size: 12px;
       font-weight: 700;
@@ -40,6 +42,7 @@
       border-radius: 0 5px 5px 0;
       display: flex;
       align-items: center;
+
       .icon {
         margin-right: 4px;
       }
@@ -47,6 +50,7 @@
   }
 
   .content-wrap {
+    padding: 0 0 8px 10px;
 
     .promotions-wrap {
       display: flex;

package/es/composite-comp/dito/components/SearchBar/mobile/index.less

@@ -35,6 +35,7 @@
   font-style: normal;
   font-weight: 400;
   font-size: 0.28rem;
+  outline: none;
 }
 .m-search-bar .right .message-wrap {
   position: relative;

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

@@ -11,8 +11,6 @@ require("./index.less");
 
 var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
 
-var _locale = require("../../../../../locale");
-
 var _MonpayProductItem = _interopRequireDefault(require("../../../../common/components/MonpayProductItem"));
 
 var _coreUtil = require("../../../../../utils/coreUtil");
@@ -23,6 +21,8 @@ var _commonUtil = require("../../../../../utils/commonUtil");
 
 var _storeUtil = require("../../../../../utils/storeUtil");
 
+var _constants = require("../../../../../constants");
+
 var _dateUtil = require("../../../../../utils/dateUtil");
 
 var _MonpayCountDown = _interopRequireDefault(require("../MonpayCountDown"));
@@ -364,6 +364,31 @@ function (_super) {
       });
     };
 
+    _this.toLocale = function (value) {
+      var locale = (0, _storeUtil.getStore)(_constants.STORAGE_KEY.FISHX_LOCALE) || (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE);
+
+      if (locale == 'mn') {
+        // const time = newDate('2024-10-13 10:11:00');
+        var time = (0, _dateUtil.newDate)(value);
+
+        var _hour = time.getHours() < 10 ? '0' + time.getHours() : time.getHours();
+
+        var _minutes = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes();
+
+        if ((0, _dateUtil.isTomorrow)(time)) {
+          return "\u041C\u0430\u0440\u0433\u0430\u0430\u0448, " + _hour + ":" + _minutes;
+        }
+
+        if ((0, _dateUtil.isToday)(time)) {
+          return "\u04E8\u043D\u04E9\u04E9\u0434\u04E9\u0440, " + _hour + ":" + _minutes;
+        } else {
+          return time.getMonth() + 1 + " \u0441\u0430\u0440\u044B\u043D " + time.getDate() + "-\u043D\u044B " + _hour + ":" + _minutes;
+        }
+      } else {
+        return (0, _dateUtil.formatDayMonthTime)(value);
+      }
+    };
+
     return _this;
   }
 
@@ -380,6 +405,8 @@ function (_super) {
   };
 
   FlashDealMobile.prototype.render = function () {
+    var _this = this;
+
     var panelProps = this.props.panelProps;
     var _a = this.state,
         times = _a.times,
@@ -426,9 +453,7 @@ function (_super) {
         }
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "time"
-      }, (0, _dateUtil.formatDayMonthTime)(item.effDate)), /*#__PURE__*/_react["default"].createElement("div", {
-        className: "status"
-      }, item.cmpState === 'A' ? (0, _locale.i18n)('COMING_SOON') : (0, _locale.i18n)('ON_GOING')));
+      }, _this.toLocale(item.effDate)));
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "flash-deal-list"
     }, _list.map(function (item) {

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

@@ -282,6 +282,7 @@ function (_super) {
     var _this = this;
 
     var data = this.props.data;
+    console.log('data: ', data);
     var _a = this.state,
         balance = _a.balance,
         cenduit = _a.cenduit;
@@ -289,6 +290,8 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-wallet"
     }, data.groupSource.map(function (group, index) {
+      var _a;
+
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: group.id,
         className: "wallet-item",
@@ -297,7 +300,7 @@ function (_super) {
         }
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "item-head"
-      }, group.logo.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+      }, ((_a = group === null || group === void 0 ? void 0 : group.logo) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
         data: group.logo,
         GAData: GAData,
         style: (0, _commonUtil.pxToRem)({

package/es/decorator/compositeDecorator.js

@@ -15,8 +15,6 @@ var _constants = require("../constants");
 
 var _commonUtil = require("../utils/commonUtil");
 
-var _androidUtil = require("../utils/androidUtil");
-
 var _storeUtil = require("../utils/storeUtil");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -289,13 +287,12 @@ function compositeDecorator(WrappedComponent) {
           hoveredFloor: _mobx.store.hoveredFloor
         });
       });
-      this.getOuterWrapStyle();
+      this.getOuterWrapStyle(); // if (browserVersion().isDelivistaApp) {
 
-      if ((0, _androidUtil.browserVersion)().isDelivistaApp) {
-        window['switchLanguage'] = this.switchLanguage;
-        window['getUserAddress'] = this.getUserAddress; // switchLanguage();
-        // getUserAddress();
-      }
+      window['switchLanguage'] = this.switchLanguage;
+      window['getUserAddress'] = this.getUserAddress; // switchLanguage();
+      // getUserAddress();
+      // }
     };
 
     Wrapper.prototype.componentWillUnmount = function () {

package/es/locale/mn/mn.json

@@ -172,7 +172,7 @@
   "COUPON": "Купон",
   "HEADER_IMAGE": "Толгойн зураг",
   "ACTIVITY_LABEL": "Үйл ажиллагааны шошго",
-  "STOCK": "Хувьцаа",
+  "STOCK": "Үлдэгдэл",
   "DISCOUNT_LABEL": "Хөнгөлөлтийн шошго",
   "SESSION_TIME": "Сеанс цаг",
   "COUNTDOWN": "Countdown",

package/es/utils/dateUtil.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.formatDateTime = exports.formatDateMinute = exports.formatDate = void 0;
 exports.formatDayMonth = formatDayMonth;
 exports.formatDayMonthTime = formatDayMonthTime;
+exports.isToday = isToday;
+exports.isTomorrow = isTomorrow;
 exports.newDate = void 0;
 
 var _moment = _interopRequireDefault(require("moment"));
@@ -80,4 +82,16 @@ function formatDayMonthTime(date, fmt) {
   }
 
   return (0, _moment["default"])(newDate(date)).format(fmt);
+}
+
+function isToday(date) {
+  var now = new Date();
+  var tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+  return date.getDate() === tomorrow.getDate() && date.getMonth() === tomorrow.getMonth() && date.getFullYear() === tomorrow.getFullYear();
+}
+
+function isTomorrow(date) {
+  var now = new Date();
+  var tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1);
+  return date.getDate() === tomorrow.getDate() && date.getMonth() === tomorrow.getMonth() && date.getFullYear() === tomorrow.getFullYear();
 }

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

@@ -7,16 +7,17 @@
   position: relative;
   margin-right: 16px;
   border-radius: 8px;
+  border: 1px solid #E4E4E4;
 
   .img-wrap {
     position: relative;
-    border-radius: 8px;
+    border-radius: 8px 8px 0 0;
     // overflow: hidden;
 
     .product-img {
       width: 140px;
       height: 140px;
-      border-radius: 8px;
+      border-radius: 8px 8px 0 0;
       object-fit: cover;
     }
 
@@ -31,6 +32,7 @@
       top: 15px;
       left: 0;
     }
+
     .giftL-tag {
       font-size: 12px;
       font-weight: 700;
@@ -40,6 +42,7 @@
       border-radius: 0 5px 5px 0;
       display: flex;
       align-items: center;
+
       .icon {
         margin-right: 4px;
       }
@@ -47,6 +50,7 @@
   }
 
   .content-wrap {
+    padding: 0 0 8px 10px;
 
     .promotions-wrap {
       display: flex;

package/lib/composite-comp/dito/components/SearchBar/mobile/index.less

@@ -35,6 +35,7 @@
   font-style: normal;
   font-weight: 400;
   font-size: 0.28rem;
+  outline: none;
 }
 .m-search-bar .right .message-wrap {
   position: relative;

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

@@ -11,8 +11,6 @@ require("./index.less");
 
 var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
 
-var _locale = require("../../../../../locale");
-
 var _MonpayProductItem = _interopRequireDefault(require("../../../../common/components/MonpayProductItem"));
 
 var _coreUtil = require("../../../../../utils/coreUtil");
@@ -23,6 +21,8 @@ var _commonUtil = require("../../../../../utils/commonUtil");
 
 var _storeUtil = require("../../../../../utils/storeUtil");
 
+var _constants = require("../../../../../constants");
+
 var _dateUtil = require("../../../../../utils/dateUtil");
 
 var _MonpayCountDown = _interopRequireDefault(require("../MonpayCountDown"));
@@ -364,6 +364,31 @@ function (_super) {
       });
     };
 
+    _this.toLocale = function (value) {
+      var locale = (0, _storeUtil.getStore)(_constants.STORAGE_KEY.FISHX_LOCALE) || (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE);
+
+      if (locale == 'mn') {
+        // const time = newDate('2024-10-13 10:11:00');
+        var time = (0, _dateUtil.newDate)(value);
+
+        var _hour = time.getHours() < 10 ? '0' + time.getHours() : time.getHours();
+
+        var _minutes = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes();
+
+        if ((0, _dateUtil.isTomorrow)(time)) {
+          return "\u041C\u0430\u0440\u0433\u0430\u0430\u0448, " + _hour + ":" + _minutes;
+        }
+
+        if ((0, _dateUtil.isToday)(time)) {
+          return "\u04E8\u043D\u04E9\u04E9\u0434\u04E9\u0440, " + _hour + ":" + _minutes;
+        } else {
+          return time.getMonth() + 1 + " \u0441\u0430\u0440\u044B\u043D " + time.getDate() + "-\u043D\u044B " + _hour + ":" + _minutes;
+        }
+      } else {
+        return (0, _dateUtil.formatDayMonthTime)(value);
+      }
+    };
+
     return _this;
   }
 
@@ -380,6 +405,8 @@ function (_super) {
   };
 
   FlashDealMobile.prototype.render = function () {
+    var _this = this;
+
     var panelProps = this.props.panelProps;
     var _a = this.state,
         times = _a.times,
@@ -426,9 +453,7 @@ function (_super) {
         }
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "time"
-      }, (0, _dateUtil.formatDayMonthTime)(item.effDate)), /*#__PURE__*/_react["default"].createElement("div", {
-        className: "status"
-      }, item.cmpState === 'A' ? (0, _locale.i18n)('COMING_SOON') : (0, _locale.i18n)('ON_GOING')));
+      }, _this.toLocale(item.effDate)));
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "flash-deal-list"
     }, _list.map(function (item) {

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

@@ -282,6 +282,7 @@ function (_super) {
     var _this = this;
 
     var data = this.props.data;
+    console.log('data: ', data);
     var _a = this.state,
         balance = _a.balance,
         cenduit = _a.cenduit;
@@ -289,6 +290,8 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-wallet"
     }, data.groupSource.map(function (group, index) {
+      var _a;
+
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: group.id,
         className: "wallet-item",
@@ -297,7 +300,7 @@ function (_super) {
         }
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "item-head"
-      }, group.logo.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+      }, ((_a = group === null || group === void 0 ? void 0 : group.logo) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
         data: group.logo,
         GAData: GAData,
         style: (0, _commonUtil.pxToRem)({

package/lib/decorator/compositeDecorator.js

@@ -15,8 +15,6 @@ var _constants = require("../constants");
 
 var _commonUtil = require("../utils/commonUtil");
 
-var _androidUtil = require("../utils/androidUtil");
-
 var _storeUtil = require("../utils/storeUtil");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -289,13 +287,12 @@ function compositeDecorator(WrappedComponent) {
           hoveredFloor: _mobx.store.hoveredFloor
         });
       });
-      this.getOuterWrapStyle();
+      this.getOuterWrapStyle(); // if (browserVersion().isDelivistaApp) {
 
-      if ((0, _androidUtil.browserVersion)().isDelivistaApp) {
-        window['switchLanguage'] = this.switchLanguage;
-        window['getUserAddress'] = this.getUserAddress; // switchLanguage();
-        // getUserAddress();
-      }
+      window['switchLanguage'] = this.switchLanguage;
+      window['getUserAddress'] = this.getUserAddress; // switchLanguage();
+      // getUserAddress();
+      // }
     };
 
     Wrapper.prototype.componentWillUnmount = function () {

package/lib/locale/mn/mn.json

@@ -172,7 +172,7 @@
   "COUPON": "Купон",
   "HEADER_IMAGE": "Толгойн зураг",
   "ACTIVITY_LABEL": "Үйл ажиллагааны шошго",
-  "STOCK": "Хувьцаа",
+  "STOCK": "Үлдэгдэл",
   "DISCOUNT_LABEL": "Хөнгөлөлтийн шошго",
   "SESSION_TIME": "Сеанс цаг",
   "COUNTDOWN": "Countdown",

package/lib/utils/dateUtil.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.formatDateTime = exports.formatDateMinute = exports.formatDate = void 0;
 exports.formatDayMonth = formatDayMonth;
 exports.formatDayMonthTime = formatDayMonthTime;
+exports.isToday = isToday;
+exports.isTomorrow = isTomorrow;
 exports.newDate = void 0;
 
 var _moment = _interopRequireDefault(require("moment"));
@@ -80,4 +82,16 @@ function formatDayMonthTime(date, fmt) {
   }
 
   return (0, _moment["default"])(newDate(date)).format(fmt);
+}
+
+function isToday(date) {
+  var now = new Date();
+  var tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+  return date.getDate() === tomorrow.getDate() && date.getMonth() === tomorrow.getMonth() && date.getFullYear() === tomorrow.getFullYear();
+}
+
+function isTomorrow(date) {
+  var now = new Date();
+  var tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1);
+  return date.getDate() === tomorrow.getDate() && date.getMonth() === tomorrow.getMonth() && date.getFullYear() === tomorrow.getFullYear();
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "2.0.189",
+  "version": "2.0.190",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",
@@ -32,7 +32,7 @@
     "marked": "4.3.0",
     "mobx": "6.6.1",
     "mobx-react": "7.5.2",
-    "moment": "2.29.3",
+    "moment": "2.30",
     "postcss-pxtorem": "^6.0.0",
     "quill": "^1.3.7",
     "ramda": "^0.28.0",