@fonixtree/magic-design 0.0.75 → 0.0.76

package/es/common/MessageModal/index.js

@@ -0,0 +1,73 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _reactDom = _interopRequireDefault(require("react-dom"));
+
+require("./index.less");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var _default = {
+  dom: null,
+  success: function success(_a) {
+    var _this = this;
+
+    var title = _a.title,
+        content = _a.content,
+        onOk = _a.onOk,
+        onCancel = _a.onCancel,
+        okText = _a.okText,
+        cancelText = _a.cancelText;
+    this.close();
+    this.dom = document.createElement('div');
+    this.dom.setAttribute('id', 'message_modal');
+
+    var JSXdom = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "message-container"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "modal-shadow",
+      onClick: this.close
+    }), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "modal-content"
+    }, title && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "modal-title"
+    }, title), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "modal-message"
+    }, content), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "modal-btn-wrap"
+    }, cancelText && /*#__PURE__*/_react["default"].createElement("button", {
+      className: "cancel",
+      onClick: function onClick() {
+        return _this.onCancel(onCancel);
+      }
+    }, cancelText), okText && /*#__PURE__*/_react["default"].createElement("button", {
+      className: "confirm",
+      onClick: function onClick() {
+        return _this.onOk(onOk);
+      }
+    }, okText)))));
+
+    _reactDom["default"].render(JSXdom, this.dom);
+
+    document.body.appendChild(this.dom);
+  },
+  onCancel: function onCancel(_onCancel) {
+    _onCancel instanceof Function && _onCancel();
+    this.close();
+  },
+  onOk: function onOk(_onOk) {
+    _onOk instanceof Function && _onOk();
+    this.close();
+  },
+  close: function close() {
+    var dom = document.querySelector('#message_modal');
+    dom && dom.remove();
+  }
+};
+exports["default"] = _default;

package/es/utils/commonUtil.js

@@ -49,7 +49,7 @@ function commonFetch(url, data, method) {
 
   var _method = method.toUpperCase();
 
-  return new Promise(function (resolve) {
+  return new Promise(function (resolve, reject) {
     var _a, _b;
 
     var isLoginUrl = url.includes('portal/login');
@@ -64,6 +64,8 @@ function commonFetch(url, data, method) {
           params: data
         }).then(function (res) {
           resolve(res);
+        })["catch"](function (err) {
+          reject(err);
         });
         return;
       }
@@ -73,6 +75,8 @@ function commonFetch(url, data, method) {
         headers: headers
       }).then(function (res) {
         resolve(res.data);
+      })["catch"](function (err) {
+        reject(err.response.data);
       });
     }
 
@@ -83,6 +87,8 @@ function commonFetch(url, data, method) {
           data: data
         }).then(function (res) {
           resolve(res);
+        })["catch"](function (err) {
+          reject(err);
         });
         return;
       }
@@ -91,6 +97,8 @@ function commonFetch(url, data, method) {
         headers: headers
       }).then(function (res) {
         resolve(res.data);
+      })["catch"](function (err) {
+        reject(err.response.data);
       });
     }
   });

package/es/utils/coreUtil.js

@@ -13,6 +13,8 @@ var _commonUtil = require("./commonUtil");
 
 var _androidUtil = require("./androidUtil");
 
+var _constants = require("../constants");
+
 var _MessageModal = _interopRequireDefault(require("../common/MessageModal"));
 
 var _locale = require("../locale");
@@ -207,7 +209,8 @@ var renderPreview = function renderPreview() {
     bubbles: false
   });
   window.document.dispatchEvent(evt);
-};
+}; // 领取优惠券
+
 
 exports.renderPreview = renderPreview;
 
