@fonixtree/magic-design 2.0.81 → 2.0.83

package/lib/mobx/UserState.js

@@ -0,0 +1,144 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.UserState = void 0;
+
+var _mobx = require("mobx");
+
+var _storeUtil = require("../utils/storeUtil");
+
+var _androidUtil = require("../utils/androidUtil");
+
+var _commonUtil = require("../utils/commonUtil");
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
+var __decorate = void 0 && (void 0).__decorate || function (decorators, target, key, desc) {
+  var c = arguments.length,
+      r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
+      d;
+  if ((typeof Reflect === "undefined" ? "undefined" : _typeof(Reflect)) === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) {
+    if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  }
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+
+var debug = require('debug')('worker:userState');
+/** 缓存 Key */
+
+
+var CACHE_KEY = 'USER_STATE';
+/** 持久化白名单 */
+
+var whiteList = ['photo', 'firstName', 'middleName', 'lastName', 'nickName', 'mobilePhone', 'cartNum', 'email', 'lastPaymentDate', 'userAddress', 'userDefAddress', 'recentViewNum', 'userCollectionNum', 'couponNum', 'language', 'distributor', 'tempVal', 'gender', 'birthdayDay', 'enUserId'];
+
+var getUserStore = function getUserStore() {
+  if (!(0, _commonUtil.isLogin)()) {
+    return {};
+  }
+
+  return (0, _storeUtil.getStore)(CACHE_KEY);
+};
+
+var initData = {
+  /** 头像 */
+  photo: '',
+
+  /** userId */
+  userId: '',
+
+  /** 昵称 */
+  nickName: '',
+
+  /** 名字 */
+  firstName: '',
+
+  /** 名字 */
+  middleName: '',
+
+  /** 名字 */
+  lastName: '',
+
+  /** 手机号 */
+  mobilePhone: '',
+
+  /** 购物车数量 */
+  cartNum: 0,
+  // 邮箱
+  email: '',
+  // 上次支付时间
+  lastPaymentDate: '',
+  // 用户设置语言
+  language: (0, _androidUtil.browserVersion)().isApp && localStorage.getItem('USER_LANGUAGE') ? localStorage.getItem('USER_LANGUAGE') : 'en',
+
+  /** 用户邮寄地址 */
+  userAddress: null,
+  userDefAddress: {},
+  // 最近浏览数量
+  recentViewNum: 0,
+  // 收藏数量
+  userCollectionNum: 0,
+  // 优惠券数量
+  couponNum: 0,
+  // 临时存放值
+  tempVal: '',
+  gender: '',
+  birthdayDay: '',
+  enUserId: '',
+  distributor: null
+};
+
+var UserState =
+/** @class */
+function () {
+  function UserState() {
+    this.state = __assign(__assign({}, initData), getUserStore());
+  }
+  /** 修改状态 */
+
+
+  UserState.prototype.setState = function (data) {
+    debug('用户状态更新', data);
+    var preState = this.state;
+    this.state = __assign(__assign({}, preState), data);
+    (0, _storeUtil.persistence)(CACHE_KEY, this.state, whiteList);
+  };
+
+  UserState.prototype.clearUserState = function () {
+    this.state = __assign(__assign({}, initData), {
+      language: this.state.language
+    });
+    (0, _storeUtil.persistence)(CACHE_KEY, this.state, whiteList);
+    /** 恢复默认地址 */
+
+    (0, _commonUtil.setDefaultAddressFromIP)();
+  };
+
+  __decorate([_mobx.observable], UserState.prototype, "state", void 0);
+
+  __decorate([_mobx.action.bound], UserState.prototype, "setState", null);
+
+  __decorate([_mobx.action.bound], UserState.prototype, "clearUserState", null);
+
+  return UserState;
+}();
+
+exports.UserState = UserState;

package/lib/mobx/index.js

@@ -5,9 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {
   store: true,
-  frameStore: true
+  frameStore: true,
+  userState: true
 };
-exports.store = exports.frameStore = exports["default"] = void 0;
+exports.userState = exports.store = exports.frameStore = exports["default"] = void 0;
 
 var _mobx = require("mobx");
 
@@ -27,6 +28,8 @@ var _Store = require("./Store");
 
 var _Frame = require("./Frame");
 
+var _UserState = require("./UserState");
+
 /* 开启严格模式 */
 (0, _mobx.configure)({
   enforceActions: 'observed'
@@ -35,8 +38,11 @@ var store = new _Store.Store();
 exports.store = store;
 var frameStore = new _Frame.Frame();
 exports.frameStore = frameStore;
+var userState = new _UserState.UserState();
+exports.userState = userState;
 var _default = {
   store: store,
-  frameStore: frameStore
+  frameStore: frameStore,
+  userState: userState
 };
 exports["default"] = _default;

package/lib/utils/androidUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.sendToJs = exports.sendToIos = exports.sendToApp = exports.sendToAndroid = exports.iosSendToJs = exports.connectWebViewJavascriptBridge = exports.browserVersion = void 0;
+exports.sendToJs = exports.sendToIos = exports.sendToApp = exports.sendToAndroid = exports.iosSendToJs = exports.goToLoginApp = exports.connectWebViewJavascriptBridge = exports.browserVersion = void 0;
 
 // 判断访问终端
 var browserVersion = function browserVersion() {
@@ -129,6 +129,17 @@ var sendToApp = function sendToApp(params) {
   if (AlipayJSBridge) {
     AlipayJSBridge.call('mpaasAction', params);
   }
+}; // 拉起APP登录
+
+
+exports.sendToApp = sendToApp;
+
+var goToLoginApp = function goToLoginApp() {
+  if (browserVersion().androidApp) {
+    window.dito.goToLogin();
+  } else if (browserVersion().iosApp) {
+    window.dito.goToLogin();
+  }
 };
 
-exports.sendToApp = sendToApp;
+exports.goToLoginApp = goToLoginApp;

package/lib/utils/commonUtil.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.addZero = exports.addUrlQuery = void 0;
 exports.asyncDataURLtoImage = asyncDataURLtoImage;
-exports.checkFileName = exports.calcLastTime = exports.asyncNextTick = void 0;
+exports.checkLogin = exports.checkFileName = exports.calcLastTime = exports.asyncNextTick = void 0;
 exports.commonFetch = commonFetch;
 exports.convertCount = exports.compatibleNewPageData = void 0;
 exports.convertImageUrl = convertImageUrl;
@@ -16,9 +16,13 @@ exports.dragSource = exports.downloadBase64Image = void 0;
 exports.ensure = ensure;
 exports.getGAData = exports.getColorRgba = void 0;
 exports.getPageDataMap = getPageDataMap;
-exports.onListenTouch = exports.nextTick = exports.navigateTo = exports.importAsync = exports.getUrlParams = void 0;
+exports.getUrlParams = void 0;
+exports.goLogin = goLogin;
+exports.importAsync = void 0;
+exports.isLogin = isLogin;
+exports.onListenTouch = exports.nextTick = exports.navigateTo = void 0;
 exports.pushGA = pushGA;
-exports.pxToRem = void 0;
+exports.setDefaultAddressFromIP = exports.pxToRem = void 0;
 exports.shareFacebook = shareFacebook;
 exports.shareLinkedin = shareLinkedin;
 exports.shareTwitter = shareTwitter;
@@ -33,8 +37,14 @@ var _uuid = require("uuid");
 
 var _qs = _interopRequireDefault(require("qs"));
 
+var _androidUtil = require("./androidUtil");
+
+var _storeUtil = require("./storeUtil");
+
 var _constants = require("../constants");
 
+var _mobx = require("../mobx");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __assign = void 0 && (void 0).__assign || function () {
@@ -287,6 +297,8 @@ function commonFetch(url, data, method) {
 }
 
 var navigateTo = function navigateTo(url) {
+  console.log(url);
+
   if (!url) {
     return;
   }
@@ -309,9 +321,111 @@ var navigateTo = function navigateTo(url) {
     }
   }
 };
+/** 判断是否登录状态 */
+
 
 exports.navigateTo = navigateTo;
 
+function isLogin() {
+  return localStorage.getItem('isLogin') === 'Y';
+}
+/**
+ * 跳转登陆页面
+ * SF打开的页面，需要跳转到手机验证码登陆页面
+ * @param {*} state
+ */
+
+
+function goLogin(state, replaceFlag) {
+  if (state === void 0) {
+    state = {};
+  }
+
+  if (replaceFlag === void 0) {
+    replaceFlag = false;
+  }
+
+  var isFromSf = (0, _storeUtil.getStore)(_constants.STORE_KEY.IS_FROM_SF);
+  var signUrl = isFromSf === 'Y' ? '/sign-in-opt' : '/sign-in';
+
+  if (replaceFlag) {
+    Fishx.history.replace({
+      pathname: signUrl,
+      state: state
+    });
+  } else {
+    navigateTo(signUrl, state);
+  }
+}
+/**
+ * 检查是否登录 未登录返回登录页
+ * @param {boolean?} isLead 是否引导登录
+ * @returns boolean
+ */
+
+
+var checkLogin = function checkLogin(isLead, redirectUrl, replaceFlag) {
+  if (isLead === void 0) {
+    isLead = true;
+  }
+
+  if (!isLogin()) {
+    if (isLead) {
+      if ((0, _androidUtil.browserVersion)().isApp) {
+        goToLoginApp();
+      } else {
+        var _a = window.location,
+            pathname = _a.pathname,
+            search = _a.search,
+            hash = _a.hash;
+
+        var _redirectUrl = pathname + search + hash;
+
+        goLogin({
+          redirectUrl: redirectUrl || _redirectUrl
+        }, replaceFlag);
+      }
+    }
+
+    return false;
+  }
+
+  return true;
+};
+/**
+ * TODO 根据IP获取地址信息
+ */
+
+
+exports.checkLogin = checkLogin;
+
+var setDefaultAddressFromIP = function setDefaultAddressFromIP() {
+  /** 设置初始地址 */
+
+  /** 接口返回数据addrPath: "1|2|137088|137089|137090" 保留后两个再拼上contactStdId
+     * 未登陆造数据和真实数据一致使用countryId占位
+    */
+
+  /** 138375,138376,126065,126066 */
+  if (!_mobx.userState.state.userAddress) {
+    _mobx.userState.setState({
+      userAddress: {
+        _FROM: 'ip',
+        addrPath: 'countryId|countryId1T|countryId2T|138375|138376|126065',
+        city: 'CITY OF MANILA',
+        contactStdId: 126066,
+        // country: 'CITY OF MANILA',
+        district: 'SAN MIGUEL',
+        street: 'Barangay 637',
+        province: 'NCR, CITY OF MANILA, FIRST DISTRICT',
+        type: 'address'
+      }
+    });
+  }
+};
+
+exports.setDefaultAddressFromIP = setDefaultAddressFromIP;
+
 var addUrlQuery = function addUrlQuery(url, queryObj) {
   if (/\?/.test(url)) {
     return url + '&' + _qs["default"].stringify(queryObj);

package/lib/utils/coreUtil.js

@@ -383,7 +383,7 @@ var clickUrl = function clickUrl(url) {
           window.open(a);
         }
       } else {
-        window.open(a);
+        window.open(link);
       }
     } else {
       (0, _commonUtil.navigateTo)(link);

package/package.json

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