@fonixtree/magic-design 2.0.188 → 2.0.189

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

@@ -19,7 +19,9 @@ var _common = require("../../../../../common");
 
 var _locale = require("../../../../../locale");
 
-var _androidUtil = require("../../../../../utils/androidUtil");
+var _storeUtil = require("../../../../../utils/storeUtil");
+
+var _coreUtil = require("../../../../../utils/coreUtil");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -74,34 +76,24 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {};
-
-    _this.switchLanguage = function (value) {
-      alert(value);
-    };
-
-    _this.getUserAddress = function (value) {
-      alert(value);
-    };
-
     return _this;
   }
 
-  MerchantSalesMobile.prototype.componentDidMount = function () {
-    if ((0, _androidUtil.browserVersion)().isDelivistaApp) {
-      window.magicDesign.switchLanguage = this.switchLanguage;
-      window.magicDesign.getUserAddress = this.getUserAddress;
-    }
-  };
+  MerchantSalesMobile.prototype.componentDidMount = function () {};
 
   MerchantSalesMobile.prototype.render = function () {
     var _a;
 
     var panelProps = this.props.panelProps;
+    var info = (0, _storeUtil.getStore)('USER_ADDRESS_INFO') || {};
+    var customerInfo = info.customer ? info.customer + " " + info.tel : (0, _locale.i18n)('CAN_BE_ADDED_AS_YOUR_ADDRESS');
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('m-location-mobile', (_a = {}, _a['reversed-layout'] = (0, _commonUtil.needReverse)(), _a))
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "address-wrap",
-      onClick: function onClick() {}
+      onClick: function onClick() {
+        return (0, _coreUtil.clickUrl)('/location');
+      }
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "address-bg",
       style: {
@@ -116,12 +108,12 @@ function (_super) {
     }, panelProps.content.address.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "address one_row",
       data: __assign(__assign({}, panelProps.content.address), {
-        text: (0, _locale.i18n)('DISPLAY_LOCATION_ADDRESS')
+        text: (0, _coreUtil.isDesignMode)() ? (0, _locale.i18n)('DISPLAY_LOCATION_ADDRESS') : info.address
       })
     }), panelProps.content.customer.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "customer one_row",
       data: __assign(__assign({}, panelProps.content.customer), {
-        text: (0, _locale.i18n)('CUSTOMER_NAME_AND_PHONE_NUMBER')
+        text: (0, _coreUtil.isDesignMode)() ? (0, _locale.i18n)('CUSTOMER_NAME_AND_PHONE_NUMBER') : customerInfo
       })
     })), panelProps.content.arrowIcon.open && /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       className: "reversed-icon",

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

@@ -101,7 +101,6 @@ function (_super) {
         rest = __rest(_a, ["data", "panelProps", "onItemClick", "layout"]);
 
     var soldNumber = data.salesCnt > 250 ? "" + (data.salesCnt - data.salesCnt % 250) : data.salesCnt || 0;
-    console.log(panelProps);
     var storeName = panelProps.storeName,
         storeDesc = panelProps.storeDesc,
         freeDeliveryLabel = panelProps.freeDeliveryLabel,

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

@@ -318,7 +318,7 @@ function (_super) {
         data: __assign({}, item),
         layout: panelProps.customize.layout,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("store-" + item.storeId + "}");
+          return (0, _coreUtil.clickUrl)("store-" + item.storeId);
         },
         panelProps: panelProps.content
       });

package/es/constants/index.js