@@ -217,15 +220,7 @@ var getCoupon = function getCoupon(couponId) {
     return __generator(this, function (_a) {
       switch (_a.label) {
         case 0:
-          _MessageModal["default"].success({
-            content: 'test',
-            okText: 'Ok'
-          });
-
-          _a.label = 1;
-
-        case 1:
-          _a.trys.push([1, 3,, 4]);
+          _a.trys.push([0, 2,, 3]);
 
           return [4
           /*yield*/
@@ -233,8 +228,8 @@ var getCoupon = function getCoupon(couponId) {
             couponId: Number(couponId)
           }, 'POST')];
 
-        case 2:
-          _a.sent();
+        case 1:
+          res = _a.sent();
 
           _MessageModal["default"].success({
             content: (0, _locale.i18n)('VOUCHER_SUCCESS'),
@@ -243,21 +238,27 @@ var getCoupon = function getCoupon(couponId) {
 
           return [3
           /*break*/
-          , 4];
+          , 3];
 
-        case 3:
+        case 2:
           err_1 = _a.sent();
 
+          if (err_1.code === _constants.respCodeMap.NOT_LOGGED_IN) {
+            return [2
+            /*return*/
+            ];
+          }
+
           _MessageModal["default"].success({
-            content: err_1,
+            content: err_1.message,
             okText: 'Ok'
           });
 
           return [3
           /*break*/
-          , 4];
+          , 3];
 
-        case 4:
+        case 3:
           return [2
           /*return*/
           ];
@@ -268,8 +269,6 @@ var getCoupon = function getCoupon(couponId) {
 
 var clickUrl = function clickUrl(url) {
   console.log('url', url);
-  getCoupon(100);
-  return;
 
   if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url) {
     return;

package/lib/common/MessageModal/index.js

@@ -0,0 +1,73 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _reactDom = _interopRequireDefault(require("react-dom"));
+
+require("./index.less");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var _default = {
+  dom: null,
+  success: function success(_a) {
+    var _this = this;
+
+    var title = _a.title,
+        content = _a.content,
+        onOk = _a.onOk,
+        onCancel = _a.onCancel,
+        okText = _a.okText,
+        cancelText = _a.cancelText;
+    this.close();
+    this.dom = document.createElement('div');
+    this.dom.setAttribute('id', 'message_modal');
+
+    var JSXdom = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "message-container"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "modal-shadow",
+      onClick: this.close
+    }), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "modal-content"
+    }, title && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "modal-title"
+    }, title), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "modal-message"
+    }, content), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "modal-btn-wrap"
+    }, cancelText && /*#__PURE__*/_react["default"].createElement("button", {
+      className: "cancel",
+      onClick: function onClick() {
+        return _this.onCancel(onCancel);
+      }
+    }, cancelText), okText && /*#__PURE__*/_react["default"].createElement("button", {
+      className: "confirm",
+      onClick: function onClick() {
+        return _this.onOk(onOk);
+      }
+    }, okText)))));
+
+    _reactDom["default"].render(JSXdom, this.dom);
+
+    document.body.appendChild(this.dom);
+  },
+  onCancel: function onCancel(_onCancel) {
+    _onCancel instanceof Function && _onCancel();
+    this.close();
+  },
+  onOk: function onOk(_onOk) {
+    _onOk instanceof Function && _onOk();
+    this.close();
+  },
+  close: function close() {
+    var dom = document.querySelector('#message_modal');
+    dom && dom.remove();
+  }
+};
+exports["default"] = _default;

package/lib/utils/commonUtil.js

@@ -49,7 +49,7 @@ function commonFetch(url, data, method) {
 
   var _method = method.toUpperCase();
 
-  return new Promise(function (resolve) {
+  return new Promise(function (resolve, reject) {
     var _a, _b;
 
     var isLoginUrl = url.includes('portal/login');
@@ -64,6 +64,8 @@ function commonFetch(url, data, method) {
           params: data
         }).then(function (res) {
           resolve(res);
+        })["catch"](function (err) {
+          reject(err);
         });
         return;
       }
@@ -73,6 +75,8 @@ function commonFetch(url, data, method) {
         headers: headers
       }).then(function (res) {
         resolve(res.data);
+      })["catch"](function (err) {
+        reject(err.response.data);
       });
     }
 
@@ -83,6 +87,8 @@ function commonFetch(url, data, method) {
           data: data
         }).then(function (res) {
           resolve(res);
+        })["catch"](function (err) {
+          reject(err);
         });
         return;
       }
@@ -91,6 +97,8 @@ function commonFetch(url, data, method) {
         headers: headers
       }).then(function (res) {
         resolve(res.data);
+      })["catch"](function (err) {
+        reject(err.response.data);
       });
     }
   });

package/lib/utils/coreUtil.js

@@ -13,6 +13,8 @@ var _commonUtil = require("./commonUtil");
 
 var _androidUtil = require("./androidUtil");
 
+var _constants = require("../constants");
+
 var _MessageModal = _interopRequireDefault(require("../common/MessageModal"));
 
 var _locale = require("../locale");
@@ -207,7 +209,8 @@ var renderPreview = function renderPreview() {
     bubbles: false
   });
   window.document.dispatchEvent(evt);
-};
+}; // 领取优惠券
+
 
 exports.renderPreview = renderPreview;
 
@@ -217,15 +220,7 @@ var getCoupon = function getCoupon(couponId) {
     return __generator(this, function (_a) {
       switch (_a.label) {
         case 0:
-          _MessageModal["default"].success({
-            content: 'test',
-            okText: 'Ok'
-          });
-
-          _a.label = 1;
-
-        case 1:
-          _a.trys.push([1, 3,, 4]);
+          _a.trys.push([0, 2,, 3]);
 
           return [4
           /*yield*/
@@ -233,8 +228,8 @@ var getCoupon = function getCoupon(couponId) {
             couponId: Number(couponId)
           }, 'POST')];
 
-        case 2:
-          _a.sent();
+        case 1:
+          res = _a.sent();
 
           _MessageModal["default"].success({
             content: (0, _locale.i18n)('VOUCHER_SUCCESS'),
@@ -243,21 +238,27 @@ var getCoupon = function getCoupon(couponId) {
 
           return [3
           /*break*/
-          , 4];
+          , 3];
 
-        case 3:
+        case 2:
           err_1 = _a.sent();
 
+          if (err_1.code === _constants.respCodeMap.NOT_LOGGED_IN) {
+            return [2
+            /*return*/
+            ];
+          }
+
           _MessageModal["default"].success({
-            content: err_1,
+            content: err_1.message,
             okText: 'Ok'
           });
 
           return [3
           /*break*/
-          , 4];
+          , 3];
 
-        case 4:
+        case 3:
           return [2
           /*return*/
           ];
@@ -268,8 +269,6 @@ var getCoupon = function getCoupon(couponId) {
 
 var clickUrl = function clickUrl(url) {
   console.log('url', url);
-  getCoupon(100);
-  return;
 
   if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url) {
     return;

package/package.json

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