@fonixtree/magic-design 2.0.194 → 2.0.197

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

@@ -19,10 +19,10 @@ var _common = require("../../../../../common");
 
 var _locale = require("../../../../../locale");
 
-var _storeUtil = require("../../../../../utils/storeUtil");
-
 var _coreUtil = require("../../../../../utils/coreUtil");
 
+var _mobx = require("../../../../../mobx");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -75,24 +75,34 @@ function (_super) {
   function LocationMobile() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
-    _this.state = {};
+    _this.state = {
+      locationInfo: {}
+    };
     return _this;
   }
 
-  LocationMobile.prototype.componentDidMount = function () {};
+  LocationMobile.prototype.componentDidMount = function () {
+    var _this = this;
+
+    this.distroy = (0, _mobx.autorun)(function () {
+      _this.setState({
+        locationInfo: _mobx.store.locationInfo
+      });
+    });
+  };
 
   LocationMobile.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');
+    var locationInfo = this.state.locationInfo;
+    var customerInfo = locationInfo.customer ? locationInfo.customer + " " + locationInfo.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() {
-        return (0, _coreUtil.clickUrl)('/location');
+        return (0, _coreUtil.clickUrl)(locationInfo.address ? '/location' : '/add-location');
       }
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "address-bg",
@@ -108,7 +118,7 @@ function (_super) {
     }, panelProps.content.address.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "address one_row",
       data: __assign(__assign({}, panelProps.content.address), {
-        text: (0, _coreUtil.isDesignMode)() ? (0, _locale.i18n)('DISPLAY_LOCATION_ADDRESS') : info.address
+        text: (0, _coreUtil.isDesignMode)() ? (0, _locale.i18n)('DISPLAY_LOCATION_ADDRESS') : locationInfo.address
       })
     }), panelProps.content.customer.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "customer one_row",

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

@@ -19,7 +19,7 @@ var _commonUtil = require("../../../../../utils/commonUtil");
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 
-var _storeUtil = require("../../../../../utils/storeUtil");
+var _mobx = require("../../../../../mobx");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -239,7 +239,8 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {
-      list: []
+      list: [],
+      locationInfo: {}
     };
     _this.sourceType = '1';
     _this.maxProdNum = 5;
