@fonixtree/magic-design 0.2.9 → 0.2.11

package/es/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,7 +16,11 @@ 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.shareFacebook = shareFacebook;
@@ -33,6 +37,8 @@ var _uuid = require("uuid");
 
 var _qs = _interopRequireDefault(require("qs"));
 
+var _androidUtil = require("./androidUtil");
+
 var _constants = require("../constants");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -295,15 +301,75 @@ var navigateTo = function navigateTo(url) {
     if (window.magicDesign.history && !window.magicDesign.navigatePreUrl) {
       window.magicDesign.history.push(url);
     } else {
-      window.location.href = "" + window.magicDesign.navigatePreUrl + url;
+      window.location.href = "" + (window.magicDesign.navigatePreUrl || '') + url;
     }
   } else {
     window.location.href = url;
   }
 };
+/** 判断是否登录状态 */
+
 
 exports.navigateTo = navigateTo;
 
+function isLogin() {
+  return localStorage.getItem('isLogin') === 'Y';
+}
+/**
+ * 跳转登陆页面
+ * SF打开的页面，需要跳转到手机验证码登陆页面
+ * @param {*} state
+ */
+
+
+function goLogin(state) {
+  if (state === void 0) {
+    state = {};
+  }
+
+  navigateTo('/password-sign-in', state);
+}
+/**
+ * 检查是否登录 未登录返回登录页
+ * @param {boolean?} isLead 是否引导登录
+ * @returns boolean
+ */
+
+
+var checkLogin = function checkLogin(isLead, redirectUrl) {
+  if (isLead === void 0) {
+    isLead = true;
+  }
+
+  if (!isLogin()) {
+    if (isLead) {
+      if ((0, _androidUtil.browserVersion)().isAshitaApp) {
+        (0, _androidUtil.sendToApp)({
+          action: 'login',
+          params: {}
+        });
+      } else {
+        var _a = window.location,
+            pathname = _a.pathname,
+            search = _a.search,
+            hash = _a.hash;
+
+        var _redirectUrl = pathname + search + hash;
+
+        goLogin({
+          redirectUrl: redirectUrl || _redirectUrl
+        });
+      }
+    }
+
+    return false;
+  }
+
+  return true;
+};
+
+exports.checkLogin = checkLogin;
+
 var addUrlQuery = function addUrlQuery(url, queryObj) {
   if (/\?/.test(url)) {
     return url + '&' + _qs["default"].stringify(queryObj);

package/es/utils/coreUtil.js

@@ -309,7 +309,14 @@ var clickUrl = function clickUrl(url) {
     params: {
       url: params.link
     }
-  });
+  }); // 领取优惠券
+
+  if (params.type === 'GET_COUPON') {
+    if ((0, _commonUtil.checkLogin)(true)) {
+      getCoupon(params.couponId);
+      return;
+    }
+  }
 
   if ((0, _androidUtil.browserVersion)().isAshitaApp) {
     (0, _androidUtil.sendToApp)(data);
@@ -328,12 +335,6 @@ var clickUrl = function clickUrl(url) {
         source: params.data.sourceUrl
       }));
       return;
-    } // 领取优惠券
-
-
-    if (params.type === 'GET_COUPON') {
-      getCoupon(params.couponId);
-      return;
     }
 
     if (params.type === 'SHARE_URL' || params.type === 'AFFILIATE_PRODUCT') {

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,7 +16,11 @@ 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.shareFacebook = shareFacebook;
@@ -33,6 +37,8 @@ var _uuid = require("uuid");
 
 var _qs = _interopRequireDefault(require("qs"));
 
+var _androidUtil = require("./androidUtil");
+
 var _constants = require("../constants");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -295,15 +301,75 @@ var navigateTo = function navigateTo(url) {
     if (window.magicDesign.history && !window.magicDesign.navigatePreUrl) {
       window.magicDesign.history.push(url);
     } else {
-      window.location.href = "" + window.magicDesign.navigatePreUrl + url;
+      window.location.href = "" + (window.magicDesign.navigatePreUrl || '') + url;
     }
   } else {
     window.location.href = url;
   }
 };
+/** 判断是否登录状态 */
+
 
 exports.navigateTo = navigateTo;
 
+function isLogin() {
+  return localStorage.getItem('isLogin') === 'Y';
+}
+/**
+ * 跳转登陆页面
+ * SF打开的页面，需要跳转到手机验证码登陆页面
+ * @param {*} state
+ */
+
+
+function goLogin(state) {
+  if (state === void 0) {
+    state = {};
+  }
+
+  navigateTo('/password-sign-in', state);
+}
+/**
+ * 检查是否登录 未登录返回登录页
+ * @param {boolean?} isLead 是否引导登录
+ * @returns boolean
+ */
+
+
+var checkLogin = function checkLogin(isLead, redirectUrl) {
+  if (isLead === void 0) {
+    isLead = true;
+  }
+
+  if (!isLogin()) {
+    if (isLead) {
+      if ((0, _androidUtil.browserVersion)().isAshitaApp) {
+        (0, _androidUtil.sendToApp)({
+          action: 'login',
+          params: {}
+        });
+      } else {
+        var _a = window.location,
+            pathname = _a.pathname,
+            search = _a.search,
+            hash = _a.hash;
+
+        var _redirectUrl = pathname + search + hash;
+
+        goLogin({
+          redirectUrl: redirectUrl || _redirectUrl
+        });
+      }
+    }
+
+    return false;
+  }
+
+  return true;
+};
+
+exports.checkLogin = checkLogin;
+
 var addUrlQuery = function addUrlQuery(url, queryObj) {
   if (/\?/.test(url)) {
     return url + '&' + _qs["default"].stringify(queryObj);

package/lib/utils/coreUtil.js

@@ -309,7 +309,14 @@ var clickUrl = function clickUrl(url) {
     params: {
       url: params.link
     }
-  });
+  }); // 领取优惠券
+
+  if (params.type === 'GET_COUPON') {
+    if ((0, _commonUtil.checkLogin)(true)) {
+      getCoupon(params.couponId);
+      return;
+    }
+  }
 
   if ((0, _androidUtil.browserVersion)().isAshitaApp) {
     (0, _androidUtil.sendToApp)(data);
@@ -328,12 +335,6 @@ var clickUrl = function clickUrl(url) {
         source: params.data.sourceUrl
       }));
       return;
-    } // 领取优惠券
-
-
-    if (params.type === 'GET_COUPON') {
-      getCoupon(params.couponId);
-      return;
     }
 
     if (params.type === 'SHARE_URL' || params.type === 'AFFILIATE_PRODUCT') {

package/package.json

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