@@ -133,6 +133,7 @@ var campaignTypes = {
 exports.campaignTypes = campaignTypes;
 var urlType = {
   PRODUCT_DETAIL: 'proDetail',
+  STORE: 'store',
   CATG_PROD_LIST: 'catg',
   CUSTOMIZED: 'customized',
   PROD_FILTER: 'filter',
@@ -162,7 +163,8 @@ var urlTypeMap = {
   INTERESTED_MERCHANTS: 'InterestedMerchants',
   INTERESTED_PRODUCTS: 'InterestedProducts',
   MERCHANT_STORY: 'MerchantStory',
-  AFFILIATE_MISSION_DETAIL: 'AffiliateMissionDetail'
+  AFFILIATE_MISSION_DETAIL: 'AffiliateMissionDetail',
+  BUSINESS_TYPE: 'Business Type'
 };
 exports.urlTypeMap = urlTypeMap;
 var respCodeMap = {

package/es/decorator/compositeDecorator.js

@@ -15,6 +15,10 @@ 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -84,8 +88,27 @@ function compositeDecorator(WrappedComponent) {
       _this.state = {
         clickedFloor: '',
         hoveredFloor: ''
+      };
+
+      _this.switchLanguage = function (value) {
+        alert(value); // const lang = 'ar';
+
+        (0, _storeUtil.setStore)(_constants.STORAGE_KEY.LOCALE, value);
+      };
+
+      _this.getUserAddress = function (value) {
+        alert(value); // const info = {
+        //   address: '简短地址',
+        //   customer: '客户名称',
+        //   tel: '客户手机号',
+        //   longitude: '经度',
+        //   latitude: '纬度',
+        // };
+
+        (0, _storeUtil.setStore)('USER_ADDRESS_INFO', value);
       }; // 复合组件点击事件
 
+
       _this.onCompositeCompClick = function (event) {
         if (window.magicDesign.mode === 'renderer') {
           return;
@@ -267,6 +290,12 @@ function compositeDecorator(WrappedComponent) {
         });
       });
       this.getOuterWrapStyle();
+
+      if ((0, _androidUtil.browserVersion)().isDelivistaApp) {
+        window['switchLanguage'] = this.switchLanguage;
+        window['getUserAddress'] = this.getUserAddress; // switchLanguage();
+        // getUserAddress();
+      }
     };
 
     Wrapper.prototype.componentWillUnmount = function () {

package/es/locale/ar/ar.json

@@ -1,4 +1,5 @@
 {
+  "CAN_BE_ADDED_AS_YOUR_ADDRESS": "Can be added as your address",
   "GIFT": "Gift",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",
   "MIN_ORDER": "Min Order",

package/es/locale/en/en.json

@@ -1,4 +1,5 @@
 {
+  "CAN_BE_ADDED_AS_YOUR_ADDRESS": "Can be added as your address",
   "GIFT": "Gift",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",
   "MIN_ORDER": "Min Order",

package/es/locale/es/es.json

@@ -1,4 +1,5 @@
 {
+  "CAN_BE_ADDED_AS_YOUR_ADDRESS": "Can be added as your address",
   "GIFT": "Gift",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",
   "MIN_ORDER": "Min Order",

package/es/locale/mn/mn.json

@@ -1,4 +1,5 @@
 {
+  "CAN_BE_ADDED_AS_YOUR_ADDRESS": "Can be added as your address",
   "GIFT": "Бэлэгтэй",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",
   "MIN_ORDER": "Min Order",

package/es/utils/businessUtil.js

@@ -267,6 +267,18 @@ var newParseUrl = function newParseUrl(urlObj) {
       };
       break;
 
+    case _constants.urlTypeMap.BUSINESS_TYPE:
+      // 业态列表
+      link = '';
+      params = {
+        action: 'jump',
+        params: {
+          type: 'SEARCH_STORE_LIST_PAGE',
+          storeBizTypeId: value
+        }
+      };
+      break;
+
     default:
       var map = {
         '/main/cart': 'CART',
@@ -285,7 +297,8 @@ var newParseUrl = function newParseUrl(urlObj) {
         '/account/wallet': 'WEBVIEW',
         '/product/GroupBuy': 'GROUP',
         '/search-page': 'SEARCH_PAGE',
-        '/commission': 'COMMISSION'
+        '/commission': 'COMMISSION',
+        '/location': 'ADD_ADDRESS_PAGE'
       };
       var typeTemp = map[link];
 
@@ -370,6 +383,17 @@ var parseUrl = function parseUrl(url) {
         }
       };
       break;
+
+    case _constants.urlType.STORE:
+      // 店铺详情
+      params = {
+        action: 'jump',
+        params: {
+          type: 'STORE',
+          storeId: arg1
+        }
+      };
+      break;
     // 海报页面
 
     case _constants.urlType.CUSTOMIZED:
@@ -451,7 +475,8 @@ var parseUrl = function parseUrl(url) {
         '/product/GroupBuy': 'GROUP',
         '/search-page': 'SEARCH_PAGE',
         '/main/my-commission': 'WALLET',
-        '/commission': 'COMMISSION'
+        '/commission': 'COMMISSION',
+        '/location': 'ADD_ADDRESS_PAGE'
       };
       link = url;
       params = {

package/es/utils/coreUtil.js

@@ -335,7 +335,9 @@ var clickUrl = function clickUrl(url, state) {
     return;
   }
 
-  if ((0, _androidUtil.browserVersion)().isAshitaApp || (0, _androidUtil.browserVersion)().flutterApp) {
+  console.log('sendToApp', data);
+
+  if ((0, _androidUtil.browserVersion)().isAshitaApp || (0, _androidUtil.browserVersion)().flutterApp || (0, _androidUtil.browserVersion)().isDelivistaApp) {
     (0, _androidUtil.sendToApp)(data);
   } else if ((0, _androidUtil.browserVersion)().isApp && params.link && params.link.startsWith('http')) {
     // 跳转链接是个绝对路径

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

@@ -19,7 +19,9 @@ var _common = require("../../../../../common");
 
 var _locale = require("../../../../../locale");
 
-var _androidUtil = require("../../../../../utils/androidUtil");
+var _storeUtil = require("../../../../../utils/storeUtil");
+
+var _coreUtil = require("../../../../../utils/coreUtil");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -74,34 +76,24 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {};
-
-    _this.switchLanguage = function (value) {
-      alert(value);
-    };
-
-    _this.getUserAddress = function (value) {
-      alert(value);
-    };
-
     return _this;
   }
 
-  MerchantSalesMobile.prototype.componentDidMount = function () {
-    if ((0, _androidUtil.browserVersion)().isDelivistaApp) {
-      window.magicDesign.switchLanguage = this.switchLanguage;
-      window.magicDesign.getUserAddress = this.getUserAddress;
-    }
-  };
+  MerchantSalesMobile.prototype.componentDidMount = function () {};
 
   MerchantSalesMobile.prototype.render = function () {
     var _a;
 
     var panelProps = this.props.panelProps;
+    var info = (0, _storeUtil.getStore)('USER_ADDRESS_INFO') || {};
+    var customerInfo = info.customer ? info.customer + " " + info.tel : (0, _locale.i18n)('CAN_BE_ADDED_AS_YOUR_ADDRESS');
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('m-location-mobile', (_a = {}, _a['reversed-layout'] = (0, _commonUtil.needReverse)(), _a))
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "address-wrap",
-      onClick: function onClick() {}
+      onClick: function onClick() {
+        return (0, _coreUtil.clickUrl)('/location');
+      }
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "address-bg",
       style: {
@@ -116,12 +108,12 @@ function (_super) {
     }, panelProps.content.address.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "address one_row",
       data: __assign(__assign({}, panelProps.content.address), {
-        text: (0, _locale.i18n)('DISPLAY_LOCATION_ADDRESS')
+        text: (0, _coreUtil.isDesignMode)() ? (0, _locale.i18n)('DISPLAY_LOCATION_ADDRESS') : info.address
       })
     }), panelProps.content.customer.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "customer one_row",
       data: __assign(__assign({}, panelProps.content.customer), {
-        text: (0, _locale.i18n)('CUSTOMER_NAME_AND_PHONE_NUMBER')
+        text: (0, _coreUtil.isDesignMode)() ? (0, _locale.i18n)('CUSTOMER_NAME_AND_PHONE_NUMBER') : customerInfo
       })
     })), panelProps.content.arrowIcon.open && /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       className: "reversed-icon",

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

@@ -101,7 +101,6 @@ function (_super) {
         rest = __rest(_a, ["data", "panelProps", "onItemClick", "layout"]);
 
     var soldNumber = data.salesCnt > 250 ? "" + (data.salesCnt - data.salesCnt % 250) : data.salesCnt || 0;
-    console.log(panelProps);
     var storeName = panelProps.storeName,
         storeDesc = panelProps.storeDesc,
         freeDeliveryLabel = panelProps.freeDeliveryLabel,

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

@@ -318,7 +318,7 @@ function (_super) {
         data: __assign({}, item),
         layout: panelProps.customize.layout,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("store-" + item.storeId + "}");
+          return (0, _coreUtil.clickUrl)("store-" + item.storeId);
         },
         panelProps: panelProps.content
       });

package/lib/constants/index.js

@@ -133,6 +133,7 @@ var campaignTypes = {
 exports.campaignTypes = campaignTypes;
 var urlType = {
   PRODUCT_DETAIL: 'proDetail',
+  STORE: 'store',
   CATG_PROD_LIST: 'catg',
   CUSTOMIZED: 'customized',
   PROD_FILTER: 'filter',
@@ -162,7 +163,8 @@ var urlTypeMap = {
   INTERESTED_MERCHANTS: 'InterestedMerchants',
   INTERESTED_PRODUCTS: 'InterestedProducts',
   MERCHANT_STORY: 'MerchantStory',
-  AFFILIATE_MISSION_DETAIL: 'AffiliateMissionDetail'
+  AFFILIATE_MISSION_DETAIL: 'AffiliateMissionDetail',
+  BUSINESS_TYPE: 'Business Type'
 };
 exports.urlTypeMap = urlTypeMap;
 var respCodeMap = {

package/lib/decorator/compositeDecorator.js

@@ -15,6 +15,10 @@ 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -84,8 +88,27 @@ function compositeDecorator(WrappedComponent) {
       _this.state = {
         clickedFloor: '',
         hoveredFloor: ''
+      };
+
+      _this.switchLanguage = function (value) {
+        alert(value); // const lang = 'ar';
+
+        (0, _storeUtil.setStore)(_constants.STORAGE_KEY.LOCALE, value);
+      };
+
+      _this.getUserAddress = function (value) {
+        alert(value); // const info = {
+        //   address: '简短地址',
+        //   customer: '客户名称',
+        //   tel: '客户手机号',
+        //   longitude: '经度',
+        //   latitude: '纬度',
+        // };
+
+        (0, _storeUtil.setStore)('USER_ADDRESS_INFO', value);
       }; // 复合组件点击事件
 
+
       _this.onCompositeCompClick = function (event) {
         if (window.magicDesign.mode === 'renderer') {
           return;
@@ -267,6 +290,12 @@ function compositeDecorator(WrappedComponent) {
         });
       });
       this.getOuterWrapStyle();
+
+      if ((0, _androidUtil.browserVersion)().isDelivistaApp) {
+        window['switchLanguage'] = this.switchLanguage;
+        window['getUserAddress'] = this.getUserAddress; // switchLanguage();
+        // getUserAddress();
+      }
     };
 
     Wrapper.prototype.componentWillUnmount = function () {

package/lib/locale/ar/ar.json

@@ -1,4 +1,5 @@
 {
+  "CAN_BE_ADDED_AS_YOUR_ADDRESS": "Can be added as your address",
   "GIFT": "Gift",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",
   "MIN_ORDER": "Min Order",

package/lib/locale/en/en.json

@@ -1,4 +1,5 @@
 {
+  "CAN_BE_ADDED_AS_YOUR_ADDRESS": "Can be added as your address",
   "GIFT": "Gift",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",
   "MIN_ORDER": "Min Order",

package/lib/locale/es/es.json

@@ -1,4 +1,5 @@
 {
+  "CAN_BE_ADDED_AS_YOUR_ADDRESS": "Can be added as your address",
   "GIFT": "Gift",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",
   "MIN_ORDER": "Min Order",

package/lib/locale/mn/mn.json

@@ -1,4 +1,5 @@
 {
+  "CAN_BE_ADDED_AS_YOUR_ADDRESS": "Can be added as your address",
   "GIFT": "Бэлэгтэй",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",
   "MIN_ORDER": "Min Order",

package/lib/utils/businessUtil.js

@@ -267,6 +267,18 @@ var newParseUrl = function newParseUrl(urlObj) {
       };
       break;
 
+    case _constants.urlTypeMap.BUSINESS_TYPE:
+      // 业态列表
+      link = '';
+      params = {
+        action: 'jump',
+        params: {
+          type: 'SEARCH_STORE_LIST_PAGE',
+          storeBizTypeId: value
+        }
+      };
+      break;
+
     default:
       var map = {
         '/main/cart': 'CART',
@@ -285,7 +297,8 @@ var newParseUrl = function newParseUrl(urlObj) {
         '/account/wallet': 'WEBVIEW',
         '/product/GroupBuy': 'GROUP',
         '/search-page': 'SEARCH_PAGE',
-        '/commission': 'COMMISSION'
+        '/commission': 'COMMISSION',
+        '/location': 'ADD_ADDRESS_PAGE'
       };
       var typeTemp = map[link];
 
@@ -370,6 +383,17 @@ var parseUrl = function parseUrl(url) {
         }
       };
       break;
+
+    case _constants.urlType.STORE:
+      // 店铺详情
+      params = {
+        action: 'jump',
+        params: {
+          type: 'STORE',
+          storeId: arg1
+        }
+      };
+      break;
     // 海报页面
 
     case _constants.urlType.CUSTOMIZED:
@@ -451,7 +475,8 @@ var parseUrl = function parseUrl(url) {
         '/product/GroupBuy': 'GROUP',
         '/search-page': 'SEARCH_PAGE',
         '/main/my-commission': 'WALLET',
-        '/commission': 'COMMISSION'
+        '/commission': 'COMMISSION',
+        '/location': 'ADD_ADDRESS_PAGE'
       };
       link = url;
       params = {

package/lib/utils/coreUtil.js

@@ -335,7 +335,9 @@ var clickUrl = function clickUrl(url, state) {
     return;
   }
 
-  if ((0, _androidUtil.browserVersion)().isAshitaApp || (0, _androidUtil.browserVersion)().flutterApp) {
+  console.log('sendToApp', data);
+
+  if ((0, _androidUtil.browserVersion)().isAshitaApp || (0, _androidUtil.browserVersion)().flutterApp || (0, _androidUtil.browserVersion)().isDelivistaApp) {
     (0, _androidUtil.sendToApp)(data);
   } else if ((0, _androidUtil.browserVersion)().isApp && params.link && params.link.startsWith('http')) {
     // 跳转链接是个绝对路径

package/package.json

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