@@ -247,7 +248,7 @@ function (_super) {
 
     _this.getData = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var _a, maxProdNum, sourceType, storeIds, params, info, res, list;
+        var _a, maxProdNum, sourceType, storeIds, params, locationInfo, res, list;
 
         var _b;
 
@@ -271,11 +272,11 @@ function (_super) {
               }
 
               if ((0, _commonUtil.isLogin)()) {
-                info = (0, _storeUtil.getStore)('USER_ADDRESS_INFO') || {};
+                locationInfo = this.state.locationInfo;
 
-                if (info.longitude && info.latitude) {
-                  params.longitude = info.longitude;
-                  params.latitude = info.latitude;
+                if (locationInfo.longitude && locationInfo.latitude) {
+                  params.longitude = locationInfo.longitude;
+                  params.latitude = locationInfo.latitude;
                 }
               }
 
@@ -301,7 +302,16 @@ function (_super) {
   }
 
   Mobile.prototype.componentDidMount = function () {
+    var _this = this;
+
     this.getData();
+    this.distroy = (0, _mobx.autorun)(function () {
+      _this.setState({
+        locationInfo: _mobx.store.locationInfo
+      }, function () {
+        _this.getData();
+      });
+    });
   };
 
   Mobile.prototype.componentWillReceiveProps = function (nextProps) {

package/es/decorator/compositeDecorator.js

@@ -89,21 +89,21 @@ function compositeDecorator(WrappedComponent) {
       };
 
       _this.switchLanguage = function (value) {
-        alert(value); // const lang = 'ar';
-
-        (0, _storeUtil.setStore)(_constants.STORAGE_KEY.LOCALE, value);
+        // const lang = 'ar';
+        (0, _storeUtil.setStore)(_constants.STORAGE_KEY.LOCALE, value); // 实时更新问题待优化;
       };
 
       _this.getUserAddress = function (value) {
-        alert(value); // const info = {
+        // const info = {
         //   address: '简短地址',
         //   customer: '客户名称',
         //   tel: '客户手机号',
         //   longitude: '经度',
         //   latitude: '纬度',
         // };
-
-        (0, _storeUtil.setStore)('USER_ADDRESS_INFO', value);
+        _mobx.store.setState({
+          locationInfo: value || {}
+        });
       }; // 复合组件点击事件
 
 

package/es/mobx/Store.js

@@ -12,7 +12,7 @@ var _storeUtil = require("../utils/storeUtil");
 var debug = require('debug')('worker:mobx');
 
 var CACHE_KEY = 'STORE';
-var whiteList = ['hoveredMeta', 'clickedMeta', 'clickedGroup', 'clickedFloor', 'hoveredFloor', 'textSelection', 'MPageData'];
+var whiteList = ['hoveredMeta', 'clickedMeta', 'clickedGroup', 'clickedFloor', 'hoveredFloor', 'textSelection', 'MPageData', 'locationInfo'];
 
 var Store =
 /** @class */
@@ -36,6 +36,8 @@ function () {
 
     this.imgGenVisible = false; // 图片生成器是否可见
 
+    this.locationInfo = {}; // 地址组件暂存数据
+
     (0, _mobx.makeObservable)(this, {
       MPageData: _mobx.observable,
       hoveredMeta: _mobx.observable,
@@ -45,6 +47,7 @@ function () {
       hoveredFloor: _mobx.observable,
       CarouselStore: _mobx.observable,
       imgGenVisible: _mobx.observable,
+      locationInfo: _mobx.observable,
       setState: _mobx.action.bound
     });
   }

package/es/utils/businessUtil.js

@@ -165,7 +165,7 @@ var newParseUrl = function newParseUrl(urlObj) {
         action: 'jump',
         params: {
           type: 'STORE',
-          url: value
+          storeId: value
         }
       };
       break;
@@ -298,7 +298,8 @@ var newParseUrl = function newParseUrl(urlObj) {
         '/product/GroupBuy': 'GROUP',
         '/search-page': 'SEARCH_PAGE',
         '/commission': 'COMMISSION',
-        '/location': 'ADD_ADDRESS_PAGE'
+        '/add-location': 'ADD_ADDRESS_PAGE',
+        '/location': 'ADDRESS_PAGE'
       };
       var typeTemp = map[link];
 
@@ -366,8 +367,8 @@ var parseUrl = function parseUrl(url) {
         action: 'jump',
         params: {
           type: 'PRODUCT_DETAIL',
-          offerId: arg1,
-          productId: arg2
+          offerId: Number(arg1),
+          productId: Number(arg2)
         }
       };
       break;
@@ -390,7 +391,7 @@ var parseUrl = function parseUrl(url) {
         action: 'jump',
         params: {
           type: 'STORE',
-          storeId: arg1
+          storeId: Number(arg1)
         }
       };
       break;
@@ -476,7 +477,8 @@ var parseUrl = function parseUrl(url) {
         '/search-page': 'SEARCH_PAGE',
         '/main/my-commission': 'WALLET',
         '/commission': 'COMMISSION',
-        '/location': 'ADD_ADDRESS_PAGE'
+        '/add-location': 'ADD_ADDRESS_PAGE',
+        '/location': 'ADDRESS_PAGE'
       };
       link = url;
       params = {

package/es/utils/coreUtil.js

@@ -405,8 +405,8 @@ var clickUrl = function clickUrl(url, state) {
         (0, _commonUtil.navigateTo)(link, state);
       }
     } else if (((_b = window === null || window === void 0 ? void 0 : window.magicDesign) === null || _b === void 0 ? void 0 : _b.projectCode) === 'pto') {
-      // 输入的是完整的跳转地址
-      if (isUrl(link)) {
+      // 输入的是完整的跳转地址 排除掉‘https://www.baidu.com;mydito://BuyLoad’这种情况
+      if (isUrl(link) && !link.includes('mydito://')) {
         if (!link.includes(window.location.host)) {
           // 跳转外链 需要把token带上
           if (link.includes('?')) {

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

@@ -19,10 +19,10 @@ var _common = require("../../../../../common");
 
 var _locale = require("../../../../../locale");
 
-var _storeUtil = require("../../../../../utils/storeUtil");
-
 var _coreUtil = require("../../../../../utils/coreUtil");
 
+var _mobx = require("../../../../../mobx");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -75,24 +75,34 @@ function (_super) {
   function LocationMobile() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
-    _this.state = {};
+    _this.state = {
+      locationInfo: {}
+    };
     return _this;
   }
 
-  LocationMobile.prototype.componentDidMount = function () {};
+  LocationMobile.prototype.componentDidMount = function () {
+    var _this = this;
+
+    this.distroy = (0, _mobx.autorun)(function () {
+      _this.setState({
+        locationInfo: _mobx.store.locationInfo
+      });
+    });
+  };
 
   LocationMobile.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');
+    var locationInfo = this.state.locationInfo;
+    var customerInfo = locationInfo.customer ? locationInfo.customer + " " + locationInfo.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() {
-        return (0, _coreUtil.clickUrl)('/location');
+        return (0, _coreUtil.clickUrl)(locationInfo.address ? '/location' : '/add-location');
       }
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "address-bg",
@@ -108,7 +118,7 @@ function (_super) {
     }, panelProps.content.address.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "address one_row",
       data: __assign(__assign({}, panelProps.content.address), {
-        text: (0, _coreUtil.isDesignMode)() ? (0, _locale.i18n)('DISPLAY_LOCATION_ADDRESS') : info.address
+        text: (0, _coreUtil.isDesignMode)() ? (0, _locale.i18n)('DISPLAY_LOCATION_ADDRESS') : locationInfo.address
       })
     }), panelProps.content.customer.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "customer one_row",

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

@@ -19,7 +19,7 @@ var _commonUtil = require("../../../../../utils/commonUtil");
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 
-var _storeUtil = require("../../../../../utils/storeUtil");
+var _mobx = require("../../../../../mobx");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -239,7 +239,8 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {
-      list: []
+      list: [],
+      locationInfo: {}
     };
     _this.sourceType = '1';
     _this.maxProdNum = 5;
@@ -247,7 +248,7 @@ function (_super) {
 
     _this.getData = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var _a, maxProdNum, sourceType, storeIds, params, info, res, list;
+        var _a, maxProdNum, sourceType, storeIds, params, locationInfo, res, list;
 
         var _b;
 
@@ -271,11 +272,11 @@ function (_super) {
               }
 
               if ((0, _commonUtil.isLogin)()) {
-                info = (0, _storeUtil.getStore)('USER_ADDRESS_INFO') || {};
+                locationInfo = this.state.locationInfo;
 
-                if (info.longitude && info.latitude) {
-                  params.longitude = info.longitude;
-                  params.latitude = info.latitude;
+                if (locationInfo.longitude && locationInfo.latitude) {
+                  params.longitude = locationInfo.longitude;
+                  params.latitude = locationInfo.latitude;
                 }
               }
 
@@ -301,7 +302,16 @@ function (_super) {
   }
 
   Mobile.prototype.componentDidMount = function () {
+    var _this = this;
+
     this.getData();
+    this.distroy = (0, _mobx.autorun)(function () {
+      _this.setState({
+        locationInfo: _mobx.store.locationInfo
+      }, function () {
+        _this.getData();
+      });
+    });
   };
 
   Mobile.prototype.componentWillReceiveProps = function (nextProps) {

package/lib/decorator/compositeDecorator.js

@@ -89,21 +89,21 @@ function compositeDecorator(WrappedComponent) {
       };
 
       _this.switchLanguage = function (value) {
-        alert(value); // const lang = 'ar';
-
-        (0, _storeUtil.setStore)(_constants.STORAGE_KEY.LOCALE, value);
+        // const lang = 'ar';
+        (0, _storeUtil.setStore)(_constants.STORAGE_KEY.LOCALE, value); // 实时更新问题待优化;
       };
 
       _this.getUserAddress = function (value) {
-        alert(value); // const info = {
+        // const info = {
         //   address: '简短地址',
         //   customer: '客户名称',
         //   tel: '客户手机号',
         //   longitude: '经度',
         //   latitude: '纬度',
         // };
-
-        (0, _storeUtil.setStore)('USER_ADDRESS_INFO', value);
+        _mobx.store.setState({
+          locationInfo: value || {}
+        });
       }; // 复合组件点击事件
 
 

package/lib/mobx/Store.js

@@ -12,7 +12,7 @@ var _storeUtil = require("../utils/storeUtil");
 var debug = require('debug')('worker:mobx');
 
 var CACHE_KEY = 'STORE';
-var whiteList = ['hoveredMeta', 'clickedMeta', 'clickedGroup', 'clickedFloor', 'hoveredFloor', 'textSelection', 'MPageData'];
+var whiteList = ['hoveredMeta', 'clickedMeta', 'clickedGroup', 'clickedFloor', 'hoveredFloor', 'textSelection', 'MPageData', 'locationInfo'];
 
 var Store =
 /** @class */
@@ -36,6 +36,8 @@ function () {
 
     this.imgGenVisible = false; // 图片生成器是否可见
 
+    this.locationInfo = {}; // 地址组件暂存数据
+
     (0, _mobx.makeObservable)(this, {
       MPageData: _mobx.observable,
       hoveredMeta: _mobx.observable,
@@ -45,6 +47,7 @@ function () {
       hoveredFloor: _mobx.observable,
       CarouselStore: _mobx.observable,
       imgGenVisible: _mobx.observable,
+      locationInfo: _mobx.observable,
       setState: _mobx.action.bound
     });
   }

package/lib/utils/businessUtil.js

@@ -165,7 +165,7 @@ var newParseUrl = function newParseUrl(urlObj) {
         action: 'jump',
         params: {
           type: 'STORE',
-          url: value
+          storeId: value
         }
       };
       break;
@@ -298,7 +298,8 @@ var newParseUrl = function newParseUrl(urlObj) {
         '/product/GroupBuy': 'GROUP',
         '/search-page': 'SEARCH_PAGE',
         '/commission': 'COMMISSION',
-        '/location': 'ADD_ADDRESS_PAGE'
+        '/add-location': 'ADD_ADDRESS_PAGE',
+        '/location': 'ADDRESS_PAGE'
       };
       var typeTemp = map[link];
 
@@ -366,8 +367,8 @@ var parseUrl = function parseUrl(url) {
         action: 'jump',
         params: {
           type: 'PRODUCT_DETAIL',
-          offerId: arg1,
-          productId: arg2
+          offerId: Number(arg1),
+          productId: Number(arg2)
         }
       };
       break;
@@ -390,7 +391,7 @@ var parseUrl = function parseUrl(url) {
         action: 'jump',
         params: {
           type: 'STORE',
-          storeId: arg1
+          storeId: Number(arg1)
         }
       };
       break;
@@ -476,7 +477,8 @@ var parseUrl = function parseUrl(url) {
         '/search-page': 'SEARCH_PAGE',
         '/main/my-commission': 'WALLET',
         '/commission': 'COMMISSION',
-        '/location': 'ADD_ADDRESS_PAGE'
+        '/add-location': 'ADD_ADDRESS_PAGE',
+        '/location': 'ADDRESS_PAGE'
       };
       link = url;
       params = {

package/lib/utils/coreUtil.js

@@ -405,8 +405,8 @@ var clickUrl = function clickUrl(url, state) {
         (0, _commonUtil.navigateTo)(link, state);
       }
     } else if (((_b = window === null || window === void 0 ? void 0 : window.magicDesign) === null || _b === void 0 ? void 0 : _b.projectCode) === 'pto') {
-      // 输入的是完整的跳转地址
-      if (isUrl(link)) {
+      // 输入的是完整的跳转地址 排除掉‘https://www.baidu.com;mydito://BuyLoad’这种情况
+      if (isUrl(link) && !link.includes('mydito://')) {
         if (!link.includes(window.location.host)) {
           // 跳转外链 需要把token带上
           if (link.includes('?')) {

package/package.json

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